[bug#57204] [PATCH 1/3] wayland-protocols: Bump to 1.24 * Needed to bump mesa to 22.1.3

[bug#57204] [PATCH 1/3] wayland-protocols: Bump to 1.24 * Needed to bump mesa to 22.1.3

[Jacob Hrbek]

[-- Attachment #1.1: Type: text/plain, Size: 1347 bytes --]

Signed-off-by: Jacob Hrbek <kreyren@rixotstudio.cz>
---
 gnu/packages/freedesktop.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 037a247243..7432b4e417 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2021, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022 Jacob Hrbek <kreyren@rixotstudio.cz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1062,7 +1063,7 @@ (define-public wayland
 (define-public wayland-protocols
   (package
     (name "wayland-protocols")
-    (version "1.23")
+    (version "1.24")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1070,7 +1071,7 @@ (define-public wayland-protocols
                     "wayland-protocols-" version ".tar.xz"))
               (sha256
                (base32
-                "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"))))
+                "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"))))
     (build-system meson-build-system)
     (inputs
      (list wayland))
-- 
2.37.1


[-- Attachment #1.2: publickey - kreyren@rixotstudio.cz - 1677db82.asc --]
[-- Type: application/pgp-keys, Size: 713 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

[bug#57205] [PATCH 2/3] libdrm: Bump 2.4.107->2.4.110 * Needed to bump mesa on 22.1.3

[Jacob Hrbek]

[-- Attachment #1.1: Type: text/plain, Size: 1261 bytes --]

Signed-off-by: Jacob Hrbek <kreyren@rixotstudio.cz>
---
 gnu/packages/xdisorg.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8360708445..6c2be295bb 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 Derek Chuank <derekchuank@outlook.com>
 ;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
+;;; Copyright © 2022 Jacob Hrbek <kreyren@rixotstudio.cz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -691,7 +692,7 @@ (define-public pixman
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.107")
+    (version "2.4.110")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -699,7 +700,7 @@ (define-public libdrm
                     version ".tar.xz"))
               (sha256
                (base32
-                "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
+                "0dwpry9m5l27dlhq48j4bsiqwm0247cxdqwv3b7ddmkynk2f9kpf"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
2.37.1


[-- Attachment #1.2: publickey - kreyren@rixotstudio.cz - 1677db82.asc --]
[-- Type: application/pgp-keys, Size: 713 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

[bug#57206] [PATCH 3/3] mesa: Bump 21.3.8->22.1.3 * Needed to use newer DXVK<https://github.com/doitsujin/dxvk/issues/2822#issuecomment-1214256276>

[Jacob Hrbek]

[-- Attachment #1.1: Type: text/plain, Size: 2726 bytes --]

Signed-off-by: Jacob Hrbek <kreyren@rixotstudio.cz>
---
 gnu/packages/gl.scm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index c740c087dd..b47b8564eb 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2022 Jacob Hrbek <kreyren@rixotstudio.cz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -261,7 +262,7 @@ (define libva-without-mesa
 (define-public mesa
   (package
     (name "mesa")
-    (version "21.3.8")
+    (version "22.1.3")
     (source
       (origin
         (method url-fetch)
@@ -273,12 +274,11 @@ (define-public mesa
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7"))
-        (patches
-         (search-patches "mesa-skip-tests.patch"))))
+          "1qwky31vdqh3y6i0mxqnrbq7jc39kjcyndpv4mbzz8d2gax353xr"))))
     (build-system meson-build-system)
     (propagated-inputs
-      (list ;; The following are in the Requires.private field of gl.pc.
+     (list ;; The following are in the Requires.private field of gl.pc.
+      ;; NOTE(Krey): Since version 22.1.3 it requires libdrm_amdgpu[>=2.4.110]
             libdrm
             libvdpau
             libx11
@@ -295,6 +295,7 @@ (define-public mesa
                    libxrandr
                    libxvmc
                    wayland
+                   ;; NOTE(Krey): Since 22.1.3 requires wayland-protocols[>=1.24]
                    wayland-protocols)
              ;; TODO: Resort alphabetically.
              ;; Note: update the 'clang' input of mesa-opencl when bumping this.
@@ -355,17 +356,7 @@ (define-public mesa
          "-Dvulkan-layers=device-select,overlay"
 
          ;; Also enable the tests.
-         "-Dbuild-tests=true"
-
-         ;; on non-intel systems, drop i915 and i965
-         ;; from the default dri drivers
-         ,@(match (%current-system)
-             ((or "x86_64-linux" "i686-linux")
-              '("-Ddri-drivers=i915,i965,nouveau,r200,r100"))
-             (_
-              '("-Ddri-drivers=nouveau,r200,r100")))
-
-                "-Dllvm=enabled")       ; default is x86/x86_64 only
+         "-Dbuild-tests=true")
 
        ;; XXX: 'debugoptimized' causes LTO link failures on some drivers.  The
        ;; documentation recommends using 'release' for performance anyway.
-- 
2.37.1


[-- Attachment #1.2: publickey - kreyren@rixotstudio.cz - 1677db82.asc --]
[-- Type: application/pgp-keys, Size: 713 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

[bug#57204] [PATCH 1/3] wayland-protocols: Bump to 1.24 * Needed to bump mesa to 22.1.3

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 439 bytes --]

On 14-08-2022 17:51, Jacob Hrbek wrote:

> Signed-off-by: Jacob Hrbek<kreyren@rixotstudio.cz>

What do you mean with this line?

Also, wayland-protocols & drm is already updated in the older patch 
series <https://issues.guix.gnu.org/56814> to a newer version.  
Likewise, mesa has already been updated in 
<https://issues.guix.gnu.org/49339> (on core-updates), hence I'm closing 
this as a duplicate.

Greetings,
Maxime.


[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#57206] [PATCH 3/3] mesa: Bump 21.3.8->22.1.3 * Needed to use newer DXVK<https://github.com/doitsujin/dxvk/issues/2822#issuecomment-1214256276>

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 560 bytes --]

merge 57204 57205 57206
thanks

See "(guix)Sending a Patch Series"  for instructions on submitting 
patches, in particular:

> When sending a patch series (e.g., using ‘git send-email’), please first
> send one message to <guix-patches@gnu.org>, and then send subsequent
> patches to <NNN@debbugs.gnu.org> to make sure they are kept together.
> See the Debbugs documentation (https://debbugs.gnu.org/Advanced.html)
> for more information.  You can install ‘git send-email’ with ‘guix
> install git:send-email’.
Greetings,
Maxime.


[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

bug#57204: [PATCH 1/3] wayland-protocols: Bump to 1.24 * Needed to bump mesa to 22.1.3

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 30 bytes --]

Closing (see first response)

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]