From e2de6bbdd5503bb58524f0faaaf374988e02f2b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Jun 2017 17:21:43 +0200 Subject: gnu: xf86-video-intel: Update to 2.99.917-6-6babcf1. Consult this URL for changes since the last update (six commits): * gnu/packages/xorg.scm (xf86-video-intel): Update to 2.99.917-6-6babcf1. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cc785a998b..e40e681d29 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2812,10 +2812,10 @@ X server.") (define-public xf86-video-intel - (let ((commit "b57abe20e81f4b8e4dd203b6a9eda7ff441bc8ce")) + (let ((commit "6babcf15dd605ef40de53f5c34f95b7fd195edbe")) (package (name "xf86-video-intel") - (version (string-append "2.99.917-5-" (string-take commit 7))) + (version (string-append "2.99.917-6-" (string-take commit 7))) (source (origin ;; there's no current tarball @@ -2825,7 +2825,7 @@ X server.") (commit commit))) (sha256 (base32 - "1l08jdrqrpaj2168hlz0hwlx27bm7n7lnv82jjyvy884v47gn2ay")) + "055v4z26r00h3mxsd084n3aq8b5h0h3jkv52xss76zgbsq3n2354")) (file-name (string-append name "-" version)))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) -- cgit v1.2.3 From 4b34d603ef192c322b2f5b3bf1559872b2b60b17 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 23 Jun 2017 05:45:29 +0200 Subject: gnu: Add Xpra. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (xpra): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/xorg.scm | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e40e681d29..d4da5d7098 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017 John Darrington ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) @@ -48,6 +50,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) + #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) @@ -58,6 +61,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages spice) + #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg)) @@ -5790,3 +5795,96 @@ basic eye-candy effects.") (home-page "https://cgit.freedesktop.org/xorg/app/xcompmgr/") (license (license:x11-style "https://cgit.freedesktop.org/xorg/app/xcompmgr/tree/COPYING")))) + +(define-public xpra + (package + (name "xpra") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.xpra.org/src/xpra-" + version ".tar.xz")) + (sha256 + (base32 + "09hzgbsj9v5qyh41rbz968ipi7016jk66b60vm6piryna9kbnha3")))) + (build-system python-build-system) + (inputs `(("ffmpeg", ffmpeg) + ("flac", flac) + ("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet + ("libjpeg", libjpeg) + ("libpng", libpng) + ("libvpx", libvpx) + ("libx264", libx264) + ("libxcomposite", libxcomposite) + ("libxdamage", libxdamage) + ("libxkbfile", libxkbfile) + ("libxrandr", libxrandr) + ("libxtst", libxtst) + ("lzo", lzo) + ("python2-cryptography", python2-cryptography) + ("python2-dbus", python2-dbus) + ("python2-lz4", python2-lz4) + ("python2-lzo", python2-lzo) + ("python2-numpy", python2-numpy) + ("python2-pillow" ,python2-pillow) + ("python2-pycairo", python2-pycairo) + ("python2-pycrypto", python2-pycrypto) + ("python2-pygobject", python2-pygobject) + ("python2-pyopengl", python2-pyopengl) + ("python2-pygtk", python2-pygtk) + ("python2-rencode", python2-rencode) + ("xorg-server", xorg-server))) + (native-inputs `(("pkg-config" ,pkg-config) + ("python2-cython", python2-cython))) + (arguments + `(#:python ,python-2 ;; no full Python 3 support yet + #:configure-flags '("--with-tests" + "--with-bundle_tests" + "--without-strict") + #:modules ((guix build python-build-system) + (guix build utils)) + + #:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'check) ;; There's no test suite at the moment. + + ;; Remove BUILD_CPU, BUILD_DATE, BUILD_TIME from build info to + ;; prevent deterministic issues. Also correct some directories and + ;; use the xvfb binary instead of xorg-server (which doesn't seem to + ;; work). + (add-before 'install 'remove-timestamps&set-file-names + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "add_build_info.py" + ((".*\"BUILD_CPU\", get_cpuinfo.*") "")) + (substitute* "add_build_info.py" + ((".*\"BUILD_DATE\", datetime.*") "")) + (substitute* "add_build_info.py" + ((".*\"BUILD_TIME\", datetime.*") "")) + (substitute* "setup.py" + (("/etc/init.d/") + (string-append (assoc-ref outputs "out") + "/etc/init.d/"))) + (substitute* "setup.py" + (("/usr/lib/") + (string-append (assoc-ref outputs "out") "/lib/"))) + (substitute* "./etc/xpra/conf.d/55_server_x11.conf.in" + (("xvfb = %.*") + (string-append "xvfb = " + (assoc-ref inputs "xorg-server") + "/bin/Xvfb +extension Composite -nolisten tcp" + " -noreset -auth $XAUTHORITY" + " -screen 0 5760x2560x24+32"))) + #t))))) + (home-page "https://www.xpra.org/") + (synopsis "Remote access to individual applications or full desktops") + (description "Xpra is a persistent remote display server and client for +forwarding applications and desktop screens. It gives you remote access to +individual applications or full desktops. On X11, it is also known as +``@command{screen} for X11'': it allows you to run programs, usually on a +remote host, direct their display to your local machine, and then to +disconnect from these programs and reconnect from the same or another machine, +without losing any state. It can also be used to forward full desktops from +X11 servers, Windows, or macOS.") + (license license:gpl2+))) -- cgit v1.2.3