Fixes from Alun Jones for bugs in ppmtompeg #150063.

Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 33 insertions, 3 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 36e3dec2d5ff..9ca4c5e8ee30 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.131 2006/10/19 00:37:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.132 2006/10/22 09:14:04 vapier Exp $
+
+  22 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.34-ppmtompeg.patch, netpbm-10.34.ebuild,
+  netpbm-10.36.0.ebuild:
+  Fixes from Alun Jones for bugs in ppmtompeg #150063.
 
 *netpbm-10.26.32 (19 Oct 2006)
 
diff --git a/media-libs/netpbm/files/netpbm-10.34-ppmtompeg.patch b/media-libs/netpbm/files/netpbm-10.34-ppmtompeg.patch
new file mode 100644
index 000000000000..6aa51bb6f764
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.34-ppmtompeg.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/150063
+
+--- converter/ppm/ppmtompeg/mpeg.c
++++ converter/ppm/ppmtompeg/mpeg.c
+@@ -1150,7 +1150,7 @@ GenMPEGStream(struct inputSource * const
+     if (showBitRatePerFrame)
+         OpenBitRateFile();  /* May modify showBitRatePerFrame */
+ 
+-    if (context == CONTEXT_WHOLESTREAM)
++    if (context == CONTEXT_WHOLESTREAM || context == CONTEXT_GOP)
+         bbP = Bitio_New(ofP);
+     else
+         bbP = NULL;
+--- converter/ppm/ppmtompeg/combine.c
++++ converter/ppm/ppmtompeg/combine.c
+@@ -110,7 +110,6 @@ appendSpecifiedGopFiles(struct inputSour
+              nAttempts < READ_ATTEMPTS && !ifP;
+              ++nAttempts) {
+ 
+-            FILE * ifP;
+             ifP = fopen(fileName, "rb");
+             if (ifP == NULL) {
+                 pm_message("ERROR:  Couldn't read file '%s'.  retry %u", 
diff --git a/media-libs/netpbm/netpbm-10.34.ebuild b/media-libs/netpbm/netpbm-10.34.ebuild
index 6abaae8d4122..ced2379fdeec 100644
--- a/media-libs/netpbm/netpbm-10.34.ebuild
+++ b/media-libs/netpbm/netpbm-10.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.34.ebuild,v 1.12 2006/09/04 04:13:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.34.ebuild,v 1.13 2006/10/22 09:14:04 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/netpbm-10.33-memmem.patch
 	epatch "${FILESDIR}"/netpbm-10.34-xml2.patch #137871
 	epatch "${FILESDIR}"/netpbm-10.34-rgb-paths.patch #139423
+	epatch "${FILESDIR}"/netpbm-10.34-ppmtompeg.patch #150063
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config
diff --git a/media-libs/netpbm/netpbm-10.36.0.ebuild b/media-libs/netpbm/netpbm-10.36.0.ebuild
index b8b3cbb97848..a4abaa5a1c7c 100644
--- a/media-libs/netpbm/netpbm-10.36.0.ebuild
+++ b/media-libs/netpbm/netpbm-10.36.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.36.0.ebuild,v 1.1 2006/10/02 14:30:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.36.0.ebuild,v 1.2 2006/10/22 09:14:04 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -51,6 +51,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 	epatch "${FILESDIR}"/netpbm-10.35.0-xml2.patch #137871
+	epatch "${FILESDIR}"/netpbm-10.34-ppmtompeg.patch #150063
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config