Add fix from upstream for pngtopnm errors #287725 by Denys Duchier.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

4 files changed, 231 insertions, 10 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index f214363eea31..249958f465e5 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.230 2009/12/12 16:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.231 2009/12/12 16:02:47 vapier Exp $
+
+*netpbm-10.48.00-r1 (12 Dec 2009)
+
+  12 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  +netpbm-10.48.00-r1.ebuild, +files/netpbm-10.48.00-pngx.patch:
+  Add fix from upstream for pngtopnm errors #287725 by Denys Duchier.
 
 *netpbm-10.35.71 (12 Dec 2009)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 8c9c0c7c5a9f..298757de486e 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,26 +4,29 @@ Hash: SHA1
 AUX netpbm-10.26.64-min_DCT_v_scaled_size.patch 1056 RMD160 abc0ef32a608823033bada6bbccc01243499c575 SHA1 5e9857abe0decbae37648cc3b51d05f3d08d1132 SHA256 30652e72c0b234f2ed0d9390a3f5ab76d9e9ae2a6311e5b965aa543c9ad2c72a
 AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124ed SHA1 d14b5144c310c9182c45cefb629f2b4e77be0058 SHA256 aa7c4dcad0fe5aa71cce357236aa859b14c3794c92c5a5b848cc31618194b174
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
+AUX netpbm-10.35.0-pnmtopng-zlib.patch 412 RMD160 fbef74327c74badad288454090b79627e2fde0d6 SHA1 08fd7b8e17c0f272cf628582b22f9ecde0d35cc9 SHA256 577a6b5a49c8773ca29adb045132ee71034e3b6f4abf29ff92126adb1ba83a17
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
 AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86
 AUX netpbm-10.46.00-min_DCT_v_scaled_size.patch 1022 RMD160 8b3370958c504c9330dc47c77ab579e021bc03f8 SHA1 71cf92f4143c7831a42de7c503045b7a23bc5997 SHA256 42c21d97f73523c9668ed8700ec33fd4d44e445429d61bd65218711d8ca02135
-DIST netpbm-10.26.62.tgz 2545623 RMD160 be41d041db78c1c91b3ad82193495ade05572c6e SHA1 e9f1fa0804f90a9b6aa44fbceccb0a63d42a3585 SHA256 1156eb12165b974c52431992911e7f9a7400d7bc05e50c391e5e99ab49b90cc5
+AUX netpbm-10.48.00-pngx.patch 1149 RMD160 387a1f7df51b457eb2a87c32b7ac60a499249c82 SHA1 0823541f93d804f17d6e7512c5f7e9facc4558d6 SHA256 86ffe862542e882db61d4e32ae49c78e1f6056df42eaa44ffe8e43867c27ce74
+AUX netpbm-10.48.00-pnmtopng-zlib.patch 419 RMD160 d4e51baf414ee3ca3ed2c1e8ba186bfa3be7a9dd SHA1 0cc0892bde1384b34d37fe1085866e4b919c0cb3 SHA256 29031875887a03adc503a2f6d5965a8b4eb1e82a1def98d9e3a6fb4250285897
 DIST netpbm-10.26.64.tgz 2545993 RMD160 c3e922aaec320a5692fb0d71b5e34303d9dc2f9f SHA1 1518d6268a35a208b1df557d6e193236d2ec56f8 SHA256 1cf89173f141e2e8f46c54b9537f344c874f8e3ffd1d41a95d41de02d927257b
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
 DIST netpbm-10.33-manpages.tar.bz2 236722 RMD160 5e43836a5f4d16f1ba5ece21e9996dbe60b252ae SHA1 6c0372f540ad040771beae15a8c2015252679e5f SHA256 aa18adee4a187ad5df243cb1a7c51097dc6a7d6a8072cf6da09972b74ac5454a
+DIST netpbm-10.35.71.tgz 2544654 RMD160 36379f1df33810cdfc3f6b3da3eaf5355f3ab8ef SHA1 3a20e4ebebc1a78830fe0da05b56545325ffba0f SHA256 73e0ca8f1adc23eeb438fb099d5a4e55899e6dd95aaddee9907a08dfa1891906
 DIST netpbm-10.46.00.tar.lzma 1897731 RMD160 79230ebe58c90f9f6f7d5de13f215ac22c581c18 SHA1 0dee5f49bf1ebd5d08675db21a621f3d7ceea3d0 SHA256 598350fc2b65f268666a711ae50952573c606157727a1fe5295de9bff4e1fd3a
 DIST netpbm-10.48.00.tar.lzma 1908122 RMD160 597c1f2c7a276bf2200cc65e25218a92ef316000 SHA1 fc62507988d59b27b59b5ddc87ef441fa247ab44 SHA256 8847d09c3275528cedaf51fbb1c42b494bd53ec97d6f4681a5c297dcd5c405a7
-EBUILD netpbm-10.26.62.ebuild 2895 RMD160 91f714d94c546ec08e8d4fae8a428c23330d0858 SHA1 59a05481b8d6fc4558ea8fb11d8cf9608882e157 SHA256 b90fbb741700ab0020828d19e139d37886bd5d1fc23c9f668617f0de4342bb26
 EBUILD netpbm-10.26.64.ebuild 2961 RMD160 6ab18916af77364406e3658d2e1a75958f90b706 SHA1 1fb24e2d444532819558c2bab768903697ab0595 SHA256 42d3fe669df8fe3b516403c3b8eee534443c655c0dd3b37f6382f497a8b1119f
-EBUILD netpbm-10.46.00-r1.ebuild 4359 RMD160 846f82115daa0f1179d8b485010011aa70ddcc74 SHA1 5c7294e6dfaecc60633e2ac49559291d5034b420 SHA256 b4892c85ef94149a30f62026c5b5d25d8491c4d8371169eef0ec014d6383a104
-EBUILD netpbm-10.46.00.ebuild 4304 RMD160 57a195c49e688f36f0b580ee4da2f092b2ef645d SHA1 9bce70df1e6b423f9f5d1c2cab8dbc2387829c81 SHA256 e4a1101f879f0975999b4a01c60051fad3bab57b6f50eeb9ce6f2b476fd1ae5d
-EBUILD netpbm-10.48.00.ebuild 4220 RMD160 63e2e264f35484634915a03500191046a7c83798 SHA1 ba200f7bd022ebf7e1f8f43f023dfb72d7ab09ca SHA256 ca1796da7a2f163f1229fcc2faece5dab832a21e17a44e5a07d1b102f7c62c1e
-MISC ChangeLog 31055 RMD160 cc3c04eef35a12729479c679750a28482f722a70 SHA1 22f1813f595e4973e539e524d2346b7828bbfff2 SHA256 08beba784337718835189a75195265126b1df59b4d135fc283ffb6d9e5c7a316
+EBUILD netpbm-10.35.71.ebuild 4366 RMD160 38a25118a1beb5f420c532feae705135026f052b SHA1 5a2c0afe3c6e9f7a00b0d88bef0317d9fd4e1013 SHA256 22470fe59548b9afaabef2d9f2443ffea847cc86f11d3efb3dc60d9714f23bce
+EBUILD netpbm-10.46.00-r1.ebuild 4424 RMD160 6db996e17abba307a10df72eaacdb578788e86d6 SHA1 82c5cb191af8a3e4694597905035287fac25e812 SHA256 dbdf3237971b26b2a5e5a9a832f3670972b6f3beff51b41fa27308dc83354c9c
+EBUILD netpbm-10.48.00-r1.ebuild 4327 RMD160 4772af531b80aa0e37d503380dbb4eeed4265e91 SHA1 3a25bfc3802a274ca1e2376167d162ff60e46169 SHA256 1acfb382030e7eaddc69137496b6118e330b70353eb4d3fb2b17de676da1661a
+EBUILD netpbm-10.48.00.ebuild 4286 RMD160 c5cc6908c58aa4f75d244336e95dfa92df123049 SHA1 5c2b50e4bc32deddacd1aa3993e3027448d66296 SHA256 db355e2f7dbfaa7e77d429e4865019d49384923b64b90e42b23c92dfe84f508e
+MISC ChangeLog 31649 RMD160 be17d0fbadbf120dce15e90388d307637d5f47d0 SHA1 93fc20a01c5a10e4fbd503cca7f4e25676cd6d83 SHA256 379c0721034a71ab576f09f95425e84a637bf59116ac508f8c32bd78755a2b2f
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksCx/gACgkQlPl3HsVfCDoirQCfUwz7P2r99edrOiuoad7/yKZb
-Gm0AnRhaQC2LZRvQz7f6Sg4owziUmMMf
-=jL83
+iEYEARECAAYFAksjvuIACgkQlPl3HsVfCDo93gCdG03xSIskNoEjFc+A+LpSOecY
+Gs0Ani/QF5bGg1D+moB8vS1TxXB00itf
+=+jQV
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch b/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch
new file mode 100644
index 000000000000..9975d29dceaa
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch
@@ -0,0 +1,51 @@
+http://bugs.gentoo.org/287725
+
+fix from upstream
+
+--- netpbm/converter/other/pngx.c	(revision 1021)
++++ netpbm/converter/other/pngx.c	(revision 1022)
+@@ -69,6 +69,7 @@
+             else
+                 *pngxPP = pngxP;
+         }
++        pngxP->rw = rw;
+     }
+ }
+ 
+@@ -77,7 +78,14 @@
+ void
+ pngx_destroy(struct pngx * const pngxP) {
+ 
+-    png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr);
++    switch(pngxP->rw) {
++    case PNGX_READ:
++        png_destroy_read_struct(&pngxP->png_ptr, &pngxP->info_ptr, NULL);
++        break;
++    case PNGX_WRITE:
++        png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr);
++        break;
++    }
+ 
+     free(pngxP);
+ }
+--- netpbm/converter/other/pngx.h	(revision 1021)
++++ netpbm/converter/other/pngx.h	(revision 1022)
+@@ -5,14 +5,14 @@
+    the PNG library easier and cleaner.
+ */
+ 
++typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw;
++
+ struct pngx {
+     png_structp png_ptr;
+-    png_infop info_ptr;
++    png_infop   info_ptr;
++    pngx_rw     rw;
+ };
+ 
+-typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw;
+-
+-
+ void
+ pngx_create(struct pngx ** const pngxPP,
+             pngx_rw        const rw,
diff --git a/media-libs/netpbm/netpbm-10.48.00-r1.ebuild b/media-libs/netpbm/netpbm-10.48.00-r1.ebuild
new file mode 100644
index 000000000000..76349051c450
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.48.00-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.48.00-r1.ebuild,v 1.1 2009/12/12 16:02:47 vapier Exp $
+
+inherit toolchain-funcs eutils multilib
+
+MAN_VER=10.33
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.lzma
+	mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
+
+RDEPEND="jpeg? ( >=media-libs/jpeg-7 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	xml? ( dev-libs/libxml2 )
+	zlib? ( sys-libs/zlib )
+	svga? ( media-libs/svgalib )
+	jbig? ( media-libs/jbigkit )
+	rle? ( media-libs/urt )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	app-arch/xz-utils"
+
+maint_pkg_create() {
+	local base="/usr/local/src"
+	local srcdir="${base}/netpbm/release_number"
+	if [[ -d ${srcdir} ]] ; then
+		cd "${T}" || die
+
+		ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}"
+		svn export -q ${srcdir}/${PV} netpbm-${PV}
+		eend $? || return 1
+
+		ebegin "Creating netpbm-${PV}.tar.lzma"
+		tar cf - netpbm-${PV} | lzma > netpbm-${PV}.tar.lzma
+		eend $?
+
+		einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.lzma"
+	else
+		einfo "You need to run:"
+		einfo " cd ${base}"
+		einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
+		die "need svn checkout dir"
+	fi
+}
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.lzma ]] && maint_pkg_create ; }
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	if use $1 ; then
+		[[ $2 != "!" ]] && echo -l${2:-$1}
+	else
+		echo NONE
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.48.00-pnmtopng-zlib.patch #291987
+	epatch "${FILESDIR}"/netpbm-10.48.00-pngx.patch #287725
+
+	# avoid ugly depend.mk warnings
+	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+
+	cat config.mk.in /dev/stdin >> config.mk <<-EOF
+	# Misc crap
+	BUILD_FIASCO = N
+	SYMLINK = ln -sf
+
+	# Toolchain options
+	CC = $(tc-getCC) -Wall
+	LD = \$(CC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	LD_FOR_BUILD = \$(CC_FOR_BUILD)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	LDRELOC = \$(LD) -r
+	LDSHLIB = $(netpbm_ldshlib)
+	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+	LINKERISCOMPILER = Y
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	NETPBMLIBTYPE = $(netpbm_libtype)
+
+	# Gentoo build options
+	TIFFLIB = $(netpbm_config tiff)
+	JPEGLIB = $(netpbm_config jpeg)
+	PNGLIB = $(netpbm_config png)
+	ZLIB = $(netpbm_config zlib z)
+	LINUXSVGALIB = $(netpbm_config svga vga)
+	XML2_LIBS = $(netpbm_config xml xml2)
+	JBIGLIB = -ljbig
+	JBIGHDR_DIR = $(netpbm_config jbig "!")
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
+	URTLIB = $(netpbm_config rle)
+	URTHDR_DIR =
+	X11LIB = $(netpbm_config X X11)
+	X11HDR_DIR =
+	EOF
+	# cannot chain the die with the heredoc above as bash-3
+	# has a parser bug in that setup #282902
+	[ $? -eq 0 ] || die "writing config.mk failed"
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_install() {
+	emake -j1 package pkgdir="${D}"/usr || die "make package failed"
+
+	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm -f "${D}"/usr/bin/{doc.url,manweb} || die
+	rm -r "${D}"/usr/man/web || die
+	rm -r "${D}"/usr/link || die
+	rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/ || die
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
+
+	dodoc README
+	cd doc
+	GLOBIGNORE='*.html:.*' dodoc *
+	dohtml -r .
+
+	cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die
+	doman *.[0-9]
+	dodoc README* gen-netpbm-manpages
+}