update opencl enabled mesa

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

3 files changed, 45 insertions, 17 deletions

diff --git a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
new file mode 100644
index 0000000..9fe7e32
--- /dev/null
+++ b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac	2012-05-12 11:50:09.786970584 +0200
++++ b/configure.ac	2012-05-12 12:00:00.770582272 +0200
+@@ -1922,14 +1922,6 @@
+     fi
+ }
+ 
+-gallium_require_llvm() {
+-    if test "x$MESA_LLVM" = x0; then
+-        case "$host_cpu" in
+-        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);;
+-        esac
+-    fi
+-}
+-
+ gallium_require_drm_loader() {
+     if test "x$enable_gallium_loader" = xyes; then
+         PKG_CHECK_MODULES([LIBUDEV], [libudev], [],
+@@ -1962,7 +1954,6 @@
+             ;;
+         xr300)
+             PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
+-            gallium_require_llvm "Gallium R300"
+             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+             gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300"
+             ;;
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 680c37b..7e39bae 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-use opencl && EGIT_BRANCH="gallium-compute"
-
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
 if [[ ${PV} = 9999* ]]; then
@@ -50,18 +48,19 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
-	opencl openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc xa
-	xorg kernel_FreeBSD"
+	opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi
+	vdpau wayland xvmc xa xorg kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
 	g3dvl?  ( gallium )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
-	opencl? ( gallium )
+	opencl? ( gallium r600-llvm-compiler )
 	gbm?    ( shared-glapi )
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
 	xa?  ( gallium )
 	xorg?  ( gallium )
 	xvmc?  ( g3dvl )
@@ -74,7 +73,7 @@ REQUIRED_USE="
 	video_cards_r200?   ( classic )
 	video_cards_r300?   ( gallium )
 	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm xorg )
+	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )
 "
 
@@ -89,13 +88,12 @@ EXTERNAL_DEPEND="
 # keep blocks in rdepend for binpkg
 # gtest file collision bug #411825
 RDEPEND="${EXTERNAL_DEPEND}
-	!dev-cpp/gtest
+	dev-util/indent
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.2.2
-	app-admin/eselect-opencl
 	dev-libs/expat
 	gbm? ( sys-fs/udev )
 	>=x11-libs/libX11-1.3.99.901
@@ -104,6 +102,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXxf86vm
 	>=x11-libs/libxcb-1.8
 	d3d? ( app-emulation/wine )
+	opencl? ( app-admin/eselect-opencl )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( dev-libs/wayland )
 	xorg? (
@@ -128,12 +127,13 @@ done
 DEPEND="${RDEPEND}
 	llvm? (
 		>=sys-devel/llvm-2.9
+		r600-llvm-compiler? ( >=sys-devel/llvm-3.1 )
 		video_cards_radeonsi? ( >=sys-devel/llvm-3.1 )
 	)
-	opencl? ( 
-				>=sys-devel/clang-3.0
+	opencl? (
+				>=sys-devel/clang-3.1
 				>=sys-devel/gcc-4.6
-				)
+	)
 	=dev-lang/python-2*
 	dev-libs/libxml2[python]
 	dev-util/pkgconfig
@@ -173,6 +173,9 @@ src_prepare() {
 		epatch
 	fi
 
+	# relax the requirement that r300 must have llvm, bug 380303
+	epatch "${FILESDIR}"/${P}-dont-require-llvm-for-r300.patch
+
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
@@ -229,6 +232,7 @@ src_configure() {
 			$(use_enable g3dvl gallium-g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
+			$(use_enable r600-llvm-compiler)
 			$(use_enable vdpau)
 			$(use_enable xvmc)
 		"
@@ -247,6 +251,7 @@ src_configure() {
 				! use video_cards_r600; then
 			gallium_enable video_cards_radeon r300 r600
 		fi
+		# opencl stuff
 		if use opencl; then
 			myconf+="
 				$(use_enable opencl)
@@ -352,13 +357,12 @@ src_install() {
 			popd
 		eend $?
 	fi
-
 	if use opencl; then
 		ebegin "Moving Gallium/Clover OpenCL implentation for dynamic switching"
 		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* "${ED}"/usr/$(get_libdir)/OpenCL/vendors/mesa
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"/usr/$(get_libdir)/OpenCL/vendors/mesa
 		fi
-		eend $?
 	fi
 }
 
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 8f5aac2..a918a88 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -12,12 +12,11 @@
 	<flag name='gles1'>Enable GLESv1 support.</flag>
 	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
-	<flag name='opencl'>Enable OpenCL</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+	<flag name='r600-llvm-compiler'>Enable r600 shader compiler LLVM backend.</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
-	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>