[bug#73124] [PATCH 0/3] gnu: wlroots: update on mesa-updates

[bug#73124] [PATCH 0/3] gnu: wlroots: update on mesa-updates

[Rutherther via Guix-patches via]

Hello all,

This patch series adds wlroots 0.18. To do that, I've also
updated wayland to 1.23. This patch series should be applied
onto mesa-updates, since it requires libdrm >=2.4.122 that is
not present on master branch.

Since wlroots introduces breaking changes in all major releases,
and decided to rename wlroots.pc to wlroots-version.pc, I've made
sure to expose all wlroots versions with symbol wlroots-X.XX. I've
kept the wlroots symbol pointing to wlroots-0.17 to make sure
no breakage of existing packages occurs.

I've also removed no longer necessary wlroots-hwdata-fallback.patch,
as that one was provided to make sure hwdata was found when it was
not using pkgconfig. Hwdata started using pkgconfig, so now the patch
is no longer necessary.

Regards,
Rutherther

Rutherther (3):
  gnu: wayland: Update to 1.23.1
  gnu: wlroots: add 0.18
  gnu: wlroots: Remove hwdata patch

 gnu/local.mk                                  |  1 -
 gnu/packages/freedesktop.scm                  |  4 +-
 .../patches/wlroots-hwdata-fallback.patch     | 46 -------------------
 gnu/packages/wm.scm                           | 29 +++++++++---
 4 files changed, 24 insertions(+), 56 deletions(-)
 delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch


base-commit: fafd0245505fad7629ec98cef8d15e6e478f3f98
--
2.46.0

[bug#73124] [PATCH 1/3] gnu: wayland: Update to 1.23.1

[Rutherther via Guix-patches via]

Change-Id: I8430fd2c5f970e11c86ea3e4c1a4f066e9bf524e
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d5b31bf837..89509e7a1c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1316,7 +1316,7 @@ (define-public python-pyxdg
 (define-public wayland
   (package
     (name "wayland")
-    (version "1.22.0")
+    (version "1.23.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gitlab.freedesktop.org/" name
@@ -1324,7 +1324,7 @@ (define-public wayland
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0hjq8b1cprxpxcv2klgir1hd63vy5hrqilp9v317394qlqgayh0m"))))
+                "1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
-- 
2.46.0

[bug#73124] [PATCH 2/3] gnu: wlroots: add 0.18

[Rutherther via Guix-patches via]

wlroots major versions are usually incompatible. With
change to 0.18 wlroots has a different .pc pkg-config file
name, wlroots-0.18.pc. That means any package using pkg-config
to search for wlroots won't be able to find it. So even if there
were no breaking changes inside wlroots code base, it means programs
cannot be compiled against different major version.

I've thus exposed every wlroots as a separate symbol without the need
for use of "wlroots" symbol, so every package can use major wlroots version
appropriate for its version. I've kept wlroots symbol to not break anything
that is currently using it for wlroots-0.17.

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

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7d7ac3498f..238f4138ab 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1723,10 +1723,10 @@ (define-public polybar
 functionality to display information about the most commonly used services.")
     (license license:expat)))
 
-(define-public wlroots
+(define-public wlroots-0.18
   (package
     (name "wlroots")
-    (version "0.17.4")
+    (version "0.18.0")
     (source
      (origin
        (method git-fetch)
@@ -1735,9 +1735,8 @@ (define-public wlroots
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))
-         ;; This patch can be removed once hwdata in Guix supports pkg-config
-         (patches (search-patches "wlroots-hwdata-fallback.patch"))))
+        (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))
+       (patches (search-patches "wlroots-hwdata-fallback.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -1784,9 +1783,25 @@ (define-public wlroots
 modules for building a Wayland compositor.")
     (license license:expat)))  ; MIT license
 
+(define-public wlroots-0.17
+  (package
+    (inherit wlroots-0.18)
+    (name "wlroots")
+    (version "0.17.4")
+    (source
+     (origin
+       (inherit (package-source wlroots-0.18))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))))))
+
 (define-public wlroots-0.16
   (package
-    (inherit wlroots)
+    (inherit wlroots-0.18)
     (name "wlroots-0.16")
     (version "0.16.2")
     (source
@@ -1803,7 +1818,7 @@ (define-public wlroots-0.16
 
 (define-public wlroots-0.15
   (package
-    (inherit wlroots)
+    (inherit wlroots-0.18)
     (name "wlroots-0.15")
     (version "0.15.1")
     (source
@@ -1816,6 +1831,8 @@ (define-public wlroots-0.15
        (sha256
         (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))))
 
+(define-public wlroots wlroots-0.17)
+
 (define-public wl-mirror
   (package
     (name "wl-mirror")
-- 
2.46.0

[bug#73124] [PATCH 3/3] gnu: wlroots: Remove hwdata patch

[Rutherther via Guix-patches via]

Hwdata has been updated and outputs "share/pkgconfig/hwdata.pc",
this patch is no longer necessary.

Change-Id: Ie4c8cd26fa5c1162004f096f037c658b103b02ae
---
 gnu/local.mk                                  |  1 -
 .../patches/wlroots-hwdata-fallback.patch     | 46 -------------------
 gnu/packages/wm.scm                           |  4 +-
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cf42e2b6da..4a2b1c1dbe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2288,7 +2288,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch	\
   %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \
   %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch	\
-  %D%/packages/patches/wlroots-hwdata-fallback.patch		\
   %D%/packages/patches/wmctrl-64-fix.patch			\
   %D%/packages/patches/wmfire-dont-inline-draw-fire.patch	\
   %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch	\
diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch
deleted file mode 100644
index 6468c7cbf3..0000000000
--- a/gnu/packages/patches/wlroots-hwdata-fallback.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-backend/drm: add hardcoded hwdata path fallback
-
-Add hardcoded fallback "/usr/share/hwdata/pnp.ids" as a
-temporary solution to get things working in Guix until
-hwdata ships with pkg-config file.
-
-diff --git a/backend/drm/meson.build b/backend/drm/meson.build
-index 6fcb2c15..ed95360a 100644
---- a/backend/drm/meson.build
-+++ b/backend/drm/meson.build
-@@ -1,8 +1,7 @@
- hwdata = dependency(
- 	'hwdata',
--	required: 'drm' in backends,
-+	required: false,
- 	native: true,
--	not_found_message: 'Required for the DRM backend.',
- )
- 
- libdisplay_info = dependency(
-@@ -19,15 +18,21 @@ libliftoff = dependency(
- 	required: false,
- )
- 
--if not (hwdata.found() and libdisplay_info.found() and features['session'])
-+if hwdata.found()
-+	hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')
-+	pnp_ids = files(hwdata_dir / 'pnp.ids')
-+else
-+	pnp_ids = files('/usr/share/hwdata/pnp.ids')
-+endif
-+
-+if not (libdisplay_info.found() and features['session'])
- 	subdir_done()
- endif
- 
--hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')
- pnpids_c = custom_target(
- 	'pnpids.c',
- 	output: 'pnpids.c',
--	input: files(hwdata_dir / 'pnp.ids'),
-+	input: pnp_ids,
- 	feed: true,
- 	capture: true,
- 	command: files('gen_pnpids.sh'),
-
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 238f4138ab..ed998101e7 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1735,8 +1735,7 @@ (define-public wlroots-0.18
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))
-       (patches (search-patches "wlroots-hwdata-fallback.patch"))))
+        (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -1790,7 +1789,6 @@ (define-public wlroots-0.17
     (version "0.17.4")
     (source
      (origin
-       (inherit (package-source wlroots-0.18))
        (method git-fetch)
        (uri (git-reference
              (url "https://gitlab.freedesktop.org/wlroots/wlroots")
-- 
2.46.0

[bug#73124] [PATCH v2 0/3] gnu: wlroots: update on mesa-updates

[Rutherther via Guix-patches via]

I've changed the order of the commits to first remove
hwdata patch, as it was no longer needed. I've also
added changelog style, sorry for not sending it
with that on first try. This is based on feedback
I got from podiki in #guix IRC channel.

Rutherther (3):
  gnu: wlroots: Remove hwdata patch
  gnu: wayland: Update to 1.23.1
  gnu: wlroots: add 0.18

 gnu/local.mk                                  |  1 -
 gnu/packages/freedesktop.scm                  |  4 +-
 .../patches/wlroots-hwdata-fallback.patch     | 46 -------------------
 gnu/packages/wm.scm                           | 30 +++++++++---
 4 files changed, 25 insertions(+), 56 deletions(-)
 delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch


base-commit: fafd0245505fad7629ec98cef8d15e6e478f3f98
--
2.45.2

[bug#73124] [PATCH v2 1/3] gnu: wlroots: Remove hwdata patch

[Rutherther via Guix-patches via]

* gnu/packages/wm.scm: remove wlroots patch wlroots-hwdata-fallback.patch,
since it's no longer necessary as hwdata package has "share/pkgconfig/hwdata.pc"
* gnu/packages/patches/wlroots-hwdata-fallback.patch: Remove unused patch
* gnu/local.mk: Remove reference of removed gnu/packages/patches/wlroots-hwdata-fallback.patch

Change-Id: I4be3e203b99f1d8e4d837164d55a8c06c8fc71ee
---
 gnu/local.mk                                  |  1 -
 .../patches/wlroots-hwdata-fallback.patch     | 46 -------------------
 gnu/packages/wm.scm                           |  4 +-
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cf42e2b6da..4a2b1c1dbe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2288,7 +2288,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch	\
   %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \
   %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch	\
-  %D%/packages/patches/wlroots-hwdata-fallback.patch		\
   %D%/packages/patches/wmctrl-64-fix.patch			\
   %D%/packages/patches/wmfire-dont-inline-draw-fire.patch	\
   %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch	\
diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch
deleted file mode 100644
index 6468c7cbf3..0000000000
--- a/gnu/packages/patches/wlroots-hwdata-fallback.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-backend/drm: add hardcoded hwdata path fallback
-
-Add hardcoded fallback "/usr/share/hwdata/pnp.ids" as a
-temporary solution to get things working in Guix until
-hwdata ships with pkg-config file.
-
-diff --git a/backend/drm/meson.build b/backend/drm/meson.build
-index 6fcb2c15..ed95360a 100644
---- a/backend/drm/meson.build
-+++ b/backend/drm/meson.build
-@@ -1,8 +1,7 @@
- hwdata = dependency(
- 	'hwdata',
--	required: 'drm' in backends,
-+	required: false,
- 	native: true,
--	not_found_message: 'Required for the DRM backend.',
- )
- 
- libdisplay_info = dependency(
-@@ -19,15 +18,21 @@ libliftoff = dependency(
- 	required: false,
- )
- 
--if not (hwdata.found() and libdisplay_info.found() and features['session'])
-+if hwdata.found()
-+	hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')
-+	pnp_ids = files(hwdata_dir / 'pnp.ids')
-+else
-+	pnp_ids = files('/usr/share/hwdata/pnp.ids')
-+endif
-+
-+if not (libdisplay_info.found() and features['session'])
- 	subdir_done()
- endif
- 
--hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir')
- pnpids_c = custom_target(
- 	'pnpids.c',
- 	output: 'pnpids.c',
--	input: files(hwdata_dir / 'pnp.ids'),
-+	input: pnp_ids,
- 	feed: true,
- 	capture: true,
- 	command: files('gen_pnpids.sh'),
-
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7d7ac3498f..30ae699550 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1735,9 +1735,7 @@ (define-public wlroots
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))
-         ;; This patch can be removed once hwdata in Guix supports pkg-config
-         (patches (search-patches "wlroots-hwdata-fallback.patch"))))
+        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.45.2

[bug#73124] [PATCH v2 2/3] gnu: wayland: Update to 1.23.1

[Rutherther via Guix-patches via]

* gnu/packages/freedesktop.scm: Update Wayland to 1.23.1

Change-Id: Iacfeb77617cb6a039822fa7f0649a6433fa96973
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d5b31bf837..89509e7a1c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1316,7 +1316,7 @@ (define-public python-pyxdg
 (define-public wayland
   (package
     (name "wayland")
-    (version "1.22.0")
+    (version "1.23.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gitlab.freedesktop.org/" name
@@ -1324,7 +1324,7 @@ (define-public wayland
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0hjq8b1cprxpxcv2klgir1hd63vy5hrqilp9v317394qlqgayh0m"))))
+                "1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
-- 
2.45.2

[bug#73124] [PATCH v2 3/3] gnu: wlroots: add 0.18

[Rutherther via Guix-patches via]

wlroots major versions are usually incompatible. With
change to 0.18 wlroots has a different .pc pkg-config file
name, wlroots-0.18.pc. That means any package using pkg-config
to search for wlroots won't be able to find it. So even if there
were no breaking changes inside wlroots code base, it means programs
cannot be compiled against different major version.

I've thus exposed every wlroots as a separate symbol without the need
for use of "wlroots" symbol, so every package can use major wlroots version
appropriate for its version. I've kept wlroots symbol to not break anything
that is currently using it for wlroots-0.17.

* gnu/packages/wm.scm: Add wlroots-0.18, bind wlroots 0.17
to wlroots-0.17 symbol to make it easier to target specific
major wlroots version.

Change-Id: I377ed66e91b4adc1216d42077fe7c34178a5552b
---
 gnu/packages/wm.scm | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 30ae699550..b558c1223c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1723,10 +1723,10 @@ (define-public polybar
 functionality to display information about the most commonly used services.")
     (license license:expat)))
 
-(define-public wlroots
+(define-public wlroots-0.18
   (package
     (name "wlroots")
-    (version "0.17.4")
+    (version "0.18.0")
     (source
      (origin
        (method git-fetch)
@@ -1735,7 +1735,7 @@ (define-public wlroots
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))))
+        (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -1782,9 +1782,25 @@ (define-public wlroots
 modules for building a Wayland compositor.")
     (license license:expat)))  ; MIT license
 
+(define-public wlroots-0.17
+  (package
+    (inherit wlroots-0.18)
+    (name "wlroots")
+    (version "0.17.4")
+    (source
+     (origin
+       (inherit (package-source wlroots-0.18))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83"))))))
+
 (define-public wlroots-0.16
   (package
-    (inherit wlroots)
+    (inherit wlroots-0.18)
     (name "wlroots-0.16")
     (version "0.16.2")
     (source
@@ -1801,7 +1817,7 @@ (define-public wlroots-0.16
 
 (define-public wlroots-0.15
   (package
-    (inherit wlroots)
+    (inherit wlroots-0.18)
     (name "wlroots-0.15")
     (version "0.15.1")
     (source
@@ -1814,6 +1830,8 @@ (define-public wlroots-0.15
        (sha256
         (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))))
 
+(define-public wlroots wlroots-0.17)
+
 (define-public wl-mirror
   (package
     (name "wl-mirror")
-- 
2.45.2

bug#73124: [PATCH v2 0/3] gnu: wlroots: update on mesa-updates

[John Kehayias via Guix-patches via]

Hello,

Thanks for the patches! I've applied them to mesa-updates as 108aee2706, 715399c84f, and c1ca70a980 with some minor changes. Though note with rebasing these hashes will change. The most significant was reworking the last patch, detailed below. (Sorry for not sending diffs against your patches, but you can see the committed versions.)

On Sun, Sep 08, 2024 at 06:26 PM, Rutherther wrote:

> I've changed the order of the commits to first remove
> hwdata patch, as it was no longer needed. I've also
> added changelog style, sorry for not sending it
> with that on first try. This is based on feedback
> I got from podiki in #guix IRC channel.
>

Thanks for the changes. For changelog, some details below, but do see the manual for some helpers (like yasnippet in Emacs) and use the git log as reference.

> Rutherther (3):
>   gnu: wlroots: Remove hwdata patch

I applied this second as it went more as a start to the wlroots updates. For changelog, be sure to use fields (what variable or record was changed in the file) and this one didn't really need commentary. Though fine to include, I opted to simplify here.

>   gnu: wayland: Update to 1.23.1

I applied this first. Use periods (and double spaces) in the first line and for every change. Again, variable names go in the changelog.

>   gnu: wlroots: add 0.18
>

Here I added myself as a coauthor for the following changes: did chain inheritance (typically what we do and makes for less repeated work as things change), cleaned up wlroots-0.17 a bit for things that aren't needed, renamed all current wlroots usage to wlroots-0.17 as there were just a few. For the changelog, again use variable and field names; I cleaned up the comment a little and added one about the inconsistent names/file-names for older wlroots just as a note.

Hope that gets everything and I didn't mess anything up! Thanks again for your work here and I'll see how it looks on mesa-updates.

John

>  gnu/local.mk                                  |  1 -
>  gnu/packages/freedesktop.scm                  |  4 +-
>  .../patches/wlroots-hwdata-fallback.patch     | 46 -------------------
>  gnu/packages/wm.scm                           | 30 +++++++++---
>  4 files changed, 25 insertions(+), 56 deletions(-)
>  delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch
>
>
> base-commit: fafd0245505fad7629ec98cef8d15e6e478f3f98