Fix building with USE=-jpeg #111895 by Andrey Kolbasenko.

Package-Manager: portage-2.0.53_rc7

4 files changed, 62 insertions, 7 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 3ed5b1a67078..b4f00c57c051 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.86 2005/11/09 06:03:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.87 2005/11/09 06:33:54 vapier Exp $
+
+  09 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netpbm-10.30-jpeg-prototypes.patch, netpbm-10.30-r1.ebuild:
+  Fix building with USE=-jpeg #111895 by Andrey Kolbasenko.
 
 *netpbm-10.26.18 (09 Nov 2005)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 39c7e3785fe6..859c4a050170 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c541a63dd9eb135d3a10a7d1dbf3aecc ChangeLog 12355
+MD5 53ec9bff54fff267e7764b105f32a8c1 ChangeLog 12535
 MD5 0a45793fc070f81d4d6f6806706a8a57 files/digest-netpbm-10.26.17 139
 MD5 08ce9acb79a75a5d63c62122a4d4c8ae files/digest-netpbm-10.26.18 139
 MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
@@ -14,6 +14,7 @@ MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
 MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
 MD5 d54a93389a63382e459a5aa153484b46 files/netpbm-10.30-anytopnm.patch 1434
 MD5 c63d12c2c7deaafa4fcddb6035b34169 files/netpbm-10.30-build.patch 2276
+MD5 f877055480e9ba8f7c11ff8386782621 files/netpbm-10.30-jpeg-prototypes.patch 2077
 MD5 2dd6e3d7a2601a35259474344f7feb20 files/netpbm-10.30-pngtopnm.patch 417
 MD5 87a9972b59b90f26620b09ad990a8546 files/netpbm-10.30-tifftopnm.patch 373
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
@@ -23,11 +24,11 @@ MD5 fdba89dc66d463a4fb3d50d0c046a230 netpbm-10.26.18.ebuild 2799
 MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
 MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
 MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
-MD5 616e416b2017c1a2f0d85b78fd62fb0b netpbm-10.30-r1.ebuild 2957
+MD5 9528175f0b2c8de6f083d45e1d1bb769 netpbm-10.30-r1.ebuild 3042
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDcZFtgIKl8Uu19MoRAqYFAJ924FizBzwH9DOHtl7kZKKZT3jEbgCfVxGu
-fE4vazl2IMmMLLmZSx4kI8o=
-=U7/I
+iD8DBQFDcZh/gIKl8Uu19MoRAhoPAJ0U93Zu016MydouwUnphrBJVVhRjwCZAW0b
+Q/gUFXmY+PuHaQ3YPu/5pd4=
+=OFi6
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.30-jpeg-prototypes.patch b/media-libs/netpbm/files/netpbm-10.30-jpeg-prototypes.patch
new file mode 100644
index 000000000000..83df22f20145
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.30-jpeg-prototypes.patch
@@ -0,0 +1,48 @@
+Make sure we keep all the prototypes the same or we hit a build
+failure like this:
+converter/ppm/ppmtompeg/headers/jpeg.h:47:
+error: previous declaration of 'JMovie2JPEG' was here
+nojpeg.c:89: error: conflicting types for 'JMovie2JPEG'
+
+http://bugs.gentoo.org/111895
+
+--- converter/ppm/ppmtompeg/headers/jpeg.h
++++ converter/ppm/ppmtompeg/headers/jpeg.h
+@@ -44,6 +44,6 @@
+ #include "ansi.h"
+ 
+ 
+-extern void     JMovie2JPEG _ANSI_ARGS_((char *infilename, char *obase,
+-                                        int start, int end));
+-extern void ReadJPEG _ANSI_ARGS_((MpegFrame * mf, FILE *fp));
++extern void     JMovie2JPEG _ANSI_ARGS_((const char * const infilename, const char * const obase,
++                                        int const start, int end));
++extern void ReadJPEG _ANSI_ARGS_((MpegFrame * const mf, FILE * const fp));
+--- converter/ppm/ppmtompeg/nojpeg.c
++++ converter/ppm/ppmtompeg/nojpeg.c
+@@ -86,7 +86,7 @@
+ JMovie2JPEG(const char * const infilename,
+             const char * const obase,
+             int          const start,
+-            int          const end) {
++            int          end) {
+ 
+     pm_error("This program has not been built with the "
+              "ability to handle JPEG input files");
+--- converter/ppm/ppmtompeg/jpeg.c
++++ converter/ppm/ppmtompeg/jpeg.c
+@@ -72,10 +72,10 @@
+  ************************************************************************/
+ void
+   JMovie2JPEG(infilename,obase,start,end)
+-char *infilename;       /* input filename string */
+-char *obase;            /* output filename base string=>obase##.jpg */ 
+-int start;              /* first frame to be extracted */
+-int end;                /* last frame to be extracted */
++const char * const infilename;  /* input filename string */
++const char * const obase;       /* output filename base string=>obase##.jpg */ 
++int const start;                /* first frame to be extracted */
++int end;                        /* last frame to be extracted */
+ {
+   FILE *inFile;			/* Jmovie file pointer */
+   FILE *outFile;		/* JPEG file pointer for output file */
diff --git a/media-libs/netpbm/netpbm-10.30-r1.ebuild b/media-libs/netpbm/netpbm-10.30-r1.ebuild
index 5745d843a9b0..5ac5fba1b6eb 100644
--- a/media-libs/netpbm/netpbm-10.30-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.30-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.30-r1.ebuild,v 1.2 2005/10/31 15:58:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.30-r1.ebuild,v 1.3 2005/11/09 06:33:54 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -52,6 +52,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/netpbm-10.30-anytopnm.patch
 	epatch "${FILESDIR}"/netpbm-10.30-pngtopnm.patch
 	epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
+	epatch "${FILESDIR}"/netpbm-10.30-jpeg-prototypes.patch #111895
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config
@@ -83,6 +84,7 @@ src_unpack() {
 	URTLIB = -lrle
 	URTHDR_DIR =
 	EOF
+	append-flags -Wall
 
 	# Sparc support ...
 	replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc"