rpms/zsnes/devel zsnes-1.51-libpng15.patch, NONE, 1.1 zsnes.spec, 1.10, 1.11

[Andrea Musuruane]

Author: musuruan

Update of /cvs/free/rpms/zsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10689

Modified Files:
	zsnes.spec 
Added Files:
	zsnes-1.51-libpng15.patch 
Log Message:
* Sat Nov 26 2011 Andrea Musuruane <musuruan at gmail.com> 1.51-12
- fixed FTBFS with libpng 1.5


zsnes-1.51-libpng15.patch:
 zpng.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE zsnes-1.51-libpng15.patch ---
--- zsnes-1.510+bz2.orig/src/zip/zpng.c
+++ zsnes-1.510+bz2/src/zip/zpng.c
@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
 
         //Allocate an array of scanline pointers
         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));


Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/zsnes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zsnes.spec	9 Dec 2011 13:02:34 -0000	1.10
+++ zsnes.spec	9 Dec 2011 15:13:02 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: A Super Nintendo emulator
 Name: zsnes
 Version: 1.51
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: Applications/Emulators
 URL: http://www.zsnes.com/
@@ -22,6 +22,9 @@
 # Fix gamepad diagonals problem
 # http://board.zsnes.com/phpBB3/viewtopic.php?t=12544
 Patch6: zsnes-1.51-hat_events.patch
+# Fix FTBFS with libpng 1.5
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649801
+Patch7: zsnes-1.51-libpng15.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # This is to build only for ix86 on plague
@@ -55,6 +58,7 @@
 %patch4 -p2
 %patch5 -p2
 %patch6 -p2
+%patch7 -p2
 
 # Remove hardcoded CFLAGS and LDFLAGS
 sed -i \
@@ -133,6 +137,9 @@
 %doc ../docs/readme.htm/ ../docs/readme.txt/
 
 %changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan at gmail.com> 1.51-12
+- fixed FTBFS with libpng 1.5
+
 * Sat Nov 26 2011 Andrea Musuruane <musuruan at gmail.com> 1.51-11
 - fixed gamepad diagonals problem (BZ #1976)