public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/xarthisius:master commit in: virtual/opencl/
@ 2012-01-15 11:04 Kacper Kowalik
  0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik @ 2012-01-15 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0c9c500f0002855ebb8d090020ce79b2126fd9b5
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 11:04:31 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:04:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=0c9c500f

[virtual/opencl] add ati-driver

---
 virtual/opencl/Manifest        |    2 +-
 virtual/opencl/opencl-0.ebuild |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 75db4c0..9bdba46 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,3 +1,3 @@
-EBUILD opencl-0.ebuild 696 RMD160 f06efa0c5a4e7b1e5ee32b355a18a0293edb3f09 SHA1 2bd4609c043b9fd8b895aa8949191cf2148cf939 SHA256 3398e00ebba8543c93209d834b95248c84bcc5f5a2288186e0f4127629b3523a
+EBUILD opencl-0.ebuild 562 RMD160 14a4b68e91460f1e7f95acd6fcb0cf9729f44207 SHA1 01b40068e7d19aacbe46dd6f7f884223a6a4887a SHA256 ccc61a3452933028b581da777a28076fb63f74912af92ddeee9be9c53ce188b3
 MISC ChangeLog 563 RMD160 aa2dd37824bca3c9e8676a43f7e4856190b82ab0 SHA1 fa77721c3e624a171d1b40ca84f6edf440e00c90 SHA256 d73326fe95e263947a3266673baa0894b270efa8e32a6b63ba44d0f53a07a9a7
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/virtual/opencl/opencl-0.ebuild b/virtual/opencl/opencl-0.ebuild
index 6eca249..bb3ceb7 100644
--- a/virtual/opencl/opencl-0.ebuild
+++ b/virtual/opencl/opencl-0.ebuild
@@ -2,23 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/virtual/opencl/opencl-0.ebuild,v 1.2 2011/12/20 22:09:15 vapier Exp $
 
-# Until ATI's SDK is in the tree, nvidia is the only
-# viable provider #392179 #257626
-
 EAPI="4"
 
 DESCRIPTION="Virtual for OpenCL implementations"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-#CARDS=( fglrx nvidia )
-CARDS=( nvidia )
+CARDS=( fglrx nvidia )
 IUSE="${CARDS[@]/#/video_cards_}"
 
 REQUIRED_USE="|| ( ${IUSE} )"
 
-#		video_cards_fglrx? ( x11-drivers/ati-drivers[opencl] )
 RDEPEND="|| (
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers
-			|| ( dev-util/opencl-headers >=dev-util/nvidia-cuda-toolkit-3.1 ) )
+		video_cards_fglrx? ( >=x11-drivers/ati-drivers-11.2[opencl] )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
 	)"



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/xarthisius:master commit in: virtual/opencl/
@ 2012-01-15 11:17 Kacper Kowalik
  0 siblings, 0 replies; 2+ messages in thread
From: Kacper Kowalik @ 2012-01-15 11:17 UTC (permalink / raw
  To: gentoo-commits

commit:     7ad3ac7bd9a425ce4bf02799dc6ba6dd2255a738
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 11:17:20 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 11:17:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xarthisius.git;a=commit;h=7ad3ac7b

[virtual/opencl] drop stable keywords, fix nvidia dependency

---
 virtual/opencl/Manifest                            |    2 +-
 .../opencl/{opencl-0.ebuild => opencl-0-r1.ebuild} |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 9bdba46..e3cfd14 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,3 +1,3 @@
-EBUILD opencl-0.ebuild 562 RMD160 14a4b68e91460f1e7f95acd6fcb0cf9729f44207 SHA1 01b40068e7d19aacbe46dd6f7f884223a6a4887a SHA256 ccc61a3452933028b581da777a28076fb63f74912af92ddeee9be9c53ce188b3
+EBUILD opencl-0-r1.ebuild 564 RMD160 6b9bbed449955c2cee6edc665e097155980a9c07 SHA1 a86cd2450aec06b8f9a3181b0de9c7c6af1f1694 SHA256 00f530bb5f0974cbf10bd037d6f9392655c8162f257e961be9711255b7b349cd
 MISC ChangeLog 563 RMD160 aa2dd37824bca3c9e8676a43f7e4856190b82ab0 SHA1 fa77721c3e624a171d1b40ca84f6edf440e00c90 SHA256 d73326fe95e263947a3266673baa0894b270efa8e32a6b63ba44d0f53a07a9a7
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/virtual/opencl/opencl-0.ebuild b/virtual/opencl/opencl-0-r1.ebuild
similarity index 77%
rename from virtual/opencl/opencl-0.ebuild
rename to virtual/opencl/opencl-0-r1.ebuild
index bb3ceb7..53988f0 100644
--- a/virtual/opencl/opencl-0.ebuild
+++ b/virtual/opencl/opencl-0-r1.ebuild
@@ -7,13 +7,14 @@ EAPI="4"
 DESCRIPTION="Virtual for OpenCL implementations"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 CARDS=( fglrx nvidia )
 IUSE="${CARDS[@]/#/video_cards_}"
 
 REQUIRED_USE="|| ( ${IUSE} )"
 
-RDEPEND="|| (
+RDEPEND="app-admin/eselect-opencl
+	|| (
 		video_cards_fglrx? ( >=x11-drivers/ati-drivers-11.2[opencl] )
-		video_cards_nvidia? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10 )
 	)"



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-01-15 11:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-15 11:17 [gentoo-commits] dev/xarthisius:master commit in: virtual/opencl/ Kacper Kowalik
  -- strict thread matches above, loose matches on Subject: below --
2012-01-15 11:04 Kacper Kowalik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox