From 39ede794e3f943a9ff2ca85355fda021c5381982 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Tue, 15 Apr 2025 09:45:34 +0000
Subject: [PATCH] mesa: upgrade 25.0.2 -> 25.0.3

---
 ...on-t-encode-build-path-into-binaries.patch | 23 +++++++++----------
 ...SIMD-blake-optimisations-on-x32-host.patch |  4 ++--
 ...sdetects-64bit-atomics-on-mips-clang.patch |  2 +-
 ...cross-compilation-arguments-to-LLVM-.patch |  6 ++---
 meta/recipes-graphics/mesa/mesa.inc           |  4 ++--
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
index 953a724dc0..1ec5c69b0b 100644
--- a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
+++ b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
@@ -1,4 +1,4 @@
-From 027ac36756cc75eea9ed4fee135a351af30b35fd Mon Sep 17 00:00:00 2001
+From a42f2c0ba316ae3f19fc8fc9ccc7be48de1479a9 Mon Sep 17 00:00:00 2001
 From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
 Date: Tue, 16 Jul 2024 12:32:47 +0300
 Subject: [PATCH] freedreno: don't encode build path into binaries
@@ -13,13 +13,14 @@ it manually when running the tests.
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30206]
 Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
 ---
- src/freedreno/afuc/meson.build   | 4 ++++
- src/freedreno/decode/meson.build | 4 +++-
- src/freedreno/meson.build        | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
+ src/freedreno/afuc/meson.build        | 4 ++++
+ src/freedreno/decode/meson.build      | 4 +++-
+ src/freedreno/meson.build             | 2 +-
+ src/freedreno/registers/gen_header.py | 7 ++++---
+ 4 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/src/freedreno/afuc/meson.build b/src/freedreno/afuc/meson.build
-index bb7cebf5a748..351cc31ef2de 100644
+index bb7cebf..351cc31 100644
 --- a/src/freedreno/afuc/meson.build
 +++ b/src/freedreno/afuc/meson.build
 @@ -56,10 +56,12 @@ if with_tests
@@ -50,7 +51,7 @@ index bb7cebf5a748..351cc31ef2de 100644
      )
      test('afuc-disasm',
 diff --git a/src/freedreno/decode/meson.build b/src/freedreno/decode/meson.build
-index 469eeb4eb597..dfa1c12d0d9f 100644
+index 469eeb4..915ba11 100644
 --- a/src/freedreno/decode/meson.build
 +++ b/src/freedreno/decode/meson.build
 @@ -194,6 +194,7 @@ if dep_lua.found() and dep_libarchive.found()
@@ -72,7 +73,7 @@ index 469eeb4eb597..dfa1c12d0d9f 100644
  
      test('crashdec-' + name,
 diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
-index 98e49b8fcf0e..145e72597eb9 100644
+index 29e1bc4..afb7426 100644
 --- a/src/freedreno/meson.build
 +++ b/src/freedreno/meson.build
 @@ -6,7 +6,7 @@ inc_freedreno_rnn = include_directories('rnn')
@@ -85,9 +86,10 @@ index 98e49b8fcf0e..145e72597eb9 100644
  dep_libarchive = dependency('libarchive', allow_fallback: true, required: false)
  dep_libxml2 = dependency('libxml-2.0', allow_fallback: true, required: false)
 diff --git a/src/freedreno/registers/gen_header.py b/src/freedreno/registers/gen_header.py
+index 7b1aa3e..5b58bc9 100644
 --- a/src/freedreno/registers/gen_header.py
 +++ b/src/freedreno/registers/gen_header.py
-@@ -885,13 +885,14 @@ The rules-ng-ng source files this header
+@@ -885,13 +885,14 @@ The rules-ng-ng source files this header was generated from are:
  """)
  	maxlen = 0
  	for filepath in p.xml_files:
@@ -105,6 +107,3 @@ diff --git a/src/freedreno/registers/gen_header.py b/src/freedreno/registers/gen
  	if p.copyright_year:
  		current_year = str(datetime.date.today().year)
  		print()
----
-2.39.2
-
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
index bebe30037a..e3ba4ff84c 100644
--- 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
@@ -1,4 +1,4 @@
-From f3c34b8da2662643089b33be8b93e56a4da8703d Mon Sep 17 00:00:00 2001
+From a7410ddbfee35d54ca71c034525927885aa9ae72 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
@@ -14,7 +14,7 @@ Upstream-Status: Pending [will be submitted upstream after internal clearance]
  1 file changed, 2 insertions(+)
 
 diff --git a/src/util/blake3/meson.build b/src/util/blake3/meson.build
-index 6b53daab6b32..ce6dd85ac1ea 100644
+index 6b53daa..ce6dd85 100644
 --- a/src/util/blake3/meson.build
 +++ b/src/util/blake3/meson.build
 @@ -24,6 +24,8 @@ if cpu_family == 'x86_64'
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
index baa98a0d46..60abc8660a 100644
--- a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
+++ b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
@@ -1,4 +1,4 @@
-From 02cc21800fe29f566add525e63f619c0536d6e7b Mon Sep 17 00:00:00 2001
+From b084fa8f4f09f51e3515c8a7783f1a3801b799ae Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 13 Jan 2020 15:23:47 -0800
 Subject: [PATCH] meson misdetects 64bit atomics on mips/clang
diff --git a/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch b/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch
index d527b34087..d9899fa3bb 100644
--- a/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch
+++ b/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch
@@ -1,4 +1,4 @@
-From b9cf34f39ca7e7546508ce2ab1f053edef5fc201 Mon Sep 17 00:00:00 2001
+From 2c6c68c99f230c6c0535d308fab008f40db0e334 Mon Sep 17 00:00:00 2001
 From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
 Date: Wed, 26 Mar 2025 17:47:09 +0200
 Subject: [PATCH] rusticl: provide cross-compilation arguments to LLVM bindgen
@@ -18,7 +18,7 @@ Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
  2 files changed, 22 insertions(+)
 
 diff --git a/meson_options.txt b/meson_options.txt
-index 0147cafcb146..f73e83fded18 100644
+index 0147caf..f73e83f 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -796,3 +796,17 @@ option(
@@ -40,7 +40,7 @@ index 0147cafcb146..f73e83fded18 100644
 +  description : 'Clang target for cross-generating LLVM bindings'
 +  )
 diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
-index a5d1dcf3abb9..480c220b7f5f 100644
+index a5d1dcf..7dd0794 100644
 --- a/src/gallium/frontends/rusticl/meson.build
 +++ b/src/gallium/frontends/rusticl/meson.build
 @@ -115,6 +115,11 @@ rusticl_bindgen_c_args = [
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index aca34983e9..aa615af38e 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -21,8 +21,8 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
            file://0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch \
 "
 
-SRC_URI[sha256sum] = "adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97"
-PV = "25.0.2"
+SRC_URI[sha256sum] = "5ff426ed6ce0588fd96d18975bdff451ae2ab2fe98b5d1528842ee71ec66711b"
+PV = "25.0.3"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
-- 
2.47.1

