all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 49662@debbugs.gnu.org
Cc: Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#49662] [PATCH v1 1/5] gnu: weston: Update to 9.0.0 and adjust arguments+inputs accordingly.
Date: Tue, 20 Jul 2021 10:36:53 -0400	[thread overview]
Message-ID: <20210720143657.31826-1-rg@raghavgururajan.name> (raw)
In-Reply-To: <689da071-089c-74ad-8691-75f86334f350@raghavgururajan.name>

* 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





  reply	other threads:[~2021-07-20 14:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-20 14:30 [bug#49662] Weston (Wayland Compositor) Raghav Gururajan via Guix-patches via
2021-07-20 14:36 ` Raghav Gururajan via Guix-patches via [this message]
2021-07-20 14:36   ` [bug#49662] [PATCH v1 2/5] gnu: weston: Add missing inputs Raghav Gururajan via Guix-patches via
2021-07-20 14:36   ` [bug#49662] [PATCH v1 3/5] gnu: freerdp: Propagate some inputs as per pkg-config files Raghav Gururajan via Guix-patches via
2021-07-20 14:36   ` [bug#49662] [PATCH v1 4/5] gnu: weston: Enable some features Raghav Gururajan via Guix-patches via
2021-07-20 14:36   ` [bug#49662] [PATCH v1 5/5] gnu: weston: Propagate some inputs as per pkg-config files Raghav Gururajan via Guix-patches via
2021-07-20 18:25     ` Efraim Flashner
2021-07-20 18:27   ` [bug#49662] [PATCH v1 1/5] gnu: weston: Update to 9.0.0 and adjust arguments+inputs accordingly Efraim Flashner
2021-07-21 19:30     ` [bug#49662] Weston (Wayland Compositor) Sarah Morgensen
2021-07-22  6:34       ` Efraim Flashner
2021-07-25  6:18 ` bug#49662: (no subject) Raghav Gururajan via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210720143657.31826-1-rg@raghavgururajan.name \
    --to=guix-patches@gnu.org \
    --cc=49662@debbugs.gnu.org \
    --cc=rg@raghavgururajan.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.