diff options
Diffstat (limited to 'x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild')
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild | 13 |
1 files changed, 5 insertions, 8 deletions
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 |