* [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/ati-drivers/
@ 2012-01-15 11:01 Kacper Kowalik
0 siblings, 0 replies; 4+ messages in thread
From: Kacper Kowalik @ 2012-01-15 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 533764b9f0c8d26d6bebe8dff19e9e4ad623fe72
Author: Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 11:01:36 2012 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:01:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=533764b9
[x11-drivers/ati-drivers] add symlink
---
x11-drivers/ati-drivers/Manifest | 2 +-
.../ati-drivers/ati-drivers-11.12-r1.ebuild | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index aca5c2d..471b163 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -2,5 +2,5 @@ AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64d
AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
DIST ati-driver-installer-11-12-x86.x86_64.run 99618112 RMD160 70ae7407bab182c7fc9b1d4a177c2e1493ffb508 SHA1 d20a185165eff1b6d9631b7e3ed7201eeda9312a SHA256 0179d1f0425036e50b637e5153b0c64b25836d09e9d22bc50edfbdf6aed32b42
-EBUILD ati-drivers-11.12-r1.ebuild 19129 RMD160 48d835a1cc387d35399107b6881e132f0a0b81a6 SHA1 a8fcf133e7857477deabbc6ec4d9384bb36eafaa SHA256 42deae51cca6340b5cad2fa5b9cd87a4e21eae73da545096d95e4f1428147416
+EBUILD ati-drivers-11.12-r1.ebuild 19213 RMD160 e078d25523d5b37cc43fe7c7472928ef1ed12ff5 SHA1 623a7c46e6dc3cb8d0eb54bf4ac89be796184874 SHA256 ba705ec037708b4c3958092421b34fcd531f9d0bcab5b87db4b2c07bff849cb1
MISC metadata.xml 654 RMD160 3e7fd3ab86650df6ffa64df4cd3bd603e4f01afd SHA1 0236c5a647f00b5a49934753fc4ab83da27f41a0 SHA256 46041d48f808d0bf985c35c7b1d7a46730654c576d20d9d9d3a46b487d08b916
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
index 66b429e..64fe050 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
@@ -535,6 +535,7 @@ src_install-libs() {
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
fi
exeinto /usr/$(get_libdir)
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/ati-drivers/
@ 2012-01-15 14:07 Kacper Kowalik
0 siblings, 0 replies; 4+ messages in thread
From: Kacper Kowalik @ 2012-01-15 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 2922aa8106de140a8d27e6ea7bfa7cee119fddb1
Author: Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 14:07:25 2012 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 14:07:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=2922aa81
[x11-drivers/ati-drivers] add missing pax_kernel bits, thanks to Ke for spotting
---
x11-drivers/ati-drivers/Manifest | 2 +-
.../ati-drivers/ati-drivers-11.12-r1.ebuild | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 471b163..068d39a 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -2,5 +2,5 @@ AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64d
AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
DIST ati-driver-installer-11-12-x86.x86_64.run 99618112 RMD160 70ae7407bab182c7fc9b1d4a177c2e1493ffb508 SHA1 d20a185165eff1b6d9631b7e3ed7201eeda9312a SHA256 0179d1f0425036e50b637e5153b0c64b25836d09e9d22bc50edfbdf6aed32b42
-EBUILD ati-drivers-11.12-r1.ebuild 19213 RMD160 e078d25523d5b37cc43fe7c7472928ef1ed12ff5 SHA1 623a7c46e6dc3cb8d0eb54bf4ac89be796184874 SHA256 ba705ec037708b4c3958092421b34fcd531f9d0bcab5b87db4b2c07bff849cb1
+EBUILD ati-drivers-11.12-r1.ebuild 19306 RMD160 88350248c3b82a0b639d0029dbd1d2e4cd227fee SHA1 87bafea65a73a3228edca63ebf871a1f1ed8f14c SHA256 c7859cfe28cf6540709d84453d9ef23ee1ef2e8b15b86aa72eceb0ce2e49b1ff
MISC metadata.xml 654 RMD160 3e7fd3ab86650df6ffa64df4cd3bd603e4f01afd SHA1 0236c5a647f00b5a49934753fc4ab83da27f41a0 SHA256 46041d48f808d0bf985c35c7b1d7a46730654c576d20d9d9d3a46b487d08b916
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
index 64fe050..11bf281 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
@@ -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 qt4"
+IUSE="debug +modules multilib opencl pax_kernel qt4"
LICENSE="AMD GPL-2 QPL-1.0 as-is"
KEYWORDS="~amd64 ~x86"
@@ -317,7 +317,11 @@ src_prepare() {
|| die "Replacing 'finger' with 'who' failed."
# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
# add function to detect default state.
- epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
+ epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
+
+ # fix needed for at least hardened-sources, see bug #392753
+ use pax_kernel && epatch "${FILESDIR}"/ati-drivers-redefine-WARN.patch
+
cd "${MODULE_DIR}"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/ati-drivers/
@ 2011-12-25 22:59 Kacper Kowalik
0 siblings, 0 replies; 4+ messages in thread
From: Kacper Kowalik @ 2011-12-25 22:59 UTC (permalink / raw
To: gentoo-commits
commit: a3d12cfb2d22a9e31eae2c4f5ee1bad7cc075aa9
Author: Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Sun Dec 25 22:59:25 2011 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 22:59:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=a3d12cfb
[x11-drivers/ati-drivers] envd files obsoleted by eselect-opencl
---
x11-drivers/ati-drivers/Manifest | 2 +-
.../ati-drivers/ati-drivers-11.12-r1.ebuild | 6 ------
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index aafc15e..aca5c2d 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -2,5 +2,5 @@ AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64d
AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
DIST ati-driver-installer-11-12-x86.x86_64.run 99618112 RMD160 70ae7407bab182c7fc9b1d4a177c2e1493ffb508 SHA1 d20a185165eff1b6d9631b7e3ed7201eeda9312a SHA256 0179d1f0425036e50b637e5153b0c64b25836d09e9d22bc50edfbdf6aed32b42
-EBUILD ati-drivers-11.12-r1.ebuild 19343 RMD160 a4aaa997b6a21f2417f90c44d5ceffdc8facdb43 SHA1 76c354bf0f86d630946ead3f6197224e2e5634e9 SHA256 81f4e38dcdd30eb46b00df517b549cdb26000837ecb91a1c8fd665f79220ea20
+EBUILD ati-drivers-11.12-r1.ebuild 19129 RMD160 48d835a1cc387d35399107b6881e132f0a0b81a6 SHA1 a8fcf133e7857477deabbc6ec4d9384bb36eafaa SHA256 42deae51cca6340b5cad2fa5b9cd87a4e21eae73da545096d95e4f1428147416
MISC metadata.xml 654 RMD160 3e7fd3ab86650df6ffa64df4cd3bd603e4f01afd SHA1 0236c5a647f00b5a49934753fc4ab83da27f41a0 SHA256 46041d48f808d0bf985c35c7b1d7a46730654c576d20d9d9d3a46b487d08b916
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
index 4d00808..66b429e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
@@ -546,12 +546,6 @@ src_install-libs() {
/usr/$(get_libdir)/OpenCL/vendors/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/vendors/amd"
- EOF
- doenvd "${T}"/35amdocl${oclsuffix} || die "doenvd failed"
fi
local envname="${T}"/04ati-dri-path
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/ati-drivers/
@ 2011-12-25 19:25 Kacper Kowalik
0 siblings, 0 replies; 4+ messages in thread
From: Kacper Kowalik @ 2011-12-25 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 4af4faf63c1da948a03e07a89b9986e13d127309
Author: root <root <AT> shakuras <DOT> (none)>
AuthorDate: Sun Dec 25 19:23:28 2011 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 19:23:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=4af4faf6
[x11-drivers/ati-drivers] fix path, remove blocker
---
x11-drivers/ati-drivers/Manifest | 2 +-
.../ati-drivers/ati-drivers-11.12-r1.ebuild | 13 +++++--------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 4baa341..aafc15e 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -2,5 +2,5 @@ AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64d
AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
DIST ati-driver-installer-11-12-x86.x86_64.run 99618112 RMD160 70ae7407bab182c7fc9b1d4a177c2e1493ffb508 SHA1 d20a185165eff1b6d9631b7e3ed7201eeda9312a SHA256 0179d1f0425036e50b637e5153b0c64b25836d09e9d22bc50edfbdf6aed32b42
-EBUILD ati-drivers-11.12-r1.ebuild 19388 RMD160 d37bc273656fd15a2cf3aa2641e7f61ca54020b9 SHA1 fb2a4f1a7e46fa9313685f4d345abbc679ae0ef7 SHA256 896522e88fb4c4300c2e4c3f5cce54ac63fea678ba62b22c4928750d044657f8
+EBUILD ati-drivers-11.12-r1.ebuild 19343 RMD160 a4aaa997b6a21f2417f90c44d5ceffdc8facdb43 SHA1 76c354bf0f86d630946ead3f6197224e2e5634e9 SHA256 81f4e38dcdd30eb46b00df517b549cdb26000837ecb91a1c8fd665f79220ea20
MISC metadata.xml 654 RMD160 3e7fd3ab86650df6ffa64df4cd3bd603e4f01afd SHA1 0236c5a647f00b5a49934753fc4ab83da27f41a0 SHA256 46041d48f808d0bf985c35c7b1d7a46730654c576d20d9d9d3a46b487d08b916
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
index a397629..4d00808 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild
@@ -46,9 +46,6 @@ RDEPEND="
x11-libs/qt-core
x11-libs/qt-gui
)
- opencl? (
- !>=x11-drivers/nvidia-drivers-195
- )
"
DEPEND="${RDEPEND}
@@ -130,8 +127,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() {
@@ -535,7 +532,7 @@ src_install-libs() {
# AMD Cal and OpenCL libraries
if use opencl ; then
- exeinto /usr/$(get_libdir)/OpenCL/vendor/amd
+ exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
fi
@@ -546,13 +543,13 @@ src_install-libs() {
if use opencl ; then
insinto /etc/OpenCL/vendors/
cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
- /usr/$(get_libdir)/OpenCL/vendor/amd/libamdocl${oclsuffix}.so
+ /usr/$(get_libdir)/OpenCL/vendors/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"
+ LDPATH="/usr/$(get_libdir)/OpenCL/vendors/amd"
EOF
doenvd "${T}"/35amdocl${oclsuffix} || die "doenvd failed"
fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-15 14:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-15 11:01 [gentoo-commits] dev/xarthisius:master commit in: x11-drivers/ati-drivers/ Kacper Kowalik
-- strict thread matches above, loose matches on Subject: below --
2012-01-15 14:07 Kacper Kowalik
2011-12-25 22:59 Kacper Kowalik
2011-12-25 19:25 Kacper Kowalik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox