| 1 |
commit: 4b13a94f842380c506f42c47fac0fd77dfa6ac2c |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 2 17:03:22 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Oct 2 17:03:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4b13a94f |
| 7 |
|
| 8 |
media-libs/mesa: version bump to 17.1.10/17.2.2 |
| 9 |
|
| 10 |
media-libs/mesa/Manifest | 6 +- |
| 11 |
.../{mesa-17.2.1.ebuild => mesa-17.1.10.ebuild} | 23 +++-- |
| 12 |
media-libs/mesa/mesa-17.2.1.ebuild | 103 ++++++++++++++++++--- |
| 13 |
.../{mesa-17.2.1.ebuild => mesa-17.2.2.ebuild} | 103 ++++++++++++++++++--- |
| 14 |
4 files changed, 194 insertions(+), 41 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
| 17 |
index 0e2f63a..0c92f6d 100644 |
| 18 |
--- a/media-libs/mesa/Manifest |
| 19 |
+++ b/media-libs/mesa/Manifest |
| 20 |
@@ -6,15 +6,19 @@ AUX mesa-17-missing-fcntl_h.patch 385 SHA256 61fa64c296d22c0a490576ec595ee1a4beb |
| 21 |
DIST mesa-13.0.5.tar.xz 9171480 SHA256 bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1 WHIRLPOOL 164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e |
| 22 |
DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441 WHIRLPOOL 1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a |
| 23 |
DIST mesa-17.0.6.tar.xz 9494872 SHA256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf WHIRLPOOL f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab |
| 24 |
+DIST mesa-17.1.10.tar.xz 9872168 SHA256 cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b WHIRLPOOL d33cc0b7620e01822ce6ca2708f01eccc6c7796c1ed19f3642dab733521d17d794658dbc47bcca7d71f94f99c81637a28738dc6c45c4d1ccc7e2855f07a5f961 |
| 25 |
DIST mesa-17.1.8.tar.xz 9902800 SHA256 75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db SHA512 d29fd999d75967683f5aa836cf0b701705f54de428ebbbac059c3e335e94552c0b455aa67fa2870464a086dc58994f2f320710a1abc265dea363241aede71c5b WHIRLPOOL 8faad2f3da8546d48ee9b5470d147de7507a0dc39787a876f6513933e958baa94571d285095fced7c34c674364ab897a896acc39374849fb22026dd05a9bd27f |
| 26 |
DIST mesa-17.1.9.tar.xz 9908296 SHA256 5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a SHA512 359da171deaba0a1a5ce7112d49d7b48be38d24d0211264fcdcc3218f1f35be9419e5be1d08d56b6ca15654d3f93107b1706ff18a5e31d3746f7a3191b808cdf WHIRLPOOL a4b76204005ed15cee799a0e7e590d5e9f5078f65d83fccec26f00ab397c4144f70ff6eac652f13197af3bbdf4c4096c531329766297caa9875aee47bc3e4d67 |
| 27 |
DIST mesa-17.2.0.tar.xz 10335284 SHA256 3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943 SHA512 6ac39274fcf86a26ea5fe51aed486ba3d45b75e0d2f7cc17e1e71d4cf9a85420a832fe559a2ac7b215eda615fab99a2bd290c8388a48c52e13737e7e4ef8d4fd WHIRLPOOL 3fec3810c23aa12f49c0fe561b6dbdbd5724a3bff513b21c273d5796c85eebdd889fb405a03f7cc0fe926a8289794e1872a0d04799c31122061a268faceacf36 |
| 28 |
DIST mesa-17.2.1.tar.xz 10414776 SHA256 77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e SHA512 19a7d6c2e2d439b1c73199bffd4154b42017bccc138be954a893c3b70e885f07988de84dc8aa2aff36e06295e91f0181d5b95372152f6f0f80b7afe4b3846b6a WHIRLPOOL b9048aa4d512307c3f558a925afb39949ea84b7e52ca52e2ba39cf6fba38c284ef527b25fdbfa7ec22ca6c9e17a8628ce41fc8916bfaafc7f5142c3476750b6d |
| 29 |
+DIST mesa-17.2.2.tar.xz 10359156 SHA256 cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 SHA512 641342c68989b8d801c37e668b012d3b7c4ad43d8ca01b74f8cbb3a1ec25b7390f69fe7ebc84b29dab1c6a4ac01c882ec9fd4a6b331505629461bdbbe6aa3f7e WHIRLPOOL 74271721fb38a0c62f6f35d84ba9196e000f2fe2a32e75120288e77649a87e225464572d347fc149190b573d22c32dfee3e174d6a2578b3c649c4b72375a94ec |
| 30 |
EBUILD mesa-13.0.5.ebuild 13700 SHA256 976acd2588bdad196db14ea94d7908257aae3b4a3647e0b67c2a98991ce505c1 SHA512 5b7118bf47b32a108907674754a96ba6660561ee5f2e02e9b65cd55fbfc9e9af6b09d1e63d7cb6a1366b6ca048bf6bb64c04d357cb24eed05e171e6a1fc5a1dd WHIRLPOOL 6e709af9862d4e71de9eaf8736c0515c98713424dd8e4a9842b3ef24311edd3f0344c6b1c377c42f2213019c0251ba13410c4ed1c11ca6ad94708caa6d663580 |
| 31 |
EBUILD mesa-13.0.6.ebuild 13626 SHA256 8c52b73f947625e30b63ebf09f7ef24ca1253924369ba16f462ee51ddae1f710 SHA512 ef98945307ca3a6e157a0e68f333dd06eda8b6ff053d8663f99bc17e352f5db10aebc4f8cb514b68e4abf06a97f278740b4d2aa97b2e2bc8d3a5fce43ece37f2 WHIRLPOOL 5292e8d17f5e1d09a44a8260b1e2f99af87dc0348c61efd64a54b2b88edb0dda14813d7aec53c37133e16de1b339ec7c45c6c7f2edc9c655f062361812aa565a |
| 32 |
EBUILD mesa-17.0.6.ebuild 13633 SHA256 1b72648e1c77ecae4bbd639a4bc93f25be477b764ce4fdff0a5867334e22bea1 SHA512 2a8ab4f22d6dbba9fadee3e566931104fff23e58ee3ed9a358dbe4a946acdca067c753a865c471342cef6d9a564efd688e3d46f2c8df5f138ee40409436cb434 WHIRLPOOL e156696276d32c8359d002baa620cf54bd8827bfe427f45212541e875d39d3b544d7a011d37d02fff5f4d855f20275e3fec1e9a481f5ed07cb27296b454cba9b |
| 33 |
+EBUILD mesa-17.1.10.ebuild 13510 SHA256 68948c65aa47611e9df044b15049e2c762c2178c037fc491fa88839eddeaa4d7 SHA512 5c305a289d36883517e48402f63a4a8883c80fba6c67936c4b13c1a394220df05a2d30be23a536127ab31302c8ac40b78c36bd1faf6f8464a6dd300a6bf2096d WHIRLPOOL b84db37e1807e1b9e95c7437486dbd46f4b3ee4f406388887f30b715da23f0b27e5fd846a2261a00556b961a705389a43d3cd0fc5e96833d2dc003611a0c5cf2 |
| 34 |
EBUILD mesa-17.1.8.ebuild 13507 SHA256 0c238bc97f47ab8449a851702ccd0ff2660d62995e260a5caf43be58662ea2c1 SHA512 4ee9f6a463599b9f89bdb1d4c35a27a46efe3d96fcf3cc534fc6030bae538f5c7ebd4c67d905c7adc6081a789555e90f79169bf6f1358f18b5afe4ad79a7106a WHIRLPOOL 755a3b62729b891d28dae4e3f2fa648bebd58a3526dfcd66a66c5322cdacc338edbcb1b6baf1994f7b60b2f7eb07b7032d8aa25d44d2609437e312ac01456c02 |
| 35 |
EBUILD mesa-17.1.9.ebuild 13510 SHA256 68948c65aa47611e9df044b15049e2c762c2178c037fc491fa88839eddeaa4d7 SHA512 5c305a289d36883517e48402f63a4a8883c80fba6c67936c4b13c1a394220df05a2d30be23a536127ab31302c8ac40b78c36bd1faf6f8464a6dd300a6bf2096d WHIRLPOOL b84db37e1807e1b9e95c7437486dbd46f4b3ee4f406388887f30b715da23f0b27e5fd846a2261a00556b961a705389a43d3cd0fc5e96833d2dc003611a0c5cf2 |
| 36 |
EBUILD mesa-17.2.0.ebuild 13540 SHA256 6425956f1c9353f8c69abe199b0c44d514453be6f6c73457c6109fa50109c2bf SHA512 d9551cbbf3f05b847d8f4311948172778f1602077d809424a845f310852e821ff44c62d8e6273a1f1b622ec0e859d5581ad72bc8791544308d072faea374ff59 WHIRLPOOL 3fc1ede8283d7a8b32f544c282143bbd5844a3bc4041a8d878fccbbb43bca292be255cf75fd9cf3df52cd8e54dd6f6dd3d08113566d1d572d3bf18854ad81846 |
| 37 |
-EBUILD mesa-17.2.1.ebuild 13540 SHA256 6425956f1c9353f8c69abe199b0c44d514453be6f6c73457c6109fa50109c2bf SHA512 d9551cbbf3f05b847d8f4311948172778f1602077d809424a845f310852e821ff44c62d8e6273a1f1b622ec0e859d5581ad72bc8791544308d072faea374ff59 WHIRLPOOL 3fc1ede8283d7a8b32f544c282143bbd5844a3bc4041a8d878fccbbb43bca292be255cf75fd9cf3df52cd8e54dd6f6dd3d08113566d1d572d3bf18854ad81846 |
| 38 |
+EBUILD mesa-17.2.1.ebuild 14997 SHA256 59ee3e1c8413ea9508ec31ec20b5e017d27cdf78d0c0ffcc21507137defd93e3 SHA512 f9cf8c28a2316ab9e8cfc6efb597a51b17767c83c4fa73b0e76cc90fccc47321c42a475e9c2b0ad5caec1565b1b196541142a2cb5064e8ddbb3d00093efb7006 WHIRLPOOL 05153ed20702f1a2b96d1200d0145e886037d5cb0d694912e86151e594156ce25d25d59d39395745de8d4a26b13ce414e9834c08ebbecac913fc605a4be6b5fe |
| 39 |
+EBUILD mesa-17.2.2.ebuild 14997 SHA256 59ee3e1c8413ea9508ec31ec20b5e017d27cdf78d0c0ffcc21507137defd93e3 SHA512 f9cf8c28a2316ab9e8cfc6efb597a51b17767c83c4fa73b0e76cc90fccc47321c42a475e9c2b0ad5caec1565b1b196541142a2cb5064e8ddbb3d00093efb7006 WHIRLPOOL 05153ed20702f1a2b96d1200d0145e886037d5cb0d694912e86151e594156ce25d25d59d39395745de8d4a26b13ce414e9834c08ebbecac913fc605a4be6b5fe |
| 40 |
MISC metadata.xml 2536 SHA256 d19b63eae85e1a25553e11db8b6e38b31f55810412d7e48680bd78fda4fe4808 SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666 WHIRLPOOL 561a884f9ea3bc15d070e52e53cf3ea461a94ee33f0b06778595c83ab9e35311367dbe37a681201d19cb0c9610fe7eebfb295e1cf116c2b040d286ee579676ac |
| 41 |
|
| 42 |
diff --git a/media-libs/mesa/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild |
| 43 |
similarity index 96% |
| 44 |
copy from media-libs/mesa/mesa-17.2.1.ebuild |
| 45 |
copy to media-libs/mesa/mesa-17.1.10.ebuild |
| 46 |
index 84b26ef..89c42db 100644 |
| 47 |
--- a/media-libs/mesa/mesa-17.2.1.ebuild |
| 48 |
+++ b/media-libs/mesa/mesa-17.1.10.ebuild |
| 49 |
@@ -32,8 +32,9 @@ LICENSE="MIT" |
| 50 |
SLOT="0" |
| 51 |
RESTRICT="!bindist? ( bindist )" |
| 52 |
|
| 53 |
+INTEL_CARDS="i915 i965 intel" |
| 54 |
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" |
| 55 |
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 vivante vmware" |
| 56 |
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware" |
| 57 |
for card in ${VIDEO_CARDS}; do |
| 58 |
IUSE_VIDEO_CARDS+=" video_cards_${card}" |
| 59 |
done |
| 60 |
@@ -74,7 +75,7 @@ REQUIRED_USE=" |
| 61 |
video_cards_vmware? ( gallium ) |
| 62 |
" |
| 63 |
|
| 64 |
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82" |
| 65 |
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77" |
| 66 |
# keep correct libdrm and dri2proto dep |
| 67 |
# keep blocks in rdepend for binpkg |
| 68 |
RDEPEND=" |
| 69 |
@@ -118,18 +119,16 @@ RDEPEND=" |
| 70 |
video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) |
| 71 |
) |
| 72 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
| 73 |
- wayland? ( |
| 74 |
- >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] |
| 75 |
- >=dev-libs/wayland-protocols-1.8 |
| 76 |
- ) |
| 77 |
+ wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] ) |
| 78 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
| 79 |
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] |
| 80 |
- |
| 81 |
- video_cards_intel? ( |
| 82 |
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
| 83 |
- ) |
| 84 |
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
| 85 |
" |
| 86 |
+for card in ${INTEL_CARDS}; do |
| 87 |
+ RDEPEND="${RDEPEND} |
| 88 |
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
| 89 |
+ " |
| 90 |
+done |
| 91 |
+ |
| 92 |
for card in ${RADEON_CARDS}; do |
| 93 |
RDEPEND="${RDEPEND} |
| 94 |
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) |
| 95 |
@@ -237,7 +236,7 @@ multilib_src_configure() { |
| 96 |
fi |
| 97 |
|
| 98 |
if use egl; then |
| 99 |
- myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" |
| 100 |
+ myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" |
| 101 |
fi |
| 102 |
|
| 103 |
if use gallium; then |
| 104 |
|
| 105 |
diff --git a/media-libs/mesa/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.2.1.ebuild |
| 106 |
index 84b26ef..789541f 100644 |
| 107 |
--- a/media-libs/mesa/mesa-17.2.1.ebuild |
| 108 |
+++ b/media-libs/mesa/mesa-17.2.1.ebuild |
| 109 |
@@ -97,7 +97,6 @@ RDEPEND=" |
| 110 |
llvm? ( |
| 111 |
video_cards_radeonsi? ( |
| 112 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 113 |
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) |
| 114 |
) |
| 115 |
video_cards_r600? ( |
| 116 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 117 |
@@ -105,7 +104,6 @@ RDEPEND=" |
| 118 |
video_cards_radeon? ( |
| 119 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 120 |
) |
| 121 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 122 |
) |
| 123 |
opencl? ( |
| 124 |
app-eselect/eselect-opencl |
| 125 |
@@ -139,20 +137,84 @@ RDEPEND="${RDEPEND} |
| 126 |
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) |
| 127 |
" |
| 128 |
|
| 129 |
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once |
| 130 |
-# LLVM < 3.9 is out of the game |
| 131 |
-DEPEND="${RDEPEND} |
| 132 |
- ${PYTHON_DEPS} |
| 133 |
+# Please keep the LLVM dependency block separate. Since LLVM is slotted, |
| 134 |
+# we need to *really* make sure we're not pulling one than more slot |
| 135 |
+# simultaneously. |
| 136 |
+# |
| 137 |
+# How to use it: |
| 138 |
+# 1. List all the working slots (with min versions) in ||, newest first. |
| 139 |
+# 2. Update the := to specify *max* version, e.g. < 7. |
| 140 |
+# 3. Specify LLVM_MAX_SLOT, e.g. 6. |
| 141 |
+LLVM_MAX_SLOT="5" |
| 142 |
+LLVM_DEPSTR=" |
| 143 |
+ || ( |
| 144 |
+ sys-devel/llvm:5[${MULTILIB_USEDEP}] |
| 145 |
+ sys-devel/llvm:4[${MULTILIB_USEDEP}] |
| 146 |
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] |
| 147 |
+ ) |
| 148 |
+ sys-devel/llvm:=[${MULTILIB_USEDEP}] |
| 149 |
+" |
| 150 |
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 151 |
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} |
| 152 |
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 153 |
+RDEPEND="${RDEPEND} |
| 154 |
llvm? ( |
| 155 |
- video_cards_radeonsi? ( || ( |
| 156 |
- sys-devel/llvm[llvm_targets_AMDGPU] |
| 157 |
- sys-devel/llvm[video_cards_radeon] |
| 158 |
- ) ) |
| 159 |
+ opencl? ( |
| 160 |
+ video_cards_r600? ( |
| 161 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 162 |
+ ) |
| 163 |
+ !video_cards_r600? ( |
| 164 |
+ video_cards_radeonsi? ( |
| 165 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 166 |
+ ) |
| 167 |
+ ) |
| 168 |
+ !video_cards_r600? ( |
| 169 |
+ !video_cards_radeonsi? ( |
| 170 |
+ video_cards_radeon? ( |
| 171 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 172 |
+ ) |
| 173 |
+ ) |
| 174 |
+ ) |
| 175 |
+ !video_cards_r600? ( |
| 176 |
+ !video_cards_radeon? ( |
| 177 |
+ !video_cards_radeonsi? ( |
| 178 |
+ ${CLANG_DEPSTR} |
| 179 |
+ ) |
| 180 |
+ ) |
| 181 |
+ ) |
| 182 |
+ ) |
| 183 |
+ !opencl? ( |
| 184 |
+ video_cards_r600? ( |
| 185 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 186 |
+ ) |
| 187 |
+ !video_cards_r600? ( |
| 188 |
+ video_cards_radeonsi? ( |
| 189 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 190 |
+ ) |
| 191 |
+ ) |
| 192 |
+ !video_cards_r600? ( |
| 193 |
+ !video_cards_radeonsi? ( |
| 194 |
+ video_cards_radeon? ( |
| 195 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 196 |
+ ) |
| 197 |
+ ) |
| 198 |
+ ) |
| 199 |
+ !video_cards_r600? ( |
| 200 |
+ !video_cards_radeon? ( |
| 201 |
+ !video_cards_radeonsi? ( |
| 202 |
+ ${LLVM_DEPSTR} |
| 203 |
+ ) |
| 204 |
+ ) |
| 205 |
+ ) |
| 206 |
+ ) |
| 207 |
) |
| 208 |
+" |
| 209 |
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} |
| 210 |
+ |
| 211 |
+DEPEND="${RDEPEND} |
| 212 |
+ ${PYTHON_DEPS} |
| 213 |
opencl? ( |
| 214 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 215 |
- >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}] |
| 216 |
- >=sys-devel/gcc-4.6 |
| 217 |
+ >=sys-devel/gcc-4.6 |
| 218 |
) |
| 219 |
sys-devel/gettext |
| 220 |
virtual/pkgconfig |
| 221 |
@@ -187,6 +249,19 @@ x86? ( |
| 222 |
) |
| 223 |
)" |
| 224 |
|
| 225 |
+llvm_check_deps() { |
| 226 |
+ local flags=${MULTILIB_USEDEP} |
| 227 |
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi |
| 228 |
+ then |
| 229 |
+ flags+=",llvm_targets_AMDGPU(-)" |
| 230 |
+ fi |
| 231 |
+ |
| 232 |
+ if use opencl; then |
| 233 |
+ has_version "sys-devel/clang[${flags}]" || return 1 |
| 234 |
+ fi |
| 235 |
+ has_version "sys-devel/llvm[${flags}]" |
| 236 |
+} |
| 237 |
+ |
| 238 |
pkg_setup() { |
| 239 |
# warning message for bug 459306 |
| 240 |
if use llvm && has_version sys-devel/llvm[!debug=]; then |
| 241 |
@@ -194,7 +269,7 @@ pkg_setup() { |
| 242 |
ewarn "detected! This can cause problems. For details, see bug 459306." |
| 243 |
fi |
| 244 |
|
| 245 |
- if use llvm || use opencl; then |
| 246 |
+ if use llvm; then |
| 247 |
llvm_pkg_setup |
| 248 |
fi |
| 249 |
python-any-r1_pkg_setup |
| 250 |
|
| 251 |
diff --git a/media-libs/mesa/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.2.2.ebuild |
| 252 |
similarity index 87% |
| 253 |
copy from media-libs/mesa/mesa-17.2.1.ebuild |
| 254 |
copy to media-libs/mesa/mesa-17.2.2.ebuild |
| 255 |
index 84b26ef..789541f 100644 |
| 256 |
--- a/media-libs/mesa/mesa-17.2.1.ebuild |
| 257 |
+++ b/media-libs/mesa/mesa-17.2.2.ebuild |
| 258 |
@@ -97,7 +97,6 @@ RDEPEND=" |
| 259 |
llvm? ( |
| 260 |
video_cards_radeonsi? ( |
| 261 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 262 |
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) |
| 263 |
) |
| 264 |
video_cards_r600? ( |
| 265 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 266 |
@@ -105,7 +104,6 @@ RDEPEND=" |
| 267 |
video_cards_radeon? ( |
| 268 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 269 |
) |
| 270 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 271 |
) |
| 272 |
opencl? ( |
| 273 |
app-eselect/eselect-opencl |
| 274 |
@@ -139,20 +137,84 @@ RDEPEND="${RDEPEND} |
| 275 |
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) |
| 276 |
" |
| 277 |
|
| 278 |
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once |
| 279 |
-# LLVM < 3.9 is out of the game |
| 280 |
-DEPEND="${RDEPEND} |
| 281 |
- ${PYTHON_DEPS} |
| 282 |
+# Please keep the LLVM dependency block separate. Since LLVM is slotted, |
| 283 |
+# we need to *really* make sure we're not pulling one than more slot |
| 284 |
+# simultaneously. |
| 285 |
+# |
| 286 |
+# How to use it: |
| 287 |
+# 1. List all the working slots (with min versions) in ||, newest first. |
| 288 |
+# 2. Update the := to specify *max* version, e.g. < 7. |
| 289 |
+# 3. Specify LLVM_MAX_SLOT, e.g. 6. |
| 290 |
+LLVM_MAX_SLOT="5" |
| 291 |
+LLVM_DEPSTR=" |
| 292 |
+ || ( |
| 293 |
+ sys-devel/llvm:5[${MULTILIB_USEDEP}] |
| 294 |
+ sys-devel/llvm:4[${MULTILIB_USEDEP}] |
| 295 |
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] |
| 296 |
+ ) |
| 297 |
+ sys-devel/llvm:=[${MULTILIB_USEDEP}] |
| 298 |
+" |
| 299 |
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 300 |
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} |
| 301 |
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 302 |
+RDEPEND="${RDEPEND} |
| 303 |
llvm? ( |
| 304 |
- video_cards_radeonsi? ( || ( |
| 305 |
- sys-devel/llvm[llvm_targets_AMDGPU] |
| 306 |
- sys-devel/llvm[video_cards_radeon] |
| 307 |
- ) ) |
| 308 |
+ opencl? ( |
| 309 |
+ video_cards_r600? ( |
| 310 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 311 |
+ ) |
| 312 |
+ !video_cards_r600? ( |
| 313 |
+ video_cards_radeonsi? ( |
| 314 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 315 |
+ ) |
| 316 |
+ ) |
| 317 |
+ !video_cards_r600? ( |
| 318 |
+ !video_cards_radeonsi? ( |
| 319 |
+ video_cards_radeon? ( |
| 320 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 321 |
+ ) |
| 322 |
+ ) |
| 323 |
+ ) |
| 324 |
+ !video_cards_r600? ( |
| 325 |
+ !video_cards_radeon? ( |
| 326 |
+ !video_cards_radeonsi? ( |
| 327 |
+ ${CLANG_DEPSTR} |
| 328 |
+ ) |
| 329 |
+ ) |
| 330 |
+ ) |
| 331 |
+ ) |
| 332 |
+ !opencl? ( |
| 333 |
+ video_cards_r600? ( |
| 334 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 335 |
+ ) |
| 336 |
+ !video_cards_r600? ( |
| 337 |
+ video_cards_radeonsi? ( |
| 338 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 339 |
+ ) |
| 340 |
+ ) |
| 341 |
+ !video_cards_r600? ( |
| 342 |
+ !video_cards_radeonsi? ( |
| 343 |
+ video_cards_radeon? ( |
| 344 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 345 |
+ ) |
| 346 |
+ ) |
| 347 |
+ ) |
| 348 |
+ !video_cards_r600? ( |
| 349 |
+ !video_cards_radeon? ( |
| 350 |
+ !video_cards_radeonsi? ( |
| 351 |
+ ${LLVM_DEPSTR} |
| 352 |
+ ) |
| 353 |
+ ) |
| 354 |
+ ) |
| 355 |
+ ) |
| 356 |
) |
| 357 |
+" |
| 358 |
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} |
| 359 |
+ |
| 360 |
+DEPEND="${RDEPEND} |
| 361 |
+ ${PYTHON_DEPS} |
| 362 |
opencl? ( |
| 363 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 364 |
- >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}] |
| 365 |
- >=sys-devel/gcc-4.6 |
| 366 |
+ >=sys-devel/gcc-4.6 |
| 367 |
) |
| 368 |
sys-devel/gettext |
| 369 |
virtual/pkgconfig |
| 370 |
@@ -187,6 +249,19 @@ x86? ( |
| 371 |
) |
| 372 |
)" |
| 373 |
|
| 374 |
+llvm_check_deps() { |
| 375 |
+ local flags=${MULTILIB_USEDEP} |
| 376 |
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi |
| 377 |
+ then |
| 378 |
+ flags+=",llvm_targets_AMDGPU(-)" |
| 379 |
+ fi |
| 380 |
+ |
| 381 |
+ if use opencl; then |
| 382 |
+ has_version "sys-devel/clang[${flags}]" || return 1 |
| 383 |
+ fi |
| 384 |
+ has_version "sys-devel/llvm[${flags}]" |
| 385 |
+} |
| 386 |
+ |
| 387 |
pkg_setup() { |
| 388 |
# warning message for bug 459306 |
| 389 |
if use llvm && has_version sys-devel/llvm[!debug=]; then |
| 390 |
@@ -194,7 +269,7 @@ pkg_setup() { |
| 391 |
ewarn "detected! This can cause problems. For details, see bug 459306." |
| 392 |
fi |
| 393 |
|
| 394 |
- if use llvm || use opencl; then |
| 395 |
+ if use llvm; then |
| 396 |
llvm_pkg_setup |
| 397 |
fi |
| 398 |
python-any-r1_pkg_setup |
Archives