From 47cd6e81704031b4844e34fa899858066485e679 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Sat, 29 Sep 2012 02:07:20 +0000 Subject: [PATCH] opencl: video card selection improved --- profiles/pentoo/base/package.use/dev-util | 1 + virtual/opencl-sdk/Manifest | 2 +- virtual/opencl-sdk/opencl-sdk-1.1.ebuild | 23 ++++++++++++++++------- 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 profiles/pentoo/base/package.use/dev-util diff --git a/profiles/pentoo/base/package.use/dev-util b/profiles/pentoo/base/package.use/dev-util new file mode 100644 index 000000000..594cf7a18 --- /dev/null +++ b/profiles/pentoo/base/package.use/dev-util @@ -0,0 +1 @@ +dev-util/nvidia-cuda-sdk opencl diff --git a/virtual/opencl-sdk/Manifest b/virtual/opencl-sdk/Manifest index f353a8f83..607400c6c 100644 --- a/virtual/opencl-sdk/Manifest +++ b/virtual/opencl-sdk/Manifest @@ -1 +1 @@ -EBUILD opencl-sdk-1.1.ebuild 468 SHA256 3984a1e0f02ee26eaa7411da9d441bdeb505f76a4bf47aedb3bc0f9a2360d8a8 SHA512 40ec2d07aa1f7d48545136b2ede7e214eef8f679af46a23ad2976ee8f5585b6da965b8ee4c2ad8e44087a1cdb6e8d7e76bd8dcd8405df2215957521d14e698ba WHIRLPOOL 09df37fb914e740471a6258782c331d230b636a99329acd9655a33830ef3c1859b97435a0e214f4a5ffb0417b6580b51daf8f401f97c40d4193ace31c65a5704 +EBUILD opencl-sdk-1.1.ebuild 857 SHA256 476c93fa600bbe3eb0f996c1008c847efe6228459e4be3c468631569f490892b SHA512 69a9e1ecce1436cea08bf64779e462192a6fd96fefff32e3bb98c374bc822df48d7140ff1d582112dd8b3724040a7cb0bc458b315dd5216b03b98e5b0514dec0 WHIRLPOOL aa434ddbd915526dc8b9e1b90be5d107b5389c9686489fc0c2d45f73bcb93c62a2aed232dd6450babc501439b59c8d1c8cb9b5c5b6ba9dcf44c14843bdceb9f1 diff --git a/virtual/opencl-sdk/opencl-sdk-1.1.ebuild b/virtual/opencl-sdk/opencl-sdk-1.1.ebuild index e28040033..58ed6d9e5 100644 --- a/virtual/opencl-sdk/opencl-sdk-1.1.ebuild +++ b/virtual/opencl-sdk/opencl-sdk-1.1.ebuild @@ -2,20 +2,29 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0.ebuild,v 1.12 2010/01/11 11:03:47 ulm Exp $ -EAPI="2" +EAPI=4 -DESCRIPTION="Virtual for nv/ati opencl SDK" +DESCRIPTION="Virtual for nv/ati/intel opencl SDK" HOMEPAGE="" SRC_URI="" LICENSE="" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" + +IUSE_VIDEO_CARDS="video_cards_intel video_cards_fglrx video_cards_nvidia " +IUSE="${IUSE_VIDEO_CARDS}" RDEPEND="app-admin/eselect-opencl - || ( - >=dev-util/ati-stream-sdk-bin-2.2 - >=dev-util/nvidia-cuda-sdk-3.0[opencl] - )" + video_cards_intel? ( dev-util/intel-ocl-sdk ) + video_cards_fglrx? ( >=dev-util/ati-stream-sdk-bin-2.2 ) + video_cards_nvidia? ( >=dev-util/nvidia-cuda-sdk-3.0[opencl] ) + " DEPEND="" + +pkg_setup(){ + if use !video_cards_intel && !video_cards_fglrx && !video_cards_nvidia ; then + eerror "at least one video card must be enabled" + die "at least one video card must be enabled" + fi +}