From 699b5a0b2374849c7b81da71603ccb7812dbaaae Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Tue, 15 Jul 2025 13:36:46 +0000
Subject: [PATCH] mesa: upgrade 25.1.4 -> 25.1.5

---
 .../0001-dont-build-clover-frontend.patch     | 14 +++++++----
 ...on-t-encode-build-path-into-binaries.patch | 23 +++++++++----------
 ...sdetects-64bit-atomics-on-mips-clang.patch |  2 +-
 meta/recipes-graphics/mesa/mesa.inc           |  4 ++--
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/meta/recipes-graphics/mesa/files/0001-dont-build-clover-frontend.patch b/meta/recipes-graphics/mesa/files/0001-dont-build-clover-frontend.patch
index 5f45f94fea..2ee3144fff 100644
--- a/meta/recipes-graphics/mesa/files/0001-dont-build-clover-frontend.patch
+++ b/meta/recipes-graphics/mesa/files/0001-dont-build-clover-frontend.patch
@@ -1,5 +1,6 @@
+From 0c9b07d135a3d6880db72b580cd3275028e61f1c Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 19 Mai 2025 15:34:46 +0100
+Date: Sat, 19 Jul 2025 15:34:46 +0000
 Subject: [PATCH] dont build clover frontend
 
 The clover frontend is deprecated and is always built with opencl, even if
@@ -7,10 +8,15 @@ using rusticl. Additionally it adds a reproducibility issue.
 
 Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ src/gallium/meson.build | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
---- a/src/gallium/meson.build	2025-05-07 18:35:10.000000000 +0200
-+++ b/src/gallium/meson.build	2025-05-18 17:05:23.677694272 +0200
-@@ -195,15 +195,11 @@
+diff --git a/src/gallium/meson.build b/src/gallium/meson.build
+index 4d06365..3e2bb8e 100644
+--- a/src/gallium/meson.build
++++ b/src/gallium/meson.build
+@@ -195,15 +195,11 @@ if with_gallium_d3d12
  else
    driver_d3d12 = declare_dependency()
  endif
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..bc5ee6438b 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 944b099ed6bb77010a2bce3dcb6811eeab388612 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 e1cfb5f..4e3db12 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..2a3151114d 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 3bcfe55a5e99c8085d40652e826fe97169c95b7c 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 3d9e9ec91f..47b95728e0 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -20,8 +20,8 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
            file://0001-dont-build-clover-frontend.patch \
 "
 
-SRC_URI[sha256sum] = "164872a5e792408aa72fecd52b7be6409724c4ad81700798675a7d801d976704"
-PV = "25.1.4"
+SRC_URI[sha256sum] = "3c4f6b10ff6ee950d0ec6ea733cc6e6d34c569454e3d39a9b276de9115a3b363"
+PV = "25.1.5"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
-- 
2.47.1

