From 03f678a39e7163f611ba581c7ebdbf3c869083fd Mon Sep 17 00:00:00 2001
From: Upgrade Helper <uh@not.set>
Date: Sat, 1 Nov 2025 16:10:53 +0000
Subject: [PATCH] mesa: upgrade 25.2.5 -> 25.2.6

---
 ...on-t-encode-build-path-into-binaries.patch | 25 +++++++++----------
 ...sdetects-64bit-atomics-on-mips-clang.patch |  2 +-
 meta/recipes-graphics/mesa/mesa.inc           |  4 +--
 3 files changed, 15 insertions(+), 16 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 136ed8623b..208da6b508 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 7552bcb60bc213807b40559716eeaf709addbb1c 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 5dddc9a..1932410 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 8c242de..2115b0e 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()
@@ -61,7 +62,7 @@ index 469eeb4eb597..dfa1c12d0d9f 100644
          capture: true,
        )
        test('cffdump-' + name,
-@@ -247,7 +248,8 @@ if with_tests
+@@ -265,7 +266,8 @@ if with_tests
        output: name + '.log',
        command: [crashdec, args, files('../tests/traces/' + name + '.devcore')],
        capture: true,
@@ -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 54ce18d..b9189ce 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
+@@ -889,13 +889,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-misdetects-64bit-atomics-on-mips-clang.patch b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
index baa98a0d46..0a1680a21f 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 cea8ebf5fcaa03c86dc7fb6f64a7fb612c6b41b6 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/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6a36aea259..6b4d8d4233 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -19,8 +19,8 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
            file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
 "
 
-SRC_URI[sha256sum] = "bb6243e7a6f525febfa1e6ab50827ca4d4bfdad73812377b0ca9b6c50998b03e"
-PV = "25.2.5"
+SRC_URI[sha256sum] = "361c97e8afa5fe20141c5362c5b489040751e12861c186a16c621a2fb182fc42"
+PV = "25.2.6"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
-- 
2.47.1

