From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 25 Feb 2022 17:32:14 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nNdVu-00A7F7-4P for lore@lore.pengutronix.de; Fri, 25 Feb 2022 17:32:14 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nNdVt-0008SC-IL; Fri, 25 Feb 2022 17:32:13 +0100 Received: from dude03.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::39]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nNdVG-0008KO-MA for ptxdist@pengutronix.de; Fri, 25 Feb 2022 17:31:34 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Fri, 25 Feb 2022 17:31:31 +0100 Message-Id: <20220225163132.2929166-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH 1/2] libva: drop obsolete GLX support X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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