diff mbox series

[1/2] mesa: remove XA tracker support

Message ID 20250527234920.263235-1-dmitry.baryshkov@oss.qualcomm.com
State Accepted, archived
Commit e8bba3efd72bf90d70e674b0686d13639a44f0ad
Headers show
Series [1/2] mesa: remove XA tracker support | expand

Commit Message

Dmitry Baryshkov May 27, 2025, 11:49 p.m. UTC 
XA tracker is unmaintained and deprecated. It has been removed in 25.2
branch and it is going to be disabled by default in the 25.1.2 release.
Be slightly more proactive, pick up the patch disabling XA by default
and drop support for XA tracker in the recipe.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 ...01-meson-stop-building-XA-by-default.patch | 33 +++++++++++++++++++
 meta/recipes-graphics/mesa/mesa.inc           |  7 +---
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch
diff mbox series

Patch

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
new file mode 100644
index 000000000000..4372675952eb
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-meson-stop-building-XA-by-default.patch
@@ -0,0 +1,33 @@ 
+From 31a835dd2573c17d77efa8803c7fb28e0d58abc6 Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
+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 <dmitry.baryshkov@oss.qualcomm.com>
+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 7c067420c12b..75467fc856ce 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -18,6 +18,7 @@  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"
@@ -197,7 +198,6 @@  MESA_NATIVE:class-native = ""
 PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm"
 PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm llvm-native elfutils"
 PACKAGECONFIG[libclc] = "-Dmesa-clc=${MESA_CLC} -Dinstall-mesa-clc=${INSTALL_MESA_CLC} -Dmesa-clc-bundle-headers=enabled,,libclc spirv-tools spirv-llvm-translator ${MESA_NATIVE}"
-PACKAGECONFIG[xa]  = "-Dgallium-xa=enabled, -Dgallium-xa=disabled"
 PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial"
 PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"
 
@@ -253,7 +253,6 @@  PACKAGES =+ "libegl-mesa libegl-mesa-dev \
              libgles1-mesa libgles1-mesa-dev \
              libgles2-mesa libgles2-mesa-dev \
              libopencl-mesa \
-             libxatracker libxatracker-dev \
              mesa-megadriver mesa-vulkan-drivers \
              mesa-vdpau-drivers mesa-tools \
             "
@@ -345,7 +344,6 @@  FILES:libgl-mesa = "${libdir}/libGL.so.*"
 FILES:libglx-mesa = "${libdir}/libGLX*.so.*"
 FILES:libopencl-mesa = "${libdir}/lib*OpenCL.so* ${sysconfdir}/OpenCL/vendors/*.icd"
 FILES:libglapi = "${libdir}/libglapi.so.*"
-FILES:libxatracker = "${libdir}/libxatracker.so.*"
 
 FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/GL/internal/dri_interface.h ${includedir}/vulkan ${libdir}/vdpau/*.so"
 FILES:libegl-mesa-dev = "${libdir}/libEGL*.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
@@ -354,9 +352,6 @@  FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL/*.h ${libdir}/pkgconf
 FILES:libglapi-dev = "${libdir}/libglapi.*"
 FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
 FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc"
-FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
-                          ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
-                          ${libdir}/pkgconfig/xatracker.pc"
 # catch all to get all the tools and data
 FILES:${PN}-tools = "${bindir} ${datadir}"
 ALLOW_EMPTY:${PN}-tools = "1"