Fix by Andy Chambers for segfault in pnmtopng #104434 by Heiko Baums. Fix by Matthew Lange for buggy anytopnm #105127 by Erik Thiele. Add real manpages #67017. Also try to fix parallel building.

(Portage version: 2.0.52-r1 http://www.bash.org/?136501 )

4 files changed, 138 insertions, 0 deletions

diff --git a/media-libs/netpbm/files/digest-netpbm-10.29-r1 b/media-libs/netpbm/files/digest-netpbm-10.29-r1
new file mode 100644
index 000000000000..5f256cebbee7
--- /dev/null
+++ b/media-libs/netpbm/files/digest-netpbm-10.29-r1
@@ -0,0 +1,2 @@
+MD5 606c7ca1f3cd4c722a98961216730aec netpbm-10.29.tgz 2359729
+MD5 2009fd15b23e6b405af0813e950d044e netpbm-10.29-manpages.tar.bz2 232801
diff --git a/media-libs/netpbm/files/netpbm-10.29-anytopnm.patch b/media-libs/netpbm/files/netpbm-10.29-anytopnm.patch
new file mode 100644
index 000000000000..aa4cf5afec35
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.29-anytopnm.patch
@@ -0,0 +1,58 @@
+Patch by Matthew Lange
+
+http://bugs.gentoo.org/105127
+
+--- converter/other/anytopnm
++++ converter/other/anytopnm
+@@ -73,7 +73,7 @@
+     file --mime /dev/null >/dev/null 2>/dev/null
+     if [ $? -eq 0 ]; then
+         # Now that we know the --mime option exists, use it.
+-        mimeType=`file --mime "$1" | cut -d: -f2-`
++        mimeType=`file --mime "$1" | cut -d: -f2- | cut -c2-`
+     else
+         # file --mime failed; we don't know why, but we assume it's because it
+         # is a traditional 'file' program that doesn't have a --mime option.
+@@ -90,26 +90,26 @@
+     case "$1" in
+ 
+         image/jpeg )
+-            type = "jfif"
++            type="jfif"
+             ;;
+         image/gif )
+-            type = "gif"
++            type="gif"
+             ;;
+         image/tiff )
+-            type = "tiff"
++            type="tiff"
+             ;;
+         image/bmp )
+-            type = "bmp"
++            type="bmp"
+             ;;
+         image/png )
+-            type = "png"
++            type="png"
+             ;;
+         image/x-portable-bitmap | image/x-portable-pixmap | \
+                 image/x-portable-greymap)
+-            type = "pnm"
++            type="pnm"
+             ;;
+         image/x-xpm )
+-            type = "xpm"
++            type="xpm"
+             ;;
+         * )
+             filetype=unknown
+@@ -541,7 +541,7 @@
+ 
+ setMimeType "$file"
+ 
+-typeDescription=`file "$file" | cut -d: -f2-`
++typeDescription=`file "$file" | cut -d: -f2- | cut -c2`
+ 
+ determineType "$file" "$mimeType" "$typeDescription" "$fileExtension"
+ 
diff --git a/media-libs/netpbm/files/netpbm-10.29-build.patch b/media-libs/netpbm/files/netpbm-10.29-build.patch
new file mode 100644
index 000000000000..902f9aa5ab4b
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.29-build.patch
@@ -0,0 +1,60 @@
+- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
+- Try to fix parallel building
+- Make the libopt tool less 'helpful'
+
+--- lib/Makefile
++++ lib/Makefile
+@@ -249,7 +249,7 @@
+ .PHONY: install.staticlib
+ install.staticlib: $(PKGDIR)/link
+ 	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
+-	  $(PKGDIR)/link
++	  $(PKGDIR)/lib
+ 
+ # Install a shared library stub -- the ".so" file used at link time to
+ # prepare a program for dynamically linking a library at run time 
+@@ -257,9 +257,9 @@
+ install.sharedlibstub: $(PKGDIR)/link
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install the link-time (.so) links to the runtime libraries
+-	cd $(PKGDIR)/link ; \
++	cd $(PKGDIR)/lib ; \
+           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
+-          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
++          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
+             libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+--- GNUmakefile
++++ GNUmakefile
+@@ -87,6 +87,9 @@
+ 
+ .PHONY: nonmerge
+ nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
++
++$(PRODUCT_SUBDIRS:%=%/all): $(LIBOPT)
++converter/all analyzer/all editor/all generator/all other/all: lib/all
+ 
+ OMIT_CONFIG_RULE = 1
+ include $(SRCDIR)/Makefile.common
+--- buildtools/libopt.c
++++ buildtools/libopt.c
+@@ -496,4 +496,5 @@
+ main(int argc, char **argv) {
+ 
++    bool shut_the_hell_up = TRUE;
+     bool error;
+     bool runtime;  /* -runtime option has been seen */
+@@ -508,4 +509,6 @@
+         if (strcmp(argv[arg], "-runtime") == 0)
+             runtime = TRUE;
++        else if (strcmp(argv[arg], "-v") == 0)
++            shut_the_hell_up = FALSE;
+         else {
+             if (strlen(argv[arg]) > 200)
+@@ -534,4 +537,5 @@
+     } else {
+         fputs(outputLine, stdout);
++        if (shut_the_hell_up == FALSE)
+         fprintf(stderr, "libopt results: '%s'\n", outputLine);
+         retval = 0;
diff --git a/media-libs/netpbm/files/netpbm-10.29-pnmtopng-alpha-check.patch b/media-libs/netpbm/files/netpbm-10.29-pnmtopng-alpha-check.patch
new file mode 100644
index 000000000000..fbae5ac4e7a2
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.29-pnmtopng-alpha-check.patch
@@ -0,0 +1,18 @@
+Fix segfault when converting files w/out alpha
+
+Patch by Andy Chambers
+
+http://bugs.gentoo.org/104434
+
+--- converter/other/pnmtopng.c
++++ converter/other/pnmtopng.c
+@@ -1690,7 +1690,8 @@
+             pnm_promoteformatrow(xelrow, cols, maxval, format, maxval,
+                                  PPM_TYPE);
+             
+-            makePngLine(line, xelrow, cols, maxval, alpha, alpha_mask[row],
++            makePngLine(line, xelrow, cols, maxval, 
++			alpha, alpha ? alpha_mask[row] : NULL,
+                         cht, caht, info_ptr, png_maxval, depth);
+ 
+             png_write_row(png_ptr, line);