Subject: bug#57206: closed (Re: [bug#57204] [PATCH 1/3] wayland-protocols: Bump to 1.24 * Needed to bump mesa to 22.1.3)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 14 Aug 2022 16:27:03 +0000

Your bug report

#57204: [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>

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
57204: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57204
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#57204] [PATCH 1/3] wayland-protocols: Bump to 1.24 * Needed to bump mesa to 22.1.3
From: Maxime Devos <[email-masked]>
To: [email-masked], [email-masked], [email-masked]
Date: Sun, 14 Aug 2022 18:26:27 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Closing (see first response)

Subject: [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>
From: Jacob Hrbek <[email-masked]>
To: [email-masked]
Cc: Jacob Hrbek <[email-masked]>
Date: Sun, 14 Aug 2022 15:52:09 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Signed-off-by: Jacob Hrbek <[email-masked]>
---
 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 <[email-masked]>
 ;;; Copyright © 2021 John Kehayias <[email-masked]>
 ;;; Copyright © 2022 Petr Hodina <[email-masked]>
+;;; Copyright © 2022 Jacob Hrbek <[email-masked]>
 ;;;
 ;;; 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