summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@cherry.de>2025-10-16 16:58:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-10-27 11:37:43 +0000
commita9e529cd5e038d7f071675d72c39d1b37d7a8335 (patch)
treefff2d1e56b90d79f03aae07cfa9761a7aae8c498 /meta/recipes-graphics
parent6f85697140fe4a6a53b480e7164391fd5edcd6a5 (diff)
downloadpoky-a9e529cd5e038d7f071675d72c39d1b37d7a8335.tar.gz
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. (From OE-Core rev: 33498005ff8099b743efaf1ae431ba1a0ba597a0) Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-glx-provide-glx.pc.patch41
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc5
2 files changed, 2 insertions, 44 deletions
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 @@
1From 4fed044aaed5911fdc58d2a634f34a7186836935 Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
3Date: Sun, 12 Oct 2025 23:54:25 +0300
4Subject: [PATCH] glx: provide glx.pc
5
6New Vulkan CTS 1.4.4 started requiring glx.pc pkg-config file. Provide
7one if GLVND is not used in order to let VK CTS and other programs find
8Mesa GLX implementation.
9
10Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
11Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37834]
12---
13 src/glx/meson.build | 12 ++++++++++++
14 1 file changed, 12 insertions(+)
15
16diff --git a/src/glx/meson.build b/src/glx/meson.build
17index 04fdf26ba6a2..28313f83a783 100644
18--- a/src/glx/meson.build
19+++ b/src/glx/meson.build
20@@ -134,6 +134,18 @@ libgl = shared_library(
21 install : true,
22 )
23
24+if not with_glvnd
25+ pkg.generate(
26+ name : 'glx',
27+ description : 'Mesa GLX Library',
28+ version : meson.project_version(),
29+ libraries : libgl,
30+ libraries_private : gl_priv_libs,
31+ requires_private : gl_priv_reqs,
32+ variables : ['glx_tls=yes'],
33+ )
34+endif
35+
36 if with_symbols_check
37 libgl_symbols_file = with_glvnd ? 'glvnd-symbols.txt' : 'libgl-symbols.txt'
38
39--
402.51.0
41
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"
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-glx-provide-glx.pc.patch \
21" 20"
22 21
23SRC_URI[sha256sum] = "a370b4c549cbfbe646b319e34d73edb50ed883978f5e95133f282f0eae39ab52" 22SRC_URI[sha256sum] = "bb6243e7a6f525febfa1e6ab50827ca4d4bfdad73812377b0ca9b6c50998b03e"
24PV = "25.2.4" 23PV = "25.2.5"
25 24
26UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 25UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
27 26