From patchwork Tue Mar 5 14:55:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Flake X-Patchwork-Id: 61377 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 840D727BBE9; Tue, 5 Mar 2024 15:23:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7349427BBEB for ; Tue, 5 Mar 2024 15:23:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhWcu-0007Gx-L3; Tue, 05 Mar 2024 10:22:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhWIP-0006lp-Hg for guix-patches@gnu.org; Tue, 05 Mar 2024 10:01:33 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhWIO-0004xm-Md for guix-patches@gnu.org; Tue, 05 Mar 2024 10:01:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhWIs-0006Zx-TH for guix-patches@gnu.org; Tue, 05 Mar 2024 10:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65711] [PATCH v1] wlr-protocols / wl-mirror added References: <20230902232057.48289-1-kiasoc5@disroot.org> In-Reply-To: <20230902232057.48289-1-kiasoc5@disroot.org> Resent-From: Julian Flake Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Mar 2024 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65711@debbugs.gnu.org Cc: Julian Flake Received: via spool by 65711-submit@debbugs.gnu.org id=B65711.170965089125242 (code B ref 65711); Tue, 05 Mar 2024 15:02:02 +0000 Received: (at 65711) by debbugs.gnu.org; 5 Mar 2024 15:01:31 +0000 Received: from localhost ([127.0.0.1]:48600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhWIM-0006Z3-Ih for submit@debbugs.gnu.org; Tue, 05 Mar 2024 10:01:31 -0500 Received: from nsmtp.uni-koblenz.de ([141.26.64.14]:39295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhWIJ-0006Yp-U9 for 65711@debbugs.gnu.org; Tue, 05 Mar 2024 10:01:28 -0500 Received: from localhost (localhost [127.0.0.1]) by nsmtp.uni-koblenz.de (Postfix) with ESMTP id 2B5751A0026; Tue, 5 Mar 2024 16:00:52 +0100 (CET) Authentication-Results: nsmtp.uni-koblenz.de (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=uni-koblenz.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uni-koblenz.de; h=content-transfer-encoding:mime-version:x-mailer:message-id :date:date:subject:subject:from:from:received:received:received; s=mail; t=1709650852; x=1711465253; bh=UNgQv9epzJWu84WRyrinO52G ewldErlmxX2q2IxykHQ=; b=pSJns7+BpK0zAKK9cgUjD/sPT0Lpwu209Xv9PgoT EmDMgplEL8lIZx8qurslcRzLFaxI9rXXtIH/l/+Xa24FOOK7mCjv+q4wTVLFEa6s a6X+X1qgvMm9ybwdbedU8FIwj+KJvFOlzcQFO7KRc1feveICIkQ9+SbEW2m0cKxX T+E= X-Virus-Scanned: Debian amavisd-new at uni-koblenz.de Received: from nsmtp.uni-koblenz.de ([127.0.0.1]) by localhost (nsmtp.uni-koblenz.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N_ES3x5rDCGh; Tue, 5 Mar 2024 16:00:52 +0100 (CET) Received: from mailproxy.uni-koblenz.de (mailproxy.uni-koblenz.de [141.26.64.230]) by nsmtp.uni-koblenz.de (Postfix) with ESMTPS; Tue, 5 Mar 2024 16:00:52 +0100 (CET) Received: from nutbook.uni-koblenz.de (unknown [IPv6:2001:4c80:50:16:179a:2a3a:f775:a428]) by mailproxy.uni-koblenz.de (Postfix) with ESMTPSA id 02817100115; Tue, 5 Mar 2024 16:00:51 +0100 (CET) From: Julian Flake Date: Tue, 5 Mar 2024 15:55:24 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 05 Mar 2024 10:22:43 -0500 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/freedesktop.scm | 31 +++++++++++++++++ gnu/packages/wm.scm | 67 ++++++++++++++++++++++++++---------- 2 files changed, 80 insertions(+), 18 deletions(-) base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7b5d2dbbf2..627a837801 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1270,6 +1270,37 @@ (define-public wayland-protocols . "https://wayland.freedesktop.org/releases.html"))) (license license:expat))) +(define-public wlr-protocols + (let ((revision "0") + (commit "4264185db3b7e961e7f157e1cc4fd0ab75137568")) + (package + (name "wlr-protocols") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/wlroots/wlr-protocols.git") + (commit commit))) + (sha256 + (base32 + "045jj3mbhi7p2qn59krz0vap0wd3i6zgwkvpl97idy702bnk9mv6")))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-prefix-in-makefile + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("PREFIX=.*") (string-append "PREFIX="out "\n"))))))))) + (inputs + (list wayland)) + (home-page "https://gitlab.freedesktop.org/wlroots/wlr-protocols") + (synopsis "Wayland protocols designed for use in wlroots (and other compositors).") + (description + "Wayland protocols designed for use in wlroots (and other compositors).") + (license expat)))) + (define-public wayland-utils (package (name "wayland-utils") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8ed3ed1107..f661140d28 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1759,6 +1759,37 @@ (define-public wlroots-0.16 (propagated-inputs (modify-inputs (package-propagated-inputs wlroots) (delete libdisplay-info))))) +(define-public wl-mirror + (package + (name "wl-mirror") + (version "0.16.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ferdi265/wl-mirror") + (commit "v0.16.1"))) + (sha256 + (base32 + "0464m60xsbpfwvsszrdkjsxfvrbkr71hp7phsz05cqyvjwf6cism")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:configure-flags + #~(list "-DFORCE_SYSTEM_WL_PROTOCOLS=ON" + (string-append "-DWL_PROTOCOL_DIR=" + #$(this-package-input "wayland-protocols") "/share/wayland-protocols") + "-DFORCE_SYSTEM_WLR_PROTOCOLS=ON" + (string-append "-DWLR_PROTOCOL_DIR=" + #$(this-package-input "wlr-protocols") "/share/wlr-protocols")))) + (inputs + (list pkg-config egl-wayland mesa wayland wayland-protocols wlr-protocols)) + (home-page "https://github.com/Ferdi265/wl-mirror") + (synopsis "A simple Wayland output mirror client") + (description + "wl-mirror attempts to provide a solution to sway's lack of output mirroring by mirroring an output onto a client surface.") + (license gpl3))) + (define-public sway (package (name "sway") @@ -1777,21 +1808,21 @@ (define-public sway `(;; elogind is propagated by wlroots -> libseat ;; and would otherwise shadow basu. #:configure-flags '("-Dsd-bus-provider=basu") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'hardcode-paths - (lambda* (#:key inputs #:allow-other-keys) - ;; Hardcode path to swaybg. - (substitute* "sway/config.c" - (("strdup..swaybg..") - (string-append "strdup(\"" (assoc-ref inputs "swaybg") - "/bin/swaybg\")"))) - ;; Hardcode path to scdoc. - (substitute* "meson.build" - (("scdoc.get_pkgconfig_variable..scdoc..") - (string-append "'" (assoc-ref inputs "scdoc") - "/bin/scdoc'"))) - #t))))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'hardcode-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Hardcode path to swaybg. + (substitute* "sway/config.c" + (("strdup..swaybg..") + (string-append "strdup(\"" (assoc-ref inputs "swaybg") + "/bin/swaybg\")"))) + ;; Hardcode path to scdoc. + (substitute* "meson.build" + (("scdoc.get_pkgconfig_variable..scdoc..") + (string-append "'" (assoc-ref inputs "scdoc") + "/bin/scdoc'"))) + #t))))) (inputs (list basu cairo gdk-pixbuf @@ -1807,9 +1838,9 @@ (define-public sway (native-inputs (cons* linux-pam mesa pkg-config scdoc wayland-protocols (if (%current-target-system) - (list pkg-config-for-build - wayland) - '()))) + (list pkg-config-for-build + wayland) + '()))) (home-page "https://github.com/swaywm/sway") (synopsis "Wayland compositor compatible with i3") (description "Sway is a i3-compatible Wayland compositor.")