commit: 1afb3f2d15e00209fbd4488b31b3e234e4399081 Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Mon Dec 7 08:11:49 2015 +0000 Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> CommitDate: Mon Dec 7 08:11:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1afb3f2d
dev-util/amdapp: Add dependency on x11-drivers/ati-drivers Let catalyst provide libOpenCL.so* and /etc/OpenCL/vendors files. Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=544124 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567240 Package-Manager: portage-2.2.20.1 dev-util/amdapp/ChangeLog | 11 +++++++++++ .../amdapp/{amdapp-2.9.1.ebuild => amdapp-2.9.1-r1.ebuild} | 14 ++------------ .../amdapp/{amdapp-3.0.ebuild => amdapp-3.0-r1.ebuild} | 14 ++------------ 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/dev-util/amdapp/ChangeLog b/dev-util/amdapp/ChangeLog index a78a3e0..582c340 100644 --- a/dev-util/amdapp/ChangeLog +++ b/dev-util/amdapp/ChangeLog @@ -2,6 +2,17 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*amdapp-2.9.1-r1 (07 Dec 2015) +*amdapp-3.0-r1 (07 Dec 2015) + + 07 Dec 2015; Marius Brehler <[email protected]> + +amdapp-2.9.1-r1.ebuild, +amdapp-3.0-r1.ebuild, -amdapp-2.9.1.ebuild, + -amdapp-3.0.ebuild: + dev-util/amdapp: Add dependency on x11-drivers/ati-drivers Rely on + libOpenCL.so* and /etc/OpenCL/vendors files provided by catalyst. Gentoo-Bug: + https://bugs.gentoo.org/show_bug.cgi?id=544124 Gentoo-Bug: + https://bugs.gentoo.org/show_bug.cgi?id=567240 + 07 Dec 2015; Marius Brehler <[email protected]> -amdapp-2.9.ebuild: dev-util/amdapp: Drop old diff --git a/dev-util/amdapp/amdapp-2.9.1.ebuild b/dev-util/amdapp/amdapp-2.9.1-r1.ebuild similarity index 83% rename from dev-util/amdapp/amdapp-2.9.1.ebuild rename to dev-util/amdapp/amdapp-2.9.1-r1.ebuild index 657a362..b1ac785 100644 --- a/dev-util/amdapp/amdapp-2.9.1.ebuild +++ b/dev-util/amdapp/amdapp-2.9.1-r1.ebuild @@ -33,7 +33,8 @@ RDEPEND=" media-libs/freeglut virtual/opencl examples? ( media-libs/glew ) - app-eselect/eselect-opencl" + app-eselect/eselect-opencl + x11-drivers/ati-drivers" DEPEND=" ${RDEPEND} dev-lang/perl @@ -61,10 +62,6 @@ src_unpack() { fi } -src_prepare() { - AMD_CL=usr/$(get_libdir)/OpenCL/vendors/amd/ -} - src_compile() { MAKEOPTS+=" -j1" use examples && cd samples/opencl && default @@ -73,11 +70,4 @@ src_compile() { src_install() { dodir /opt/AMDAPP cp -R "${S}/"* "${ED}/opt/AMDAPP" || die "Install failed!" - - dodir "${AMD_CL}" - dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so" "${AMD_CL}" - dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so.1" "${AMD_CL}" - - #insinto /etc/OpenCL/vendors/ - #doins ../etc/OpenCL/vendors/* } diff --git a/dev-util/amdapp/amdapp-3.0.ebuild b/dev-util/amdapp/amdapp-3.0-r1.ebuild similarity index 83% rename from dev-util/amdapp/amdapp-3.0.ebuild rename to dev-util/amdapp/amdapp-3.0-r1.ebuild index 7baa570..a9bea09 100644 --- a/dev-util/amdapp/amdapp-3.0.ebuild +++ b/dev-util/amdapp/amdapp-3.0-r1.ebuild @@ -33,7 +33,8 @@ RDEPEND=" media-libs/freeglut virtual/opencl examples? ( media-libs/glew ) - app-eselect/eselect-opencl" + app-eselect/eselect-opencl + x11-drivers/ati-drivers" DEPEND=" ${RDEPEND} dev-lang/perl @@ -61,10 +62,6 @@ src_unpack() { fi } -src_prepare() { - AMD_CL=usr/$(get_libdir)/OpenCL/vendors/amd/ -} - src_compile() { MAKEOPTS+=" -j1" use examples && cd samples/opencl && default @@ -73,11 +70,4 @@ src_compile() { src_install() { dodir /opt/AMDAPP cp -R "${S}/"* "${ED}/opt/AMDAPP" || die "Install failed!" - - dodir "${AMD_CL}" - dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so" "${AMD_CL}" - dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so.1" "${AMD_CL}" - - #insinto /etc/OpenCL/vendors/ - #doins ../etc/OpenCL/vendors/* }
