ssuominen 14/05/14 17:13:30 Modified: imagemagick-6.8.8.10-r1.ebuild ChangeLog Log: Improve support for openjpeg-2.1.0 with conditional patching for now as a temporary solution; will go away with next ebuild. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.3 media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild?r1=1.2&r2=1.3 Index: imagemagick-6.8.8.10-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- imagemagick-6.8.8.10-r1.ebuild 14 May 2014 17:04:51 -0000 1.2 +++ imagemagick-6.8.8.10-r1.ebuild 14 May 2014 17:13:30 -0000 1.3 @@ -1,6 +1,6 @@ # 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.2 2014/05/14 17:04:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.3 2014/05/14 17:13:30 ssuominen Exp $ EAPI=5 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator @@ -27,10 +27,10 @@ fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) - jbig? ( media-libs/jbigkit ) + jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2 ) - lcms? ( media-libs/lcms:2 ) + jpeg2k? ( >=media-libs/openjpeg-2.0.0:2 ) + lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) @@ -40,7 +40,7 @@ postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 @@ -53,9 +53,9 @@ x11-libs/libXext x11-libs/libXt ) - xml? ( dev-libs/libxml2 ) + xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib:= )" DEPEND="${RDEPEND} !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig @@ -67,10 +67,11 @@ 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 + # These both have been accepted by upstream: + if use jpeg2k && has_version '<media-libs/openjpeg-2.1.0'; then + epatch "${FILESDIR}"/${PN}-6.8.8.8-openjpeg-2.0.0-has-no-opj_stream_destroy_v3.patch + fi + epatch "${FILESDIR}"/${P}-LIBOPENJP2_DELEGATE_not_JP2_DELEGATE.patch epatch_user 1.556 media-gfx/imagemagick/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.556&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.556&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.555&r2=1.556 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v retrieving revision 1.555 retrieving revision 1.556 diff -u -r1.555 -r1.556 --- ChangeLog 14 May 2014 17:04:51 -0000 1.555 +++ ChangeLog 14 May 2014 17:13:30 -0000 1.556 @@ -1,6 +1,11 @@ # 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.555 2014/05/14 17:04:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.556 2014/05/14 17:13:30 ssuominen Exp $ + + 14 May 2014; Samuli Suominen <ssuomi...@gentoo.org> + imagemagick-6.8.8.10-r1.ebuild: + Improve support for openjpeg-2.1.0 with conditional patching for now as a + temporary solution; will go away with next ebuild. 14 May 2014; Samuli Suominen <ssuomi...@gentoo.org> imagemagick-6.8.8.10-r1.ebuild:
