[bug#49662] Weston (Wayland Compositor)

[bug#49662] Weston (Wayland Compositor)

[Raghav Gururajan via Guix-patches via]

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

Hello Guix!

I am opening this thread for patches related to Weston, which is a 
Wayland Compositor.

Regards,
RG.

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

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

[bug#49662] [PATCH v1 1/5] gnu: weston: Update to 9.0.0 and adjust arguments+inputs accordingly.

[Raghav Gururajan via Guix-patches via]

* gnu/packages/freedesktop.scm (weston)[version]: Update to 9.0.0.
[configure-flags](c_link_args): New flag.
(simple-dmabuf-drm): Remove flag.
[native-inputs]: Add mscgen.
[inputs]: Add pipewire.
---
 gnu/packages/freedesktop.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 24f12a045a..c59efa67b4 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -75,6 +75,7 @@
   #:use-module (gnu packages glib)                ;intltool
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages graph)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
@@ -1037,7 +1038,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
 (define-public weston
   (package
     (name "weston")
-    (version "6.0.1")
+    (version "9.0.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1045,10 +1046,11 @@ applications, X servers (rootless or fullscreen) or other display servers.")
                     "weston-" version ".tar.xz"))
               (sha256
                (base32
-                "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"))))
+                "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"))))
     (build-system meson-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("mscgen" ,mscgen)
+       ("pkg-config" ,pkg-config)
        ("xorg-server" ,xorg-server)))
     (inputs
      `(("cairo" ,cairo-xcb)
@@ -1069,19 +1071,25 @@ applications, X servers (rootless or fullscreen) or other display servers.")
        ("mtdev" ,mtdev)
        ("linux-pam" ,linux-pam)
        ("pango" ,pango)
+       ("pipewire" ,pipewire)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)
        ("xorg-server-xwayland" ,xorg-server-xwayland)))
     (arguments
      `(#:configure-flags
-       (list "-Dbackend-rdp=false" ; TODO: Enable.
-             "-Dremoting=false" ; TODO: Enable.
-             "-Dsimple-dmabuf-drm=auto"
-             "-Dsystemd=false"
-             (string-append "-Dxwayland-path="
-                            (assoc-ref %build-inputs "xorg-server-xwayland")
-                            "/bin/Xwayland"))
-       #:parallel-tests? #f ; Parallel tests cause failures.
+       (list
+        ;; Otherwise, the RUNPATH will lack the final path component.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out") "/lib:"
+                       (assoc-ref %outputs "out") "/lib/weston:"
+                       (assoc-ref %outputs "out") "/lib/libweston-9")
+        "-Dbackend-rdp=false"           ; TODO: Enable.
+        "-Dremoting=false"              ; TODO: Enable.
+        "-Dsystemd=false"
+        (string-append "-Dxwayland-path="
+                       (assoc-ref %build-inputs "xorg-server-xwayland")
+                       "/bin/Xwayland"))
+       #:parallel-tests? #f           ; Parallel tests cause failures.
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'use-elogind
-- 
2.32.0

[bug#49662] [PATCH v1 2/5] gnu: weston: Add missing inputs.

[Raghav Gururajan via Guix-patches via]

These new inputs are referenced by the package but was missing in
the package definition. Some of these inputs might have been used
by the package indirectly via propagation from other inputs.

* gnu/packages/freedesktop.scm (weston)[inputs]: Add glib, libdrm,
libpng, libx11, libxcb and pixman.
---
 gnu/packages/freedesktop.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index c59efa67b4..a6e96dc500 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1057,13 +1057,18 @@ applications, X servers (rootless or fullscreen) or other display servers.")
        ("colord" ,colord)
        ("dbus" ,dbus)
        ("elogind" ,elogind)
+       ("glib" ,glib)
        ("lcms" ,lcms)
+       ("libdrm" ,libdrm)
        ("libevdev" ,libevdev)
        ("libinput" ,libinput-minimal)
        ("libjpeg" ,libjpeg-turbo)
+       ("libpng" ,libpng)
        ("libunwind" ,libunwind)
        ("libva" ,libva)
        ("libwebp" ,libwebp)
+       ("libx11" ,libx11)
+       ("libxcb" ,libxcb)
        ("libxcursor" ,libxcursor)
        ("libxkbcommon" ,libxkbcommon)
        ("libxml2" ,libxml2)
@@ -1072,6 +1077,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
        ("linux-pam" ,linux-pam)
        ("pango" ,pango)
        ("pipewire" ,pipewire)
+       ("pixman" ,pixman)
        ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)
        ("xorg-server-xwayland" ,xorg-server-xwayland)))
-- 
2.32.0

[bug#49662] [PATCH v1 3/5] gnu: freerdp: Propagate some inputs as per pkg-config files.

[Raghav Gururajan via Guix-patches via]

* gnu/packages/rdesktop.scm (freerdp)[inputs]: Move libxkbcommon,
openssl and wayland to ...
[propagated-inputs]: ... here.
---
 gnu/packages/rdesktop.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 30523deefe..adfbe7de06 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -108,7 +108,6 @@ to remotely control a user's Windows desktop.")
        ("libjpeg" ,libjpeg-turbo)
        ("libusb" ,libusb)
        ("libx11" ,libx11)
-       ("libxkbcommon" ,libxkbcommon)
        ("libxkbfile" ,libxkbfile)
        ("libxcursor" ,libxcursor)
        ("libxext" ,libxext)
@@ -118,10 +117,12 @@ to remotely control a user's Windows desktop.")
        ("libxrender" ,libxrender)
        ("libxinerama" ,libxinerama)
        ("libxshmfence" ,libxshmfence)
-       ("openssl" ,openssl)
        ("pulseaudio" ,pulseaudio)
-       ("wayland" ,wayland)
        ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("openssl" ,openssl)
+       ("wayland" ,wayland)))
     (arguments
      `(#:build-type "RELEASE"
        #:configure-flags
-- 
2.32.0

[bug#49662] [PATCH v1 4/5] gnu: weston: Enable some features.

[Raghav Gururajan via Guix-patches via]

* gnu/packages/freedesktop.scm (weston)[inputs]: Add freerdp,
gstreamer and gst-plugins-base.
[configure-flags](backend-rdp,remoting): Remove flags.
(backend-default): New flag.
---
 gnu/packages/freedesktop.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index a6e96dc500..f05b5927f9 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -97,6 +97,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages rdesktop)
   #:use-module (gnu packages samba)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages valgrind)
@@ -1057,7 +1058,10 @@ applications, X servers (rootless or fullscreen) or other display servers.")
        ("colord" ,colord)
        ("dbus" ,dbus)
        ("elogind" ,elogind)
+       ("freerdp" ,freerdp)
        ("glib" ,glib)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
        ("lcms" ,lcms)
        ("libdrm" ,libdrm)
        ("libevdev" ,libevdev)
@@ -1089,8 +1093,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
                        (assoc-ref %outputs "out") "/lib:"
                        (assoc-ref %outputs "out") "/lib/weston:"
                        (assoc-ref %outputs "out") "/lib/libweston-9")
-        "-Dbackend-rdp=false"           ; TODO: Enable.
-        "-Dremoting=false"              ; TODO: Enable.
+        "-Dbackend-default=auto"
         "-Dsystemd=false"
         (string-append "-Dxwayland-path="
                        (assoc-ref %build-inputs "xorg-server-xwayland")
-- 
2.32.0

[bug#49662] [PATCH v1 5/5] gnu: weston: Propagate some inputs as per pkg-config files.

[Raghav Gururajan via Guix-patches via]

* gnu/packages/freedesktop.scm (weston)[inputs]: Move libxkbcommon,
pixman and wayland to ...
[propagated-inputs]: ... here.
---
 gnu/packages/freedesktop.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index f05b5927f9..401d15a2df 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1074,17 +1074,18 @@ applications, X servers (rootless or fullscreen) or other display servers.")
        ("libx11" ,libx11)
        ("libxcb" ,libxcb)
        ("libxcursor" ,libxcursor)
-       ("libxkbcommon" ,libxkbcommon)
        ("libxml2" ,libxml2)
        ("mesa" ,mesa)
        ("mtdev" ,mtdev)
        ("linux-pam" ,linux-pam)
        ("pango" ,pango)
        ("pipewire" ,pipewire)
-       ("pixman" ,pixman)
-       ("wayland" ,wayland)
        ("wayland-protocols" ,wayland-protocols)
        ("xorg-server-xwayland" ,xorg-server-xwayland)))
+    (propagated-inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("pixman" ,pixman)
+       ("wayland" ,wayland)))
     (arguments
      `(#:configure-flags
        (list
-- 
2.32.0

[bug#49662] [PATCH v1 5/5] gnu: weston: Propagate some inputs as per pkg-config files.

[Efraim Flashner]

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

On Tue, Jul 20, 2021 at 10:36:57AM -0400, Raghav Gururajan via Guix-patches via wrote:
> * gnu/packages/freedesktop.scm (weston)[inputs]: Move libxkbcommon,
> pixman and wayland to ...
> [propagated-inputs]: ... here.
> ---

you added pixman in a previous patch. I would combine the two patches
for adding more inputs and moving others to propagated-inputs with a
'fixup package inputs' or a subject line similar to that.

>  gnu/packages/freedesktop.scm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index f05b5927f9..401d15a2df 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -1074,17 +1074,18 @@ applications, X servers (rootless or fullscreen) or other display servers.")
>         ("libx11" ,libx11)
>         ("libxcb" ,libxcb)
>         ("libxcursor" ,libxcursor)
> -       ("libxkbcommon" ,libxkbcommon)
>         ("libxml2" ,libxml2)
>         ("mesa" ,mesa)
>         ("mtdev" ,mtdev)
>         ("linux-pam" ,linux-pam)
>         ("pango" ,pango)
>         ("pipewire" ,pipewire)
> -       ("pixman" ,pixman)
> -       ("wayland" ,wayland)
>         ("wayland-protocols" ,wayland-protocols)
>         ("xorg-server-xwayland" ,xorg-server-xwayland)))
> +    (propagated-inputs
> +     `(("libxkbcommon" ,libxkbcommon)
> +       ("pixman" ,pixman)
> +       ("wayland" ,wayland)))
>      (arguments
>       `(#:configure-flags
>         (list
> -- 
> 2.32.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#49662] [PATCH v1 1/5] gnu: weston: Update to 9.0.0 and adjust arguments+inputs accordingly.

[Efraim Flashner]

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

On Tue, Jul 20, 2021 at 10:36:53AM -0400, Raghav Gururajan via Guix-patches via wrote:
> * gnu/packages/freedesktop.scm (weston)[version]: Update to 9.0.0.
> [configure-flags](c_link_args): New flag.
> (simple-dmabuf-drm): Remove flag.
> [native-inputs]: Add mscgen.
> [inputs]: Add pipewire.
> ---
>  gnu/packages/freedesktop.scm | 30 +++++++++++++++++++-----------
>  1 file changed, 19 insertions(+), 11 deletions(-)
> 
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index 24f12a045a..c59efa67b4 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -75,6 +75,7 @@
>    #:use-module (gnu packages glib)                ;intltool
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages gperf)
> +  #:use-module (gnu packages graph)
>    #:use-module (gnu packages graphviz)
>    #:use-module (gnu packages gstreamer)
>    #:use-module (gnu packages gtk)
> @@ -1037,7 +1038,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
>  (define-public weston
>    (package
>      (name "weston")
> -    (version "6.0.1")
> +    (version "9.0.0")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -1045,10 +1046,11 @@ applications, X servers (rootless or fullscreen) or other display servers.")
>                      "weston-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"))))
> +                "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"))))
>      (build-system meson-build-system)
>      (native-inputs
> -     `(("pkg-config" ,pkg-config)
> +     `(("mscgen" ,mscgen)
> +       ("pkg-config" ,pkg-config)
>         ("xorg-server" ,xorg-server)))
>      (inputs
>       `(("cairo" ,cairo-xcb)
> @@ -1069,19 +1071,25 @@ applications, X servers (rootless or fullscreen) or other display servers.")
>         ("mtdev" ,mtdev)
>         ("linux-pam" ,linux-pam)
>         ("pango" ,pango)
> +       ("pipewire" ,pipewire)
>         ("wayland" ,wayland)
>         ("wayland-protocols" ,wayland-protocols)
>         ("xorg-server-xwayland" ,xorg-server-xwayland)))
>      (arguments
>       `(#:configure-flags
> -       (list "-Dbackend-rdp=false" ; TODO: Enable.
> -             "-Dremoting=false" ; TODO: Enable.
> -             "-Dsimple-dmabuf-drm=auto"
> -             "-Dsystemd=false"
> -             (string-append "-Dxwayland-path="
> -                            (assoc-ref %build-inputs "xorg-server-xwayland")
> -                            "/bin/Xwayland"))
> -       #:parallel-tests? #f ; Parallel tests cause failures.
> +       (list
> +        ;; Otherwise, the RUNPATH will lack the final path component.
> +        (string-append "-Dc_link_args=-Wl,-rpath="
> +                       (assoc-ref %outputs "out") "/lib:"
> +                       (assoc-ref %outputs "out") "/lib/weston:"
> +                       (assoc-ref %outputs "out") "/lib/libweston-9")

rather (untested):
(assoc-ref %outputs "out") "/lib/libweston-" (version-major ,version))

> +        "-Dbackend-rdp=false"           ; TODO: Enable.
> +        "-Dremoting=false"              ; TODO: Enable.
> +        "-Dsystemd=false"
> +        (string-append "-Dxwayland-path="
> +                       (assoc-ref %build-inputs "xorg-server-xwayland")
> +                       "/bin/Xwayland"))
> +       #:parallel-tests? #f           ; Parallel tests cause failures.
>         #:phases
>         (modify-phases %standard-phases
>           (add-before 'configure 'use-elogind
> -- 
> 2.32.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#49662] Weston (Wayland Compositor)

[Sarah Morgensen]

Efraim Flashner <efraim@flashner.co.il> writes:

[...]

>> +                       (assoc-ref %outputs "out") "/lib:"
>> +                       (assoc-ref %outputs "out") "/lib/weston:"
>> +                       (assoc-ref %outputs "out") "/lib/libweston-9")
>
> rather (untested):
> (assoc-ref %outputs "out") "/lib/libweston-" (version-major ,version))

Or perhaps more robustly (in case of inheritance):
  (assoc-ref %outputs "out") "/lib/libweston-" (version-major
                                               ,(package-version this-package))

--
Sarah

[bug#49662] Weston (Wayland Compositor)

[Efraim Flashner]

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

On Wed, Jul 21, 2021 at 12:30:29PM -0700, Sarah Morgensen wrote:
> Efraim Flashner <efraim@flashner.co.il> writes:
> 
> [...]
> 
> >> +                       (assoc-ref %outputs "out") "/lib:"
> >> +                       (assoc-ref %outputs "out") "/lib/weston:"
> >> +                       (assoc-ref %outputs "out") "/lib/libweston-9")
> >
> > rather (untested):
> > (assoc-ref %outputs "out") "/lib/libweston-" (version-major ,version))
> 
> Or perhaps more robustly (in case of inheritance):
>   (assoc-ref %outputs "out") "/lib/libweston-" (version-major
>                                                ,(package-version this-package))
> 

That is nicer. I should get more used to using this-package.

-- 
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#49662: (no subject)

[Raghav Gururajan via Guix-patches via]

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

@Efraim and @Sarah

Thanks for the suggestions.

Pushed as 45881ea747..f703bef87a to master. Closing.

Regards,
RG.

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