From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-939927-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0DF79139694
for <garchives@archives.gentoo.org>; Mon, 20 Mar 2017 21:37:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F156721C09C;
Mon, 20 Mar 2017 21:37:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BB28921C09C
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Mar 2017 21:37:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 23EBA340A23
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Mar 2017 21:37:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B9AB66F2B
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Mar 2017 21:37:14 +0000 (UTC)
From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" <lluixhi@gmail.com>
Message-ID: <1490045793.a7fa6e9a3a8bae2b2b5bcb773a5ff524f69a9a49.lluixhi@gentoo>
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/, media-libs/mesa/files/
X-VCS-Repository: proj/musl
X-VCS-Files: media-libs/mesa/Manifest media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch media-libs/mesa/mesa-13.0.6.ebuild media-libs/mesa/mesa-17.0.1.ebuild media-libs/mesa/mesa-17.0.2.ebuild
X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/
X-VCS-Committer: lluixhi
X-VCS-Committer-Name: Aric Belsito
X-VCS-Revision: a7fa6e9a3a8bae2b2b5bcb773a5ff524f69a9a49
X-VCS-Branch: master
Date: Mon, 20 Mar 2017 21:37:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0ada6921-85c9-4582-adad-882d41d589fb
X-Archives-Hash: 0e7d26c54a306febdedbdacc41f53c6a
commit: a7fa6e9a3a8bae2b2b5bcb773a5ff524f69a9a49
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Mar 20 21:36:33 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Mar 20 21:36:33 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a7fa6e9a
media-libs/mesa: version bump to 13.0.6/17.0.2
media-libs/mesa/Manifest | 7 +-
...er-Work-around-build-failure-with-AltiVec.patch | 69 ------------------
.../{mesa-17.0.1.ebuild => mesa-13.0.6.ebuild} | 82 ++++++++++------------
.../{mesa-17.0.1.ebuild => mesa-17.0.2.ebuild} | 1 -
4 files changed, 42 insertions(+), 117 deletions(-)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d1af0fa..d9697c9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,9 +2,10 @@ AUX eselect-mesa.conf.9.2 1630 SHA256 c1ca0e3fddc12b49c5db1739f2d57a0afd6856824d
AUX mesa-11-execinfo.patch 3063 SHA256 150a0f8f6324db046538756fcf79a082fb1e64afe46bd679cc7965b0ebd71d15 SHA512 f30d4b79f5120dc8ff338a16b8c0c3cd1dc25dae3854f9e1c20eeb1a8115f48f01167dd11d316c788f715723815d37a21d65cf6026d65ef424335a481cb93090 WHIRLPOOL da15270c3efba6a1ff1968fa131f63b6d2472b05111a51d5da7d29095a9089f715d8b4bbfbba31e3858076b4ef6e5f3f9ed6c83b6faee44c48c4022756535489
AUX mesa-13-clover-Work-around-build-failure-with-AltiVec.patch 2317 SHA256 02dd7e59ea5d08d4a66b2f7353bb427b71ed8e6638b50da593d35165a032ac42 SHA512 6b3cd038c0a61b4d64ec0b645086d7cf2c74b97bd0febe5229c88d78e8dc3a4cbd2876a06ca2394f819dd04b0397722fc76c4ce5939c5c58f40ef0d2e2bcbe84 WHIRLPOOL 0200946c578dfb47782533052e86804c8534d2da056670dad0712e694ca22a6983e433f0a355f489472814969c74558f113b03f01c3fd4c3bb671f09a2bf49b0
AUX mesa-13-musl_endian.patch 417 SHA256 3686132ef3a57b607c223705a18f32da7fa7f58fecd5b118f3d7f5df3697cd11 SHA512 6b351de61e0d3ed5cc37233df8f915ca3e3d80291944556124c88408da2471c3b65fb5c355f1e78ca24a8ed1e007e3efd7c7fc52d08b509eaa66fc368b751ab2 WHIRLPOOL 7d1c0cfbb6a914df589c9f41939e6e7054aa6bfe8b2bed79e25a2d1bc44cb4d7b01a21b5e39aeeca27d9ebffdf0fb7f9af651a845316a131826521f11197ffc1
-AUX mesa-17-clover-Work-around-build-failure-with-AltiVec.patch 2176 SHA256 d26cb6f3abd2c4e3190dc1621f4bd27ec0dbb3d16ac599b9614e809428935de3 SHA512 35e1df05720e2911d01403e588b500102792b730c2bea6276560a6e6bb506afbe11e2aa59d3929eca550509605eef190a64826934f7c28ef235b2274c182aedf WHIRLPOOL 614fd2985a26d3f764720722186a20600aaf5a2dd29e85ce23bf899839bb858bc1eafd1733137577a8436a622e7515e423754e669c495aa37d36de141db10993
DIST mesa-13.0.5.tar.xz 9171480 SHA256 bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1 WHIRLPOOL 164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e
-DIST mesa-17.0.1.tar.xz 9447712 SHA256 96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c SHA512 f3a807fbf30327a1dccb690e484276ab1b2b1e33b0440884b6476607e08aa3513d5c9d4b6dd345415decb93747d334c70bffe9e49eae787b48ef6c08989aeb7c WHIRLPOOL 955800014b4155eba5dea6f4ae50e7a302467d4063a5ff0378b6c3b833f924787fd923248f8746bdbbef3e57135ae44eb1a38248c08112ad5435b645fc955ec4
+DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441 WHIRLPOOL 1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
+DIST mesa-17.0.2.tar.xz 9451056 SHA256 f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4 SHA512 df0cb47d01dee16d1d72e0a5fd9d49ab412294761ca647cbb6b411e16892b8be503d87911591339d4630d16b7c948897bfa4321b2c5a8a4219fa58b347015471 WHIRLPOOL 3cb03a48da994202e6a39f4adc97e8b40f2bcc713f5fb859fbbdc0a068f3842a59bc916fa0e36138cf560c4bf25c3b70425d6ed9ea8096acc8bbd9ddebfd1acc
EBUILD mesa-13.0.5.ebuild 13682 SHA256 c0941589335d956bff393fbd26114b2017d1f71fae94e06becaae8a1c52f0b0c SHA512 e407f73610a8d6c7e3456a051dac01bb577a4714128568f276c7e8811b9fc7ac050f29e2770861c1addb561a6828006cfb9f3f18a215448df61b6f9f03f9a7df WHIRLPOOL 71ebf88582419ef5175a04a5ea2d286fe8d2946c95ab354bc2a3a52386ba7100010d5bf92dc9c0c1f0ee4d65353636e2482ef911663b55f932547613d0520b48
-EBUILD mesa-17.0.1.ebuild 13718 SHA256 2b7031253f392cd3040e9cab0b5037668fa65c09ec62bf8725908bdc67af5039 SHA512 204824c9e7940660cc8167e702f24a8404a98a6de8e330411705a9a31a1f56591a2946d5cd9bfd6494c98b122143a68709f7bd7a978fcccf0fc0402eaad4a622 WHIRLPOOL 79f8decd28b033ff7c545f912f5af38bd21dd587f4d9a5e9e6e2cfb365ee532463dd6b307f35e7a258c75dcbf287bff99ffbc53a922b232f1eed8a338d368511
+EBUILD mesa-13.0.6.ebuild 13608 SHA256 1eec6bc2746825886f65b2ea71742a63c6a1c3822da6e380751248e5e869de2b SHA512 562514a18f7c9a0606ca358404abaaab86ed78671f0056480eaae2d70581a4ed3a96daa28316021a026f4bb7c1b35d32d8d3ec7a4b2af378d0e1e16cb08dc67d WHIRLPOOL 8856f1a7a347b517d4ba74af483c086b3fec49c8cdf62edbc161de9d3eef5e1ce805bbbac16d5ff58b8cb2095558f888d2f65562a9c45a21e15e1ff54c3ed9de
+EBUILD mesa-17.0.2.ebuild 13635 SHA256 38045d4ddd3751f2446b74330cc416583d6c5e2cc913c2627e679940477fbca9 SHA512 8981e0da8ca573c6a4a7ef3c7fc565b208c236bfaffe9b5557f2795363f93edea9c1a4ee7fcac93e40e4286077604df6b855f934bad5af631615f3d5badd7313 WHIRLPOOL 5feb6d17ccaf72a14ac88b391b8e5996fe27bc7fb548a32258106b525318297271939743b2e619c3d8ba1e389b3a4f8323ec6c2d4ed1e47775da9068599655f8
MISC metadata.xml 2440 SHA256 98874315e8480a14f26b8395eb2573b85dbe402a8bb30a72aa2cc884bc0512a2 SHA512 47237a5fd95a9c58b1857b27da2558ecf46266630eeb7514db2f276f0a8c82a0751122d71a27b4949a1a66df75bbe9e5a833b1f12a86214614e6777849d4c5d8 WHIRLPOOL 5742264ad29f82e98a96044efb74fb230e7a8cc4d58ad569676e8ffc9a86873d5148de86e8a101a11ee465e204cae47f1ec8d50ba8a8c0d75070cb705a03eef8
diff --git a/media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch b/media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch
deleted file mode 100644
index 87f5f9d..0000000
--- a/media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7d1195c1e4d071fe796bf5f210c468ea1cc86225 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 2 Mar 2017 04:43:21 +0000
-Subject: [PATCH] clover: Work around build failure with AltiVec.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=587210
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68504
-Acked-by: Francisco Jerez <currojerez@riseup.net>
----
- configure.ac | 14 ++++++++++++++
- src/gallium/state_trackers/clover/Makefile.am | 3 +++
- 2 files changed, 17 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index a3d1a00..57c4b1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2033,6 +2033,20 @@ if test "x$enable_opencl" = xyes; then
- AC_MSG_ERROR([Clover requires libelf])
- fi
-
-+ if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
-+ altivec_enabled=no
-+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+ #if !defined(__VEC__) || !defined(__ALTIVEC__)
-+ #error "AltiVec not enabled"
-+ #endif
-+ ])], altivec_enabled=yes)
-+
-+ if test "$altivec_enabled" = yes; then
-+ CLOVER_STD_OVERRIDE="-std=gnu++11"
-+ fi
-+ AC_SUBST([CLOVER_STD_OVERRIDE])
-+ fi
-+
- llvm_require_version $LLVM_REQUIRED_OPENCL "opencl"
-
- llvm_add_default_components "opencl"
-diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
-index a657e5b..3213935 100644
---- a/src/gallium/state_trackers/clover/Makefile.am
-+++ b/src/gallium/state_trackers/clover/Makefile.am
-@@ -32,6 +32,7 @@ noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
-
- libcltgsi_la_CXXFLAGS = \
- -std=c++11 \
-+ $(CLOVER_STD_OVERRIDE) \
- $(VISIBILITY_CXXFLAGS)
-
- libcltgsi_la_SOURCES = $(TGSI_SOURCES)
-@@ -40,6 +41,7 @@ libclllvm_la_CXXFLAGS = \
- -std=c++11 \
- $(VISIBILITY_CXXFLAGS) \
- $(LLVM_CXXFLAGS) \
-+ $(CLOVER_STD_OVERRIDE) \
- $(DEFINES) \
- $(LIBELF_CFLAGS) \
- -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
-@@ -50,6 +52,7 @@ libclllvm_la_SOURCES = $(LLVM_SOURCES)
-
- libclover_la_CXXFLAGS = \
- -std=c++11 \
-+ $(CLOVER_STD_OVERRIDE) \
- $(VISIBILITY_CXXFLAGS)
-
- libclover_la_LIBADD = \
---
-2.10.2
-
diff --git a/media-libs/mesa/mesa-17.0.1.ebuild b/media-libs/mesa/mesa-13.0.6.ebuild
similarity index 87%
copy from media-libs/mesa/mesa-17.0.1.ebuild
copy to media-libs/mesa/mesa-13.0.6.ebuild
index 4638859..c24d7d5 100644
--- a/media-libs/mesa/mesa-17.0.1.ebuild
+++ b/media-libs/mesa/mesa-13.0.6.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=5
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
if [[ ${PV} = 9999 ]]; then
GIT_ECLASS="git-r3"
@@ -12,11 +12,12 @@ fi
PYTHON_COMPAT=( python2_7 )
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
OPENGL_DIR="xorg-x11"
MY_P="${P/_/-}"
+FOLDER="${PV/_rc*/}"
DESCRIPTION="OpenGL-like graphic library for Linux"
HOMEPAGE="https://www.mesa3d.org/"
@@ -24,7 +25,7 @@ HOMEPAGE="https://www.mesa3d.org/"
if [[ $PV == 9999 ]]; then
SRC_URI=""
else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+ SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
@@ -34,17 +35,18 @@ RESTRICT="!bindist? ( bindist )"
INTEL_CARDS="i915 i965 intel"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau
- vulkan wayland xvmc xa"
+ bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
+ libressl +llvm +nettle +nptl opencl osmesa pax_kernel openmax openssl pic
+ selinux vaapi valgrind vdpau vulkan wayland xvmc xa"
REQUIRED_USE="
+ || ( gcrypt libressl nettle openssl )
d3d9? ( dri3 gallium )
llvm? ( gallium )
opencl? ( gallium llvm )
@@ -53,15 +55,13 @@ REQUIRED_USE="
gles2? ( egl )
vaapi? ( gallium )
vdpau? ( gallium )
- vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
+ vulkan? ( video_cards_i965 )
wayland? ( egl gbm )
xa? ( gallium )
video_cards_freedreno? ( gallium )
video_cards_intel? ( classic )
video_cards_i915? ( || ( classic gallium ) )
video_cards_i965? ( classic )
- video_cards_imx? ( gallium )
video_cards_nouveau? ( || ( classic gallium ) )
video_cards_radeon? ( || ( classic gallium )
gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
@@ -70,12 +70,11 @@ REQUIRED_USE="
video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
video_cards_r600? ( gallium )
video_cards_radeonsi? ( gallium llvm )
- video_cards_vivante? ( gallium gbm )
video_cards_vmware? ( gallium )
${PYTHON_REQUIRED_USE}
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.74"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.72"
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
RDEPEND="
@@ -96,10 +95,6 @@ RDEPEND="
llvm? (
video_cards_radeonsi? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
- vulkan? (
- || (
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) )
)
video_cards_r600? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
@@ -107,11 +102,15 @@ RDEPEND="
video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
- || (
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
+ )
+ nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
+ !nettle? (
+ gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+ !gcrypt? (
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+ !libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
)
- <sys-devel/llvm-5:=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
@@ -124,9 +123,9 @@ RDEPEND="
video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
)
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,${MULTILIB_USEDEP}]
"
for card in ${INTEL_CARDS}; do
RDEPEND="${RDEPEND}
@@ -153,15 +152,9 @@ DEPEND="${RDEPEND}
) )
)
opencl? (
- || (
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
- )
- || (
- sys-devel/clang:4[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}]
- )
- >=sys-devel/gcc-4.6
+ >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}]
+ >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}]
+ >=sys-devel/gcc-4.6
)
sys-devel/gettext
virtual/pkgconfig
@@ -204,20 +197,14 @@ pkg_setup() {
ewarn "detected! This can cause problems. For details, see bug 459306."
fi
- if use llvm || use opencl; then
- LLVM_MAX_SLOT=4 llvm_pkg_setup
- fi
python-any-r1_pkg_setup
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-11-execinfo.patch
- eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
- eapply "${FILESDIR}"/${PN}-17-clover-Work-around-build-failure-with-AltiVec.patch
+ epatch "${FILESDIR}"/${PN}-11-execinfo.patch
+ epatch "${FILESDIR}"/${PN}-13-musl_endian.patch
eautoreconf
-
- eapply_user
}
multilib_src_configure() {
@@ -265,11 +252,9 @@ multilib_src_configure() {
gallium_enable swrast
gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
gallium_enable video_cards_vmware svga
gallium_enable video_cards_nouveau nouveau
gallium_enable video_cards_i915 i915
- gallium_enable video_cards_imx imx
if ! use video_cards_i915 && \
! use video_cards_i965; then
gallium_enable video_cards_intel i915
@@ -295,7 +280,9 @@ multilib_src_configure() {
if use vulkan; then
vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_radeonsi radeon
+
+ # radv is disabled due to dependence on >=llvm-3.9, bug 607660
+ #vulkan_enable video_cards_radeonsi radeon
fi
# x86 hardened pax_kernel needs glx-rts, bug 240956
@@ -322,6 +309,7 @@ multilib_src_configure() {
--enable-dri \
--enable-glx \
--enable-shared-glapi \
+ --disable-shader-cache \
$(use_enable !bindist texture-float) \
$(use_enable d3d9 nine) \
$(use_enable debug) \
@@ -336,6 +324,7 @@ multilib_src_configure() {
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \
--with-vulkan-drivers=${VULKAN_DRIVERS} \
+ --with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt libcrypto)) \
PYTHON2="${PYTHON}" \
${myconf}
}
@@ -397,7 +386,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
+ prune_libtool_files --all
einstalldocs
if use !bindist; then
@@ -407,6 +396,11 @@ multilib_src_install_all() {
# Install config file for eselect mesa
insinto /usr/share/mesa
newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+
+ # Mesa should not install these
+ if use vulkan; then
+ rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
+ fi
}
multilib_src_test() {
diff --git a/media-libs/mesa/mesa-17.0.1.ebuild b/media-libs/mesa/mesa-17.0.2.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-17.0.1.ebuild
rename to media-libs/mesa/mesa-17.0.2.ebuild
index 4638859..69263ea 100644
--- a/media-libs/mesa/mesa-17.0.1.ebuild
+++ b/media-libs/mesa/mesa-17.0.2.ebuild
@@ -213,7 +213,6 @@ pkg_setup() {
src_prepare() {
eapply "${FILESDIR}"/${PN}-11-execinfo.patch
eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
- eapply "${FILESDIR}"/${PN}-17-clover-Work-around-build-failure-with-AltiVec.patch
eautoreconf