From a868595ebb17c16ca6a06d88fc6adca790377540 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sun, 18 Sep 2022 19:34:40 +0000 Subject: gnu: weston: Update to 10.0.2. * 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c7339eb00e..4a9cf3229c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1165,18 +1165,18 @@ (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 - "https://wayland.freedesktop.org/releases/" - "weston-" version ".tar.xz")) + "https://gitlab.freedesktop.org/wayland/weston/-/releases/" + version "/downloads/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)) -- cgit v1.2.3 From e1ee64b55a93706c42cf977cec3a339f1d9c78e1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:04:00 +0200 Subject: gnu: weston: Remove trailing #T from build phases. * gnu/packages/freedesktop.scm (weston)[arguments]: Remove trailing #T from build phases. --- gnu/packages/freedesktop.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4a9cf3229c..10f0b2d620 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès -;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2015 David Hashe ;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau @@ -1233,23 +1233,19 @@ (define-public weston (substitute* '("libweston/launcher-logind.c" "libweston/weston-launch.c") (("#include ") - "#include ")) - #t)) + "#include ")))) (add-after 'configure 'patch-confdefs.h (lambda _ - (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h") - #t)) + (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h"))) (add-before 'check 'setup (lambda _ (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - #t)) + (setenv "XDG_RUNTIME_DIR" (getcwd)))) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t))))) + (setenv "DISPLAY" ":1")))))) (home-page "https://wayland.freedesktop.org") (synopsis "Reference implementation of a Wayland compositor") (description "Weston is the reference implementation of a Wayland -- cgit v1.2.3 From 4678f77b499e6a2bb7afff0b9a2d38aa19642bb7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:05:46 +0200 Subject: gnu: weston: Use plain list of inputs. * gnu/packages/freedesktop.scm (weston)[inputs]: Use new style. --- gnu/packages/freedesktop.scm | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 10f0b2d620..109b7664d1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1178,34 +1178,34 @@ (define-public weston (native-inputs (list mscgen pkg-config python-3 xorg-server)) (inputs - `(("cairo" ,cairo-xcb) - ("colord" ,colord) - ("dbus" ,dbus) - ("elogind" ,elogind) - ("freerdp" ,freerdp) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("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) - ("libxml2" ,libxml2) - ("mesa" ,mesa) - ("mtdev" ,mtdev) - ("linux-pam" ,linux-pam) - ("pango" ,pango) - ("pipewire" ,pipewire-0.3) - ("wayland-protocols" ,wayland-protocols-next) - ("xorg-server-xwayland" ,xorg-server-xwayland))) + (list cairo-xcb + colord + dbus + elogind + freerdp + glib + gstreamer + gst-plugins-base + lcms + libdrm + libevdev + libinput-minimal + libjpeg-turbo + libpng + libunwind + libva + libwebp + libx11 + libxcb + libxcursor + libxml2 + mesa + mtdev + linux-pam + pango + pipewire-0.3 + wayland-protocols-next + xorg-server-xwayland)) (propagated-inputs (list libxkbcommon pixman wayland)) (arguments -- cgit v1.2.3 From 9e1c255b35a16c408fbd408c6690af6c30ea9180 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 8 Oct 2022 10:09:07 +0200 Subject: gnu: weston: Use G-expression. * gnu/packages/freedesktop.scm (weston)[arguments]: Use gexp to remove references to %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 109b7664d1..ab37f04bef 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1209,22 +1209,23 @@ (define-public weston (propagated-inputs (list libxkbcommon pixman wayland)) (arguments - `(#:configure-flags - (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-" - ,(version-major (package-version this-package))) - "-Dbackend-default=auto" - "-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 + (list + #:configure-flags + #~(list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib:" + #$output "/lib/weston:" + #$output "/lib/libweston-" + #$(version-major (package-version this-package))) + "-Dbackend-default=auto" + "-Dsystemd=false" + (string-append "-Dxwayland-path=" + #$(this-package-input "xorg-server-xwayland") + "/bin/Xwayland")) + #:parallel-tests? #f ; Parallel tests cause failures. + #:phases + '(modify-phases %standard-phases (add-before 'configure 'use-elogind (lambda _ ;; Use elogind instead of systemd -- cgit v1.2.3