[bug#57914] [PATCH 0/2] Update weston to 10.0.02

[bug#57914] [PATCH 0/2] Update weston to 10.0.02

[Kaelyn Takata via Guix-patches via]

These two patches update weston to 10.0.2, which also fixes the build of
weston with the updated vulkan-headers on the update-vulkan-headers-staging
branch. The newer weston required a newer version of wayland-protocols,
pipewire 0.3 instead of 0.2 in the inputs, and Python 3 added to the native
inputs. I've successfully built both packages on the
update-vulkan-headers-staging and on master, along all of the packages
reported by `./pre-inst-env guix refresh -l wayland-protocols`.

Kaelyn Takata (2):
  gnu: wayland-protocols: Update to 1.26.
  gnu: weston: Update to 10.0.2.

 gnu/packages/freedesktop.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


base-commit: ce3b51a4c6bef22e35ca04a945917510627fc3a7
--
2.37.3

[bug#57914] [PATCH 1/2] gnu: wayland-protocols: Update to 1.26.

[Kaelyn Takata via Guix-patches via]

* gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.26.
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index c7339eb00e..10d3664a04 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1093,7 +1093,7 @@ (define-public wayland
 (define-public wayland-protocols
   (package
     (name "wayland-protocols")
-    (version "1.23")
+    (version "1.26")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1101,7 +1101,7 @@ (define-public wayland-protocols
                     "wayland-protocols-" version ".tar.xz"))
               (sha256
                (base32
-                "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"))))
+                "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"))))
     (build-system meson-build-system)
     (inputs
      (list wayland))
--
2.37.3

[bug#57914] [PATCH 1/2] gnu: wayland-protocols: Update to 1.26.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 746 bytes --]



On 18-09-2022 20:16, Kaelyn Takata via Guix-patches via wrote:
> * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.26.
> ---
>   gnu/packages/freedesktop.scm | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index c7339eb00e..10d3664a04 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -1093,7 +1093,7 @@ (define-public wayland
>   (define-public wayland-protocols
>     (package
>       (name "wayland-protocols")
> -    (version "1.23")
> +    (version "1.26")

Have you seen 'wayland-protocols-next' below?  It is already updated.
Only applies to wayland-protocols, not weston.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57914] [PATCH 1/2] gnu: wayland-protocols: Update to 1.26.

[Kaelyn via Guix-patches via]

------- Original Message -------
On Sunday, September 18th, 2022 at 6:59 PM, Maxime Devos <maximedevos@telenet.be> wrote:


> 
> 
> On 18-09-2022 20:16, Kaelyn Takata via Guix-patches via wrote:
> 
> > * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.26.
> > ---
> > gnu/packages/freedesktop.scm | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> > index c7339eb00e..10d3664a04 100644
> > --- a/gnu/packages/freedesktop.scm
> > +++ b/gnu/packages/freedesktop.scm
> > @@ -1093,7 +1093,7 @@ (define-public wayland
> > (define-public wayland-protocols
> > (package
> > (name "wayland-protocols")
> > - (version "1.23")
> > + (version "1.26")
> 
> 
> Have you seen 'wayland-protocols-next' below? It is already updated.
> Only applies to wayland-protocols, not weston.

No I hadn't; thank you for letting me know! I'll update the weston patch to use wayland-protocols-next so the redundant wayland-protocols update isn't needed.

Cheers,
Kaelyn

[bug#57914] [PATCH 2/2] gnu: weston: Update to 10.0.2.

[Kaelyn Takata via Guix-patches via]

* gnu/packages/freedesktop.scm (weston): Update to 10.0.2.
[inputs] Switch from pipewire to pipewire-0.3.
[native-inputs]: Add python-3.
---
 gnu/packages/freedesktop.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 10d3664a04..613b43b173 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1165,7 +1165,7 @@ (define-public waylandpp
 (define-public weston
   (package
     (name "weston")
-    (version "9.0.0")
+    (version "10.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1173,10 +1173,10 @@ (define-public weston
                     "weston-" version ".tar.xz"))
               (sha256
                (base32
-                "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"))))
+                "1rs92p7sfkw9lqlkfnqh5af19ym3x8l3hp3yfv117m7qv6h6qr49"))))
     (build-system meson-build-system)
     (native-inputs
-     (list mscgen pkg-config xorg-server))
+     (list mscgen pkg-config python-3 xorg-server))
     (inputs
      `(("cairo" ,cairo-xcb)
        ("colord" ,colord)
@@ -1203,7 +1203,7 @@ (define-public weston
        ("mtdev" ,mtdev)
        ("linux-pam" ,linux-pam)
        ("pango" ,pango)
-       ("pipewire" ,pipewire)
+       ("pipewire" ,pipewire-0.3)
        ("wayland-protocols" ,wayland-protocols)
        ("xorg-server-xwayland" ,xorg-server-xwayland)))
     (propagated-inputs
--
2.37.3

[bug#57914] [PATCH v2 0/1] Update weston to 10.0.2.

[Kaelyn Takata via Guix-patches via]

This is the updated weston patch that uses wayland-protocols-next, with the
redundant update to wayland-protocols having been dropped.

Kaelyn Takata (1):
  gnu: weston: Update to 10.0.2.

 gnu/packages/freedesktop.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


base-commit: ce3b51a4c6bef22e35ca04a945917510627fc3a7
--
2.37.3

[bug#57914] [PATCH v2 1/1] gnu: weston: Update to 10.0.2.

[Kaelyn Takata via Guix-patches via]

* gnu/packages/freedesktop.scm (weston): Update to 10.0.2.
[inputs] Switch from pipewire to pipewire-0.3, use wayland-protocols-next.
[native-inputs]: Add python-3.
---
 gnu/packages/freedesktop.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index c7339eb00e..ec05c3ddea 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1165,7 +1165,7 @@ (define-public waylandpp
 (define-public weston
   (package
     (name "weston")
-    (version "9.0.0")
+    (version "10.0.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1173,10 +1173,10 @@ (define-public weston
                     "weston-" version ".tar.xz"))
               (sha256
                (base32
-                "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"))))
+                "1rs92p7sfkw9lqlkfnqh5af19ym3x8l3hp3yfv117m7qv6h6qr49"))))
     (build-system meson-build-system)
     (native-inputs
-     (list mscgen pkg-config xorg-server))
+     (list mscgen pkg-config python-3 xorg-server))
     (inputs
      `(("cairo" ,cairo-xcb)
        ("colord" ,colord)
@@ -1203,8 +1203,8 @@ (define-public weston
        ("mtdev" ,mtdev)
        ("linux-pam" ,linux-pam)
        ("pango" ,pango)
-       ("pipewire" ,pipewire)
-       ("wayland-protocols" ,wayland-protocols)
+       ("pipewire" ,pipewire-0.3)
+       ("wayland-protocols" ,wayland-protocols-next)
        ("xorg-server-xwayland" ,xorg-server-xwayland)))
     (propagated-inputs
      (list libxkbcommon pixman wayland))
--
2.37.3

bug#57914: [PATCH 0/2] Update weston to 10.0.02

[Ricardo Wurmus]

I pushed the latest version of your patch.  I had to change the URL for
the tarball, because the URL in your patch returns 404.

Thanks!

-- 
Ricardo

[bug#57914] [PATCH 0/2] Update weston to 10.0.02

[dan]

[-- Attachment #1.1.1: Type: text/plain, Size: 207 bytes --]

Do we need to also push the patch onto the update-vulkan-headers-staging 
branch? I suppose the patch series mainly tries to solve the build 
failures introduced by the vulkan-header update patch series.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 8669 bytes --]

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