From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNdVR-0003z2-26 for guix-patches@gnu.org; Wed, 21 Jun 2017 07:09:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNdVN-0001XP-Q8 for guix-patches@gnu.org; Wed, 21 Jun 2017 07:09:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56249) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNdVN-0001XL-N2 for guix-patches@gnu.org; Wed, 21 Jun 2017 07:09:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dNdVN-0002EC-Ip for guix-patches@gnu.org; Wed, 21 Jun 2017 07:09:01 -0400 Subject: [bug#27440] [PATCH 4/4] gnu: xorg: Add xpra. References: <2197677c7e5c479f7f4c3f7dbab9c8a3@mykolab.com> In-Reply-To: <2197677c7e5c479f7f4c3f7dbab9c8a3@mykolab.com> Resent-Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Wed, 21 Jun 2017 13:07:53 +0200 From: Rutger Helling Message-ID: <1b74d054ecc2b9d66ee4fc28502fee70@mykolab.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27440@debbugs.gnu.org * gnu/packages/xorg.scm (xpra): New variable. --- gnu/packages/xorg.scm | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e40e681d2..492c7f7fc 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,81 @@ 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 'fix-output + (lambda _ + (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 %output "/etc/init.d/"))) + (substitute* "setup.py" + (("/usr/lib/") (string-append %output "/lib/"))) + (substitute* "./etc/xpra/conf.d/55_server_x11.conf.in" + (("xvfb = %.*") (string-append "xvfb = " (assoc-ref +%build-inputs "xorg-server") "/bin/Xvfb +extension Composite -nolisten tcp +-noreset -auth $XAUTHORITY -screen 0 5760x2560x24+32")))))))) + (home-page "https://www.xpra.org/") + (synopsis "Screen for X11") + (description "Xpra is a persistent remote display server and client for +forwarding applications and desktop screens.") + (license license:gpl2+))) + -- 2.13.1