[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/

[Enrico Tagliavini]

commit:     15972bcd4a0f47eea658f45b6243b8119c2e84d2
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Sat Nov 19 13:34:42 2011 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Sat Nov 19 13:34:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=15972bcd

x11-drivers/ati-drivers: version bump to 11.11

Some important change in this release:

- xorg-server-1.11 support!
- OpenCL libraries are now shipped with the driver
i've made the support optional with the opencl USE flag
otherwise libOpenCL.so can conflict with the nvidia-drivers
one.

I'm following bug #372847 and i will add support to is
as soon as it will be released

---
 ...ivers-11.10.ebuild => ati-drivers-11.11.ebuild} |   24 ++++++++++++++++---
 x11-drivers/ati-drivers/metadata.xml               |    5 ++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-11.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
similarity index 96%
rename from x11-drivers/ati-drivers/ati-drivers-11.10.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
index fef0878..f3489d6 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.10.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
@@ -17,14 +17,14 @@ else
 	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
 	FOLDER_PREFIX=""
 fi
-IUSE="debug +modules multilib qt4"
+IUSE="debug +modules multilib opencl qt4"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
 SLOT="1"
 
 RDEPEND="
-	<=x11-base/xorg-server-1.10.99
+	<=x11-base/xorg-server-1.11.49
 	>=app-admin/eselect-opengl-1.0.7
 	sys-power/acpid
 	x11-apps/xauth
@@ -96,6 +96,7 @@ QA_SONAME="
 	usr/lib\(32\|64\)\?/libaticalcl.so
 	usr/lib\(32\|64\)\?/libaticaldd.so
 	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
 "
 
 QA_DT_HASH="
@@ -103,8 +104,10 @@ QA_DT_HASH="
 	opt/bin/aticonfig
 	opt/bin/atiodcli
 	opt/bin/atiode
+	opt/bin/clinfo
 	opt/bin/fglrxinfo
 	opt/sbin/atieventsd
+	opt/sbin/amdnotifyui
 	usr/lib\(32\|64\)\?/libaticalcl.so
 	usr/lib\(32\|64\)\?/libaticalrt.so
 	usr/lib\(32\|64\)\?/libatiuki.so.1.0
@@ -122,6 +125,8 @@ QA_DT_HASH="
 	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
 	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
 	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/libOpenCL.so.1
 "
 
 _check_kernel_config() {
@@ -419,6 +424,8 @@ src_install() {
 	# (s)bin.
 	into /opt
 	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+	use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo
 	# We cleaned out the compilable stuff in src_unpack
 	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
 
@@ -429,6 +436,11 @@ src_install() {
 	# Everything except for the authatieventsd.sh script.
 	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
 	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+	# OpenCL
+	if use opencl ; then
+		insinto /etc/OpenCL/vendors/
+		doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
+	fi
 
 	# include.
 	insinto /usr
@@ -521,9 +533,13 @@ src_install-libs() {
 	exeinto /usr/$(get_libdir)/dri
 	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
 
-	# AMD Cal libraries
+	# AMD Cal and OpenCL libraries
 	exeinto /usr/$(get_libdir)
-	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+	if use opencl ; then
+		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/lib*.so*
+	else
+		doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+	fi
 
 	local envname="${T}"/04ati-dri-path
 	if [[ -n ${ABI} ]]; then

diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index 8411407..a22c40e 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -18,4 +18,9 @@
 	<use>
 		<flag name='modules'>Build the kernel modules</flag>
 	</use>
+	<use>
+		<flag name='opencl'>
+			Install OpenCL libraries
+		</flag>
+	</use>
 </pkgmetadata>