commit: 564e4e3d1b14e0b5e88278c2cade94228af9a79c
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 8 23:34:29 2021 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 8 23:37:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564e4e3d
x11-libs/libva: use optfeatures instead of VIDEO_CARDS
VIDEO_CARDS is ill suited for this because the situation with Intel GPUs
is complicated.
Discussed-with: Matt Turner <mattst88 <AT> gentoo.org>
Discussed-with: Sam James <sam <AT> gentoo.org>
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
...{libva-2.13.0.ebuild => libva-2.13.0-r1.ebuild} | 24 +++++++++-------------
x11-libs/libva/libva-9999.ebuild | 24 +++++++++-------------
2 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/x11-libs/libva/libva-2.13.0.ebuild
b/x11-libs/libva/libva-2.13.0-r1.ebuild
similarity index 74%
rename from x11-libs/libva/libva-2.13.0.ebuild
rename to x11-libs/libva/libva-2.13.0-r1.ebuild
index 953e353bda4..5762e1110ac 100644
--- a/x11-libs/libva/libva-2.13.0.ebuild
+++ b/x11-libs/libva/libva-2.13.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal optfeature
DESCRIPTION="Video Acceleration (VA) API for Linux"
HOMEPAGE="https://01.org/linuxmedia/vaapi";
@@ -23,12 +23,7 @@ fi
LICENSE="MIT"
SLOT="0/$(ver_cut 1)"
-IUSE="+drm opengl utils vdpau wayland X"
-
-VIDEO_CARDS="nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
+IUSE="+drm opengl utils wayland X"
RDEPEND="
>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -47,13 +42,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
"
-PDEPEND="video_cards_nvidia? (
>=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
- video_cards_nouveau? (
>=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
- video_cards_intel? (
>=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
- video_cards_i965? (
>=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
- utils? ( media-video/libva-utils )
-"
+PDEPEND="utils? ( media-video/libva-utils )"
REQUIRED_USE="|| ( drm wayland X )
opengl? ( X )"
@@ -89,3 +78,10 @@ multilib_src_install_all() {
default
find "${ED}" -type f -name "*.la" -delete || die
}
+
+pkg_postinst() {
+ optfeature_header
+ optfeature "NVIDIA GPU support" x11-libs/libva-vdpau-driver
+ optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+ optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 045f07425bd..a5e8ebf286e 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal optfeature
DESCRIPTION="Video Acceleration (VA) API for Linux"
HOMEPAGE="https://01.org/linuxmedia/vaapi";
@@ -23,12 +23,7 @@ fi
LICENSE="MIT"
SLOT="0/$(ver_cut 1)"
-IUSE="+drm opengl utils vdpau wayland X"
-
-VIDEO_CARDS="nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
+IUSE="+drm opengl utils wayland X"
RDEPEND="
>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -47,13 +42,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
"
-PDEPEND="video_cards_nvidia? (
>=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
- video_cards_nouveau? (
>=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
- video_cards_intel? (
>=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
- video_cards_i965? (
>=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
- utils? ( media-video/libva-utils )
-"
+PDEPEND="utils? ( media-video/libva-utils )"
REQUIRED_USE="|| ( drm wayland X )
opengl? ( X )"
@@ -89,3 +78,10 @@ multilib_src_install_all() {
default
find "${ED}" -type f -name "*.la" -delete || die
}
+
+pkg_postinst() {
+ optfeature_header
+ optfeature "NVIDIA GPU support" x11-libs/libva-vdpau-driver
+ optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+ optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
