Fix compability with libpng15 wrt #362637 by Jonathan Callen

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

3 files changed, 148 insertions, 8 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 5732bbfcdb03..2e682ded3abe 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/graphicsmagick
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.74 2010/11/08 22:42:30 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.75 2011/08/07 17:49:17 ssuominen Exp $
+
+*graphicsmagick-1.3.12-r1 (07 Aug 2011)
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +graphicsmagick-1.3.12-r1.ebuild:
+  Fix compability with libpng15 wrt #362637 by Jonathan Callen
 
   08 Nov 2010; Markus Meier <maekke@gentoo.org>
   graphicsmagick-1.3.12.ebuild:
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index ac8f51455042..a7cc927aedb1 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX graphicsmagick-1.3.7-debian-fixed.patch 14493 RMD160 cbeccbd775d60da7f2b498540fdef8b08189eeb6 SHA1 2da7acdf46401cbc294170919c592cb842ab2afa SHA256 da17fbb6e30ca42b2d07871cc730de8f5ad61df9387cf22948fe1dcb72263b8c
 AUX graphicsmagick-1.3.7-perl-ldflags.patch 991 RMD160 e234224a939892f04a82b83e48ef475318183b28 SHA1 5e5c89d808bd3040945c64a60e1f8df35c03053d SHA256 f1ff9bf3009b1e353089ed27067bee2895b4e7f0d9e15100abdebac20bef8644
 DIST GraphicsMagick-1.3.12.tar.bz2 6690493 RMD160 0a2749ee38a63c00c3ee6259ea7ea65c2bccc621 SHA1 6b8a414af162ad8679f2f04b10f128edc8ee3233 SHA256 4ceea8558c959fba847b2a4cd92232aac37f5f6a59dda234bc17ef83b90e57d7
+DIST graphicsmagick-1.3.12-libpng15.patch.bz2 11866 RMD160 922a212315319c5c0818fea61263623b5701bbe1 SHA1 f3b416d7e2fe668e4da05b1dcf6078fa3cf087d8 SHA256 553bddf928debabd438a25719f5c5a559bfd33f26c0f17dd4eab8438d91edddd
+EBUILD graphicsmagick-1.3.12-r1.ebuild 3727 RMD160 6768a7ca3f39d56c3ab891a2969e98ab4ebc3418 SHA1 37b28ef6e2d3d1605b372bb261f69a8fd1cc5edd SHA256 35d84150ae338008ab67f4c6ee75438434497564643e5dc4c0fdac33a67ae913
 EBUILD graphicsmagick-1.3.12.ebuild 3616 RMD160 515818cd40973722b79405f322c967bcf0cf6da0 SHA1 6c445bd1df2cee37baa4e41e6a2104eced83d0a9 SHA256 73e0a6d6f5146241efad66790e9302cf884c89eb13484340529eeaa151357a6b
-MISC ChangeLog 6917 RMD160 a69dd6269d08821170dfabcb657d6ed9003ae0d0 SHA1 636aa5216bf0361fc0844dc6f4dac3bfc6fedb36 SHA256 a4293671c9375a8a246198f697fb55d7e86add9e403728b19cf4056ba9b17d05
+MISC ChangeLog 7115 RMD160 883915642a811b9d4879d49e385dca6a84d75c62 SHA1 18f110dd6a19fecc947eff923d1c617b8f57d40a SHA256 aa4332860b77bf7cd9a4b37edbe803b4d4b743ccd3aa7f6fd792a396d0b1e099
 MISC metadata.xml 948 RMD160 777ea220f961149cf9da9f4d0150c613df0ca92b SHA1 cf14a02282804546e796d61d143b0add1c086cfd SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzYfRUACgkQkKaRLQcq0GJzHwCgkAc8RJqsTVweRGLw5FBBYzBy
-A7UAn2HfwYX6Llp0yeUERxCCSeLQIawL
-=Jgln
+iF4EAREIAAYFAk4+z1UACgkQXkR9YqOcLPENAAD/WWmi9WIT53n1o8Qes3oS4Iw7
+Q/1EtxNb/Pao32V9lBAA/2mvxfZfJknNOtzuGFm+i2DAJ9e7U2g5Gtm5GXzRnVGR
+=GabD
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..2c4a13fb3760
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.12-r1.ebuild,v 1.1 2011/08/07 17:49:17 ssuominen Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic perl-module
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~ssuominen/${P}-libpng15.patch.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bzip2 cxx debug doc fpx imagemagick jbig jpeg jpeg2k lcms modules openmp
+	perl png q16 q32 svg threads tiff truetype X wmf zlib"
+
+RDEPEND="app-text/ghostscript-gpl
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( >=media-libs/jasper-1.701.0 )
+	lcms? ( =media-libs/lcms-1* )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( >=media-libs/tiff-3.8.2 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	wmf? ( media-libs/libwmf )
+	X? ( x11-libs/libXext x11-libs/libSM )
+	imagemagick? ( !media-gfx/imagemagick )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use openmp &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
+			! has_version sys-devel/gcc[openmp] )
+	then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+		ewarn "If you want to build fftw with OpenMP, abort now,"
+		ewarn "and switch CC to an OpenMP capable compiler"
+		epause 5
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.7-perl-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-1.3.7-debian-fixed.patch
+	epatch "${WORKDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+	local quantumDepth
+	if use q16 ; then
+		quantumDepth="16"
+	elif use q32 ; then
+		quantumDepth="32"
+	else
+		quantumDepth="8"
+	fi
+
+	# cannot use EAPI=3 because perl-module eclass doesn't support it yet
+	use !prefix && EPREFIX=
+
+	use debug && filter-flags -fomit-frame-pointer
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--enable-shared \
+		--enable-largefile \
+		--without-included-ltdl \
+		--without-frozenpaths \
+		--without-gslib \
+		--with-quantum-depth=${quantumDepth} \
+		--with-fontpath="${EPREFIX}/usr/share/fonts" \
+		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
+		--with-windows-font-dir="${EPREFIX}/usr/share/fonts/corefonts" \
+		--with-perl-options="INSTALLDIRS=vendor" \
+		$(use_enable debug ccmalloc) \
+		$(use_enable debug prof) \
+		$(use_enable debug gcov) \
+		$(use_enable imagemagick magick-compat) \
+		$(use_enable openmp) \
+		$(use_with bzip2 bzlib) \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with fpx) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with modules) \
+		$(use_with perl) \
+		$(use_with png) \
+		$(use_with svg xml) \
+		$(use_with threads) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		$(use_with X x) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use perl; then
+		emake perl-build || die "emake perl failed"
+	fi
+}
+
+src_test() {
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use perl; then
+		perl -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
+		emake -C PerlMagick DESTDIR="${D}" \
+			install || die "emake perl install failed"
+		fixlocalpod
+	fi
+	use doc || rm -rf "${D}"usr/share/doc/${PF}/html
+}