From patchwork Tue Jul 20 14:36:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 31522 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3078627BC6B; Tue, 20 Jul 2021 15:38:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 898BD27BC78 for ; Tue, 20 Jul 2021 15:38:27 +0100 (BST) Received: from localhost ([::1]:32874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5qt8-00085b-Fr for patchwork@mira.cbaines.net; Tue, 20 Jul 2021 10:38:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5qsk-000838-5P for guix-patches@gnu.org; Tue, 20 Jul 2021 10:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5qsj-0003EW-So for guix-patches@gnu.org; Tue, 20 Jul 2021 10:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m5qsj-0005XS-Lt for guix-patches@gnu.org; Tue, 20 Jul 2021 10:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49662] [PATCH v1 1/5] gnu: weston: Update to 9.0.0 and adjust arguments+inputs accordingly. References: <689da071-089c-74ad-8691-75f86334f350@raghavgururajan.name> In-Reply-To: <689da071-089c-74ad-8691-75f86334f350@raghavgururajan.name> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Jul 2021 14:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49662 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 49662@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 49662-submit@debbugs.gnu.org id=B49662.162679184021186 (code B ref 49662); Tue, 20 Jul 2021 14:38:01 +0000 Received: (at 49662) by debbugs.gnu.org; 20 Jul 2021 14:37:20 +0000 Received: from localhost ([127.0.0.1]:35039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5qs3-0005VX-Vd for submit@debbugs.gnu.org; Tue, 20 Jul 2021 10:37:20 -0400 Received: from out0.migadu.com ([94.23.1.103]:19792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5qs1-0005VB-Ut for 49662@debbugs.gnu.org; Tue, 20 Jul 2021 10:37:18 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1626791836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Xu45xL0k6PI3PFmYD3daH4YyUJGkws6w4Pph0NCTfR8=; b=C6/z7WAxd2H9hpRAIqP/yVTf6ep4/Td/zyQnhA4wVeX0npXcGhvmjBgq2fnm9zwk1aWglI WZHDxV244LQG6qQUCBnQJni+QU9EIj1931s8meKtKYwR8p+YJKQAqIsKgMbzp6rMEtjNMX fE1NxBPwcZdQFC5RBPtU8AJyNvPqsse0es7GeFEy3DbHWG3HjxGX20M5uKZO6WzIWiASv5 8eUSKGFnGTqur/N9lmx9DWLWAr6/PxSs5K1K/GgZ5apYnk3ONqd/JDH22ZNyxaeH3GmIgQ myum6D31uQRf4W/PjLmRnO209YEhuVACoGq8fZ3h+bgvpXBpegxx8OWFST73Aw== Date: Tue, 20 Jul 2021 10:36:53 -0400 Message-Id: <20210720143657.31826-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * 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