[gentoo-commits] repo/gentoo:master commit in: media-libs/libva/

["Matt Turner" <mattst88@gentoo.org>]

commit:     e9eaf08653a2ada19b94c9807a6b85008a125b3c
Author:     Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Tue Mar  7 16:56:17 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 01:25:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9eaf086

media-libs/libva: Fix circular dependency with mesa

This removes the GLX backend to drop the "virtual/opengl" dependency.
Without removing this, it would pull in mesa which in turn would pull in
libva if vaapi support was turned on.

Removing the GLX backend doesn't seem to have any practical downsides,
even under X11, as the EGL backend seems to be used even if libva were
compiled with GLX support.

Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/libva/{libva-2.18.0.ebuild => libva-2.18.0-r1.ebuild} | 8 ++------
 media-libs/libva/libva-9999.ebuild                               | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/media-libs/libva/libva-2.18.0.ebuild b/media-libs/libva/libva-2.18.0-r1.ebuild
similarity index 89%
rename from media-libs/libva/libva-2.18.0.ebuild
rename to media-libs/libva/libva-2.18.0-r1.ebuild
index ef0203c92e12..4f264beeabed 100644
--- a/media-libs/libva/libva-2.18.0.ebuild
+++ b/media-libs/libva/libva-2.18.0-r1.ebuild
@@ -19,8 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="opengl wayland X"
-REQUIRED_USE="opengl? ( X )"
+IUSE="wayland X"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -28,7 +27,6 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,11 +40,9 @@ BDEPEND="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/va/va_backend_glx.h
 	/usr/include/va/va_x11.h
 	/usr/include/va/va_dri2.h
 	/usr/include/va/va_dricommon.h
-	/usr/include/va/va_glx.h
 )
 
 multilib_src_configure() {
@@ -54,7 +50,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=$(usex X)
+		-Dwith_glx=no
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)

diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index ef0203c92e12..4f264beeabed 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -19,8 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="opengl wayland X"
-REQUIRED_USE="opengl? ( X )"
+IUSE="wayland X"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -28,7 +27,6 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,11 +40,9 @@ BDEPEND="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/va/va_backend_glx.h
 	/usr/include/va/va_x11.h
 	/usr/include/va/va_dri2.h
 	/usr/include/va/va_dricommon.h
-	/usr/include/va/va_glx.h
 )
 
 multilib_src_configure() {
@@ -54,7 +50,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=$(usex X)
+		-Dwith_glx=no
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)