Change use of function opj_stream_destroy_v3() to opj_stream_destroy() which is present in the openkpeg-2.0.0 release wrt #503692 by Alexander Miller

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)

3 files changed, 232 insertions, 1 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 8c40728758fa..39cbdaa8d702 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,14 @@
 # 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.534 2014/03/19 15:02:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.535 2014/03/19 16:59:21 ssuominen Exp $
+
+*imagemagick-6.8.8.8 (19 Mar 2014)
+
+  19 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch,
+  +imagemagick-6.8.8.8.ebuild:
+  Change use of function opj_stream_destroy_v3() to opj_stream_destroy() which
+  is present in the openkpeg-2.0.0 release wrt #503692 by Alexander Miller
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> imagemagick-6.8.8.5.ebuild:
   Stable for alpha, wrt bug #500988
diff --git a/media-gfx/imagemagick/files/imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch b/media-gfx/imagemagick/files/imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
new file mode 100644
index 000000000000..4c5586d980f7
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
@@ -0,0 +1,59 @@
+http://bugs.gentoo.org/503692
+
+The opj_stream_destroy_v3() function was added to the API in revision r2293 on 2013-02-03
+and is not present in openjpeg-2.0.0 (released in 2012-11)
+
+--- coders/jp2.c
++++ coders/jp2.c
+@@ -369,7 +369,7 @@ static Image *ReadJP2Image(const ImageIn
+   if (opj_read_header(jp2_stream,jp2_codec,&jp2_image) == 0)
+     {
+       opj_stream_set_user_data(jp2_stream,NULL);
+-      opj_stream_destroy_v3(jp2_stream);
++      opj_stream_destroy(jp2_stream);
+       opj_destroy_codec(jp2_codec);
+       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
+     }
+@@ -384,7 +384,7 @@ static Image *ReadJP2Image(const ImageIn
+       if (jp2_status == 0)
+         {
+           opj_stream_set_user_data(jp2_stream,NULL);
+-          opj_stream_destroy_v3(jp2_stream);
++          opj_stream_destroy(jp2_stream);
+           opj_destroy_codec(jp2_codec);
+           opj_image_destroy(jp2_image);
+           ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
+@@ -402,13 +402,13 @@ static Image *ReadJP2Image(const ImageIn
+   if (jp2_status == 0)
+     {
+       opj_stream_set_user_data(jp2_stream,NULL);
+-      opj_stream_destroy_v3(jp2_stream);
++      opj_stream_destroy(jp2_stream);
+       opj_destroy_codec(jp2_codec);
+       opj_image_destroy(jp2_image);
+       ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
+     }
+   opj_stream_set_user_data(jp2_stream,NULL);
+-  opj_stream_destroy_v3(jp2_stream);
++  opj_stream_destroy(jp2_stream);
+   for (i=0; i < (ssize_t) jp2_image->numcomps; i++)
+   {
+     if ((jp2_image->comps[i].dx == 0) || (jp2_image->comps[i].dy == 0))
+@@ -1057,7 +1057,7 @@ static MagickBooleanType WriteJP2Image(c
+       (opj_end_compress(jp2_codec,jp2_stream) == 0))
+     {
+       opj_stream_set_user_data(jp2_stream,NULL);
+-      opj_stream_destroy_v3(jp2_stream);
++      opj_stream_destroy(jp2_stream);
+       opj_destroy_codec(jp2_codec);
+       opj_image_destroy(jp2_image);
+       ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
+@@ -1066,7 +1066,7 @@ static MagickBooleanType WriteJP2Image(c
+     Free resources.
+   */
+   opj_stream_set_user_data(jp2_stream,NULL);
+-  opj_stream_destroy_v3(jp2_stream);
++  opj_stream_destroy(jp2_stream);
+   opj_destroy_codec(jp2_codec);
+   opj_image_destroy(jp2_image);
+   (void) CloseBlob(image);
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.8.ebuild
new file mode 100644
index 000000000000..f80ffca20039
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.8.ebuild
@@ -0,0 +1,164 @@
+# 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.8.ebuild,v 1.1 2014/03/19 16:59:21 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-aix ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-interix ~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() {
+	epatch "${FILESDIR}"/${P}-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch
+
+	epatch_user
+
+	elibtoolize # for Darwin modules
+
+	# http://bugs.gentoo.org/472766
+	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() {
+	if has_version ~${CATEGORY}/${P}; then
+		emake -j1 check
+	else
+		ewarn "Skipping testsuite because installed version doesn't match."
+	fi
+}
+
+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:=.*:='':" {} +
+}