all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#65711] [PATCH 0/2] Add wl-mirror.
@ 2023-09-02 23:20 kiasoc5 via Guix-patches via
  2023-09-18  2:08 ` [bug#65711] (no subject) kiasoc5 via Guix-patches via
                   ` (6 more replies)
  0 siblings, 7 replies; 12+ messages in thread
From: kiasoc5 via Guix-patches via @ 2023-09-02 23:20 UTC (permalink / raw)
  To: 65711; +Cc: kiasoc5

Requires wlr-protocols, which doesn't have a release, so use the latest tag.

Helps wlroots compositors (eg Sway) work around sharing windows of applications.

kiasoc5 (2):
  gnu: Add wlr-protocols.
  gnu: Add wl-mirror.

 gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++
 gnu/packages/wm.scm          | 51 ++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)


base-commit: 4818ad5ba204e094fd8995c90c16ee1940e76210
-- 
2.39.2





^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#65711] (no subject)
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
@ 2023-09-18  2:08 ` kiasoc5 via Guix-patches via
  2024-03-05 14:55 ` [bug#65711] [PATCH v1] wlr-protocols / wl-mirror added Julian Flake
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: kiasoc5 via Guix-patches via @ 2023-09-18  2:08 UTC (permalink / raw)
  To: 65711

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

For some reason git send-email didn't work with this address so I send 
the patches as attachments.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-wlr-protocols.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-wlr-protocols.patch, Size: 2039 bytes --]

From 7c41cab39fc260dd5467277e60a27d288dad8e99 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@disroot.org>
Date: Fri, 18 Aug 2023 21:11:24 -0400
Subject: [PATCH 1/2] gnu: Add wlr-protocols.

* gnu/packages/freedesktop.scm (wlr-protocols): New variable.
---
 gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 0a1c9bffb3..b81af2c344 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1250,6 +1250,34 @@ (define-public wayland-protocols
         . "https://wayland.freedesktop.org/releases.html")))
     (license license:expat)))
 
+(define-public wlr-protocols
+  (let ((commit "4264185db3b7e961e7f157e1cc4fd0ab75137568")
+        (revision "0"))
+    (package
+      (name "wlr-protocols")
+      (version (git-version "0.0.0" revision commit)) ;no release tag
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://gitlab.freedesktop.org/wlroots/wlr-protocols.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32 "045jj3mbhi7p2qn59krz0vap0wd3i6zgwkvpl97idy702bnk9mv6"))))
+      (build-system gnu-build-system)
+      (arguments
+       (list #:make-flags
+             #~(list (string-append "PREFIX=" #$output))
+             #:phases
+             #~(modify-phases %standard-phases
+                 (delete 'configure))))
+      (native-inputs (list wayland))
+      (home-page "https://gitlab.freedesktop.org/wlroots/wlr-protocols")
+      (synopsis "wlroots protocols")
+      (description "This package contains Wayland protocols designed for
+use in wlroots (and other compositors).")
+      (license license:expat)))) ; license is included in xml files
+
 (define-public wayland-utils
   (package
     (name "wayland-utils")

base-commit: 4818ad5ba204e094fd8995c90c16ee1940e76210
-- 
2.39.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-wl-mirror.patch --]
[-- Type: text/x-diff; name=0002-gnu-Add-wl-mirror.patch, Size: 2609 bytes --]

From 845e76209013521274200facea7fe80f52bf39f0 Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@disroot.org>
Date: Fri, 18 Aug 2023 21:13:09 -0400
Subject: [PATCH 2/2] gnu: Add wl-mirror.

* gnu/packages/wm.scm (wl-mirror): New variable.
---
 gnu/packages/wm.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index aaff618248..cd36e44417 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2076,6 +2076,57 @@ (define-public wdisplays
 wlr-output-management-unstable-v1 protocol.")
     (license license:gpl3+)))
 
+(define-public wl-mirror
+  (package
+    (name "wl-mirror")
+    (version "0.13.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Ferdi265/wl-mirror.git")
+                    (commit (string-append "v" version))
+                    (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "0gig06g0gcdg9741ij27dwidk9q6kp5x8idn1yh6vmcrh5xm2rvn"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "-DINSTALL_DOCUMENTATION=ON"
+                   "-DFORCE_SYSTEM_WL_PROTOCOLS=ON"
+                   "-DFORCE_SYSTEM_WLR_PROTOCOLS=ON"
+                   (string-append "-DWL_PROTOCOL_DIR="
+                                  (search-input-directory
+                                   %build-inputs "share/wayland-protocols"))
+                   (string-append "-DWLR_PROTOCOL_DIR="
+                                  (search-input-directory
+                                   %build-inputs"share/wlr-protocols")))
+           #:tests? #f)) ; no tests
+    (inputs (list libglvnd wayland wayland-protocols wlr-protocols))
+    (native-inputs (list pkg-config scdoc))
+    (home-page "https://github.com/Ferdi265/wl-mirror")
+    (synopsis "A simple Wayland output mirror client")
+    (description "@command{wl-mirror} mirrors outputs onto client surfaces
+on wlroots compositors. Features include:
+@itemize
+
+@item Mirror an output onto a resizable window
+
+@item Mirror an output onto another output by fullscreening the window
+
+@item Reacts to changes in output scale
+
+@item Preserves aspect ratio
+
+@item Corrects for flipped or rotated outputs
+
+@item Supports custom flips or rotations
+
+@item Supports mirroring custom regions of outputs
+
+@end itemize ")
+    (license license:gpl3)))
+
 (define-public stumpwm
   (package
     (name "stumpwm")
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v1] wlr-protocols / wl-mirror added
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
  2023-09-18  2:08 ` [bug#65711] (no subject) kiasoc5 via Guix-patches via
@ 2024-03-05 14:55 ` Julian Flake
  2024-03-05 14:56 ` [bug#65711] how to get this into Guix's master? Julian Flake
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-05 14:55 UTC (permalink / raw)
  To: 65711; +Cc: Julian Flake

---
 gnu/packages/freedesktop.scm | 31 +++++++++++++++++
 gnu/packages/wm.scm          | 67 ++++++++++++++++++++++++++----------
 2 files changed, 80 insertions(+), 18 deletions(-)

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.")

base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#65711] how to get this into Guix's master?
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
  2023-09-18  2:08 ` [bug#65711] (no subject) kiasoc5 via Guix-patches via
  2024-03-05 14:55 ` [bug#65711] [PATCH v1] wlr-protocols / wl-mirror added Julian Flake
@ 2024-03-05 14:56 ` Julian Flake
  2024-03-06  8:46 ` [bug#65711] cleaned up patch Julian Flake
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-05 14:56 UTC (permalink / raw)
  To: 65711

Dear Guix,

I also needed wl-mirror and unfortunately didn't check 
issues.guix.gnu.org before. However, I ended with quite the same 
patch (one difference is, that I used e newer version of 
wl-mirror), independently.

What can we do to get one of the patches merged into guix's 
master?

Best Regards,
Julian Flake

-- 
Dipl.-Inf. Julian Flake

Universität Koblenz
Fachbereich Informatik
Institut für Softwaretechnik
Postfach 20 16 02 | D-56016 Koblenz

Tel.: +49 261 287 2787
E-Mail: flake@uni-koblenz.de
Website: https://www.uni-koblenz.de/~flake




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#65711] cleaned up patch
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
                   ` (2 preceding siblings ...)
  2024-03-05 14:56 ` [bug#65711] how to get this into Guix's master? Julian Flake
@ 2024-03-06  8:46 ` Julian Flake
  2024-03-06  8:47 ` [bug#65711] [PATCH v2] wlr-protocols / wl-mirror added Julian Flake
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-06  8:46 UTC (permalink / raw)
  To: 65711

Sending patch again, since the previous [PATCH v1] contained 
additional/unnecessary indentation related diff
-- 
Dipl.-Inf. Julian Flake

Universität Koblenz
Fachbereich Informatik
Institut für Softwaretechnik
Postfach 20 16 02 | D-56016 Koblenz

Tel.: +49 261 287 2787
E-Mail: flake@uni-koblenz.de
Website: https://www.uni-koblenz.de/~flake




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v2] wlr-protocols / wl-mirror added
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
                   ` (3 preceding siblings ...)
  2024-03-06  8:46 ` [bug#65711] cleaned up patch Julian Flake
@ 2024-03-06  8:47 ` Julian Flake
  2024-03-06 11:22 ` [bug#65711] [PATCH v3 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
  2024-03-14 11:26 ` [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
  6 siblings, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-06  8:47 UTC (permalink / raw)
  To: 65711; +Cc: Julian Flake

---
 gnu/packages/freedesktop.scm | 31 +++++++++++++++++++++++++++++++
 gnu/packages/wm.scm          | 31 +++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

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..fe07747a81 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")

base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v3 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
                   ` (4 preceding siblings ...)
  2024-03-06  8:47 ` [bug#65711] [PATCH v2] wlr-protocols / wl-mirror added Julian Flake
@ 2024-03-06 11:22 ` Julian Flake
  2024-03-06 11:22   ` [bug#65711] [PATCH v3 2/2] package wl-mirror added to gnu/packages/wm.scm Julian Flake
  2024-03-14 11:26 ` [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
  6 siblings, 1 reply; 12+ messages in thread
From: Julian Flake @ 2024-03-06 11:22 UTC (permalink / raw)
  To: 65711; +Cc: Julian Flake

Split the two packages into two separate patches

---
 gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7b5d2dbbf2..dbb55506b6 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1270,6 +1270,34 @@ (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
+       '(#:make-flags (list
+                       (string-append "PREFIX=" (assoc-ref %outputs "out")))
+         #:phases (modify-phases %standard-phases
+		    (delete 'configure))))
+      (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 license:expat))))
+
 (define-public wayland-utils
   (package
     (name "wayland-utils")

base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v3 2/2] package wl-mirror added to gnu/packages/wm.scm
  2024-03-06 11:22 ` [bug#65711] [PATCH v3 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
@ 2024-03-06 11:22   ` Julian Flake
  0 siblings, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-06 11:22 UTC (permalink / raw)
  To: 65711; +Cc: Julian Flake

---
 gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..d4e5af44d5 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 license:gpl3)))
+
 (define-public sway
   (package
     (name "sway")
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm
  2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
                   ` (5 preceding siblings ...)
  2024-03-06 11:22 ` [bug#65711] [PATCH v3 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
@ 2024-03-14 11:26 ` Julian Flake
  2024-03-14 11:26   ` [bug#65711] [PATCH v4 2/2] package wl-mirror added to gnu/packages/wm.scm Julian Flake
  2024-04-20  1:28   ` bug#65711: [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Hilton Chain via Guix-patches via
  6 siblings, 2 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-14 11:26 UTC (permalink / raw)
  To: 65711; +Cc: Julian Flake

Revision 4: use latest commit of wlr-protocols

Change-Id: Ia8daffd7219b7bd573ae54e7cfc5ec6b6a5f4052
---
 gnu/packages/freedesktop.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7b5d2dbbf2..88d0d1d080 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1270,6 +1270,34 @@ (define-public wayland-protocols
         . "https://wayland.freedesktop.org/releases.html")))
     (license license:expat)))
 
+(define-public wlr-protocols
+  (let ((revision "3")
+	(commit "2b8d43325b7012cc3f9b55c08d26e50e42beac7d"))
+    (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
+		  "02ydbbbz9y0hxnpkypw9vwz7q8dzswrl1500liqq1ddgxg89zzd0"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:make-flags (list
+                       (string-append "PREFIX=" (assoc-ref %outputs "out")))
+         #:phases (modify-phases %standard-phases
+		    (delete 'configure))))
+      (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 license:expat))))
+
 (define-public wayland-utils
   (package
     (name "wayland-utils")

base-commit: b6dec0108f99d75066bad15aaa124b84bb0261f3
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v4 2/2] package wl-mirror added to gnu/packages/wm.scm
  2024-03-14 11:26 ` [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
@ 2024-03-14 11:26   ` Julian Flake
  2024-04-20  1:28   ` bug#65711: [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Hilton Chain via Guix-patches via
  1 sibling, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-03-14 11:26 UTC (permalink / raw)
  To: 65711; +Cc: Julian Flake

use latest version of wl-mirror

Change-Id: Ib87959a40800a2a8219877611b8cfd301960c608
---
 gnu/packages/wm.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..24c6fdf9e5 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.2")
+    (source (origin
+              (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/Ferdi265/wl-mirror")
+		    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "1jdycr9vf5skbf55kbm2hc3zl3qg58x3bb6xqkf9qx14m4ramcdj"))))
+    (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 license:gpl3)))
+
 (define-public sway
   (package
     (name "sway")
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* bug#65711: [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm
  2024-03-14 11:26 ` [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
  2024-03-14 11:26   ` [bug#65711] [PATCH v4 2/2] package wl-mirror added to gnu/packages/wm.scm Julian Flake
@ 2024-04-20  1:28   ` Hilton Chain via Guix-patches via
  2024-04-20  7:26     ` [bug#65711] " Julian Flake
  1 sibling, 1 reply; 12+ messages in thread
From: Hilton Chain via Guix-patches via @ 2024-04-20  1:28 UTC (permalink / raw)
  To: Julian Flake; +Cc: 65711-done

Hi Julian,

On Thu, 14 Mar 2024 19:26:46 +0800,
Julian Flake wrote:
>
> Revision 4: use latest commit of wlr-protocols

I have adjusted the series and applied them as 6c4f3043933d and d66bfbeeb2a9.

Thanks!




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm
  2024-04-20  1:28   ` bug#65711: [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Hilton Chain via Guix-patches via
@ 2024-04-20  7:26     ` Julian Flake
  0 siblings, 0 replies; 12+ messages in thread
From: Julian Flake @ 2024-04-20  7:26 UTC (permalink / raw)
  To: Hilton Chain; +Cc: 65711-done

Hi Hilton,

>> Revision 4: use latest commit of wlr-protocols
>
> I have adjusted the series and applied them as 6c4f3043933d and 
> d66bfbeeb2a9.

Thank you!

Best Regards,
Julian




^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-04-20  7:27 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-02 23:20 [bug#65711] [PATCH 0/2] Add wl-mirror kiasoc5 via Guix-patches via
2023-09-18  2:08 ` [bug#65711] (no subject) kiasoc5 via Guix-patches via
2024-03-05 14:55 ` [bug#65711] [PATCH v1] wlr-protocols / wl-mirror added Julian Flake
2024-03-05 14:56 ` [bug#65711] how to get this into Guix's master? Julian Flake
2024-03-06  8:46 ` [bug#65711] cleaned up patch Julian Flake
2024-03-06  8:47 ` [bug#65711] [PATCH v2] wlr-protocols / wl-mirror added Julian Flake
2024-03-06 11:22 ` [bug#65711] [PATCH v3 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
2024-03-06 11:22   ` [bug#65711] [PATCH v3 2/2] package wl-mirror added to gnu/packages/wm.scm Julian Flake
2024-03-14 11:26 ` [bug#65711] [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Julian Flake
2024-03-14 11:26   ` [bug#65711] [PATCH v4 2/2] package wl-mirror added to gnu/packages/wm.scm Julian Flake
2024-04-20  1:28   ` bug#65711: [PATCH v4 1/2] package wlr-protocols added to gnu/packages/freedesktop.scm Hilton Chain via Guix-patches via
2024-04-20  7:26     ` [bug#65711] " Julian Flake

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.