summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-07-11 15:25:51 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-07-11 15:25:51 +0000
commit9f99a3f0c017cd5f66feabf320566f0c766e4517 (patch)
treeb8ecf53dfaccbf170c8f6275e82915b4f11709c3 /media-gfx/imagemagick
parentkeyword ~x86-fbsd (diff)
downloadgentoo-2-9f99a3f0c017cd5f66feabf320566f0c766e4517.tar.gz
gentoo-2-9f99a3f0c017cd5f66feabf320566f0c766e4517.tar.bz2
gentoo-2-9f99a3f0c017cd5f66feabf320566f0c766e4517.zip
Fix OpenCL support wrt #373461 by nzqr
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/imagemagick')
-rw-r--r--media-gfx/imagemagick/ChangeLog6
-rw-r--r--media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild9
-rw-r--r--media-gfx/imagemagick/metadata.xml3
3 files changed, 12 insertions, 6 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 8c4ab75b38d8..4e0283f440dd 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.433 2011/07/10 22:33:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.434 2011/07/11 15:25:51 ssuominen Exp $
+
+ 11 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+ imagemagick-6.7.1.0.ebuild, metadata.xml:
+ Fix OpenCL support wrt #373461 by nzqr
*imagemagick-6.7.1.0 (10 Jul 2011)
diff --git a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
index b5ff4ae6685c..7e94a434261b 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild,v 1.1 2011/07/10 22:33:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild,v 1.2 2011/07/11 15:25:51 ssuominen Exp $
EAPI=4
inherit multilib toolchain-funcs versionator
@@ -14,8 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="autotrace bzip2 +corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma openexr openmp perl png q32 q64 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"
-IUSE="${IUSE} video_cards_nvidia" # opencl support
+IUSE="autotrace bzip2 +corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp perl png q32 q64 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"
# libtool is required for loading plugins
RDEPEND=">=sys-devel/libtool-2.2.6b
@@ -32,6 +31,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
jpeg2k? ( media-libs/jasper )
lcms? ( media-libs/lcms:2 )
lqr? ( >=media-libs/liblqr-0.1.0 )
+ opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
openexr? ( media-libs/openexr )
perl? ( >=dev-lang/perl-5.8.6-r6 )
png? ( >=media-libs/libpng-1.4 )
@@ -40,7 +40,6 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
tiff? ( >=media-libs/tiff-3.5.5 )
truetype? ( media-libs/freetype:2
corefonts? ( media-fonts/corefonts ) )
- video_cards_nvidia? ( x11-drivers/nvidia-drivers )
webp? ( media-libs/libwebp )
wmf? ( >=media-libs/libwmf-0.2.8 )
X? (
@@ -86,7 +85,7 @@ src_configure() {
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
$(use_enable static-libs static) \
$(use_enable hdri) \
- $(use_enable video_cards_nvidia opencl) \
+ $(use_enable opencl) \
--with-threads \
--without-included-ltdl \
--with-ltdl-include="${EPREFIX}/usr/include" \
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 689c2797443c..27903001f29f 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -23,6 +23,9 @@
<flag name='lqr'>
enable experimental liquid rescale support
</flag>
+ <flag name='opencl'>
+ Enable OpenCL support
+ </flag>
<flag name='q32'>
set quantum depth to 32
</flag>