From: Rutger Helling <rhelling@mykolab.com>
To: 27440@debbugs.gnu.org
Subject: [bug#27440] [PATCH 4/4] gnu: xorg: Add xpra.
Date: Wed, 21 Jun 2017 13:07:53 +0200 [thread overview]
Message-ID: <1b74d054ecc2b9d66ee4fc28502fee70@mykolab.com> (raw)
In-Reply-To: <2197677c7e5c479f7f4c3f7dbab9c8a3@mykolab.com>
* 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 <david@craven.ch>
;;; Copyright © 2016, 2017 John Darrington <jmd@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;;
;;; 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
prev parent reply other threads:[~2017-06-21 11:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 11:00 [bug#27440] [PATCH 0/4] Add Xpra Rutger Helling
2017-06-21 11:05 ` [bug#27440] [PATCH 1/4] gnu: python: Add python2-pyopengl Rutger Helling
2017-06-22 19:46 ` Ludovic Courtès
2017-06-22 20:42 ` Rutger Helling
2017-06-23 3:55 ` Rutger Helling
2017-06-23 11:52 ` bug#27440: " Ludovic Courtès
2017-06-21 11:05 ` [bug#27440] [PATCH 2/4] gnu: python: Add python-rencode Rutger Helling
2017-06-21 11:06 ` [bug#27440] [PATCH 3/4] gnu: python: Add python2-rencode Rutger Helling
2017-06-21 11:07 ` Rutger Helling [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1b74d054ecc2b9d66ee4fc28502fee70@mykolab.com \
--to=rhelling@mykolab.com \
--cc=27440@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).