| 1 |
commit: a53cea6b1935e604c4cd169d24bc4e69e64fb390 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 27 12:49:49 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 29 14:13:18 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53cea6b |
| 7 |
|
| 8 |
media-libs/mesa: Update the dependencies for LLVM_TARGETS=AMDGPU |
| 9 |
|
| 10 |
media-libs/mesa/mesa-11.2.2.ebuild | 5 ++++- |
| 11 |
media-libs/mesa/mesa-12.0.1.ebuild | 5 ++++- |
| 12 |
media-libs/mesa/mesa-12.0.2.ebuild | 5 ++++- |
| 13 |
media-libs/mesa/mesa-12.0.3.ebuild | 7 ++++++- |
| 14 |
media-libs/mesa/mesa-9999.ebuild | 7 ++++++- |
| 15 |
5 files changed, 24 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/mesa-11.2.2.ebuild b/media-libs/mesa/mesa-11.2.2.ebuild |
| 18 |
index a5caca7c..d84d50e 100644 |
| 19 |
--- a/media-libs/mesa/mesa-11.2.2.ebuild |
| 20 |
+++ b/media-libs/mesa/mesa-11.2.2.ebuild |
| 21 |
@@ -130,7 +130,10 @@ RDEPEND="${RDEPEND} |
| 22 |
|
| 23 |
DEPEND="${RDEPEND} |
| 24 |
llvm? ( |
| 25 |
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
| 26 |
+ video_cards_radeonsi? ( || ( |
| 27 |
+ sys-devel/llvm[llvm_targets_AMDGPU] |
| 28 |
+ sys-devel/llvm[video_cards_radeon] |
| 29 |
+ ) ) |
| 30 |
) |
| 31 |
opencl? ( |
| 32 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 33 |
|
| 34 |
diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild |
| 35 |
index 877042a..9cda1d7 100644 |
| 36 |
--- a/media-libs/mesa/mesa-12.0.1.ebuild |
| 37 |
+++ b/media-libs/mesa/mesa-12.0.1.ebuild |
| 38 |
@@ -133,7 +133,10 @@ RDEPEND="${RDEPEND} |
| 39 |
|
| 40 |
DEPEND="${RDEPEND} |
| 41 |
llvm? ( |
| 42 |
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
| 43 |
+ video_cards_radeonsi? ( || ( |
| 44 |
+ sys-devel/llvm[llvm_targets_AMDGPU] |
| 45 |
+ sys-devel/llvm[video_cards_radeon] |
| 46 |
+ ) ) |
| 47 |
) |
| 48 |
opencl? ( |
| 49 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 50 |
|
| 51 |
diff --git a/media-libs/mesa/mesa-12.0.2.ebuild b/media-libs/mesa/mesa-12.0.2.ebuild |
| 52 |
index fd6b44d..4c75c59 100644 |
| 53 |
--- a/media-libs/mesa/mesa-12.0.2.ebuild |
| 54 |
+++ b/media-libs/mesa/mesa-12.0.2.ebuild |
| 55 |
@@ -133,7 +133,10 @@ RDEPEND="${RDEPEND} |
| 56 |
|
| 57 |
DEPEND="${RDEPEND} |
| 58 |
llvm? ( |
| 59 |
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
| 60 |
+ video_cards_radeonsi? ( || ( |
| 61 |
+ sys-devel/llvm[llvm_targets_AMDGPU] |
| 62 |
+ sys-devel/llvm[video_cards_radeon] |
| 63 |
+ ) ) |
| 64 |
) |
| 65 |
opencl? ( |
| 66 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 67 |
|
| 68 |
diff --git a/media-libs/mesa/mesa-12.0.3.ebuild b/media-libs/mesa/mesa-12.0.3.ebuild |
| 69 |
index fd6b44d..0ea1fe2 100644 |
| 70 |
--- a/media-libs/mesa/mesa-12.0.3.ebuild |
| 71 |
+++ b/media-libs/mesa/mesa-12.0.3.ebuild |
| 72 |
@@ -131,9 +131,14 @@ RDEPEND="${RDEPEND} |
| 73 |
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) |
| 74 |
" |
| 75 |
|
| 76 |
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once |
| 77 |
+# LLVM < 3.9 is out of the game |
| 78 |
DEPEND="${RDEPEND} |
| 79 |
llvm? ( |
| 80 |
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
| 81 |
+ video_cards_radeonsi? ( || ( |
| 82 |
+ sys-devel/llvm[llvm_targets_AMDGPU] |
| 83 |
+ sys-devel/llvm[video_cards_radeon] |
| 84 |
+ ) ) |
| 85 |
) |
| 86 |
opencl? ( |
| 87 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 88 |
|
| 89 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 90 |
index 3d273ed..7088075 100644 |
| 91 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 92 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 93 |
@@ -131,9 +131,14 @@ RDEPEND="${RDEPEND} |
| 94 |
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) |
| 95 |
" |
| 96 |
|
| 97 |
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once |
| 98 |
+# LLVM < 3.9 is out of the game |
| 99 |
DEPEND="${RDEPEND} |
| 100 |
llvm? ( |
| 101 |
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
| 102 |
+ video_cards_radeonsi? ( || ( |
| 103 |
+ sys-devel/llvm[llvm_targets_AMDGPU] |
| 104 |
+ sys-devel/llvm[video_cards_radeon] |
| 105 |
+ ) ) |
| 106 |
) |
| 107 |
opencl? ( |
| 108 |
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
Archives