diff options
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 11 | ||||
| -rw-r--r-- | media-libs/netpbm/Manifest | 12 | ||||
| -rw-r--r-- | media-libs/netpbm/files/digest-netpbm-10.31-r1 | 2 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.19-message.patch | 12 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch | 24 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.31-r1.ebuild | 115 |
6 files changed, 171 insertions, 5 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 5481f911b183..b9e72ae83a6b 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.99 2005/12/28 20:31:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.100 2005/12/31 02:22:20 vapier Exp $ + +*netpbm-10.31-r1 (31 Dec 2005) + + 31 Dec 2005; Mike Frysinger <vapier@gentoo.org> + +files/netpbm-10.19-message.patch, + +files/netpbm-10.31-pnmtopng-modtime-segfault.patch, + +netpbm-10.31-r1.ebuild: + Fix segfault in pnmtopng #117180 by rgo and grab a patch from Fedora for + giftopnm. *netpbm-10.26.22 (28 Dec 2005) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index b9f46dc3a102..5d1fe0055cbd 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 d4f8196f246b2954557a9beedf35072d ChangeLog 13976 +MD5 afda4fda6b9bd4d6160822cc852ae4e0 ChangeLog 14266 MD5 cced4bdf3ef27f117d94b1c108b9a97b files/digest-netpbm-10.26.21 139 MD5 e348f459a46ba5a94ec7095398a7e523 files/digest-netpbm-10.26.22 139 MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62 @@ -9,6 +9,8 @@ MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62 MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136 MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30-r1 136 MD5 ac1e123fe227bbcf7b3721a298efb0a9 files/digest-netpbm-10.31 136 +MD5 ac1e123fe227bbcf7b3721a298efb0a9 files/digest-netpbm-10.31-r1 136 +MD5 8ef24fe5097b041d3dcac4a1ea1ae8fa files/netpbm-10.19-message.patch 633 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562 MD5 e3ef1ff99bf9335b47ea62db7416b625 files/netpbm-10.29-build.patch 2283 MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840 @@ -19,6 +21,7 @@ MD5 f877055480e9ba8f7c11ff8386782621 files/netpbm-10.30-jpeg-prototypes.patch 20 MD5 2dd6e3d7a2601a35259474344f7feb20 files/netpbm-10.30-pngtopnm.patch 417 MD5 87a9972b59b90f26620b09ad990a8546 files/netpbm-10.30-tifftopnm.patch 373 MD5 dc7c33e66fdb4bc51604243af2ea9b76 files/netpbm-10.31-build.patch 1629 +MD5 0d32ba4e0bc01d32022c6f91040015af files/netpbm-10.31-pnmtopng-modtime-segfault.patch 989 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224 MD5 4569c7796d2f5cd2fcbd5e34022d0ed6 netpbm-10.26.21.ebuild 2799 @@ -27,11 +30,12 @@ MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460 MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423 MD5 ceb3a41038d09685417ee2f66d0cc72d netpbm-10.30-r1.ebuild 3044 +MD5 14b61cd2146a7bb15c11935e38e1bb52 netpbm-10.31-r1.ebuild 3019 MD5 735ba0b4509f3dd9fe932b2f2be92839 netpbm-10.31.ebuild 2884 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDsvY/2+ySkm8kpY0RAl0lAJ0Wu/pD1fy73R0TIJQbbp7CcLeYHwCfS8C2 -Vr8hKW6d9msycbZB0auv4xg= -=3aY3 +iD8DBQFDteuD2+ySkm8kpY0RAp3VAJ4vrdbPt4BhYb+5gPoz0WqHO2z9xACfcd2L +CYOdR4/JtM1lD4ICLYX06sw= +=0ZYm -----END PGP SIGNATURE----- diff --git a/media-libs/netpbm/files/digest-netpbm-10.31-r1 b/media-libs/netpbm/files/digest-netpbm-10.31-r1 new file mode 100644 index 000000000000..f78109f5f80c --- /dev/null +++ b/media-libs/netpbm/files/digest-netpbm-10.31-r1 @@ -0,0 +1,2 @@ +MD5 2d90a47369f74692aa24b773dfd6a122 netpbm-10.30-manpages.tar.bz2 233254 +MD5 6ba2e0ee998eb23f4620ec9c175a90b6 netpbm-10.31.tgz 2383586 diff --git a/media-libs/netpbm/files/netpbm-10.19-message.patch b/media-libs/netpbm/files/netpbm-10.19-message.patch new file mode 100644 index 000000000000..10a57442a8d8 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.19-message.patch @@ -0,0 +1,12 @@ +--- netpbm-10.19/converter/other/giftopnm.c.message 2003-10-30 02:46:12.000000000 +0100 ++++ netpbm-10.19/converter/other/giftopnm.c 2004-02-09 17:02:56.964219996 +0100 +@@ -1255,7 +1255,8 @@ + requestedImageSeq+1, + imageSeq, imageSeq>1?"s":"" ); + } else { +- pm_message("Reading Image Sequence %d", imageSeq); ++ if (verbose) ++ pm_message("Reading Image Sequence %d", imageSeq+1); + convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), + imageout_file, alphafile, gifScreen, gif89); + } diff --git a/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch b/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch new file mode 100644 index 000000000000..ba81837d3f5d --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.31-pnmtopng-modtime-segfault.patch @@ -0,0 +1,24 @@ +Fix segfault when running `pnmtopng` + +http://bugs.gentoo.org/117180 + +--- netpbm-10.31/converter/other/pnmtopng.c ++++ netpbm-10.31/converter/other/pnmtopng.c +@@ -267,7 +267,7 @@ parseCommandLine (int argc, char ** argv + unsigned int option_def_index; + + unsigned int alphaSpec, transparentSpec, backgroundSpec; +- unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec; ++ unsigned int textSpec, ztxtSpec, paletteSpec; + unsigned int filterSpec; + + unsigned int nofilter, sub, up, avg, paeth, filter; +@@ -296,7 +296,7 @@ parseCommandLine (int argc, char ** argv + OPTENT3(0, "ztxt", OPT_STRING, &cmdlineP->ztxt, + &ztxtSpec, 0); + OPTENT3(0, "modtime", OPT_STRING, &modtime, +- &modtimeSpec, 0); ++ &cmdlineP->modtimeSpec,0); + OPTENT3(0, "palette", OPT_STRING, &cmdlineP->palette, + &paletteSpec, 0); + OPTENT3(0, "compression", OPT_UINT, diff --git a/media-libs/netpbm/netpbm-10.31-r1.ebuild b/media-libs/netpbm/netpbm-10.31-r1.ebuild new file mode 100644 index 000000000000..8605ffc494ed --- /dev/null +++ b/media-libs/netpbm/netpbm-10.31-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.1 2005/12/31 02:22:20 vapier Exp $ + +inherit flag-o-matic toolchain-funcs eutils multilib + +MAN_VER=10.30 +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="http://netpbm.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz + mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="svga jpeg tiff png zlib" + +DEPEND="jpeg? ( >=media-libs/jpeg-6b ) + tiff? ( >=media-libs/tiff-3.5.5 ) + png? ( >=media-libs/libpng-1.2.1 ) + zlib? ( sys-libs/zlib ) + svga? ( media-libs/svgalib ) + media-libs/jbigkit + media-libs/jasper + media-libs/urt" + +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 '-dynamiclib -install_name $(SONAME)';; + *) echo '-shared -Wl,-soname,$(SONAME)';; + esac +} +netpbm_config() { + use $1 && echo -l${2:-$1} || echo NONE +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/netpbm-10.31-build.patch + epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch + epatch "${FILESDIR}"/netpbm-10.31-pnmtopng-modtime-segfault.patch #117180 + epatch "${FILESDIR}"/netpbm-10.19-message.patch #Fedora + + rm -f configure + cp Makefile.config.in Makefile.config + cat >> Makefile.config <<-EOF + # Gentoo toolchain options + CC = $(tc-getCC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + + NETPBMLIBTYPE = $(netpbm_libtype) + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + LDSHLIB = $(netpbm_ldshlib) + + # 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) + + # Use system versions instead of bundled + JBIGLIB = -ljbig + JBIGHDR_DIR = + JASPERLIB = -ljasper + JASPERHDR_DIR = + URTLIB = -lrle + URTHDR_DIR = + EOF + append-flags -Wall + + # Sparc support ... + replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc" + replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9" +} + +src_install() { + make 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} + rm -rf "${D}"/usr/man/web + rm -rf "${D}"/usr/link + rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} + dodir /usr/share + mv "${D}"/usr/man "${D}"/usr/share/ + mv "${D}"/usr/misc "${D}"/usr/share/netpbm + + dodoc README + cd doc + GLOBIGNORE='*.html:.*' dodoc * + dohtml -r . + + cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die + doman *.[0-9] + dodoc README* gen-netpbm-manpages +} |