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 @@ -From 31a835dd2573c17d77efa8803c7fb28e0d58abc6 Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov -Date: Thu, 22 May 2025 20:11:46 +0300 -Subject: [PATCH] meson: stop building XA by default - -Commit cf40099730c4 ("meson: deprecate gallium-xa") deprecated XA -tracker, but didn't disable it by default. Thus any attempt to disable -it would cause a deprecated option warning. Flip the default to disable -XA tracker by default. - -Fixes: cf40099730c4 ("meson: deprecate gallium-xa") -Backport-to: 25.1 -Signed-off-by: Dmitry Baryshkov -Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/31cf6b94ad1dfaf4272b22a39d7e2805d03f9375] ---- - meson.options | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.options b/meson.options -index e6c9567ade86..a56bcef6e2ca 100644 ---- a/meson.options -+++ b/meson.options -@@ -127,6 +127,7 @@ option( - option( - 'gallium-xa', - type : 'feature', -+ value : 'disabled', - description : 'enable gallium xa frontend.', - deprecated: true, - ) --- -2.47.2 - 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 \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \ file://0001-dont-build-clover-frontend.patch \ - file://0001-meson-stop-building-XA-by-default.patch \ " -SRC_URI[sha256sum] = "cf942a18b7b9e9b88524dcbf0b31fed3cde18e6d52b3375b0ab6587a14415bce" -PV = "25.1.1" +SRC_URI[sha256sum] = "ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f" +PV = "25.1.3" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)"