mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 09:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

mesa: upgrade 25.2.2 -> 25.2.3

Browse Source 
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>
This commit is contained in:
Quentin Schulz
2025-09-18 19:19:30 +02:00
committed by Richard Purdie
parent 843454bcdc
commit 6cb811ba07
2 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
meta/recipes-graphics/mesa/files/0001-meson-fix-libcl-assert-reproducibility.patch
View File

@@ -1,43 +0,0 @@
From b9d43acde2d2e21d321e57d632cac199e41048ef Mon Sep 17 00:00:00 2001
From: Quentin Schulz <quentin.schulz@cherry.de>
Date: Thu, 21 Aug 2025 17:24:08 +0200
Subject: [PATCH] meson: fix libcl assert() reproducibility
The current -fmacro-prefix-map only handles removal of relative paths
but we still need to handle absolute paths.
The following path can be found in libvulkan_panfrost.so when building
with Yocto for example:
/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
These paths currently seem to only appear in the binary in strings that
start with "Shader assertion fail at " which seems to indicate there are
calls to assert() with absolute paths as well as relative paths (which
are already patched with fmacro-prefix-map).
By stripping the global source and build root directories from the paths
with -fmacro-prefix-map, we get rid of this reproducibility issue (which
incidentally makes the build fail due to buildpaths QA issue).
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36927]
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meson.build b/meson.build
index 9cc75f6636e..d4779905020 100644
--- a/meson.build
+++ b/meson.build
@@ -52,6 +52,8 @@ relative_dir = fs.relative_to(meson.global_source_root(), meson.global_build_roo
cl_args = [
'-fmacro-prefix-map=@0@/='.format(relative_dir),
+ '-fmacro-prefix-map=@0@/='.format(meson.global_source_root()),
+ '-fmacro-prefix-map=@0@/='.format(meson.global_build_root()),
# Set the OpenCL standard to CL 2.0, enabling everything at a frontend.
# Drivers may not actually support everything but that's ok.

5
meta/recipes-graphics/mesa/mesa.inc
View File

@@ -17,11 +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-meson-fix-libcl-assert-reproducibility.patch \
"
SRC_URI[sha256sum] = "43d7abcd4aa8049d8fd75538344a374104765e81e17b4a6314cee2c0160e4412"
PV = "25.2.2"
SRC_URI[sha256sum] = "f2d6b28562f1d6cb9c17ee8e58eeade7aa5faf927ae71065eadb41e17f92b4f8"
PV = "25.2.3"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"