From: "Jason A. Donenfeld" <zx2c4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/
Date: Mon, 8 Nov 2021 23:37:17 +0000 (UTC) [thread overview]
Message-ID: <1636414625.564e4e3d1b14e0b5e88278c2cade94228af9a79c.zx2c4@gentoo> (raw)
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
+}
next reply other threads:[~2021-11-08 23:37 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 23:37 Jason A. Donenfeld [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-08 14:22 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/ Matt Turner
2022-10-05 16:30 Matt Turner
2022-09-09 7:36 Agostino Sarubbo
2022-09-08 18:40 Jakov Smolić
2022-09-08 18:40 Jakov Smolić
2022-07-04 2:41 Matt Turner
2022-07-04 2:41 Matt Turner
2022-07-04 2:41 Matt Turner
2022-05-13 6:33 WANG Xuerui
2022-05-13 6:33 WANG Xuerui
2022-05-09 10:25 Jakov Smolić
2022-05-09 9:58 Jakov Smolić
2022-05-09 8:01 Jakov Smolić
2022-05-09 8:01 Jakov Smolić
2022-03-17 5:19 Matt Turner
2022-03-17 4:28 Matt Turner
2022-03-17 4:28 Matt Turner
2022-02-07 19:03 Matt Turner
2022-02-01 21:13 Arthur Zamarin
2022-01-20 14:30 Sam James
2022-01-20 2:45 Sam James
2022-01-20 2:45 Sam James
2021-12-24 4:02 Sam James
2021-12-10 23:00 Sam James
2021-11-24 2:06 Matt Turner
2021-11-22 8:05 Sam James
2021-11-20 7:28 Agostino Sarubbo
2021-11-20 7:26 Agostino Sarubbo
2021-09-22 21:20 Sam James
2021-09-22 21:19 Sam James
2021-08-27 5:12 Agostino Sarubbo
2021-08-27 5:10 Agostino Sarubbo
2021-06-29 4:40 Sam James
2021-05-16 18:33 Georgy Yakovlev
2021-04-12 16:02 Sam James
2021-03-24 18:41 Rick Farina
2021-03-01 9:20 Agostino Sarubbo
2021-02-25 0:03 Sam James
2021-01-08 15:23 Sam James
2021-01-08 15:23 Sam James
2020-12-04 14:24 Mikle Kolyada
2020-10-23 10:51 Alexis Ballier
2020-10-01 11:13 Sam James
2020-09-24 6:59 Agostino Sarubbo
2020-09-24 6:46 Agostino Sarubbo
2020-07-06 8:40 Lars Wendler
2020-07-06 8:40 Lars Wendler
2020-05-14 12:14 Lars Wendler
2020-05-07 14:10 Lars Wendler
2020-01-22 5:41 Georgy Yakovlev
2020-01-22 5:41 Georgy Yakovlev
2020-01-20 12:33 Lars Wendler
2020-01-17 16:17 Lars Wendler
2019-09-13 17:19 Matt Turner
2019-08-13 10:53 Agostino Sarubbo
2019-08-13 9:17 Agostino Sarubbo
2019-08-13 0:36 Aaron Bauman
2019-07-09 13:13 Lars Wendler
2019-07-08 7:57 Lars Wendler
2019-07-08 7:57 Lars Wendler
2019-07-05 8:41 Lars Wendler
2019-07-05 8:41 Lars Wendler
2019-05-15 13:54 Aaron Bauman
2019-02-21 16:06 Andreas Sturmlechner
2019-02-21 16:06 Andreas Sturmlechner
2019-02-21 16:06 Andreas Sturmlechner
2018-10-22 22:55 Luca Barbato
2018-07-17 7:20 Alexis Ballier
2018-07-17 7:20 Alexis Ballier
2018-02-15 5:52 Alexis Ballier
2018-02-15 5:52 Alexis Ballier
2018-02-15 5:52 Alexis Ballier
2017-12-16 5:42 Craig Andrews
2017-11-24 6:06 Matt Turner
2017-06-29 20:28 Alexis Ballier
2017-06-22 11:48 Alexis Ballier
2017-05-24 11:08 Alexis Ballier
2017-04-12 19:20 Alexis Ballier
2017-04-03 7:38 Alexis Ballier
2017-02-01 11:42 Alexis Ballier
2017-02-01 11:42 Alexis Ballier
2017-02-01 11:42 Alexis Ballier
2017-01-04 12:05 Alexis Ballier
2017-01-04 12:05 Alexis Ballier
2017-01-04 11:23 Agostino Sarubbo
2016-11-15 9:09 Alexis Ballier
2016-09-06 14:17 Alexis Ballier
2016-06-23 8:18 Alexis Ballier
2016-03-17 12:22 Alexis Ballier
2016-01-31 18:26 Pacho Ramos
2016-01-15 15:23 Agostino Sarubbo
2015-12-17 9:54 Alexis Ballier
2015-09-14 11:54 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1636414625.564e4e3d1b14e0b5e88278c2cade94228af9a79c.zx2c4@gentoo \
--to=zx2c4@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox