diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-07-11 15:25:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-07-11 15:25:51 +0000 |
| commit | e4d4d86c130519810afde86597ade41596fe2968 (patch) | |
| tree | a4a405107431d5b84a7ea3799f27a96e59d4581d | |
| parent | keyword ~x86-fbsd (diff) | |
| download | historical-e4d4d86c130519810afde86597ade41596fe2968.tar.gz historical-e4d4d86c130519810afde86597ade41596fe2968.tar.bz2 historical-e4d4d86c130519810afde86597ade41596fe2968.zip | |
Fix OpenCL support wrt #373461 by nzqr
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/imagemagick/Manifest | 12 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild | 9 | ||||
| -rw-r--r-- | media-gfx/imagemagick/metadata.xml | 3 |
4 files changed, 18 insertions, 12 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/Manifest b/media-gfx/imagemagick/Manifest index dfdf6e50e124..6f0e7ab94469 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -8,13 +8,13 @@ DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7 EBUILD imagemagick-6.6.5.6.ebuild 4113 RMD160 62448e140a1ca859702df12b0760c71800ef00ca SHA1 0650fed9e535c95a5762b8ef32bbfae132340163 SHA256 948fd844534c4312ab9b066985db340c673e6084e9fdf2db59a1931d73a0a55d EBUILD imagemagick-6.6.7.6.ebuild 4179 RMD160 36d0bc9ad0c7168e11619790ab7de09712fbbebe SHA1 d578764b45524fa4c532fd0d47d6c11a07778628 SHA256 2e541ebf5db2b23d244873dc7686429877e3d4e447ffe08c6699277b496a07b6 EBUILD imagemagick-6.6.8.5.ebuild 4327 RMD160 9d59f7b24be52a821b4fb0ccf6b78bfeaeeb6359 SHA1 406db0c15df2ee892a1a774b234872925033370f SHA256 e7fcddcc26e9db64a5dcbff62b9ee380d1b026522a14b911d844198584b5947b -EBUILD imagemagick-6.7.1.0.ebuild 4212 RMD160 5d2b738b68f342e78eab93b05796fc5cd702287b SHA1 236b78d31911b0d269daed1f3202f0bea01e8b30 SHA256 654511b0738f4bb6684c7379cb518f945bb523c326e3163e8b509950c2625598 -MISC ChangeLog 64195 RMD160 86ed2b21be099337ae6dcaf1b0bd7a4902eab5ef SHA1 95e281b6f9cdebc4e90c9efa55c338358c1b7fe9 SHA256 ff37e0b3aebce12db69d13122396ac249371f784fef348398be24d9fc0dcd558 -MISC metadata.xml 938 RMD160 7d35978ae7fadc3c2e1742bd95c458e06e2be055 SHA1 4207b87b086b08d45f744c4fe5202b853dd72e76 SHA256 3c2937a8e59647cb7752d9bd4fe4b37444ef5eab69333b02e97d6edcc1af6bb5 +EBUILD imagemagick-6.7.1.0.ebuild 4172 RMD160 bab1f34fdd3ed6ed22c200f4b2b68d8402075dbd SHA1 446714828c9926b6097cf2e35e409b5741ed75b2 SHA256 ad0cf52db143d5bac79e06d05dce458f2d261c48d8ca87c0e16908154be1d935 +MISC ChangeLog 64335 RMD160 4217192d0fb7c8319a3de30bd0db56abf08f476b SHA1 366563a6120a1d87ffe9bd0628d5b1fcd7dbaf61 SHA256 e4175b8e7e1fb79f89b5c0a9c9cb83abc0fdc3e7cfd2763604cb20357c770cba +MISC metadata.xml 996 RMD160 4afdb1acb67b84fdb8a4c4b720ec1858e85bc2fd SHA1 5cb81df1fbada2f137e13530b30af67baed6c68d SHA256 42f246f5285d9d6a16d764420e069baecd0518d126ecbbc3ff4fa81536947062 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk4aKFoACgkQXkR9YqOcLPFNbwD/fcIi0kwmGAPlBpX3UG5TiOV+ -Y8AhrnXTHpKQqwenc1UBAIQ+HO9TOEuxyXhs+BI5zRGylaU3cMYIGAtxWJJv9X2R -=iyv6 +iF4EAREIAAYFAk4bFakACgkQXkR9YqOcLPE55AD7BjoMJISkJC9mk469RgLcP93w +eKbIt68+M3m8vFTPd2IBAJeDvacpYfYe9469+UQqkJwxl4rBvR6J+cexgiwLrsM3 +=ugyY -----END PGP SIGNATURE----- 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> |