commit: 8600f437b69d409827666d21a246b10e3e944796
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 12 18:34:18 2015 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 12 18:34:18 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8600f437
media-libs/mesa: Sync with main tree.
---
media-libs/mesa/mesa-9999.ebuild | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dffd922..3d88dd8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -51,13 +51,14 @@ done
IUSE="${IUSE_VIDEO_CARDS}
bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
- vaapi vdpau wayland xvmc xa kernel_FreeBSD"
+ +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD"
REQUIRED_USE="
d3d9? ( gallium dri3 )
llvm? ( gallium )
opencl? (
gallium
+ llvm
video_cards_r600? ( r600-llvm-compiler )
video_cards_radeon? ( r600-llvm-compiler )
video_cards_radeonsi? ( r600-llvm-compiler )
@@ -96,6 +97,7 @@ RDEPEND="
classic? ( app-admin/eselect-mesa )
gallium? ( app-admin/eselect-mesa )
>=app-admin/eselect-opengl-1.3.0
+ udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
@@ -120,7 +122,7 @@ RDEPEND="
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
) )
)
- >=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
)
opencl? (
app-admin/eselect-opencl
@@ -152,8 +154,8 @@ DEPEND="${RDEPEND}
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
)
opencl? (
- >=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.3:=[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+ >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
>=sys-devel/gcc-4.6
)
sys-devel/bison
@@ -322,6 +324,7 @@ multilib_src_configure() {
$(use_enable gles2) \
$(use_enable nptl glx-tls) \
$(use_enable osmesa) \
+ $(use_enable !udev sysfs) \
--enable-llvm-shared-libs \
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \
