commit: 33ed3b9866da1cc0edcd311b428c6c698112fe70 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon May 13 14:43:01 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=33ed3b98
media-libs/mesa: update USE=vaapi dependencies Update vaapi/gallium-va to match meson.build. - add virgl https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-24.1.0-r1/meson.build?ref_type=tags#L718 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 | 9 ++++++--- media-libs/mesa/mesa-9999.ebuild | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild index 59d4567a934d..f9a1033ab2e3 100644 --- a/media-libs/mesa/mesa-24.1.0-r1.ebuild +++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild @@ -205,12 +205,14 @@ pkg_pretend() { fi fi + # VA if use vaapi; then if ! use video_cards_d3d12 && + ! use video_cards_nouveau && ! use video_cards_r600 && ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" fi fi @@ -320,9 +322,10 @@ multilib_src_configure() { fi if use video_cards_d3d12 || + 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 vaapi gallium-va)) use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) else diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 571709ebd6a4..4c91e9ed0c28 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -202,12 +202,14 @@ pkg_pretend() { fi fi + # VA if use vaapi; then if ! use video_cards_d3d12 && + ! use video_cards_nouveau && ! use video_cards_r600 && ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + ! use video_cards_virgl; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl" fi fi @@ -317,9 +319,10 @@ multilib_src_configure() { fi if use video_cards_d3d12 || + 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 vaapi gallium-va)) use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) else
