Use _LIBOPENJP2_DELEGATE instead of _JP2_DELEGATE to fix jpeg2k support for PDFs wrt #503692#c7 by Alexander Miller. The patch has been accepted by upstream, and applied in trunk for upcoming 6.9.0-0 release.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 218 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e7c00ea4d714..7a6ebd1c840f 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.546 2014/04/07 19:42:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.547 2014/04/08 11:49:24 ssuominen Exp $
+
+*imagemagick-6.8.8.10-r1 (08 Apr 2014)
+
+  08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch,
+  +imagemagick-6.8.8.10-r1.ebuild:
+  Use _LIBOPENJP2_DELEGATE instead of _JP2_DELEGATE to fix jpeg2k support for
+  PDFs wrt #503692#c7 by Alexander Miller. The patch has been accepted by
+  upstream, and applied in trunk for upcoming 6.9.0-0 release.
 
   07 Apr 2014; Markus Meier <maekke@gentoo.org> imagemagick-6.8.8.10.ebuild:
   arm stable, bug #506562
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 762ef72a5af7..2f3a9c331c81 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX imagemagick-6.7.8.7-freetype.patch 1114 SHA256 fcdb9382eddab0ae73f115178296933b1c8705719b2c3c43ce8274441a4387e7 SHA512 86372988ab4ee7be8573d50f7dd5022f031cfdf1e3e6e478c99d155e9cbc251a0db7496c141931e2b08d3e5142169ef56b544b70449dc41cf3376ddaf99e8ec1 WHIRLPOOL 9eb6105540e49b35e13e4ae7863a8fb20bd7bd292c93bc29c4e9c6914b0fb92496b736276a5c7f926a2a1b755547b2ced6471e929d0ce95ff3a6aa81c91aba62
+AUX imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch 727 SHA256 02eaec5b5815d253d4acd126a0dfe46859bbbd7fa7c39bfdb4a59f6ef0c30e5a SHA512 6dfcc14e6026a37b05071158f5da973c8be5877cb068bd9c85bdb2f94690d531c04a2298e59ac860cfb1df7cfeda4c91e890b5f3fce56ff39ebcc892029701e5 WHIRLPOOL ea1a019c144d8b9111ae693ef2b2d2ef2bea238c53d65239be121c16b99f6b10abd4b76e688ff13301ef85ba69af5e96176555c6fdcf087515425acd5e88a034
 AUX imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch 2317 SHA256 7e50934e70666b14956d90f2054f246eba36479d6def83ae4b378f8fefb0082a SHA512 83404ba9c240a8d911567beb894ebfc42887a06f06e91f0346adab6e8c1b1a50114819c0dd902452a1cad3c92dbbde50a1888fdc15e79367bb8f8a32fa477cd9 WHIRLPOOL 420bd8a9825220875cae3f692590d37935ddf44dafac48ab951b779add88b0ed1fdf0ad79b444f14a38ead4e8797c4929bede5fa0699bc02a052752b64b19865
 DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
 DIST ImageMagick-6.8.6-8.tar.xz 7537236 SHA256 8ce81b1cbc6615bc634c9bdb539025957a299744323706c3d72c9a8bdc72ddbe SHA512 5ef4eda528afc1be24e9f157884f11def0f815b40c7a0df7917abed34e09806c63013504d8a79e6b246f9348e902f9ce0a803bb5f7009337a324befbb6bdaae1 WHIRLPOOL 2c88b5d6ca03440a1b890a32a119a3fe429e80a5021741b001188dbbfa902fcb7268c4d5369e36bbbbdad13adc835efcc0f69b3bcf65159eb20d485cfd64b136
@@ -11,16 +12,21 @@ DIST ImageMagick-6.8.8-7.tar.xz 7448900 SHA256 ea5753a42329b0c251c753053b6607889
 DIST ImageMagick-6.8.8-8.tar.xz 7527740 SHA256 249f8679d03ed5ad50ce54653ad36c09c02df3450d9c7daa15a075ff8c2432ac SHA512 8f1383a8c2935a7e49395089ba7ed583532ce6c14925ae8a0f946f9153e754f19461aaa455c0552d022e70b3f2e81295dcfce423a159d88319125dfc2087faf1 WHIRLPOOL fbd5f8353dcc3f28e706ef540243406092d75346e961eb255b176a28a94bda0d12e126843eef60e4d0668263909711beaf7a17e41d9abed854a354d3adaf75df
 EBUILD imagemagick-6.7.8.7.ebuild 4262 SHA256 4999aaa5ca86a056bad155e48656256225c9dd4d918ecf17d41fdc563f6b8786 SHA512 635eeff5cc3ebf2277b30bd318630969ba017b5bbe9c50707473f1cd0de04ea6213b39d6b30f74654920c5ad637c4e8f33c8602a712d4edbce5d9d10f22fdba6 WHIRLPOOL 8ac9a2691c239605087eda39ed6b2d2c2a0ee08a477beec4eac7883ba4e6c92511026eba449d7e8db5d95bb626c1785ab33c13460a9f570e79ebd0df477652db
 EBUILD imagemagick-6.8.6.8.ebuild 4346 SHA256 5741890d4a1f48280481b5db16d87badfd528528cbaa902541a4317a7b0b79a8 SHA512 24031845c6c77af2966cb8161a9e3f541885f391f7c5275812eff6b0914cc2ea592481d3a44b7e0a65c126ef497dd9ba729fd88b1aff91e0111da38558b1dc54 WHIRLPOOL b35d517317e9d59a71093714e82b76dbdc8c6bbfee0a3c567079acd34f0747da672be46fc196dcceb08c905845e95ca7b1bfdd33e9f6a48f9c3fbfb3a31d4941
+EBUILD imagemagick-6.8.8.10-r1.ebuild 5011 SHA256 ca3f583dd4defb142a00fd30bda1374777fe4cedfeea76cec8f4984f5eed0c9f SHA512 092adf08d3089e805d6645aaa939e5bee711801bf0d329eadad82106c1ad3015bbf61a61a65233af31f4444246da9ace73272be72e4cccad6440bc919ae9bd5e WHIRLPOOL b3a85f2e42cd0ed1077c2ee27a53be9065d918411cda12289781b08f05c95027a278cce753b9e2983d3f631578b1282a734d0de08fa73ecd84909c9447eebd13
 EBUILD imagemagick-6.8.8.10.ebuild 4858 SHA256 4c9b382a843011bf308ccaaaef725416b4200480b2fe698940d7e32bbe0d09df SHA512 1ac2e6086dda8b599330bbec27ee8bf8e5523d368ee46aa4942c9be1cd60b122cd1cf0a7a11f7dd3b1f73932cf3e114308b83d93d1c6a277a359ba9f1cebe6e2 WHIRLPOOL 489e7de1f195e21e40a2ce4ba7b90b7f20a0762da522b6eaa7112d1981e4b8a5e850676d027b3a4767810bb0e70c576119dfb110dddfeac6d3e7a8269526dda5
 EBUILD imagemagick-6.8.8.5.ebuild 4737 SHA256 969e9fef3f6bb70d4fc72bc444bf24b902f11fbee8fa01dd1bf0fae38bb3d02f SHA512 4d06252946d751eb98a70b5958b11d59ff546e6c833ce82cce89c32c0b65c1463a8e14e992596302823ca7f66090798da962b21f156bc4fb7708bf5b1f174abe WHIRLPOOL 1b4b21d161e87f78d6b5137b4835334dd5c6508aeaebd6facc9f579479b4e60a336f8a7efba239d76636bda10fc3ce47db66631ffc83c4cbda5cc4d0bf20b670
 EBUILD imagemagick-6.8.8.7.ebuild 4745 SHA256 193aa732f8750c991235170db1671a705ff0cd4795058ab71d2818e3296b81be SHA512 c3a59b87b64b02e65c04ad1f8decd3bdd6251960de556e21dc223cfe037aea2d1d901a672a4d9b033b44e7002a4e7073df09ef66ba204671992279b459f70a02 WHIRLPOOL c466917bb1534c07c00cbf9b082f355922ddad756bbbb74511194cfa14eac06f8ec7991ddccb651adefc8ad79a6ca15dc38f1b863fea4a80279b80c2b2ab642f
 EBUILD imagemagick-6.8.8.8.ebuild 4668 SHA256 06e632e2be19af118b0952ad3568616263d2f869783b7534ad554449c13f275b SHA512 142528973976efd05d9117b20ef0e4218912da862aded75819a46a32c661775a874e9e24eb29ec1e4f03cc849708c3f01c2b49e2d171082702d2630a5f1b7b75 WHIRLPOOL b3dd10b61922831532ad33228aaca51678b0b8902e23ab08bf02a942285097f3978d3c56a1ba2854d3382dce5f50cd1dd59b364a5efa79863f76a9c20dc86c85
-MISC ChangeLog 80321 SHA256 572b46abc91681047d439ec17764d939ac0740b36f4f2c35ce579b8d53dc9669 SHA512 c5cc0cae100a36d6d7f551d285526f7ffa5f1547ac2e57ae1c0d7bf679040f1e1991be987e42d99663c690a4c3c86db2be6b79b3c21615f049d194a686c7f70e WHIRLPOOL d3c83efd5c38821bf91ca93b0fa2ddb1cab2d22e60d8b8640ed183febd1be9d91d2473903f376424ed87d3e3042ca8bee8f0fe46128d403f0f8e87d34535c50e
+MISC ChangeLog 80743 SHA256 0cc06ad798699e2e5c4416a1d4f51f73d175a3574d204cbdab0118440dd63bd8 SHA512 d53540e239ac66dedabbe69afd33f48423381099bd9e4406d6ac37d216734c960c9b47b04810d8a759022cc499dd07414bece71789d6f9d04dafae78a0f6e654 WHIRLPOOL f136259df2e05bec15ed94bb19ba96a990cf9b855ee9b2ffee9c64cdbe9f4d80a83958ebed78e889aec26a170f73432729175734ae26278d37eb1ed1469061c1
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNDAZEACgkQkKaRLQcq0GLq8gCgq7xbSpLIl9LO09wk/Kfc923A
-p0wAn0KxxSldo6w907ENfGYJEho32ytg
-=PsJ3
+iQEcBAEBCAAGBQJTQ+DeAAoJEEdUh39IaPFNCikH/3Vj9OUeWIqNmRfJdWiWGGnn
+3qHX5Fn9MRBCojkbwu1eyBQ6/oT3ivxn/YFyiYmDINLAMfWUUTeWwiEMtMxtxvsR
+2pGsBiDLCBCrvMrj8GbAHb8bv81zyQSXCMNboGl+JPaWAgSeLT8wO3tdxNFjJyMF
+/5dT/V4t0XFKf7PnzpUUzWfuDMF7O+iOOAEnqjUUvmjtOr8Sh5r3WU4rr0QDv7OE
+sZsCOHgSW97m7l4Abarr6OR8mAupP/znzDDjFb+5ixx8zdB0SyhTiQTp+tEKzBr/
+4TSfpsV6YXNeWlo5cSFsR5O7ZfsaQbiqbVLHoqvBKYuLzFYbLuKXCKagdr6ffzo=
+=faKt
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch b/media-gfx/imagemagick/files/imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
new file mode 100644
index 000000000000..ed606e09eacd
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.8.8.10-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/show_bug.cgi?id=503692#c7
+http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25376
+
+--- coders/pdf.c
++++ coders/pdf.c
+@@ -1276,7 +1276,7 @@ RestoreMSCWarning
+         break;
+       }
+ #endif
+-#if !defined(MAGICKCORE_JP2_DELEGATE)
++#if !defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
+       case JPEG2000Compression:
+       {
+         compression=RLECompression;
+--- magick/version.c
++++ magick/version.c
+@@ -141,7 +141,7 @@ MagickExport const char *GetMagickDelega
+ #if defined(MAGICKCORE_JPEG_DELEGATE) && defined(MAGICKCORE_PNG_DELEGATE)
+   "jng "
+ #endif
+-#if defined(MAGICKCORE_JP2_DELEGATE)
++#if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
+   "jp2 "
+ #endif
+ #if defined(MAGICKCORE_JPEG_DELEGATE)
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
new file mode 100644
index 000000000000..b2115c51b651
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.1 2014/04/08 11:49:24 ssuominen Exp $
+
+EAPI=5
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# These both have been accepted by upstream, remove once 6.9.0-0 is out:
+	epatch \
+		"${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch \
+		"${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch
+
+	epatch_user
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${cards}"; then
+		addpredict "${cards}"
+	fi
+	shopt -u nullglob
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable opencl) \
+		--with-threads \
+		--with-modules \
+		--with-quantum-depth=${depth} \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with postscript dps) \
+		$(use_with djvu) \
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
+		$(use_with fftw) \
+		$(use_with fpx) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with postscript gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		--without-mupdf \
+		$(use_with openexr) \
+		$(use_with pango) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake -j1 check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/dri/card"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+}