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 1ReSou-0002ri-CJ for garchives@archives.gentoo.org; Sat, 24 Dec 2011 14:43:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 170A821C132; Sat, 24 Dec 2011 14:43:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C665621C132 for ; Sat, 24 Dec 2011 14:43:22 +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 27E311B4008 for ; Sat, 24 Dec 2011 14:43:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 42BE880042 for ; Sat, 24 Dec 2011 14:43:21 +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: <49a88849d73ae9790e55e628330ab78f0b55e7a0.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.12-r1.ebuild x11-drivers/ati-drivers/ati-drivers-11.12.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: 49a88849d73ae9790e55e628330ab78f0b55e7a0 Date: Sat, 24 Dec 2011 14:43:21 +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: c4cd6542-d5b0-4b18-bddf-ab5272bd0006 X-Archives-Hash: 61c1bda0926d39caf15bf1d5ccdbe651 commit: 49a88849d73ae9790e55e628330ab78f0b55e7a0 Author: Enrico Tagliavini gmail com> AuthorDate: Sat Dec 24 14:43:03 2011 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Sat Dec 24 14:43:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D49a88849 x11-drivers/ati-drivers: OpenCL changes This revision introduces changes requested in bug #391131 comment #6. An envd file is installed to let applications find opencl runtime libraries until eselect opencl is ready. nvidia-drivers is still blocked until it is migrated too. --- ...rs-11.12.ebuild =3D> ati-drivers-11.12-r1.ebuild} | 41 ++++++++++++= +------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild b/x11-drive= rs/ati-drivers/ati-drivers-11.12-r1.ebuild similarity index 94% rename from x11-drivers/ati-drivers/ati-drivers-11.12.ebuild rename to x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild index d2be416..a397629 100644 --- a/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild @@ -130,8 +130,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 + usr/lib\(32\|64\)\?/OpenCL/vendor/amd/libamdocl\(32\|64\)\?.so + usr/lib\(32\|64\)\?/OpenCL/vendor/amd/libOpenCL.so.1 " =20 _check_kernel_config() { @@ -439,15 +439,6 @@ 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/ - if [[ "${ABI}" =3D=3D "amd64" ]] ; then - doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins fai= led" - else - doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl32.icd || die "doins fai= led" - fi - fi =20 # include. insinto /usr @@ -503,10 +494,12 @@ src_install-libs() { local EX_BASE_DIR=3D"${BASE_DIR}_64a" local pkglibdir=3Dlib64 local MY_ARCH_DIR=3D"${S}/arch/x86_64" + local oclsuffix=3D64 else local EX_BASE_DIR=3D"${BASE_DIR}" local pkglibdir=3Dlib local MY_ARCH_DIR=3D"${S}/arch/x86" + local oclsuffix=3D32 fi einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" =20 @@ -541,11 +534,27 @@ 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) + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* + + # OpenCL vendor files if use opencl ; then - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/lib*.so* - else - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* + 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 =20 local envname=3D"${T}"/04ati-dri-path @@ -579,6 +588,10 @@ pkg_postinst() { elog elog "Some cards need acpid running to handle events" elog "Please add it to boot runlevel with rc-update add acpid boot" + elog + ewarn "This release of ati-drivers has a crashing bug when using Xv vid= eo." + ewarn "To avoid this problem, configure your video playback software fo= r" + ewarn "OpenGL output. See https://bugs.gentoo.org/show_bug.cgi?id=3D391= 193" =20 use modules && linux-mod_pkg_postinst "${ROOT}"/usr/bin/eselect opengl set --use-old ati