From 33498005ff8099b743efaf1ae431ba1a0ba597a0 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 16 Oct 2025 16:58:45 +0200 Subject: [PATCH] mesa: upgrade 25.2.4 -> 25.2.5 See https://docs.mesa3d.org/relnotes/25.2.5.html. 0001-glx-provide-glx.pc.patch is in 25.2.5 via commit 293a26135d83 ("glx: provide glx.pc") so can be dropped. Signed-off-by: Quentin Schulz Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../mesa/files/0001-glx-provide-glx.pc.patch | 41 ------------------- meta/recipes-graphics/mesa/mesa.inc | 5 +-- 2 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-glx-provide-glx.pc.patch diff --git a/meta/recipes-graphics/mesa/files/0001-glx-provide-glx.pc.patch b/meta/recipes-graphics/mesa/files/0001-glx-provide-glx.pc.patch deleted file mode 100644 index dbe58fcc89..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-glx-provide-glx.pc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4fed044aaed5911fdc58d2a634f34a7186836935 Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov -Date: Sun, 12 Oct 2025 23:54:25 +0300 -Subject: [PATCH] glx: provide glx.pc - -New Vulkan CTS 1.4.4 started requiring glx.pc pkg-config file. Provide -one if GLVND is not used in order to let VK CTS and other programs find -Mesa GLX implementation. - -Signed-off-by: Dmitry Baryshkov -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37834] ---- - src/glx/meson.build | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/glx/meson.build b/src/glx/meson.build -index 04fdf26ba6a2..28313f83a783 100644 ---- a/src/glx/meson.build -+++ b/src/glx/meson.build -@@ -134,6 +134,18 @@ libgl = shared_library( - install : true, - ) - -+if not with_glvnd -+ pkg.generate( -+ name : 'glx', -+ description : 'Mesa GLX Library', -+ version : meson.project_version(), -+ libraries : libgl, -+ libraries_private : gl_priv_libs, -+ requires_private : gl_priv_reqs, -+ variables : ['glx_tls=yes'], -+ ) -+endif -+ - if with_symbols_check - libgl_symbols_file = with_glvnd ? 'glvnd-symbols.txt' : 'libgl-symbols.txt' - --- -2.51.0 - diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1485e0b727..6a36aea259 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -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-glx-provide-glx.pc.patch \ " -SRC_URI[sha256sum] = "a370b4c549cbfbe646b319e34d73edb50ed883978f5e95133f282f0eae39ab52" -PV = "25.2.4" +SRC_URI[sha256sum] = "bb6243e7a6f525febfa1e6ab50827ca4d4bfdad73812377b0ca9b6c50998b03e" +PV = "25.2.5" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" -- 2.47.3