From: Dmitry Baryshkov Date: Fri, 8 Aug 2025 22:05:17 +0000 (+0300) Subject: mesa: upgrade 25.1.6 -> 25.2.0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4000f9ec48d87e0ac765205c1b8096c352d2a301;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git mesa: upgrade 25.1.6 -> 25.2.0 Upgrade Mesa to the latest release. Refresh remaining patches and drop ones applied upstream. Signed-off-by: Dmitry Baryshkov Signed-off-by: Mathieu Dubois-Briand --- 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 deleted file mode 100644 index 5f45f94fea..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-dont-build-clover-frontend.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Markus Volk -Date: Sun, 19 Mai 2025 15:34:46 +0100 -Subject: [PATCH] dont build clover frontend - -The clover frontend is deprecated and is always built with opencl, even if -using rusticl. Additionally it adds a reproducibility issue. - -Upstream-Status: Inappropriate [oe-specific] -Signed-off-by: Markus Volk - ---- 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 @@ - else - driver_d3d12 = declare_dependency() - endif --if with_gallium_clover or with_tests -+if with_tests - # At the moment, clover and gallium/tests are the only two consumers - # for pipe-loader - subdir('targets/pipe-loader') - endif --if with_gallium_clover -- subdir('frontends/clover') -- subdir('targets/opencl') --endif - if with_gallium_rusticl - subdir('frontends/rusticl') - subdir('targets/rusticl') diff --git a/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch b/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch deleted file mode 100644 index 2633869625..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 531c6696d42953cd642dea7bf70153285c7949ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= -Date: Tue, 6 May 2025 14:36:57 +0200 -Subject: [PATCH] fix(FTBFS): clc: switch to new non-owned `TargetOptions` for - LLVM 21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream hid the `TargetOptions` in commit 985410f87f2d19910a8d327527fd30062b042b63 - -Use the new `getTargetOpts()` to obtain the `TargetOptions` for -`setTarget()`. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835] - -Signed-off-by: Kai Wasserbäch -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13079 -Reference: https://github.com/llvm/llvm-project/commit/985410f87f2d19910a8d327527fd30062b042b63 -Reviewed-by: Karol Herbst -Part-of: ---- - src/compiler/clc/clc_helpers.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/src/compiler/clc/clc_helpers.cpp -+++ b/src/compiler/clc/clc_helpers.cpp -@@ -874,7 +874,11 @@ clc_compile_to_llvm_module(LLVMContext & - diag_opts)); - - c->setTarget(clang::TargetInfo::CreateTargetInfo( -+#if LLVM_VERSION_MAJOR >= 21 -+ c->getDiagnostics(), c->getInvocation().getTargetOpts())); -+#else - c->getDiagnostics(), c->getInvocation().TargetOpts)); -+#endif - - c->getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly; - 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..136ed8623b 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 @@ -25,12 +25,12 @@ index bb7cebf5a748..351cc31ef2de 100644 @@ -56,10 +56,12 @@ if with_tests asm_fw = custom_target('afuc_test.fw', output: 'afuc_test.fw', - command: [asm, files('../.gitlab-ci/traces/afuc_test.asm'), '@OUTPUT@'], + command: [asm, files('../tests/traces/afuc_test.asm'), '@OUTPUT@'], + env: {'RNN_PATH': rnn_src_path}, ) asm_fw_a7xx = custom_target('afuc_test_a7xx.fw', output: 'afuc_test_a7xx.fw', - command: [asm, files('../.gitlab-ci/traces/afuc_test_a7xx.asm'), '@OUTPUT@'], + command: [asm, files('../tests/traces/afuc_test_a7xx.asm'), '@OUTPUT@'], + env: {'RNN_PATH': rnn_src_path}, ) test('afuc-asm', @@ -38,13 +38,13 @@ index bb7cebf5a748..351cc31ef2de 100644 @@ -120,11 +122,13 @@ if cc.sizeof('size_t') > 4 disasm_fw = custom_target('afuc_test.asm', output: 'afuc_test.asm', - command: [disasm, '-u', files('../.gitlab-ci/reference/afuc_test.fw')], + command: [disasm, '-u', files('../tests/reference/afuc_test.fw')], + env: {'RNN_PATH': rnn_src_path}, capture: true ) disasm_fw_a7xx = custom_target('afuc_test_a7xx.asm', output: 'afuc_test_a7xx.asm', - command: [disasm, '-u', files('../.gitlab-ci/reference/afuc_test_a7xx.fw')], + command: [disasm, '-u', files('../tests/reference/afuc_test_a7xx.fw')], + env: {'RNN_PATH': rnn_src_path}, capture: true ) @@ -56,14 +56,14 @@ index 469eeb4eb597..dfa1c12d0d9f 100644 @@ -194,6 +194,7 @@ if dep_lua.found() and dep_libarchive.found() log = custom_target(name + '.log', output: name + '.log', - command: [cffdump, '--unit-test', args, files('../.gitlab-ci/traces/' + name + '.rd.gz')], + command: [cffdump, '--unit-test', args, files('../tests/traces/' + name + '.rd.gz')], + env: {'RNN_PATH': rnn_src_path}, capture: true, ) test('cffdump-' + name, @@ -247,7 +248,8 @@ if with_tests output: name + '.log', - command: [crashdec, args, files('../.gitlab-ci/traces/' + name + '.devcore')], + command: [crashdec, args, files('../tests/traces/' + name + '.devcore')], capture: true, - env: {'GALLIUM_DUMP_CPU': 'false'}, + env: {'GALLIUM_DUMP_CPU': 'false', diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 0d6f013ae1..a848a2ad8c 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -17,12 +17,10 @@ PE = "2" SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \ - file://0001-dont-build-clover-frontend.patch \ - file://0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch \ " -SRC_URI[sha256sum] = "9f2b69eb39d2d8717d30a9868fdda3e0c0d3708ba32778bbac8ddb044538ce84" -PV = "25.1.6" +SRC_URI[sha256sum] = "7c726b21c074d14d31d253d638b741422f3c0a497ce7f1b4aaaa917d10bd8d4f" +PV = "25.2.0" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)"