mesa: upgrade 25.0.2 -> 25.0.5

Several fixes, mostly targeting AMD and Qualcomm platforms.

(From OE-Core rev: a8502be8f943332df1ba8f57742d0508d5a8b4e5)

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 32 deletions

diff --git a/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch b/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch
deleted file mode 100644
index f8af2bafb4..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f3c34b8da2662643089b33be8b93e56a4da8703d Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
-Date: Wed, 2 Apr 2025 15:30:20 +0300
-Subject: [PATCH] meson: disable SIMD blake optimisations on x32 host
-
-On X.org startup libgallium crashes on x32 hosts inside
-blake3_hash_many_sse41(), most likely because of the different pointer
-size. Disable SIMD blake implementation if x32 is detected.
-
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/b9c6afd3a7c7ac302b47e70b5c745b84cb35f188]
----
- src/util/blake3/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/util/blake3/meson.build b/src/util/blake3/meson.build
-index 6b53daab6b32..ce6dd85ac1ea 100644
---- a/src/util/blake3/meson.build
-+++ b/src/util/blake3/meson.build
-@@ -24,6 +24,8 @@ if cpu_family == 'x86_64'
-     else
-       files_blake3 += ['blake3_sse2_x86-64_windows_gnu.S', 'blake3_sse41_x86-64_windows_gnu.S', 'blake3_avx2_x86-64_windows_gnu.S', 'blake3_avx512_x86-64_windows_gnu.S']
-     endif
-+  elif meson.get_compiler('c').sizeof('void *') == 4
-+    blake3_defs += blake3_x86_no_simd_defs
-   else
-     files_blake3 += ['blake3_sse2_x86-64_unix.S', 'blake3_sse41_x86-64_unix.S', 'blake3_avx2_x86-64_unix.S', 'blake3_avx512_x86-64_unix.S']
-   endif
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index cd0f02c6d7..2b0ade496f 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -16,13 +16,12 @@ PE = "2"
 
 SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
-           file://0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch \
-           file://0001-freedreno-don-t-encode-build-path-into-binaries.patch\
+           file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
            file://0001-mesa-clc-add-an-option-to-force-inclusion-of-OpenCL-.patch \
 "
 
-SRC_URI[sha256sum] = "adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97"
-PV = "25.0.2"
+SRC_URI[sha256sum] = "c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0"
+PV = "25.0.5"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"