diff options
| author |   root <root@shakuras.(none)> | 2011-12-25 20:23:28 +0100 |
|---|---|---|
| committer | root <root@shakuras.(none)> | 2011-12-25 20:23:28 +0100 |
| commit | 4af4faf63c1da948a03e07a89b9986e13d127309 (patch) | |
| tree | dafc6fb73a203893f920429fa47d29ccbc4dabb6 | |
| parent | [x11-drivers/ati-drivers] import from x11 overlay (diff) | |
| download | xarthisius-4af4faf63c1da948a03e07a89b9986e13d127309.tar.gz xarthisius-4af4faf63c1da948a03e07a89b9986e13d127309.tar.bz2 xarthisius-4af4faf63c1da948a03e07a89b9986e13d127309.zip | |
[x11-drivers/ati-drivers] fix path, remove blocker
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 2 | ||||
| -rw-r--r-- | x11-drivers/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 |