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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index feb06d83dbbd830523c0126d0d1725347fbac550..05f87149ccc288c2f704962f5490020c4af4affd 100644 (file)
--- 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/Manifest b/games-emulation/mupen64plus/Manifest
index 00ab7e8bf2ce3fe3dfc62090faa2171cbf7f8873..7616acc6564be16a691ae84ef7bb8e775e4758af 100644 (file)
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,10 +1,7 @@
 AUX README.gentoo-patches-20091123 1355 RMD160 36a949e4205699623c4a5283abe38f4062783560 SHA1 d144cc1167d6c02008f0afb25ec3792e650f066c SHA256 472ca36495f5cd59c66a23d4660dff19e890c7bca9c389352a54371f9aae5b2e
-AUX mupen64plus-1.5-flags.patch 1123 RMD160 a38f07f536c4d31a019e8742319c73644422c25d SHA1 7b5946e1826e21be0b8cf612274585f378a7f86b SHA256 a14a2e6b7972d8fe461639888eb534e62413c0c05aba91c19149c511f9e9dc10
-AUX mupen64plus-1.5-glide64-gcc44.patch 1262 RMD160 28ccdd74a669af58363501f386acf290cf6a55bd SHA1 5113cffff2c0a472bd37325fa0f582850d71fac0 SHA256 fc9665e4cfa8ae99ab1a4e8d1810d257d81f6cd2c59fc3ac4b7b5d1ec42ef069
-AUX mupen64plus-1.5-plugindir.patch 722 RMD160 905d38cd37f4afdc67d2e7ac7f8d66a5bc9a296a SHA1 d4b77ace873c4a50ebe89fe81f523c6e00dffc8d SHA256 07507a688ab77322317cf3b7fb6419f681386b343c77d26bf3fd01afa3348276
-AUX mupen64plus-1.5-unbundle-bzip2.patch 1317 RMD160 98403a2c3853fc60c666180b106a735e8c8410a3 SHA1 9ff21c4c945dc475f7c248f738913adb13d29b82 SHA256 cc5e3e15ad44b2c5483b222dd55bba8588759ac032b97667d9e3c69d590938e0
+AUX mupen64plus-1.5-libpng14.patch 1404 RMD160 d6de12bd2922b79e7cbe2ead8b4419d94eabca8f SHA1 374915395ba7454da1e7a7e4839c5785f45dd62d SHA256 c0efb54eee809135dbb9429fc9869456a1d437a90929d9df09ab1102157d183f
 DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3bd4ff996 SHA1 ef200d6ea2eb3faa969ba9c82d2a771236c3145d SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
 DIST mupen64plus-1.5-patches-20091123.tar.bz2 25579 RMD160 4e956e66bedd944889c6b620a67c6a088c569bdb SHA1 dba1c3a2079cd96d5e2b8a06223ede21597ae958 SHA256 b4bebb8105d7ca083b1e3d96d23dea9f2170703d53b0ea75e09b428e73e43187
-EBUILD mupen64plus-1.5-r1.ebuild 3178 RMD160 24bbc79b85831ee090895343542911f026ba313f SHA1 655896fd6cc4f490a749608aefdc7d719c34c48c SHA256 b0467ad7e7dddd7be790115253ecad89db02b5f5ae77192213799b3ce930e986
-MISC ChangeLog 2147 RMD160 9eb99c69dd78ed42fa27dd84927d1de76e35a6b1 SHA1 bf31c22bbda52363cfb797f4ff73418130c95b0a SHA256 00f70ecec2ef1b60015b82635b115bd21d6b119ad7badd2297cf6e5c08a4ef2f
+EBUILD mupen64plus-1.5-r1.ebuild 3225 RMD160 70ca1eb7534df2218fda0ac6eddc997dc795369e SHA1 a109c174302d17032361cc441c194278581c5aa7 SHA256 f65a8a559fc59c73ec7dd5f3bee3007a21cec4928c48ba6167e71106f6ca03f7
+MISC ChangeLog 2336 RMD160 24eee448900008379fbea9cba8288701a30051ab SHA1 6fb127bfcc4fccf05a20c7125c8f8e76dc01d40f SHA256 dad6dfa3bd4ecac28854b4758622da5d6c9fdb02e0a7b6c73f59b0acd02779dc
 MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f

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 (file)
index d6294e1..0000000
--- 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 (file)
index c11f103..0000000
--- 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 (file)
index 0000000..8d0b447
--- /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 (file)
index 9636354..0000000
--- 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 (file)
index 9ed10be..0000000
--- 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 c1d7531e719c1528ad0ead2e21c80c7611f2bdb9..bcc0b83e13e01dfc86d9cea34a1b6a56fb39fb69 100644 (file)
--- 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/:" \