* [bug#27440] [PATCH 0/4] Add Xpra.
@ 2017-06-21 11:00 Rutger Helling
2017-06-21 11:05 ` [bug#27440] [PATCH 1/4] gnu: python: Add python2-pyopengl Rutger Helling
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Rutger Helling @ 2017-06-21 11:00 UTC (permalink / raw)
To: 27440
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
Hello Guix,
this patch series adds Xpra, along with a few dependencies. I have not
tested all the functions (webcam, microphone etc.), but the basic
functionality works ("Screen for X11", clipboard sharing).
Note that you may have to add --socket-dir to your commands (xpra
--socket-dir=~/.xpra start :200) or you can just add "--socket-dir =
~/.xpra" to ~/.xpra/xpra.conf.
[-- Attachment #2: Type: text/html, Size: 574 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 1/4] gnu: python: Add python2-pyopengl.
2017-06-21 11:00 [bug#27440] [PATCH 0/4] Add Xpra Rutger Helling
@ 2017-06-21 11:05 ` Rutger Helling
2017-06-22 19:46 ` Ludovic Courtès
2017-06-21 11:05 ` [bug#27440] [PATCH 2/4] gnu: python: Add python-rencode Rutger Helling
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Rutger Helling @ 2017-06-21 11:05 UTC (permalink / raw)
To: 27440
* gnu/packages/python.scm (python2-pyopengl): New variable.
---
gnu/packages/python.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 775cab694..95723c9de 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -40,6 +40,7 @@
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -15423,4 +15424,24 @@ window memory map manager.")
(define-public python2-smmap2
(package-with-python2 python-smmap2))
+
+(define-public python2-pyopengl
+ (package
+ (name "python2-pyopengl")
+ (version "3.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "PyOpenGL" version))
+ (sha256
+ (base32
+ "1byxjj6a8rwzhxhjqlc588zdad2qwxdd7vlam2653ylll31waiwv"))))
+ (arguments
+ `(#:python ,python-2))
+ (build-system python-build-system)
+ (home-page "http://pyopengl.sourceforge.net")
+ (synopsis "Standard OpenGL bindings for Python")
+ (description
+ "PyOpenGL is the most common cross platform Python binding to
OpenGL
+and related APIs. The binding is created using the standard ctypes
library.")
+ (license license:bsd-3)))
--
2.13.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 2/4] gnu: python: Add python-rencode.
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-21 11:05 ` Rutger Helling
2017-06-21 11:06 ` [bug#27440] [PATCH 3/4] gnu: python: Add python2-rencode Rutger Helling
2017-06-21 11:07 ` [bug#27440] [PATCH 4/4] gnu: xorg: Add xpra Rutger Helling
3 siblings, 0 replies; 9+ messages in thread
From: Rutger Helling @ 2017-06-21 11:05 UTC (permalink / raw)
To: 27440
* gnu/packages/python.scm (python-rencode): New variable.
---
gnu/packages/python.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 95723c9de..9c1485854 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15446,3 +15446,26 @@ window memory map manager.")
and related APIs. The binding is created using the standard ctypes
library.")
(license license:bsd-3)))
+
+(define-public python-rencode
+ (package
+ (name "python-rencode")
+ (version "1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "rencode" version))
+ (sha256
+ (base32
+ "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj"))))
+ (build-system python-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("python-cython", python-cython)))
+ (home-page "https://github.com/aresch/rencode")
+ (synopsis "For complex, heterogeneous data structures with many
small elements")
+ (description
+ "The rencode module is similar to bencode from the BitTorrent
project.
+For complex, heterogeneous data structures with many small elements,
r-encoding
+stake up significantly less space than b-encodings. This version of
rencode is a
+complete rewrite in Cython to attempt to increase the performance over
the pure
+Python module written by Petru Paler, Connelly Barnes et al.")
+ (license license:bsd-3)))
--
2.13.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 3/4] gnu: python: Add python2-rencode.
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-21 11:05 ` [bug#27440] [PATCH 2/4] gnu: python: Add python-rencode Rutger Helling
@ 2017-06-21 11:06 ` Rutger Helling
2017-06-21 11:07 ` [bug#27440] [PATCH 4/4] gnu: xorg: Add xpra Rutger Helling
3 siblings, 0 replies; 9+ messages in thread
From: Rutger Helling @ 2017-06-21 11:06 UTC (permalink / raw)
To: 27440
* gnu/packages/python.scm (python2-rencode): New variable.
---
gnu/packages/python.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9c1485854..88cb0a6b8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15470,4 +15470,6 @@ stake up significantly less space than
b-encodings. This version of rencode is a
complete rewrite in Cython to attempt to increase the performance over
the pure
Python module written by Petru Paler, Connelly Barnes et al.")
(license license:bsd-3)))
+
+(define-public python2-rencode
+ (package-with-python2 python-rencode))
--
2.13.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 4/4] gnu: xorg: Add xpra.
2017-06-21 11:00 [bug#27440] [PATCH 0/4] Add Xpra Rutger Helling
` (2 preceding siblings ...)
2017-06-21 11:06 ` [bug#27440] [PATCH 3/4] gnu: python: Add python2-rencode Rutger Helling
@ 2017-06-21 11:07 ` Rutger Helling
3 siblings, 0 replies; 9+ messages in thread
From: Rutger Helling @ 2017-06-21 11:07 UTC (permalink / raw)
To: 27440
* 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 1/4] gnu: python: Add python2-pyopengl.
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
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2017-06-22 19:46 UTC (permalink / raw)
To: Rutger Helling; +Cc: 27440
Hi Rutger,
Rutger Helling <rhelling@mykolab.com> skribis:
> + (description
> + "PyOpenGL is the most common cross platform Python binding
> to OpenGL
> +and related APIs. The binding is created using the standard ctypes
> library.")
It seems your patches were somehow mangled on the way, with lines
wrapped as in the example above.
Could you resend them to this address, preferably with ‘git send-email’?
I would also suggest merging patches 2 and 3, and expounding a bit on
the ‘description’ of Xpra in patch 4. Apart from that it looks alright!
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 1/4] gnu: python: Add python2-pyopengl.
2017-06-22 19:46 ` Ludovic Courtès
@ 2017-06-22 20:42 ` Rutger Helling
2017-06-23 3:55 ` Rutger Helling
0 siblings, 1 reply; 9+ messages in thread
From: Rutger Helling @ 2017-06-22 20:42 UTC (permalink / raw)
To: ludo; +Cc: 27440
[-- Attachment #1.1: Type: text/plain, Size: 749 bytes --]
Sorry about that! Here are the patches changed with your suggestions,
sent as attachments.
On 2017-06-22 21:46, ludo@gnu.org wrote:
> Hi Rutger,
>
> Rutger Helling <rhelling@mykolab.com> skribis:
>
>> + (description
>> + "PyOpenGL is the most common cross platform Python binding
>> to OpenGL
>> +and related APIs. The binding is created using the standard ctypes
>> library.")
>
> It seems your patches were somehow mangled on the way, with lines
> wrapped as in the example above.
>
> Could you resend them to this address, preferably with 'git send-email'?
>
> I would also suggest merging patches 2 and 3, and expounding a bit on
> the 'description' of Xpra in patch 4. Apart from that it looks alright!
>
> Thanks,
> Ludo'.
[-- Attachment #1.2: Type: text/html, Size: 1496 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-Add-python2-pyopengl.patch --]
[-- Type: text/x-diff; name=0001-gnu-python-Add-python2-pyopengl.patch, Size: 1775 bytes --]
From 68baddf334f1b02ee7ee67a5408d112eba87f8f3 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 22 Jun 2017 22:31:35 +0200
Subject: [PATCH] gnu: python: Add python2-pyopengl.
* gnu/packages/python.scm (python2-pyopengl): New variable.
---
gnu/packages/python.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a63006a04..27ae2093c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -41,6 +41,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -15412,3 +15413,25 @@ functionality like full case-folding for case-insensitive matches in Unicode.")
(define-public python2-regex
(package-with-python2 python-regex))
+
+(define-public python2-pyopengl
+ (package
+ (name "python2-pyopengl")
+ (version "3.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "PyOpenGL" version))
+ (sha256
+ (base32
+ "1byxjj6a8rwzhxhjqlc588zdad2qwxdd7vlam2653ylll31waiwv"))))
+ (arguments
+ `(#:python ,python-2))
+ (build-system python-build-system)
+ (home-page "http://pyopengl.sourceforge.net")
+ (synopsis "Standard OpenGL bindings for Python")
+ (description
+ "PyOpenGL is the most common cross platform Python binding to OpenGL
+and related APIs. The binding is created using the standard ctypes library, and
+is provided under an extremely liberal BSD-style Open-Source license.")
+ (license license:bsd-3)))
--
2.13.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-python-Add-python-rencode.patch --]
[-- Type: text/x-diff; name=0002-gnu-python-Add-python-rencode.patch, Size: 1891 bytes --]
From 61e2259cdc6167e4747c32f07188917dd0d94413 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 22 Jun 2017 22:33:28 +0200
Subject: [PATCH] gnu: python: Add python-rencode.
* gnu/packages/python.scm (python-rencode): New variable.
---
gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 27ae2093c..fa5ff0cfc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15435,3 +15435,30 @@ functionality like full case-folding for case-insensitive matches in Unicode.")
and related APIs. The binding is created using the standard ctypes library, and
is provided under an extremely liberal BSD-style Open-Source license.")
(license license:bsd-3)))
+
+(define-public python-rencode
+ (package
+ (name "python-rencode")
+ (version "1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "rencode" version))
+ (sha256
+ (base32
+ "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj"))))
+ (build-system python-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("python-cython", python-cython)))
+ (home-page "https://github.com/aresch/rencode")
+ (synopsis "For complex, heterogeneous data structures with many small elements")
+ (description
+ "The rencode module is similar to bencode from the BitTorrent project.
+For complex, heterogeneous data structures with many small elements, r-encoding
+stake up significantly less space than b-encodings. This version of rencode is a
+complete rewrite in Cython to attempt to increase the performance over the pure
+Python module written by Petru Paler, Connelly Barnes et al.")
+ (license license:bsd-3)))
+
+(define-public python2-rencode
+ (package-with-python2 python-rencode))
--
2.13.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-xorg-Add-xpra.patch --]
[-- Type: text/x-diff; name=0003-gnu-xorg-Add-xpra.patch, Size: 5403 bytes --]
From ae9a4999066f6ae35a9c90cd2b23ec98e61c26c7 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 22 Jun 2017 22:19:42 +0200
Subject: [PATCH] gnu: xorg: Add xpra.
* 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..6ace94e96 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 "Remote access to individual applications or full desktops")
+ (description "Xpra is a persistent remote display server and client for
+forwarding applications and desktop screens.")
+ (license license:gpl2+)))
+
--
2.13.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#27440] [PATCH 1/4] gnu: python: Add python2-pyopengl.
2017-06-22 20:42 ` Rutger Helling
@ 2017-06-23 3:55 ` Rutger Helling
2017-06-23 11:52 ` bug#27440: " Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Rutger Helling @ 2017-06-23 3:55 UTC (permalink / raw)
To: ludo; +Cc: 27440
[-- Attachment #1.1: Type: text/plain, Size: 995 bytes --]
There was a small typo in the third patch that resulted in "-nolisten
tcp-noreset" instead of "-nolisten tcp -noreset" being passed to xvfb.
Here's the corrected patch, along with the other two again.
On 2017-06-22 22:42, Rutger Helling wrote:
> Sorry about that! Here are the patches changed with your suggestions, sent as attachments.
>
> On 2017-06-22 21:46, ludo@gnu.org wrote:
> Hi Rutger,
>
> Rutger Helling <rhelling@mykolab.com> skribis:
>
> + (description
> + "PyOpenGL is the most common cross platform Python binding
> to OpenGL
> +and related APIs. The binding is created using the standard ctypes
> library.")
> It seems your patches were somehow mangled on the way, with lines
> wrapped as in the example above.
>
> Could you resend them to this address, preferably with 'git send-email'?
>
> I would also suggest merging patches 2 and 3, and expounding a bit on
> the 'description' of Xpra in patch 4. Apart from that it looks alright!
>
> Thanks,
> Ludo'.
[-- Attachment #1.2: Type: text/html, Size: 1878 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-Add-python2-pyopengl.patch --]
[-- Type: text/x-diff; name=0001-gnu-python-Add-python2-pyopengl.patch, Size: 1769 bytes --]
From 66eaa133a3e2bfc0a0621a009be23dd65229d617 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 23 Jun 2017 05:43:09 +0200
Subject: [PATCH] gnu: python: Add python2-pyopengl.
* gnu/packages/python.scm (python2-pyopengl): New variable.
---
gnu/packages/python.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3c3b4056d..6914043e9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -42,6 +42,7 @@
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -15449,3 +15450,25 @@ functionality like full case-folding for case-insensitive matches in Unicode.")
(define-public python2-regex
(package-with-python2 python-regex))
+
+(define-public python2-pyopengl
+ (package
+ (name "python2-pyopengl")
+ (version "3.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "PyOpenGL" version))
+ (sha256
+ (base32
+ "1byxjj6a8rwzhxhjqlc588zdad2qwxdd7vlam2653ylll31waiwv"))))
+ (arguments
+ `(#:python ,python-2))
+ (build-system python-build-system)
+ (home-page "http://pyopengl.sourceforge.net")
+ (synopsis "Standard OpenGL bindings for Python")
+ (description
+ "PyOpenGL is the most common cross platform Python binding to OpenGL
+and related APIs. The binding is created using the standard ctypes library, and
+is provided under an extremely liberal BSD-style Open-Source license.")
+ (license license:bsd-3)))
--
2.13.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-python-Add-python-rencode.patch --]
[-- Type: text/x-diff; name=0002-gnu-python-Add-python-rencode.patch, Size: 1891 bytes --]
From 61e2259cdc6167e4747c32f07188917dd0d94413 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 22 Jun 2017 22:33:28 +0200
Subject: [PATCH] gnu: python: Add python-rencode.
* gnu/packages/python.scm (python-rencode): New variable.
---
gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 27ae2093c..fa5ff0cfc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15435,3 +15435,30 @@ functionality like full case-folding for case-insensitive matches in Unicode.")
and related APIs. The binding is created using the standard ctypes library, and
is provided under an extremely liberal BSD-style Open-Source license.")
(license license:bsd-3)))
+
+(define-public python-rencode
+ (package
+ (name "python-rencode")
+ (version "1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "rencode" version))
+ (sha256
+ (base32
+ "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj"))))
+ (build-system python-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("python-cython", python-cython)))
+ (home-page "https://github.com/aresch/rencode")
+ (synopsis "For complex, heterogeneous data structures with many small elements")
+ (description
+ "The rencode module is similar to bencode from the BitTorrent project.
+For complex, heterogeneous data structures with many small elements, r-encoding
+stake up significantly less space than b-encodings. This version of rencode is a
+complete rewrite in Cython to attempt to increase the performance over the pure
+Python module written by Petru Paler, Connelly Barnes et al.")
+ (license license:bsd-3)))
+
+(define-public python2-rencode
+ (package-with-python2 python-rencode))
--
2.13.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-xorg-Add-xpra.patch --]
[-- Type: text/x-diff; name=0003-gnu-xorg-Add-xpra.patch, Size: 5404 bytes --]
From d7329ed89e1533744092d59c82da61ef1fe1b62d Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 23 Jun 2017 05:45:29 +0200
Subject: [PATCH] gnu: xorg: Add xpra.
* 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..932415440 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 "Remote access to individual applications or full desktops")
+ (description "Xpra is a persistent remote display server and client for
+forwarding applications and desktop screens.")
+ (license license:gpl2+)))
+
--
2.13.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* bug#27440: [PATCH 1/4] gnu: python: Add python2-pyopengl.
2017-06-23 3:55 ` Rutger Helling
@ 2017-06-23 11:52 ` Ludovic Courtès
0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2017-06-23 11:52 UTC (permalink / raw)
To: Rutger Helling; +Cc: 27440-done
[-- Attachment #1: Type: text/plain, Size: 2481 bytes --]
Hi Rutger,
Rutger Helling <rhelling@mykolab.com> skribis:
> From 66eaa133a3e2bfc0a0621a009be23dd65229d617 Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Fri, 23 Jun 2017 05:43:09 +0200
> Subject: [PATCH] gnu: python: Add python2-pyopengl.
>
> * gnu/packages/python.scm (python2-pyopengl): New variable.
[...]
> + (description
> + "PyOpenGL is the most common cross platform Python binding to OpenGL
> +and related APIs. The binding is created using the standard ctypes library, and
> +is provided under an extremely liberal BSD-style Open-Source license.")
> + (license license:bsd-3)))
I removed the mention of the license (everything is free software in
Guix, no need to explain it; also see
<https://www.gnu.org/philosophy/open-source-misses-the-point.html>),
reindented (consider using the ‘etc/indent-code.el’ script), and
committed.
> From 61e2259cdc6167e4747c32f07188917dd0d94413 Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Thu, 22 Jun 2017 22:33:28 +0200
> Subject: [PATCH] gnu: python: Add python-rencode.
>
> * gnu/packages/python.scm (python-rencode): New variable.
[...]
> + (home-page "https://github.com/aresch/rencode")
> + (synopsis "For complex, heterogeneous data structures with many small elements")
> + (description
> + "The rencode module is similar to bencode from the BitTorrent project.
> +For complex, heterogeneous data structures with many small elements, r-encoding
> +stake up significantly less space than b-encodings. This version of rencode is a
> +complete rewrite in Cython to attempt to increase the performance over the pure
> +Python module written by Petru Paler, Connelly Barnes et al.")
> + (license license:bsd-3)))
I adjusted the synopsis and description to hopefully give a better idea
of what this is and committed.
> From d7329ed89e1533744092d59c82da61ef1fe1b62d Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Fri, 23 Jun 2017 05:45:29 +0200
> Subject: [PATCH] gnu: xorg: Add xpra.
>
> * gnu/packages/xorg.scm (xpra): New variable.
Applied with the changes below (I’m currently building it but will push
as soon as it’s done.)
On the topic of synopses/descriptions, please take a look at
<https://www.gnu.org/software/guix/manual/html_node/Synopses-and-Descriptions.html>
if you haven’t already.
Thank you!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 3604 bytes --]
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 932415440..d4da5d709 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5842,17 +5842,20 @@ basic eye-candy effects.")
#:configure-flags '("--with-tests"
"--with-bundle_tests"
"--without-strict")
- #:modules ((guix build python-build-system) (guix build utils))
- #:phases (modify-phases %standard-phases
+ #: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 _
+
+ ;; 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"
@@ -5860,16 +5863,28 @@ basic eye-candy effects.")
(substitute* "add_build_info.py"
((".*\"BUILD_TIME\", datetime.*") ""))
(substitute* "setup.py"
- (("/etc/init.d/") (string-append %output "/etc/init.d/")))
+ (("/etc/init.d/")
+ (string-append (assoc-ref outputs "out")
+ "/etc/init.d/")))
(substitute* "setup.py"
- (("/usr/lib/") (string-append %output "/lib/")))
+ (("/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
-%build-inputs "xorg-server") "/bin/Xvfb +extension Composite -nolisten tcp"
-" -noreset -auth $XAUTHORITY -screen 0 5760x2560x24+32"))))))))
+ (("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.")
+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+)))
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-06-23 11:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [bug#27440] [PATCH 4/4] gnu: xorg: Add xpra Rutger Helling
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).