[gentoo-commits] proj/musl:master commit in: media-libs/mesa/

Wed, 21 Mar 2018 20:24:45 -0700 

commit:     d12c6dfc40e4129505e5201100095f7cb63ee4c0
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar 22 03:23:33 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar 22 03:23:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d12c6dfc

media-libs/mesa: version bump to 17.3.7/18.0.0_rc5

 media-libs/mesa/Manifest                                       |  2 ++
 media-libs/mesa/{mesa-18.0.0_rc4.ebuild => mesa-17.3.7.ebuild} | 10 ++++------
 media-libs/mesa/mesa-18.0.0_rc4.ebuild                         |  1 -
 .../mesa/{mesa-18.0.0_rc4.ebuild => mesa-18.0.0_rc5.ebuild}    |  1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a87a181..74f636c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,4 +1,6 @@
 DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 
205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d
 SHA512 
728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
 DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 
558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75
 SHA512 
ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
 DIST mesa-17.3.6.tar.xz 10679396 BLAKE2B 
53b74401b9cb40018b3e2c921c4fd39b81809e8485b632c2fe40e7ebd55fbf3a10f4cb8fe2f1a3d6d181f609e8ac8f36d795eca9e0eda7fd5db96b08d2105094
 SHA512 
5164ed5a1d3d25031b712a9f443f0e467a29b2bca0a1aa11324ed5c10279411979c9c7482825053926a813e76c58b78a3439c7c81fcd51a7808f53977080828f
+DIST mesa-17.3.7.tar.xz 10654684 BLAKE2B 
520b045f7ab4b60ab372960ca933e60229dc38075d28c9e0f144d0a2dc222d6c2830e4739962008319bed27fe9a83bae7c38609d0135c3d5918d35dff6c0381d
 SHA512 
ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e
 DIST mesa-18.0.0-rc4.tar.xz 11027596 BLAKE2B 
96554acd69636b91d1b79e7fefa4ba6e3f701ef7ef6c16718493070d62ab41c7bbd66e2f4d4a97fac8c236ac4c9150b2ce41e4e57b865fff6122b3f60b047e25
 SHA512 
91dd0a4396715a7896fc47aabf38c4b486df3b50c9764795805550ef01724d2e2281ba9b000e82760ea0e199c58d8c9943dbc732b2adab46554ff5c2f9e2ece1
+DIST mesa-18.0.0-rc5.tar.xz 10970572 BLAKE2B 
5415bf4a2b33d813c3987be2aa3648ffa0ec345a109f80c3f6d5af51d06104e3af1a8d8a0763af2c419a8e30ed46c316347449ce016293281c87484a678205bd
 SHA512 
90c68c0bf9e689992626b593ad53d4f7fb402e556ac70672b618abd3a224e637fc6a26fb197bb3b692a8363117de09e01fd524f9de181359eba0879226e3e5a6

diff --git a/media-libs/mesa/mesa-18.0.0_rc4.ebuild 
b/media-libs/mesa/mesa-17.3.7.ebuild
similarity index 98%
copy from media-libs/mesa/mesa-18.0.0_rc4.ebuild
copy to media-libs/mesa/mesa-17.3.7.ebuild
index c7de351..e11d14c 100644
--- a/media-libs/mesa/mesa-18.0.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-17.3.7.ebuild
@@ -75,7 +75,7 @@ REQUIRED_USE="
        video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.85"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
@@ -149,15 +149,14 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 7.
 # 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="5"
 LLVM_DEPSTR="
        || (
-               sys-devel/llvm:7[${MULTILIB_USEDEP}]
-               sys-devel/llvm:6[${MULTILIB_USEDEP}]
                sys-devel/llvm:5[${MULTILIB_USEDEP}]
                sys-devel/llvm:4[${MULTILIB_USEDEP}]
                >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
        )
-       sys-devel/llvm:=[${MULTILIB_USEDEP}]
+       <sys-devel/llvm-6:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -288,7 +287,7 @@ src_prepare() {
        eapply "${FILESDIR}"/${PN}-17-execinfo.patch
        eapply "${FILESDIR}"/${PN}-17-musl-string_h.patch
        eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch
-       eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch
+       eapply "${FILESDIR}"/${PN}-17-musl-pthread.patch
 
        eautoreconf
 
@@ -411,7 +410,6 @@ multilib_src_configure() {
                $(use_enable unwind libunwind) \
                --enable-valgrind=$(usex valgrind auto no) \
                --enable-llvm-shared-libs \
-               --disable-opencl-icd \
                --with-dri-drivers=${DRI_DRIVERS} \
                --with-gallium-drivers=${GALLIUM_DRIVERS} \
                --with-vulkan-drivers=${VULKAN_DRIVERS} \

diff --git a/media-libs/mesa/mesa-18.0.0_rc4.ebuild 
b/media-libs/mesa/mesa-18.0.0_rc4.ebuild
index c7de351..aae98e0 100644
--- a/media-libs/mesa/mesa-18.0.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-18.0.0_rc4.ebuild
@@ -151,7 +151,6 @@ RDEPEND="${RDEPEND}
 # 3. Specify LLVM_MAX_SLOT, e.g. 6.
 LLVM_DEPSTR="
        || (
-               sys-devel/llvm:7[${MULTILIB_USEDEP}]
                sys-devel/llvm:6[${MULTILIB_USEDEP}]
                sys-devel/llvm:5[${MULTILIB_USEDEP}]
                sys-devel/llvm:4[${MULTILIB_USEDEP}]

diff --git a/media-libs/mesa/mesa-18.0.0_rc4.ebuild 
b/media-libs/mesa/mesa-18.0.0_rc5.ebuild
similarity index 99%
copy from media-libs/mesa/mesa-18.0.0_rc4.ebuild
copy to media-libs/mesa/mesa-18.0.0_rc5.ebuild
index c7de351..aae98e0 100644
--- a/media-libs/mesa/mesa-18.0.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-18.0.0_rc5.ebuild
@@ -151,7 +151,6 @@ RDEPEND="${RDEPEND}
 # 3. Specify LLVM_MAX_SLOT, e.g. 6.
 LLVM_DEPSTR="
        || (
-               sys-devel/llvm:7[${MULTILIB_USEDEP}]
                sys-devel/llvm:6[${MULTILIB_USEDEP}]
                sys-devel/llvm:5[${MULTILIB_USEDEP}]
                sys-devel/llvm:4[${MULTILIB_USEDEP}]

Reply via email to