mesa: Update to v25.0.2

Author: philmmanjaro

m/mesa/manifest.x86_64.bin

@@ -8,8 +8,8 @@
 				"binary(bison)",
 				"binary(cbindgen)",
 				"binary(flex)",
-				"binary(intel_clc)",
 				"binary(llvm-config32)",
+				"binary(mesa_clc)",
 				"binary(python3)",
 				"binary(rustc)",
 				"clang-32bit",
@@ -59,7 +59,6 @@
 				"soname(libdrm.so.2(x86_64))",
 				"soname(libdrm_amdgpu.so.1(x86_64))",
 				"soname(libdrm_intel.so.1(x86_64))",
-				"soname(libdrm_radeon.so.1(x86_64))",
 				"soname(libelf.so.1(x86_64))",
 				"soname(libexpat.so.1(x86_64))",
 				"soname(libm.so.6(x86_64))",
@@ -116,11 +115,11 @@
 				"/usr/lib/libVkLayer_MESA_device_select.so",
 				"/usr/lib/libVkLayer_MESA_overlay.so",
 				"/usr/lib/libVkLayer_MESA_screenshot.so",
-				"/usr/lib/libgallium-24.3.4-serpentos.30.so",
+				"/usr/lib/libVkLayer_MESA_vram_report_limit.so",
+				"/usr/lib/libgallium-25.0.2-serpentos.31.so",
 				"/usr/lib/libgbm.so.1",
 				"/usr/lib/libgbm.so.1.0.0",
-				"/usr/lib/libglapi.so.0",
-				"/usr/lib/libglapi.so.0.0.0",
+				"/usr/lib/libvulkan_gfxstream.so",
 				"/usr/lib/libvulkan_intel.so",
 				"/usr/lib/libvulkan_intel_hasvk.so",
 				"/usr/lib/libvulkan_lvp.so",
@@ -150,6 +149,8 @@
 				"/usr/share/glvnd/egl_vendor.d/50_mesa.json",
 				"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json",
 				"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_screenshot.json",
+				"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_vram_report_limit.json",
+				"/usr/share/vulkan/icd.d/gfxstream_vk_icd.x86_64.json",
 				"/usr/share/vulkan/icd.d/intel_hasvk_icd.x86_64.json",
 				"/usr/share/vulkan/icd.d/intel_icd.x86_64.json",
 				"/usr/share/vulkan/icd.d/lvp_icd.x86_64.json",
@@ -171,9 +172,10 @@
 				"soname(libVkLayer_MESA_device_select.so(x86_64))",
 				"soname(libVkLayer_MESA_overlay.so(x86_64))",
 				"soname(libVkLayer_MESA_screenshot.so(x86_64))",
-				"soname(libgallium-24.3.4-serpentos.30.so(x86_64))",
+				"soname(libVkLayer_MESA_vram_report_limit.so(x86_64))",
+				"soname(libgallium-25.0.2-serpentos.31.so(x86_64))",
 				"soname(libgbm.so.1(x86_64))",
-				"soname(libglapi.so.0(x86_64))",
+				"soname(libvulkan_gfxstream.so(x86_64))",
 				"soname(libvulkan_intel.so(x86_64))",
 				"soname(libvulkan_intel_hasvk.so(x86_64))",
 				"soname(libvulkan_lvp.so(x86_64))",
@@ -189,8 +191,8 @@
 				"binary(bison)",
 				"binary(cbindgen)",
 				"binary(flex)",
-				"binary(intel_clc)",
 				"binary(llvm-config32)",
+				"binary(mesa_clc)",
 				"binary(python3)",
 				"binary(rustc)",
 				"clang-32bit",
@@ -241,7 +243,6 @@
 				"soname(libdrm.so.2(386))",
 				"soname(libdrm_amdgpu.so.1(386))",
 				"soname(libdrm_intel.so.1(386))",
-				"soname(libdrm_radeon.so.1(386))",
 				"soname(libelf.so.1(386))",
 				"soname(libexpat.so.1(386))",
 				"soname(libm.so.6(386))",
@@ -295,11 +296,10 @@
 				"/usr/lib32/libVkLayer_MESA_device_select.so",
 				"/usr/lib32/libVkLayer_MESA_overlay.so",
 				"/usr/lib32/libVkLayer_MESA_screenshot.so",
-				"/usr/lib32/libgallium-24.3.4-serpentos.30.so",
+				"/usr/lib32/libVkLayer_MESA_vram_report_limit.so",
+				"/usr/lib32/libgallium-25.0.2-serpentos.31.so",
 				"/usr/lib32/libgbm.so.1",
 				"/usr/lib32/libgbm.so.1.0.0",
-				"/usr/lib32/libglapi.so.0",
-				"/usr/lib32/libglapi.so.0.0.0",
 				"/usr/lib32/libvulkan_intel.so",
 				"/usr/lib32/libvulkan_intel_hasvk.so",
 				"/usr/lib32/libvulkan_lvp.so",
@@ -349,12 +349,12 @@
 				"soname(libVkLayer_MESA_overlay.so(x86))",
 				"soname(libVkLayer_MESA_screenshot.so(386))",
 				"soname(libVkLayer_MESA_screenshot.so(x86))",
-				"soname(libgallium-24.3.4-serpentos.30.so(386))",
-				"soname(libgallium-24.3.4-serpentos.30.so(x86))",
+				"soname(libVkLayer_MESA_vram_report_limit.so(386))",
+				"soname(libVkLayer_MESA_vram_report_limit.so(x86))",
+				"soname(libgallium-25.0.2-serpentos.31.so(386))",
+				"soname(libgallium-25.0.2-serpentos.31.so(x86))",
 				"soname(libgbm.so.1(386))",
 				"soname(libgbm.so.1(x86))",
-				"soname(libglapi.so.0(386))",
-				"soname(libglapi.so.0(x86))",
 				"soname(libvulkan_intel.so(386))",
 				"soname(libvulkan_intel.so(x86))",
 				"soname(libvulkan_intel_hasvk.so(386))",
@@ -375,8 +375,8 @@
 				"binary(bison)",
 				"binary(cbindgen)",
 				"binary(flex)",
-				"binary(intel_clc)",
 				"binary(llvm-config32)",
+				"binary(mesa_clc)",
 				"binary(python3)",
 				"binary(rustc)",
 				"clang-32bit",
@@ -423,7 +423,6 @@
 				"/usr/lib32/libGLX_mesa.so",
 				"/usr/lib32/libOSMesa.so",
 				"/usr/lib32/libgbm.so",
-				"/usr/lib32/libglapi.so",
 				"/usr/lib32/libxatracker.so",
 				"/usr/lib32/pkgconfig/d3d.pc",
 				"/usr/lib32/pkgconfig/dri.pc",
@@ -446,8 +445,8 @@
 				"binary(bison)",
 				"binary(cbindgen)",
 				"binary(flex)",
-				"binary(intel_clc)",
 				"binary(llvm-config32)",
+				"binary(mesa_clc)",
 				"binary(python3)",
 				"binary(rustc)",
 				"clang-32bit",
@@ -504,7 +503,6 @@
 				"/usr/lib/libGLX_mesa.so",
 				"/usr/lib/libOSMesa.so",
 				"/usr/lib/libgbm.so",
-				"/usr/lib/libglapi.so",
 				"/usr/lib/libxatracker.so",
 				"/usr/lib/pkgconfig/d3d.pc",
 				"/usr/lib/pkgconfig/dri.pc",
@@ -523,6 +521,6 @@
 		}
 	},
 	"source-name": "mesa",
-	"source-release": "30",
-	"source-version": "24.3.4"
+	"source-release": "31",
+	"source-version": "25.0.2"
 }

m/mesa/manifest.x86_64.jsonc

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 1 Mar 2025 02:16:28 +0100
+Subject: [PATCH] docs: Fix build with Sphinx 8.2
+
+---
+ docs/_exts/bootstrap.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/_exts/bootstrap.py b/docs/_exts/bootstrap.py
+index 18e46cea1608..6a9cebf59efc 100644
+--- a/docs/_exts/bootstrap.py
++++ b/docs/_exts/bootstrap.py
+@@ -65,6 +65,7 @@ class BootstrapHTML5TranslatorMixin:
+ 
+         self.body.append(self.starttag(
+             node, 'div', CLASS=('alert ' + admonitionclasses[name])))
++        self.context.append("</div>")
+         if name:
+             self.body.append(
+                   self.starttag(node, 'div', '', CLASS='h5'))

m/mesa/pkg/0001-docs-Fix-build-with-Sphinx-8.2.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 1 Mar 2025 02:33:00 +0100
+Subject: [PATCH] gfxstream: Fix log format error on x86
+
+---
+ src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+index bd443ed09006..dbb5af3215d7 100644
+--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
++++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+@@ -4902,7 +4902,11 @@ VkResult ResourceTracker::on_vkGetFenceStatus(void* context, VkResult input_resu
+ 
+         auto fenceInfoIt = info_VkFence.find(fence);
+         if (fenceInfoIt == info_VkFence.end()) {
++#if VK_USE_64_BIT_PTR_DEFINES
+             mesa_loge("Failed to find VkFence:%p", fence);
++#else
++            mesa_loge("Failed to find VkFence:%llu", fence);
++#endif
+             return VK_NOT_READY;
+         }
+         auto& fenceInfo = fenceInfoIt->second;

m/mesa/pkg/0002-gfxstream-Fix-log-format-error-on-x86.patch

@@ -4,11 +4,12 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 name        : mesa
-version     : 24.3.4
-release     : 30
+version     : 25.0.2
+# Note: keep mesa-clc in-sync with this package version-wise
+release     : 31
 homepage    : https://mesa3d.org/
 upstreams   :
-    - https://archive.mesa3d.org/mesa-24.3.4.tar.xz : e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025
+    - https://mesa.freedesktop.org/archive/mesa-25.0.2.tar.xz : adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97
 summary     : Mesa 3D graphics library
 description : |
     The Mesa project began as an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. Over the years the project has grown to implement more graphics APIs, including OpenGL ES, OpenCL, OpenMAX, VDPAU, VA-API, Vulkan and EGL. A variety of device drivers allows the Mesa libraries to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs. Mesa ties into several other open-source projects: the Direct Rendering Infrastructure, X.org, and Wayland to provide OpenGL support on Linux, FreeBSD, and other operating systems.
@@ -34,8 +35,8 @@ builddeps   :
     - binary(bison)
     - binary(cbindgen)
     - binary(flex)
-    - binary(intel_clc)
     - binary(llvm-config32)
+    - binary(mesa_clc)
     - binary(python3)
     - binary(rustc)
     - clang-32bit
@@ -84,13 +85,19 @@ profiles    :
             export BINDGEN_EXTRA_CLANG_ARGS="--target=%(target_triple)"
             export EXTRA_VK_DRIVERS=""
 environment : |
-    export EXTRA_VK_DRIVERS=",nouveau"
+    export EXTRA_VK_DRIVERS=",gfxstream,nouveau"
 setup       : |
     # Include package release in version string so Chromium invalidates
     # its GPU cache; otherwise it can cause pages to render incorrectly.
     # https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604
     echo "%(version)-serpentos.%(release)" >VERSION
 
+    # Fix build with Sphinx 8.2
+    %patch %(pkgdir)/0001-docs-Fix-build-with-Sphinx-8.2.patch
+
+    # Fix compilation error on x86
+    %patch %(pkgdir)/0002-gfxstream-Fix-log-format-error-on-x86.patch
+
     %meson \
         -Degl=enabled \
         -Dgallium-drivers=crocus,i915,iris,llvmpipe,nouveau,r300,r600,radeonsi,softpipe,svga,virgl,zink \
@@ -103,15 +110,15 @@ setup       : |
         -Dgles1=disabled \
         -Dglvnd=enabled \
         -Dllvm=enabled \
+        -Dmesa-clc=system \
         -Dosmesa=true \
         -Dzstd=enabled \
         -Dplatforms=x11,wayland \
         -Dshared-llvm=enabled \
         -Dvideo-codecs=all \
         -Dmicrosoft-clc=disabled \
-        -Dintel-clc=system \
         -Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio$EXTRA_VK_DRIVERS \
-        -Dvulkan-layers=device-select,overlay,screenshot
+        -Dvulkan-layers=device-select,overlay,screenshot,vram-report-limit
 build       : |
     %meson_build
 install     : |