bug#62176: [PATCH] Update Mesa to 22.2

[Liliana Marie Prikler]

Am Dienstag, dem 14.03.2023 um 06:31 +0100 schrieb Dr. Arne
Babenhauserheide:
> Hi,
> 
> the attached patch updates mesa to version 22.
Please do one patch per package and don't mix stylistic and functional
changes.

> The patch from core-updates is still missing. It may be a good idea
> to add that, too.
libdrm and mesa need to go through core-updates, wayland-protocols on
the other hand has few dependents and could go to master as-is.  Please
split the bugs accordingly for quicker processing.

Cheers

bug#62176: [PATCH] Update Mesa to 22.2

[Dr. Arne Babenhauserheide]

Hi,

the attached patch updates mesa to version 22.

The new Mesa package is mostly taken from core-updates, then I adapted
only the strictly required dependencies.

Many thanks to theh person who wrote the comment that mesa-opencl also
needs clang updated!

From e27c543e0071fe09f827d8f892ce6f5772f3f941 Mon Sep 17 00:00:00 2001
From: Arne Babenhauserheide 
Date: Mon, 13 Mar 2023 20:56:39 +0100
Subject: [PATCH] gnu: Update mesa to 22.2.4

* gnu/packages/freedesktop.scm (wayland-protocols): update to 1.26
* gnu/packages/gl.scm (mesa): update to 22.2.4, via core-updates
* gnu/packages/xdisorg.scm (libdrm): update to 2.4.114
---
 gnu/packages/freedesktop.scm |  4 +-
 gnu/packages/gl.scm  | 98 +---
 gnu/packages/xdisorg.scm |  4 +-
 3 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 40edcfdab4..96789121f3 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1242,7 +1242,7 @@ (define-public wayland
 (define-public wayland-protocols
   (package
 (name "wayland-protocols")
-(version "1.23")
+(version "1.26")
 (source (origin
   (method url-fetch)
   (uri (string-append
@@ -1250,7 +1250,7 @@ (define-public wayland-protocols
 "wayland-protocols-" version ".tar.xz"))
   (sha256
(base32
-"0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"
+"04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"
 (build-system meson-build-system)
 (inputs
  (list wayland))
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 4ae96032cd..f334751db4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -266,7 +266,7 @@ (define libva-without-mesa
 (define-public mesa
   (package
 (name "mesa")
-(version "21.3.8")
+(version "22.2.4")
 (source
   (origin
 (method url-fetch)
@@ -278,61 +278,65 @@ (define-public mesa
   version "/mesa-" version ".tar.xz")))
 (sha256
  (base32
-  "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7"))
+  "1azpr68pdg63yq3igmzwsgn2ypg49m0mp3hfkq0lcyswr99npmv5"))
 (patches
- (search-patches "mesa-skip-tests.patch"
+ (list ;; (search-patch "mesa-fix-sporadic-test-failures.patch")
 (build-system meson-build-system)
 (propagated-inputs
-  (list ;; The following are in the Requires.private field of gl.pc.
-libdrm
-libvdpau
-libx11
-libxdamage
-libxfixes
-libxshmfence
-libxxf86vm
-xorgproto))
+ ;; The following are in the Requires.private field of gl.pc.
+ (list libdrm
+   libvdpau
+   libx11
+   libxdamage
+   libxfixes
+   libxshmfence
+   libxxf86vm
+   xorgproto))
 (inputs
- (append (list expat
-   elfutils ;libelf required for r600 when using llvm
-   (force libva-without-mesa)
-   libxml2
-   libxrandr
-   libxvmc
-   wayland
-   wayland-protocols)
- ;; TODO: Resort alphabetically.
- ;; Note: update the 'clang' input of mesa-opencl when bumping this.
- (list llvm-11)))
+ (list expat
+  elfutils  ;libelf required for r600 when using llvm
+   (force libva-without-mesa)
+   libxml2
+   libxrandr
+   libxvmc
+   wayland
+   wayland-protocols
+   ;; TODO: Resort alphabetically.
+   ;; Note: update the 'clang' input of mesa-opencl when bumping this.
+   llvm-14))
 (native-inputs
- (append (list bison
-   flex
-   gettext-minimal
-   pkg-config
-   python-wrapper
-   python-libxml2  ;for OpenGL ES 1.1 and 2.0 support
-   python-mako
-   (@ (gnu packages base) which))
- ;; TODO: Resort alphabetically.
- (list glslang)))
+ (list bison
+   flex
+   gettext-minimal
+   glslang
+   pkg-config
+   python-libxml2   ;for OpenGL ES 1.1 and 2.0 support
+   python-mako
+   python-wrapper
+   (@ (gnu packages base) which)
+ ;; TODO: Resort alphabetically.
+ glslang))
 (outputs '("out" "bin"))
 (arguments
  `(#:configure-flags
'(,@(match (%current-system)
  ("aarch64-linux"
   ;; TODO: Fix svga driver for non-Intel architectures.
-  '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl"))
+