[bug#45908] [PATCH] gnu: xpra: Update to 4.0.6.

[bug#45908] [PATCH] gnu: xpra: Update to 4.0.6.

[Michael Rohleder]

* gnu/packages/xorg.scm (xpra): Update to 4.0.6.
[inputs]: Add libx264, x265, libvpx to have more encoding options.
---
 gnu/packages/xorg.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8f84b894f6..900f6c925d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
 ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
-;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org>
 ;;;
@@ -6279,14 +6279,14 @@ basic eye-candy effects.")
 (define-public xpra
   (package
     (name "xpra")
-    (version "4.0.5")
+    (version "4.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.xpra.org/src/xpra-"
                            version ".tar.xz"))
        (sha256
-        (base32 "11ml66z8vbc0fa567kkmp2j20l5l60aflnkrz5ay8arw3w92nmnz"))
+        (base32 "1s49y2s75a8a70vj0micnmpic5zv1n32yjxy8fkxsqa6j5njyrww"))
        (patches (search-patches "xpra-4.0.1-systemd-run.patch"))))
     (build-system python-build-system)
     ;; see also http://xpra.org/trac/wiki/Dependencies
@@ -6313,6 +6313,9 @@ basic eye-candy effects.")
               ("xf86-input-keyboard" ,xf86-input-keyboard)
               ("python-pillow" ,python-pillow)
               ;; Optional dependencies.
+              ("libx264" ,libx264)
+              ("x265" ,x265)
+              ("libvpx" ,libvpx)
               ("python-rencode" ,python-rencode) ; For speed.
               ("python-numpy" ,python-numpy)
               ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration.
-- 
2.30.0

[bug#45908] [PATCH] gnu: xpra: Update to 4.0.6.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2564 bytes --]

Does this build without the extra inputs? If so, can you split this into
two patches, one for the upgrade and one to add the extra inputs?
Thanks!

On Sat, Jan 16, 2021 at 12:20:58AM +0100, Michael Rohleder wrote:
> * gnu/packages/xorg.scm (xpra): Update to 4.0.6.
> [inputs]: Add libx264, x265, libvpx to have more encoding options.
> ---
>  gnu/packages/xorg.scm | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index 8f84b894f6..900f6c925d 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -23,7 +23,7 @@
>  ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
>  ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
>  ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
> -;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
> +;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
>  ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
>  ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org>
>  ;;;
> @@ -6279,14 +6279,14 @@ basic eye-candy effects.")
>  (define-public xpra
>    (package
>      (name "xpra")
> -    (version "4.0.5")
> +    (version "4.0.6")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (string-append "https://www.xpra.org/src/xpra-"
>                             version ".tar.xz"))
>         (sha256
> -        (base32 "11ml66z8vbc0fa567kkmp2j20l5l60aflnkrz5ay8arw3w92nmnz"))
> +        (base32 "1s49y2s75a8a70vj0micnmpic5zv1n32yjxy8fkxsqa6j5njyrww"))
>         (patches (search-patches "xpra-4.0.1-systemd-run.patch"))))
>      (build-system python-build-system)
>      ;; see also http://xpra.org/trac/wiki/Dependencies
> @@ -6313,6 +6313,9 @@ basic eye-candy effects.")
>                ("xf86-input-keyboard" ,xf86-input-keyboard)
>                ("python-pillow" ,python-pillow)
>                ;; Optional dependencies.
> +              ("libx264" ,libx264)
> +              ("x265" ,x265)
> +              ("libvpx" ,libvpx)
>                ("python-rencode" ,python-rencode) ; For speed.
>                ("python-numpy" ,python-numpy)
>                ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration.
> -- 
> 2.30.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#45908] [PATCH] gnu: xpra: Update to 4.0.6.

[Michael Rohleder]

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

Hi Efraim,

Thank you for reviewing!

Efraim Flashner <efraim@flashner.co.il> writes:
> Does this build without the extra inputs? If so, can you split this into
> two patches, one for the upgrade and one to add the extra inputs?

Yes, they are independent.


[-- Attachment #1.2: Update to 4.0.6 --]
[-- Type: text/x-patch, Size: 1661 bytes --]

>From 974edd786f172acdb374111468d37cd6ec8d51aa Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Mon, 18 Jan 2021 16:45:29 +0100
Subject: [PATCH] gnu: xpra: Update to 4.0.6.

* gnu/packages/xorg.scm (xpra): Update to 4.0.6.
---
 gnu/packages/xorg.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8f84b894f6..ef80b10e3a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
 ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
-;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org>
 ;;;
@@ -6279,14 +6279,14 @@ basic eye-candy effects.")
 (define-public xpra
   (package
     (name "xpra")
-    (version "4.0.5")
+    (version "4.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.xpra.org/src/xpra-"
                            version ".tar.xz"))
        (sha256
-        (base32 "11ml66z8vbc0fa567kkmp2j20l5l60aflnkrz5ay8arw3w92nmnz"))
+        (base32 "1s49y2s75a8a70vj0micnmpic5zv1n32yjxy8fkxsqa6j5njyrww"))
        (patches (search-patches "xpra-4.0.1-systemd-run.patch"))))
     (build-system python-build-system)
     ;; see also http://xpra.org/trac/wiki/Dependencies
-- 
2.30.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: Add more encoders --]
[-- Type: text/x-patch, Size: 1017 bytes --]

>From 985e711a6d5b7c6306841bdc7a90686556228366 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Mon, 18 Jan 2021 16:53:26 +0100
Subject: [PATCH] gnu: xpra: Add more encoding options.

* gnu/packages/xorg.scm (xpra)[inputs]: Add libx264, x265, libvpx.
---
 gnu/packages/xorg.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8f84b894f6..c2fbba7e67 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6313,6 +6313,9 @@ basic eye-candy effects.")
               ("xf86-input-keyboard" ,xf86-input-keyboard)
               ("python-pillow" ,python-pillow)
               ;; Optional dependencies.
+              ("libx264" ,libx264)
+              ("x265" ,x265)
+              ("libvpx" ,libvpx)
               ("python-rencode" ,python-rencode) ; For speed.
               ("python-numpy" ,python-numpy)
               ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration.
-- 
2.30.0


[-- Attachment #1.4: Type: text/plain, Size: 244 bytes --]


-- 
APL is a mistake, carried through to perfection.  It is the language of the
future for the programming techniques of the past: it creates a new generation
of coding bums.
		-- Edsger W. Dijkstra, SIGPLAN Notices, Volume 17, Number 5

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

bug#45908: [PATCH] gnu: xpra: Update to 4.0.6.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

Thanks. Patches pushed!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]