commit:     ca67cb916cc2772e9d046171f28c5435e171ed1b
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon May 13 14:50:45 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 20:01:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca67cb91

media-libs/mesa: update USE=vdpau dependencies

Update vaapi/gallium-vdpau to match meson.build.
- add virgl
- drop r300

https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.1.0-r1/meson.build?ref_type=tags#L601

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/mesa-24.1.0-r1.ebuild | 10 +++++-----
 media-libs/mesa/mesa-9999.ebuild      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild 
b/media-libs/mesa/mesa-24.1.0-r1.ebuild
index f9a1033ab2e3..1e0717ab75a1 100644
--- a/media-libs/mesa/mesa-24.1.0-r1.ebuild
+++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild
@@ -218,11 +218,11 @@ pkg_pretend() {
 
        if use vdpau; then
                if ! use video_cards_d3d12 &&
-                  ! use video_cards_r300 &&
+                  ! use video_cards_nouveau &&
                   ! use video_cards_r600 &&
                   ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, r300, r600, radeonsi, or nouveau"
+                  ! use video_cards_virgl; then
+                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
                fi
        fi
 
@@ -337,10 +337,10 @@ multilib_src_configure() {
        fi
 
        if use video_cards_d3d12 ||
-          use video_cards_r300 ||
+          use video_cards_nouveau ||
           use video_cards_r600 ||
           use video_cards_radeonsi ||
-          use video_cards_nouveau; then
+          use video_cards_virgl; then
                emesonargs+=($(meson_feature vdpau gallium-vdpau))
        else
                emesonargs+=(-Dgallium-vdpau=disabled)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 4c91e9ed0c28..ac812afd990b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -215,11 +215,11 @@ pkg_pretend() {
 
        if use vdpau; then
                if ! use video_cards_d3d12 &&
-                  ! use video_cards_r300 &&
+                  ! use video_cards_nouveau &&
                   ! use video_cards_r600 &&
                   ! use video_cards_radeonsi &&
-                  ! use video_cards_nouveau; then
-                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, r300, r600, radeonsi, or nouveau"
+                  ! use video_cards_virgl; then
+                       ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does 
not contain d3d12, nouveau, r600, radeonsi, or virgl"
                fi
        fi
 
@@ -334,10 +334,10 @@ multilib_src_configure() {
        fi
 
        if use video_cards_d3d12 ||
-          use video_cards_r300 ||
+          use video_cards_nouveau ||
           use video_cards_r600 ||
           use video_cards_radeonsi ||
-          use video_cards_nouveau; then
+          use video_cards_virgl; then
                emesonargs+=($(meson_feature vdpau gallium-vdpau))
        else
                emesonargs+=(-Dgallium-vdpau=disabled)

Reply via email to