From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RRl4x-0008RG-TG for garchives@archives.gentoo.org; Sat, 19 Nov 2011 13:35:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A4FC21C038; Sat, 19 Nov 2011 13:35:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B9CF21C038 for ; Sat, 19 Nov 2011 13:35:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50DE31B4020 for ; Sat, 19 Nov 2011 13:35:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 836B880042 for ; Sat, 19 Nov 2011 13:35:25 +0000 (UTC) From: "Enrico Tagliavini" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Enrico Tagliavini" Message-ID: <15972bcd4a0f47eea658f45b6243b8119c2e84d2.Enrico@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-11.10.ebuild x11-drivers/ati-drivers/ati-drivers-11.11.ebuild x11-drivers/ati-drivers/metadata.xml X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: 15972bcd4a0f47eea658f45b6243b8119c2e84d2 Date: Sat, 19 Nov 2011 13:35:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c5f63799-6b27-4ff4-865f-6e2b9e67dbde X-Archives-Hash: 8bfca2cc2a7c61b8da79e13da388608e commit: 15972bcd4a0f47eea658f45b6243b8119c2e84d2 Author: Enrico Tagliavini gmail com> AuthorDate: Sat Nov 19 13:34:42 2011 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Sat Nov 19 13:34:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D15972bcd 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 =3D> 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-drive= rs/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=3D"https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2= :${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" FOLDER_PREFIX=3D"" fi -IUSE=3D"debug +modules multilib qt4" +IUSE=3D"debug +modules multilib opencl qt4" =20 LICENSE=3D"AMD GPL-2 QPL-1.0 as-is" KEYWORDS=3D"~amd64 ~x86" SLOT=3D"1" =20 RDEPEND=3D" - <=3Dx11-base/xorg-server-1.10.99 + <=3Dx11-base/xorg-server-1.11.49 >=3Dapp-admin/eselect-opengl-1.0.7 sys-power/acpid x11-apps/xauth @@ -96,6 +96,7 @@ QA_SONAME=3D" 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 " =20 QA_DT_HASH=3D" @@ -103,8 +104,10 @@ QA_DT_HASH=3D" 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=3D" 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 " =20 _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/* =20 @@ -429,6 +436,11 @@ src_install() { # Everything except for the authatieventsd.sh script. doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpc= sdb.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 fail= ed" + fi =20 # 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 =20 - # 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 =20 local envname=3D"${T}"/04ati-dri-path if [[ -n ${ABI} ]]; then diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drive= rs/metadata.xml index 8411407..a22c40e 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -18,4 +18,9 @@ Build the kernel modules + + + Install OpenCL libraries + +