commit: 5c1b8b4038ee152e30de111ee673fc1ee57b245a Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Apr 29 17:35:51 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Apr 29 17:37:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1b8b40
media-libs/mesa: Replace vulkan REQUIRED_USE with pkg_pretend() Ignore USE=vulkan if no supported VIDEO_CARDS are set, like we do with other USE flags. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/mesa-20.0.5.ebuild | 9 ++++++++- media-libs/mesa/mesa-9999.ebuild | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-20.0.5.ebuild b/media-libs/mesa/mesa-20.0.5.ebuild index 85944a36141..0bd61593e8d 100644 --- a/media-libs/mesa/mesa-20.0.5.ebuild +++ b/media-libs/mesa/mesa-20.0.5.ebuild @@ -44,7 +44,6 @@ REQUIRED_USE=" gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 - || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) @@ -260,6 +259,14 @@ llvm_check_deps() { } pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, irisi, or radeonsi" + fi + fi + if use opencl; then if ! use video_cards_r600 && ! use video_cards_radeonsi; then diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 59a1d4fc57c..800cbffbe70 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -44,7 +44,6 @@ REQUIRED_USE=" gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 - || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) @@ -261,6 +260,14 @@ llvm_check_deps() { } pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, irisi, or radeonsi" + fi + fi + if use opencl; then if ! use video_cards_r600 && ! use video_cards_radeonsi; then