From: "Enrico Tagliavini" <enrico.tagliavini@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/
Date: Sat, 4 Feb 2012 14:33:13 +0000 (UTC) [thread overview]
Message-ID: <4e66f86310509475e7faa04e3f496a9b357436d3.Enrico@gentoo> (raw)
commit: 4e66f86310509475e7faa04e3f496a9b357436d3
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Sat Feb 4 14:32:49 2012 +0000
Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Sat Feb 4 14:32:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4e66f863
x11-drivers/ati-drivers sync with main portage tree
---
...vers-12.1.ebuild => 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-drivers/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: $
@@ -17,7 +17,7 @@ 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 opencl pax_kernel qt4"
+IUSE="debug +modules multilib pax_kernel qt4"
LICENSE="AMD GPL-2 QPL-1.0 as-is"
KEYWORDS="~amd64 ~x86"
@@ -26,6 +26,7 @@ SLOT="1"
RDEPEND="
<=x11-base/xorg-server-1.11.49
>=app-admin/eselect-opengl-1.0.7
+ app-admin/eselect-opencl
sys-power/acpid
x11-apps/xauth
x11-libs/libX11
@@ -46,9 +47,6 @@ RDEPEND="
x11-libs/qt-core
x11-libs/qt-gui
)
- opencl? (
- !>=x11-drivers/nvidia-drivers-195
- )
"
DEPEND="${RDEPEND}
@@ -130,8 +128,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\)\?/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
"
_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/*
@@ -536,28 +534,19 @@ src_install-libs() {
doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
# 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/libOpenCL.so
exeinto /usr/$(get_libdir)
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
# 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="/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
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 ba2339f..e68850a 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -19,11 +19,6 @@
<flag name='modules'>Build the kernel modules</flag>
</use>
<use>
- <flag name='opencl'>
- Install OpenCL runtime libraries
- </flag>
- </use>
- <use>
<flag name='pax_kernel'>
Enable if the user plans to run the package under a pax enabled hardened kernel
</flag>
next reply other threads:[~2012-02-04 14:33 UTC|newest]
Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-04 14:33 Enrico Tagliavini [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-09 17:46 [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ Emil Karlson
2015-04-01 19:04 Emil Karlson
2015-04-01 16:07 Emil Karlson
2015-02-12 18:20 Emil Karlson
2015-02-11 20:31 Emil Karlson
2015-01-06 18:10 Emil Karlson
2015-01-06 12:46 Emil Karlson
2014-12-29 18:12 Emil Karlson
2014-12-10 7:30 Emil Karlson
2014-07-17 22:05 Emil Karlson
2014-06-03 4:49 Emil Karlson
2014-05-26 19:00 Emil Karlson
2014-04-29 17:34 Emil Karlson
2014-04-29 5:09 Emil Karlson
2014-04-27 7:41 Emil Karlson
2014-03-26 5:40 Emil Karlson
2014-02-27 5:34 Emil Karlson
2014-02-13 9:52 Emil Karlson
2014-02-08 22:07 Emil Karlson
2013-10-27 8:01 Emil Karlson
2013-10-09 7:29 Emil Karlson
2013-10-03 7:40 Emil Karlson
2013-09-24 10:25 Emil Karlson
2013-09-23 20:23 Emil Karlson
2013-09-19 7:54 Emil Karlson
2013-08-23 18:13 Chi-Thanh Christopher Nguyen
2013-08-22 22:55 Emil Karlson
2013-07-24 7:44 Emil Karlson
2013-06-03 16:11 Chi-Thanh Christopher Nguyen
2013-06-01 8:41 Emil Karlson
2013-05-31 6:34 Emil Karlson
2013-05-30 7:19 Emil Karlson
2013-05-20 21:29 Emil Karlson
2013-05-12 11:30 Emil Karlson
2013-05-11 2:34 Emil Karlson
2013-04-26 10:48 Emil Karlson
2013-04-26 10:48 Emil Karlson
2013-04-26 10:48 Emil Karlson
2013-04-07 18:01 Emil Karlson
2013-03-27 20:38 Emil Karlson
2013-03-19 9:50 Chi-Thanh Christopher Nguyen
2013-03-18 20:32 Emil Karlson
2013-03-16 19:29 Emil Karlson
2013-03-15 11:10 Emil Karlson
2013-03-15 11:10 Emil Karlson
2013-03-13 2:03 Chi-Thanh Christopher Nguyen
2013-03-03 21:47 Chi-Thanh Christopher Nguyen
2013-03-01 9:20 Emil Karlson
2013-02-18 21:21 Chi-Thanh Christopher Nguyen
2013-02-18 20:55 Chi-Thanh Christopher Nguyen
2013-02-17 19:32 Emil Karlson
2013-02-17 19:32 Emil Karlson
2013-02-02 15:15 Emil Karlson
2013-01-24 12:43 Emil Karlson
2013-01-24 0:40 Emil Karlson
2013-01-24 0:40 Emil Karlson
2013-01-24 0:40 Emil Karlson
2013-01-24 0:40 Emil Karlson
2013-01-21 23:29 Emil Karlson
2013-01-18 13:11 Emil Karlson
2013-01-07 5:56 Emil Karlson
2013-01-06 20:00 Emil Karlson
2013-01-06 19:15 Emil Karlson
2013-01-04 22:04 Chi-Thanh Christopher Nguyen
2012-12-30 15:55 Emil Karlson
2012-12-29 0:11 Chi-Thanh Christopher Nguyen
2012-12-27 12:26 Emil Karlson
2012-12-25 12:51 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 18:37 Emil Karlson
2012-12-23 17:06 Emil Karlson
2012-12-04 14:59 Emil Karlson
2012-11-26 23:32 Emil Karlson
2012-11-22 15:17 Emil Karlson
2012-10-24 20:03 Emil Karlson
2012-10-14 20:19 Emil Karlson
2012-09-30 12:18 Chi-Thanh Christopher Nguyen
2012-09-28 12:29 Emil Karlson
2012-09-28 12:25 Emil Karlson
2012-09-10 21:50 Emil Karlson
2012-09-09 8:50 Emil Karlson
2012-07-21 21:23 Chi-Thanh Christopher Nguyen
2012-07-16 17:28 Enrico Tagliavini
2012-07-09 14:16 Enrico Tagliavini
2012-06-17 14:30 Enrico Tagliavini
2012-03-28 18:14 Enrico Tagliavini
2012-02-12 17:21 Enrico Tagliavini
2012-01-26 19:15 Enrico Tagliavini
2011-12-30 20:17 Enrico Tagliavini
2011-12-24 14:43 Enrico Tagliavini
2011-12-14 18:33 Enrico Tagliavini
2011-11-24 15:43 Chi-Thanh Christopher Nguyen
2011-11-21 15:27 Enrico Tagliavini
2011-11-20 11:02 Enrico Tagliavini
2011-11-19 13:35 Enrico Tagliavini
2011-10-31 18:51 Enrico Tagliavini
2011-07-30 10:45 Enrico Tagliavini
2011-07-30 10:39 Enrico Tagliavini
2011-06-17 11:14 Enrico Tagliavini
2011-06-09 17:45 Chi-Thanh Christopher Nguyen
2011-05-26 17:23 Enrico Tagliavini
2011-05-11 18:51 Enrico Tagliavini
2011-05-11 17:46 Enrico Tagliavini
2011-05-01 12:23 Enrico Tagliavini
2011-04-29 11:37 Tomas Chvatal
2011-04-28 16:06 Enrico Tagliavini
2011-04-28 16:02 Enrico Tagliavini
2011-04-02 13:12 Enrico Tagliavini
2011-04-02 12:52 Enrico Tagliavini
2011-03-31 21:37 Chi-Thanh Christopher Nguyen
2011-03-30 10:15 Enrico Tagliavini
2011-03-30 9:55 Enrico Tagliavini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4e66f86310509475e7faa04e3f496a9b357436d3.Enrico@gentoo \
--to=enrico.tagliavini@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox