| 1 |
commit: 5c1b8b4038ee152e30de111ee673fc1ee57b245a |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 29 17:35:51 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 29 17:37:25 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1b8b40 |
| 7 |
|
| 8 |
media-libs/mesa: Replace vulkan REQUIRED_USE with pkg_pretend() |
| 9 |
|
| 10 |
Ignore USE=vulkan if no supported VIDEO_CARDS are set, like we do with |
| 11 |
other USE flags. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
media-libs/mesa/mesa-20.0.5.ebuild | 9 ++++++++- |
| 16 |
media-libs/mesa/mesa-9999.ebuild | 9 ++++++++- |
| 17 |
2 files changed, 16 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/mesa/mesa-20.0.5.ebuild b/media-libs/mesa/mesa-20.0.5.ebuild |
| 20 |
index 85944a36141..0bd61593e8d 100644 |
| 21 |
--- a/media-libs/mesa/mesa-20.0.5.ebuild |
| 22 |
+++ b/media-libs/mesa/mesa-20.0.5.ebuild |
| 23 |
@@ -44,7 +44,6 @@ REQUIRED_USE=" |
| 24 |
gles1? ( egl ) |
| 25 |
gles2? ( egl ) |
| 26 |
vulkan? ( dri3 |
| 27 |
- || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) |
| 28 |
video_cards_radeonsi? ( llvm ) ) |
| 29 |
vulkan-overlay? ( vulkan ) |
| 30 |
wayland? ( egl gbm ) |
| 31 |
@@ -260,6 +259,14 @@ llvm_check_deps() { |
| 32 |
} |
| 33 |
|
| 34 |
pkg_pretend() { |
| 35 |
+ if use vulkan; then |
| 36 |
+ if ! use video_cards_i965 && |
| 37 |
+ ! use video_cards_iris && |
| 38 |
+ ! use video_cards_radeonsi; then |
| 39 |
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, irisi, or radeonsi" |
| 40 |
+ fi |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
if use opencl; then |
| 44 |
if ! use video_cards_r600 && |
| 45 |
! use video_cards_radeonsi; then |
| 46 |
|
| 47 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 48 |
index 59a1d4fc57c..800cbffbe70 100644 |
| 49 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 50 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 51 |
@@ -44,7 +44,6 @@ REQUIRED_USE=" |
| 52 |
gles1? ( egl ) |
| 53 |
gles2? ( egl ) |
| 54 |
vulkan? ( dri3 |
| 55 |
- || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) |
| 56 |
video_cards_radeonsi? ( llvm ) ) |
| 57 |
vulkan-overlay? ( vulkan ) |
| 58 |
wayland? ( egl gbm ) |
| 59 |
@@ -261,6 +260,14 @@ llvm_check_deps() { |
| 60 |
} |
| 61 |
|
| 62 |
pkg_pretend() { |
| 63 |
+ if use vulkan; then |
| 64 |
+ if ! use video_cards_i965 && |
| 65 |
+ ! use video_cards_iris && |
| 66 |
+ ! use video_cards_radeonsi; then |
| 67 |
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, irisi, or radeonsi" |
| 68 |
+ fi |
| 69 |
+ fi |
| 70 |
+ |
| 71 |
if use opencl; then |
| 72 |
if ! use video_cards_r600 && |
| 73 |
! use video_cards_radeonsi; then |
Archives