summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch33
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc5
2 files changed, 2 insertions, 36 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch b/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch
deleted file mode 100644
index 4372675952..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 31a835dd2573c17d77efa8803c7fb28e0d58abc6 Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
3Date: Thu, 22 May 2025 20:11:46 +0300
4Subject: [PATCH] meson: stop building XA by default
5
6Commit cf40099730c4 ("meson: deprecate gallium-xa") deprecated XA
7tracker, but didn't disable it by default. Thus any attempt to disable
8it would cause a deprecated option warning. Flip the default to disable
9XA tracker by default.
10
11Fixes: cf40099730c4 ("meson: deprecate gallium-xa")
12Backport-to: 25.1
13Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
14Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/31cf6b94ad1dfaf4272b22a39d7e2805d03f9375]
15---
16 meson.options | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/meson.options b/meson.options
20index e6c9567ade86..a56bcef6e2ca 100644
21--- a/meson.options
22+++ b/meson.options
23@@ -127,6 +127,7 @@ option(
24 option(
25 'gallium-xa',
26 type : 'feature',
27+ value : 'disabled',
28 description : 'enable gallium xa frontend.',
29 deprecated: true,
30 )
31--
322.47.2
33
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 4b1e427ad5..b222e72fdd 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -18,11 +18,10 @@ SRC_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-dont-build-clover-frontend.patch \ 20 file://0001-dont-build-clover-frontend.patch \
21 file://0001-meson-stop-building-XA-by-default.patch \
22" 21"
23 22
24SRC_URI[sha256sum] = "cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce" 23SRC_URI[sha256sum] = "ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f"
25PV = "25.1.1" 24PV = "25.1.3"
26 25
27UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 26UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
28 27