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 1Rtgg7-0004xM-Jh for garchives@archives.gentoo.org; Sat, 04 Feb 2012 14:33:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40870E063D; Sat, 4 Feb 2012 14:33:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ECE97E063D for ; Sat, 4 Feb 2012 14:33:14 +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 03DEA1B400B for ; Sat, 4 Feb 2012 14:33:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 171E680042 for ; Sat, 4 Feb 2012 14:33:13 +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: <4e66f86310509475e7faa04e3f496a9b357436d3.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-12.1-r1.ebuild x11-drivers/ati-drivers/ati-drivers-12.1.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: 4e66f86310509475e7faa04e3f496a9b357436d3 Date: Sat, 4 Feb 2012 14:33:13 +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: bdb3fab6-828b-4c3d-aa88-bbafff7c332c X-Archives-Hash: 550681aae222eeb1682933af2d1e6c68 commit: 4e66f86310509475e7faa04e3f496a9b357436d3 Author: Enrico Tagliavini gmail com> AuthorDate: Sat Feb 4 14:32:49 2012 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Sat Feb 4 14:32:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D4e66f863 x11-drivers/ati-drivers sync with main portage tree --- ...vers-12.1.ebuild =3D> ati-drivers-12.1-r1.ebuild} | 41 +++++++-----= ------- x11-drivers/ati-drivers/metadata.xml | 5 -- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-12.1.ebuild b/x11-driver= s/ati-drivers/ati-drivers-12.1-r1.ebuild similarity index 95% rename from x11-drivers/ati-drivers/ati-drivers-12.1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild index 6808300..65cdccb 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -17,7 +17,7 @@ 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 opencl pax_kernel qt4" +IUSE=3D"debug +modules multilib pax_kernel qt4" =20 LICENSE=3D"AMD GPL-2 QPL-1.0 as-is" KEYWORDS=3D"~amd64 ~x86" @@ -26,6 +26,7 @@ SLOT=3D"1" RDEPEND=3D" <=3Dx11-base/xorg-server-1.11.49 >=3Dapp-admin/eselect-opengl-1.0.7 + app-admin/eselect-opencl sys-power/acpid x11-apps/xauth x11-libs/libX11 @@ -46,9 +47,6 @@ RDEPEND=3D" x11-libs/qt-core x11-libs/qt-gui ) - opencl? ( - !>=3Dx11-drivers/nvidia-drivers-195 - ) " =20 DEPEND=3D"${RDEPEND} @@ -130,8 +128,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\)\?/OpenCL/vendor/amd/libamdocl\(32\|64\)\?.so - usr/lib\(32\|64\)\?/OpenCL/vendor/amd/libOpenCL.so.1 + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " =20 _check_kernel_config() { @@ -430,7 +428,7 @@ src_install() { into /opt dosbin "${ARCH_DIR}"/usr/sbin/atieventsd use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui - use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo + dobin "${ARCH_DIR}"/usr/bin/clinfo # We cleaned out the compilable stuff in src_unpack dobin "${ARCH_DIR}"/usr/X11R6/bin/* =20 @@ -536,28 +534,19 @@ src_install-libs() { doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so =20 # AMD Cal and OpenCL libraries - if use opencl ; then - exeinto /usr/$(get_libdir)/OpenCL/vendor/amd - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* - fi + exeinto /usr/$(get_libdir)/OpenCL/vendors/amd + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* + dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/li= bOpenCL.so exeinto /usr/$(get_libdir) doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* =20 # OpenCL vendor files - if use opencl ; then - insinto /etc/OpenCL/vendors/ - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF - /usr/$(get_libdir)/OpenCL/vendor/amd/libamdocl${oclsuffix}.so - EOF - doins "${T}"/amdocl${oclsuffix}.icd - - # OpenCL envd file until eselect-opencl is in place - cat > "${T}"/35amdocl${oclsuffix} <<-EOF - LDPATH=3D"/usr/$(get_libdir)/OpenCL/vendor/amd" - EOF - doenvd "${T}"/35amdocl${oclsuffix} || die "doenvd failed" - fi + insinto /etc/OpenCL/vendors/ + cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF + /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so + EOF + doins "${T}"/amdocl${oclsuffix}.icd =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 ba2339f..e68850a 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -19,11 +19,6 @@ Build the kernel modules - - Install OpenCL runtime libraries - - - Enable if the user plans to run the package under a pax enabled harde= ned kernel