public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marius Brehler" <marbre@linux.sungazer.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: dev-util/amdapp/
Date: Mon,  7 Dec 2015 08:12:09 +0000 (UTC)	[thread overview]
Message-ID: <1449475909.1afb3f2d15e00209fbd4488b31b3e234e4399081.marbre@gentoo> (raw)

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 <marbre@linux.sungazer.de>
+  +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 <marbre@linux.sungazer.de> -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/*
 }


             reply	other threads:[~2015-12-07  8:12 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-07  8:12 Marius Brehler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-27 18:43 [gentoo-commits] proj/sci:master commit in: dev-util/amdapp/ Aisha Tammy
2017-03-26 14:45 Justin Lecher
2017-02-25 19:18 Justin Lecher
2017-01-29 11:59 Justin Lecher
2015-12-07  8:12 Marius Brehler
2015-11-27 16:13 Marius Brehler
2015-09-23 12:48 Justin Lecher
2015-04-02 10:34 Justin Lecher
2015-03-03 12:26 git@oystercatcher mirror+tproxy
2015-03-03 12:26 git@oystercatcher mirror+tproxy
2015-03-03 12:26 git@oystercatcher mirror+tproxy
2015-03-03 12:26 Nicolas Bock
2015-03-03 12:26 Nicolas Bock
2015-03-03 12:26 Nicolas Bock
2015-02-02 12:06 Justin Lecher
2015-02-02 12:06 Justin Lecher
2015-02-02 12:06 Justin Lecher
2015-02-02 12:06 Justin Lecher
2014-11-15  0:21 Christoph Junghans
2013-07-04 19:10 Christoph Junghans
2013-07-04 19:10 Christoph Junghans
2013-07-04 19:10 Christoph Junghans
2013-05-15 11:35 Kacper Kowalik
2013-05-15 11:35 Kacper Kowalik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449475909.1afb3f2d15e00209fbd4488b31b3e234e4399081.marbre@gentoo \
    --to=marbre@linux.sungazer.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox