summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@cherry.de>2025-09-18 19:19:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-22 22:09:48 +0100
commit6cb811ba078df998ced04d4f0f48e138ea1477f3 (patch)
tree5695f3bb4bf8346d6178d675ecd56ca60c70f2fb
parent843454bcdce977d0c318cfea8c51e32bc67821ec (diff)
downloadpoky-6cb811ba078df998ced04d4f0f48e138ea1477f3.tar.gz
mesa: upgrade 25.2.2 -> 25.2.3
Changelog and sha256sum: https://docs.mesa3d.org/relnotes/25.2.3.html 0001-meson-fix-libcl-assert-reproducibility.patch was merged in 25.2.3 (see commit 3445cb5577058262a2648cff6fdcdbd289ce1147) so can be removed. (From OE-Core rev: c5662684f38912dcc470592c4f00a13775d60871) Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0001-meson-fix-libcl-assert-reproducibility.patch43
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc5
2 files changed, 2 insertions, 46 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-fix-libcl-assert-reproducibility.patch b/meta/recipes-graphics/mesa/files/0001-meson-fix-libcl-assert-reproducibility.patch
deleted file mode 100644
index 118b52a227..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-meson-fix-libcl-assert-reproducibility.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From b9d43acde2d2e21d321e57d632cac199e41048ef Mon Sep 17 00:00:00 2001
2From: Quentin Schulz <quentin.schulz@cherry.de>
3Date: Thu, 21 Aug 2025 17:24:08 +0200
4Subject: [PATCH] meson: fix libcl assert() reproducibility
5
6The current -fmacro-prefix-map only handles removal of relative paths
7but we still need to handle absolute paths.
8
9The following path can be found in libvulkan_panfrost.so when building
10with Yocto for example:
11/work/build/tmp/work/cortexa76-cortexa55-crypto-poky-linux/mesa/25.2.0/sources/mesa-25.2.0/src/panfrost/libpan/../../util/bitpack_helpers.h
12
13These paths currently seem to only appear in the binary in strings that
14start with "Shader assertion fail at " which seems to indicate there are
15calls to assert() with absolute paths as well as relative paths (which
16are already patched with fmacro-prefix-map).
17
18By stripping the global source and build root directories from the paths
19with -fmacro-prefix-map, we get rid of this reproducibility issue (which
20incidentally makes the build fail due to buildpaths QA issue).
21
22Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
23
24Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36927]
25
26Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
27---
28 meson.build | 2 ++
29 1 file changed, 2 insertions(+)
30
31diff --git a/meson.build b/meson.build
32index 9cc75f6636e..d4779905020 100644
33--- a/meson.build
34+++ b/meson.build
35@@ -52,6 +52,8 @@ relative_dir = fs.relative_to(meson.global_source_root(), meson.global_build_roo
36
37 cl_args = [
38 '-fmacro-prefix-map=@0@/='.format(relative_dir),
39+ '-fmacro-prefix-map=@0@/='.format(meson.global_source_root()),
40+ '-fmacro-prefix-map=@0@/='.format(meson.global_build_root()),
41
42 # Set the OpenCL standard to CL 2.0, enabling everything at a frontend.
43 # Drivers may not actually support everything but that's ok.
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index ee83c9546f..c3751f3414 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -17,11 +17,10 @@ PE = "2"
17SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \ 17SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
18 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 18 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
19 file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \ 19 file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
20 file://0001-meson-fix-libcl-assert-reproducibility.patch \
21" 20"
22 21
23SRC_URI[sha256sum] = "43d7abcd4aa8049d8fd75538344a374104765e81e17b4a6314cee2c0160e4412" 22SRC_URI[sha256sum] = "f2d6b28562f1d6cb9c17ee8e58eeade7aa5faf927ae71065eadb41e17f92b4f8"
24PV = "25.2.2" 23PV = "25.2.3"
25 24
26UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 25UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
27 26