| 1 |
commit: 49a88849d73ae9790e55e628330ab78f0b55e7a0 |
| 2 |
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Dec 24 14:43:03 2011 +0000 |
| 4 |
Commit: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Dec 24 14:43:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=49a88849 |
| 7 |
|
| 8 |
x11-drivers/ati-drivers: OpenCL changes |
| 9 |
|
| 10 |
This revision introduces changes requested in bug #391131 |
| 11 |
comment #6. An envd file is installed to let applications |
| 12 |
find opencl runtime libraries until eselect opencl is ready. |
| 13 |
nvidia-drivers is still blocked until it is migrated too. |
| 14 |
|
| 15 |
--- |
| 16 |
...rs-11.12.ebuild => ati-drivers-11.12-r1.ebuild} | 41 +++++++++++++------- |
| 17 |
1 files changed, 27 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 20 |
similarity index 94% |
| 21 |
rename from x11-drivers/ati-drivers/ati-drivers-11.12.ebuild |
| 22 |
rename to x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 23 |
index d2be416..a397629 100644 |
| 24 |
--- a/x11-drivers/ati-drivers/ati-drivers-11.12.ebuild |
| 25 |
+++ b/x11-drivers/ati-drivers/ati-drivers-11.12-r1.ebuild |
| 26 |
@@ -130,8 +130,8 @@ QA_DT_HASH=" |
| 27 |
usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so |
| 28 |
usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 |
| 29 |
usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 |
| 30 |
- usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so |
| 31 |
- usr/lib\(32\|64\)\?/libOpenCL.so.1 |
| 32 |
+ usr/lib\(32\|64\)\?/OpenCL/vendor/amd/libamdocl\(32\|64\)\?.so |
| 33 |
+ usr/lib\(32\|64\)\?/OpenCL/vendor/amd/libOpenCL.so.1 |
| 34 |
" |
| 35 |
|
| 36 |
_check_kernel_config() { |
| 37 |
@@ -439,15 +439,6 @@ src_install() { |
| 38 |
# Everything except for the authatieventsd.sh script. |
| 39 |
doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} |
| 40 |
doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh |
| 41 |
- # OpenCL |
| 42 |
- if use opencl ; then |
| 43 |
- insinto /etc/OpenCL/vendors/ |
| 44 |
- if [[ "${ABI}" == "amd64" ]] ; then |
| 45 |
- doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed" |
| 46 |
- else |
| 47 |
- doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl32.icd || die "doins failed" |
| 48 |
- fi |
| 49 |
- fi |
| 50 |
|
| 51 |
# include. |
| 52 |
insinto /usr |
| 53 |
@@ -503,10 +494,12 @@ src_install-libs() { |
| 54 |
local EX_BASE_DIR="${BASE_DIR}_64a" |
| 55 |
local pkglibdir=lib64 |
| 56 |
local MY_ARCH_DIR="${S}/arch/x86_64" |
| 57 |
+ local oclsuffix=64 |
| 58 |
else |
| 59 |
local EX_BASE_DIR="${BASE_DIR}" |
| 60 |
local pkglibdir=lib |
| 61 |
local MY_ARCH_DIR="${S}/arch/x86" |
| 62 |
+ local oclsuffix=32 |
| 63 |
fi |
| 64 |
einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" |
| 65 |
|
| 66 |
@@ -541,11 +534,27 @@ src_install-libs() { |
| 67 |
doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so |
| 68 |
|
| 69 |
# AMD Cal and OpenCL libraries |
| 70 |
+ if use opencl ; then |
| 71 |
+ exeinto /usr/$(get_libdir)/OpenCL/vendor/amd |
| 72 |
+ doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* |
| 73 |
+ doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* |
| 74 |
+ fi |
| 75 |
exeinto /usr/$(get_libdir) |
| 76 |
+ doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* |
| 77 |
+ |
| 78 |
+ # OpenCL vendor files |
| 79 |
if use opencl ; then |
| 80 |
- doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/lib*.so* |
| 81 |
- else |
| 82 |
- doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* |
| 83 |
+ insinto /etc/OpenCL/vendors/ |
| 84 |
+ cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF |
| 85 |
+ /usr/$(get_libdir)/OpenCL/vendor/amd/libamdocl${oclsuffix}.so |
| 86 |
+ EOF |
| 87 |
+ doins "${T}"/amdocl${oclsuffix}.icd |
| 88 |
+ |
| 89 |
+ # OpenCL envd file until eselect-opencl is in place |
| 90 |
+ cat > "${T}"/35amdocl${oclsuffix} <<-EOF |
| 91 |
+ LDPATH="/usr/$(get_libdir)/OpenCL/vendor/amd" |
| 92 |
+ EOF |
| 93 |
+ doenvd "${T}"/35amdocl${oclsuffix} || die "doenvd failed" |
| 94 |
fi |
| 95 |
|
| 96 |
local envname="${T}"/04ati-dri-path |
| 97 |
@@ -579,6 +588,10 @@ pkg_postinst() { |
| 98 |
elog |
| 99 |
elog "Some cards need acpid running to handle events" |
| 100 |
elog "Please add it to boot runlevel with rc-update add acpid boot" |
| 101 |
+ elog |
| 102 |
+ ewarn "This release of ati-drivers has a crashing bug when using Xv video." |
| 103 |
+ ewarn "To avoid this problem, configure your video playback software for" |
| 104 |
+ ewarn "OpenGL output. See https://bugs.gentoo.org/show_bug.cgi?id=391193" |
| 105 |
|
| 106 |
use modules && linux-mod_pkg_postinst |
| 107 |
"${ROOT}"/usr/bin/eselect opengl set --use-old ati |
Archives