Fix building with libpng14 wrt #308753 by Locke Shinseiko. Clean up unused patches from files directory.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 42 insertions, 129 deletions

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index feb06d83dbbd..05f87149ccc2 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64plus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.9 2010/01/11 13:08:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.10 2010/03/11 15:30:44 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  mupen64plus-1.5-r1.ebuild, +files/mupen64plus-1.5-libpng14.patch:
+  Fix building with libpng14 wrt #308753 by Locke Shinseiko.
 
   11 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   mupen64plus-1.5-r1.ebuild:
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
deleted file mode 100644
index d6294e112183..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-flags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- pre.mk
-+++ pre.mk
-@@ -147,14 +147,14 @@
- endif
- 
- # set base program pointers and flags
--CC      = gcc
--CXX     = g++
--LD      = g++
-+CC      ?= gcc
-+CXX     ?= g++
-+LD      = $(CXX)
- ifeq ($(OS),LINUX)
--STRIP	= strip -s
-+STRIP	= true
- endif
- ifeq ($(OS),OSX)
--STRIP	= strip -x 
-+STRIP	= true
- endif
- RM      = rm
- RM_F    = rm -f
-@@ -185,19 +185,11 @@
- endif
- 
- # set base CFLAGS and LDFLAGS
--CFLAGS += -pipe -O3 -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
- CORE_LDFLAGS += -lz -lm -lpng -lfreetype -ldl
- 
- # set special flags per-system
- ifeq ($(CPU), X86)
--  ifeq ($(ARCH), 64BITS)
--    CFLAGS += -march=athlon64
--  else
--    CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse
--    ifneq ($(PROFILE), 1)
--      CFLAGS += -fomit-frame-pointer
--    endif
--  endif
-   # tweak flags for 32-bit build on 64-bit system
-   ifeq ($(ARCH), 64BITS_32)
-     CFLAGS += -m32
-@@ -205,7 +197,7 @@
-   endif
- endif
- ifeq ($(CPU), PPC)
--  CFLAGS += -mcpu=powerpc -D_BIG_ENDIAN
-+  CFLAGS += -D_BIG_ENDIAN
- endif
- 
- # set CFLAGS, LIBS, and LDFLAGS for external dependencies
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-glide64-gcc44.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-glide64-gcc44.patch
deleted file mode 100644
index c11f103c6b4e..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-glide64-gcc44.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dupr Mupen64Plus-1-5-src.old/glide64/Combine.cpp Mupen64Plus-1-5-src/glide64/Combine.cpp
---- Mupen64Plus-1-5-src.old/glide64/Combine.cpp	2009-01-04 19:47:08.000000000 +0100
-+++ Mupen64Plus-1-5-src/glide64/Combine.cpp	2009-07-27 16:54:40.737065400 +0200
-@@ -11873,7 +11873,7 @@ void InitCombine ()
-   LOG ("InitCombine() ");
-   memset(&cmb, 0, sizeof(cmb));
-   const char *extensions = grGetString (GR_EXTENSION);
--  if (char * extstr = strstr(extensions, "COMBINE")) {
-+  if (const char * extstr = strstr(extensions, "COMBINE")) {
-     if (!strncmp(extstr, "COMBINE", 7)) {
-       LOG ("extensions ");
-       cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
-diff -dupr Mupen64Plus-1-5-src.old/glide64/Main.cpp Mupen64Plus-1-5-src/glide64/Main.cpp
---- Mupen64Plus-1-5-src.old/glide64/Main.cpp	2009-07-27 16:49:30.596192066 +0200
-+++ Mupen64Plus-1-5-src/glide64/Main.cpp	2009-07-27 16:49:42.492067819 +0200
-@@ -784,7 +784,7 @@ BOOL InitGfx (BOOL evoodoo_using_window)
-   printf("bebefore2\n");
-   if (settings.fb_hires)
-   {
--    if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
-+    if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
-     {
-       if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
-       {
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch
new file mode 100644
index 000000000000..8d0b447fe96b
--- /dev/null
+++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308753
+
+--- rice_video/liblinux/pngrw.c
++++ rice_video/liblinux/pngrw.c
+@@ -136,9 +136,9 @@
+         if (end_info != NULL)
+             png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, (png_infop *) &end_info);
+         else if (info_ptr != NULL)
+-            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, png_infopp_NULL);
++            png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, NULL);
+         else if (png_ptr != NULL)
+-            png_destroy_read_struct((png_structp *) &png_ptr, png_infopp_NULL, png_infopp_NULL);
++            png_destroy_read_struct((png_structp *) &png_ptr, NULL, NULL);
+         if (rows)
+         {
+             if (rows[0])
+@@ -162,7 +162,7 @@
+ 
+     /* check the signature */
+     fread( signature, 1, 8, file );
+-    if ( !png_check_sig( signature, 8 ) )
++    if ( png_sig_cmp( signature, 0, 8 ) )
+         longjmp( err_jmp, (int)errUnsupportedFileFormat );
+ 
+     /* create a pointer to the png read structure */
+@@ -199,7 +199,7 @@
+ 
+     /* extract the data we need to form the HBITMAP from the PNG header */
+     png_get_IHDR( png_ptr, info_ptr, &Width, &Height, &BitDepth, &ColorType,
+-        &InterlaceType, int_p_NULL, int_p_NULL);
++        &InterlaceType, (int *) NULL, (int *) NULL);
+ 
+     img->width = Width;
+     img->height = Height;
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-plugindir.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-plugindir.patch
deleted file mode 100644
index 96363547a128..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-plugindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -dupr Mupen64Plus-1-5-src.orig/main/main.c Mupen64Plus-1-5-src/main/main.c
---- Mupen64Plus-1-5-src.orig/main/main.c	2009-05-01 09:18:21.387785870 +0200
-+++ Mupen64Plus-1-5-src/main/main.c	2009-05-01 09:20:10.998784906 +0200
-@@ -1476,8 +1476,7 @@ int main(int argc, char *argv[])
-     // if it's not set in the config file, use the /plugins/ sub-folder of the installation directory
-     if (strlen(dirpath) < 2)
-     {
--        strncpy(dirpath, l_InstallDir, PATH_MAX);
--        strncat(dirpath, "plugins/", PATH_MAX - strlen(dirpath));
-+        strncpy(dirpath, "%PUT_PLUGIN_PATH_HERE%", PATH_MAX);
-         dirpath[PATH_MAX-1] = '\0';
-     }
-     // scan the plugin directory and set the config dir for the plugins
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-unbundle-bzip2.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-unbundle-bzip2.patch
deleted file mode 100644
index 9ed10be85c61..000000000000
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-unbundle-bzip2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -dupr Mupen64Plus-1-5-src.old/Makefile Mupen64Plus-1-5-src/Makefile
---- Mupen64Plus-1-5-src.old/Makefile	2009-01-04 19:47:07.000000000 +0100
-+++ Mupen64Plus-1-5-src/Makefile	2009-07-27 17:12:55.984193344 +0200
-@@ -111,13 +111,6 @@ OBJ_CORE = \
- 	main/savestates.o \
- 	main/zip/ioapi.o \
- 	main/zip/unzip.o \
--	main/bzip2/bzlib.o \
--	main/bzip2/crctable.o \
--	main/bzip2/decompress.o \
--	main/bzip2/compress.o \
--	main/bzip2/randtable.o \
--	main/bzip2/huffman.o \
--	main/bzip2/blocksort.o \
- 	main/lzma/buffer.o \
- 	main/lzma/io.o \
- 	main/lzma/main.o \
-@@ -246,7 +239,7 @@ SHARE = $(shell grep CONFIG_PATH config.
- # set primary objects and libraries for all outputs
- ALL = mupen64plus $(PLUGINS)
- OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
--LIBS = $(SDL_LIBS) $(LIBGL_LIBS)
-+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
- 
- # add extra objects and libraries for selected options
- ifeq ($(DBG), 1)
-diff -dupr Mupen64Plus-1-5-src.old/main/rom.c Mupen64Plus-1-5-src/main/rom.c
---- Mupen64Plus-1-5-src.old/main/rom.c	2009-01-04 19:47:07.000000000 +0100
-+++ Mupen64Plus-1-5-src/main/rom.c	2009-07-27 17:29:55.918067662 +0200
-@@ -28,7 +28,7 @@
- #include <zlib.h>
- 
- #include "zip/unzip.h"
--#include "bzip2/bzlib.h"
-+#include <bzlib.h>
- #include "lzma/lzmadec.h"
- #include "7zip/7zExtract.h"
- #include "7zip/7zCrc.h"
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
index c1d7531e719c..bcc0b83e13e0 100644
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
+++ b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild,v 1.7 2010/01/11 13:08:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild,v 1.8 2010/03/11 15:30:44 ssuominen Exp $
 
 EAPI="2"
 
@@ -53,6 +53,8 @@ src_prepare() {
 	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
 		epatch
 
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
 	sed -i \
 		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
 		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \