[ptxdist] [PATCH 1/2] libva: drop obsolete GLX support

[Philipp Zabel <p.zabel@pengutronix.de>]

This was only required by gstreamer-vaapi1 < 1.16 [1]. Nothing requires
libva GLX support now. Removing it and with it the MESALIB dependencies
allows to enable VA support in Mesa without circular dependencies.

[1] 5384deb0679e ("gstreamer-vaapi1: fix dependency")

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/libva.in   | 10 +---------
 rules/libva.make |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/rules/libva.in b/rules/libva.in
index 8dd2229030fe..b0ba96e5c698 100644
--- a/rules/libva.in
+++ b/rules/libva.in
@@ -4,12 +4,9 @@ menuconfig LIBVA
 	tristate
 	select HOST_MESON
 	select LIBDRM
-	select XORG_LIB_X11		if LIBVA_X11 || LIBVA_GLX
+	select XORG_LIB_X11		if LIBVA_X11
 	select XORG_LIB_XEXT		if LIBVA_X11
 	select XORG_LIB_XFIXES		if LIBVA_X11
-	select MESALIB			if LIBVA_GLX
-	select MESALIB_GLX		if LIBVA_GLX
-	select MESALIB_OPENGL		if LIBVA_GLX
 	select WAYLAND			if LIBVA_WAYLAND
 	prompt "libva                         "
 	help
@@ -21,11 +18,6 @@ config LIBVA_X11
 	bool
 	prompt "X11 API support"
 
-config LIBVA_GLX
-	bool
-	select LIBVA_X11
-	prompt "GLX API support"
-
 config LIBVA_WAYLAND
 	bool
 	prompt "Wayland API support"
diff --git a/rules/libva.make b/rules/libva.make
index 7649bbb0ba97..7a16a188d820 100644
--- a/rules/libva.make
+++ b/rules/libva.make
@@ -31,7 +31,6 @@ LIBVA_LICENSE_FILES := \
 
 LIBVA_ENABLE-y				:= drm
 LIBVA_ENABLE-$(PTXCONF_LIBVA_X11)	+= x11
-LIBVA_ENABLE-$(PTXCONF_LIBVA_GLX)	+= glx
 LIBVA_ENABLE-$(PTXCONF_LIBVA_WAYLAND)	+= wayland
 
 LIBVA_CONF_TOOL	:= meson
@@ -41,7 +40,7 @@ LIBVA_CONF_OPT	:= \
 	-Ddriverdir='' \
 	-Denable_docs=false \
 	-Denable_va_messaging=true \
-	-Dwith_glx=$(call ptx/yesno, PTXCONF_LIBVA_GLX) \
+	-Dwith_glx=no \
 	-Dwith_wayland=$(call ptx/yesno, PTXCONF_LIBVA_WAYLAND) \
 	-Dwith_x11=$(call ptx/yesno, PTXCONF_LIBVA_X11)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de