diff mbox series

[22/37] mesa: upgrade 25.1.3 -> 25.1.4

Message ID 20250630091315.1897-22-wangmy@fujitsu.com
State New
Headers show
Series [01/37] bind: upgrade 9.20.9 -> 9.20.10 | expand

Commit Message

Wang Mingyu June 30, 2025, 9:13 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-freedreno-don-t-encode-build-path-into-binaries.patch
refreshed for 25.1.4

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...on-t-encode-build-path-into-binaries.patch | 23 +++++++++----------
 meta/recipes-graphics/mesa/mesa.inc           |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)
diff mbox series

Patch

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..059ff46cef 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 1e76f138b1eb3102a84e032961e560aeb9c70a6b 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/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6b42a238cc..3d9e9ec91f 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] = "ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f"
-PV = "25.1.3"
+SRC_URI[sha256sum] = "164872a5e792408aa72fecd52b7be6409724c4ad81700798675a7d801d976704"
+PV = "25.1.4"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"