[bug#29673] [PATCH] gnu: xpra: Update to 2.2.

[bug#29673] [PATCH] gnu: xpra: Update to 2.2.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 65 bytes --]

Here's an update for Xpra. The first patch adds a new dependency.

[-- Attachment #1.2: Type: text/html, Size: 252 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-Add-python2-pyopengl-accelerate.patch --]
[-- Type: text/x-diff; name=0001-gnu-python-Add-python2-pyopengl-accelerate.patch, Size: 1104 bytes --]

From 33dae42ff4d0994c8bfdb509aa9ceb0ac092ca3b Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 12 Dec 2017 10:35:44 +0100
Subject: [PATCH] gnu: python: Add python2-pyopengl-accelerate.

* gnu/packages/python.scm (python2-pyopengl-accelerate): New variable.
---
 gnu/packages/python.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 01b4e2cd2..2f1ce586b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11523,6 +11523,19 @@ related APIs.  The binding is created using the standard @code{ctypes}
 library.")
    (license license:bsd-3)))
 
+(define-public python2-pyopengl-accelerate
+  (package
+   (inherit python2-pyopengl)
+   (name "python2-pyopengl-accelerate")
+   (version "3.1.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (pypi-uri "PyOpenGL-accelerate" version))
+     (sha256
+      (base32
+       "0464c1ifzk0k92lyndikmvzjgnx1y25r7bkkc8pnxm4kp1q4czwj"))))))
+
 (define-public python-rencode
   (package
    (name "python-rencode")
-- 
2.15.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-xpra-Update-to-2.2.patch --]
[-- Type: text/x-diff; name=0002-gnu-xpra-Update-to-2.2.patch, Size: 3999 bytes --]

From edc401123133f3c7a13758e1794b9b1c757ac9e2 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 12 Dec 2017 10:28:24 +0100
Subject: [PATCH] gnu: xpra: Update to 2.2.

* gnu/packages/xorg.scm (xpra): Update to 2.2. [inputs]: Add python2-netifaces,
  python2-pyopengl-accelerate. Fix position of commas.
---
 gnu/packages/xorg.scm | 55 ++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d4beff4ef..4407d41ab 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5952,7 +5952,7 @@ basic eye-candy effects.")
 (define-public xpra
   (package
     (name "xpra")
-    (version "2.1.3")
+    (version "2.2")
     (source
      (origin
        (method url-fetch)
@@ -5960,41 +5960,42 @@ basic eye-candy effects.")
                            version ".tar.xz"))
        (sha256
         (base32
-         "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"))))
+         "0gi0i5pbhfzr5j4mbngjxvrk6r4lvigw4w2104znplmmrf1mw6y2"))))
     (build-system python-build-system)
-    (inputs `(("ffmpeg", ffmpeg)
-              ("flac", flac)
+    (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)
+              ("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-netifaces" ,python2-netifaces)
+              ("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)))
+              ("python2-pycairo" ,python2-pycairo)
+              ("python2-pycrypto" ,python2-pycrypto)
+              ("python2-pygobject" ,python2-pygobject)
+              ("python2-pyopengl" ,python2-pyopengl)
+              ("python2-pyopengl-accelerate" ,python2-pyopengl-accelerate)
+              ("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-opengl" ;; TODO: pygtkglext needed.
                            "--without-Xdummy" ;; We use Xvfb instead.
                            "--without-Xdummy_wrapper"
                            "--without-strict")
-- 
2.15.1

bug#29673: [PATCH] gnu: xpra: Update to 2.2.

[Ludovic Courtès]

Rutger Helling <rhelling@mykolab.com> skribis:

> From 33dae42ff4d0994c8bfdb509aa9ceb0ac092ca3b Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Tue, 12 Dec 2017 10:35:44 +0100
> Subject: [PATCH] gnu: python: Add python2-pyopengl-accelerate.
>
> * gnu/packages/python.scm (python2-pyopengl-accelerate): New variable.

I added a synopsis and description for this one.

> From edc401123133f3c7a13758e1794b9b1c757ac9e2 Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Tue, 12 Dec 2017 10:28:24 +0100
> Subject: [PATCH] gnu: xpra: Update to 2.2.
>
> * gnu/packages/xorg.scm (xpra): Update to 2.2. [inputs]: Add python2-netifaces,
>   python2-pyopengl-accelerate. Fix position of commas.

I tweaked the commit messages and committed.

Thanks!

Ludo’.