3:23 p.m.
Author: musuruan
Update of /cvs/free/rpms/zsnes/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12180
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-hat_events.patch zsnes-1.51-libpng15.patch
Log Message:
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
- fixed FTBFS with libpng 1.5
zsnes-1.51-hat_events.patch:
sdllink.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE zsnes-1.51-hat_events.patch ---
diff -durN zsnes_1_51/src/linux/sdllink.c zsnes_1_51.hat_events/src/linux/sdllink.c
--- zsnes_1_51/src/linux/sdllink.c 2007-01-18 17:56:04.000000000 +0100
+++ zsnes_1_51.hat_events/src/linux/sdllink.c 2011-11-26 19:10:00.806907739 +0100
@@ -307,6 +307,8 @@
case SDL_HAT_UP:
pressed[offset + 3] = 1;
pressed[offset + 2] = 0;
+ pressed[offset + 1] = 0;
+ pressed[offset + 0] = 0;
break;
case SDL_HAT_RIGHTUP:
pressed[offset] = 1;
@@ -317,6 +319,8 @@
case SDL_HAT_RIGHT:
pressed[offset] = 1;
pressed[offset + 1] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_RIGHTDOWN:
pressed[offset] = 1;
@@ -326,6 +330,8 @@
break;
case SDL_HAT_DOWN:
pressed[offset + 2] = 1;
+ pressed[offset + 0] = 0;
+ pressed[offset + 1] = 0;
pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTDOWN:
@@ -337,6 +343,8 @@
case SDL_HAT_LEFT:
pressed[offset + 1] = 1;
pressed[offset] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTUP:
pressed[offset + 1] = 1;
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/F-15/zsnes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zsnes.spec 18 Sep 2011 17:38:54 -0000 1.9
+++ zsnes.spec 9 Dec 2011 15:23:10 -0000 1.10
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 10%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -19,6 +19,13 @@
Patch4: zsnes-1.51-pulseaudio.patch
# Ralf Corsepius
Patch5: zsnes-1.51-psr.patch
+# 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
#ExclusiveArch: %{ix86}
@@ -50,6 +57,8 @@
%patch3 -p2
%patch4 -p2
%patch5 -p2
+%patch6 -p2
+%patch7 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -128,6 +137,12 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
+- fixed FTBFS with libpng 1.5
+
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-11
+- fixed gamepad diagonals problem (BZ #1976)
+
* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
- used a patch by Ralf Corsepius to fix issues with parsegen