Author: musuruan Update of /cvs/free/rpms/fceultra/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6419 Modified Files: fceultra-0.98.13-man.patch fceultra.spec Added Files: fceultra-0.98.13-acinclude.patch fceultra-0.98.13-buffer_overflow.patch fceultra-0.98.13-lib.patch fceultra-0.98.13-state-saving.patch Log Message: * Mon Apr 09 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.98.13-0.9.pre - Fixed Source0 URL - Updated man patch from Debian - Made a patch to fix FTBFS - Made a patch to correctly quote definition of AM_PATH_SDL - Added a patch from OpenSUSE to fix a potential buffer overflow and to fix state saving (split into two patches for better clarity) fceultra-0.98.13-acinclude.patch: acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fceultra-0.98.13-acinclude.patch --- --- fceu.orig/acinclude.m4 2004-04-01 08:13:04.000000000 +0200 +++ fceu/acinclude.m4 2012-04-09 18:22:19.709703964 +0200 @@ -8,7 +8,7 @@ dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS dnl -AC_DEFUN(AM_PATH_SDL, +AC_DEFUN([AM_PATH_SDL], [dnl dnl Get the cflags and libraries from the sdl-config script dnl fceultra-0.98.13-buffer_overflow.patch: bworld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fceultra-0.98.13-buffer_overflow.patch --- --- src/input/bworld.c +++ src/input/bworld.c 2007/09/10 11:16:10 @@ -61,7 +61,7 @@ seq=ptr=0; have=1; strcpy(bdata,(uint8 *)data+1); - strcpy(&bdata[13],"SUNSOFT"); + strncpy(&bdata[13],"SUNSOFT",7); } } fceultra-0.98.13-lib.patch: configure.ac | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE fceultra-0.98.13-lib.patch --- diff -durN fceu.orig/configure.ac fceu/configure.ac --- fceu.orig/configure.ac 2004-09-11 23:32:25.000000000 +0200 +++ fceu/configure.ac 2012-04-09 17:55:19.231646900 +0200 @@ -18,6 +18,10 @@ AC_DEFINE(_GNU_SOURCE) AC_CHECK_FUNC(asprintf, AC_DEFINE([HAVE_ASPRINTF]), []) +dnl Check for libm +AC_CHECK_LIB([m], [sin],[], AC_MSG_ERROR([*** libm not found!])) +LIBS="$LIBS -lm" + dnl Check for zlib AC_CHECK_LIB([z], [zlibVersion],[], AC_MSG_ERROR([*** zlib not found!])) LIBS="$LIBS -lz" fceultra-0.98.13-state-saving.patch: state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fceultra-0.98.13-state-saving.patch --- --- src/state.c +++ src/state.c 2007/09/10 11:17:02 @@ -231,7 +231,7 @@ static uint32 totalsize; static uint8 header[16]="FCS"; - memset(header+4,0,13); + memset(header+4,0,12); header[3]=0xFF; FCEU_en32lsb(header + 8, FCEU_VERSION_NUMERIC); fwrite(header,1,16,st); fceultra-0.98.13-man.patch: fceu-sdl.6 | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) Index: fceultra-0.98.13-man.patch =================================================================== RCS file: /cvs/free/rpms/fceultra/devel/fceultra-0.98.13-man.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fceultra-0.98.13-man.patch 19 Jul 2008 17:59:23 -0000 1.1 +++ fceultra-0.98.13-man.patch 15 Apr 2012 17:10:41 -0000 1.2 @@ -1,6 +1,11 @@ +Description: Manpage fixes +Author: Joe Nahmias <jello(a)debian.org&gt; + --- fceu-0.98.12.orig/Documentation/fceu-sdl.6 +++ fceu-0.98.12/Documentation/fceu-sdl.6 -@@ -2,7 +2,7 @@ +@@ -1,8 +1,8 @@ +-.\" t Hey, EMACS: -*- nroff -*- ++\" t Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) @@ -54,7 +59,7 @@ .TP .B \-gg Enable Game Genie emulation support. -@@ -69,7 +64,7 @@ +@@ -69,7 +64,7 @@ Use <portnum> for TCP/IP network play. .SH KEYBOARD COMMANDS .B FCE Ultra has a number of commands available within the emulator. @@ -63,7 +68,7 @@ .SS Gamepad Keyboard Bindings .TS center box; -@@ -89,7 +84,7 @@ +@@ -89,7 +84,7 @@ Start ENTER Activate cheat interface. .TP 15 .BI <F4> @@ -72,7 +77,7 @@ .TP 15 .BI <F5> Save game state into current slot (set using number keys). -@@ -110,14 +105,9 @@ +@@ -110,14 +105,9 @@ Toggle power to NES. Quit .B FCE Ultra. .SH SEE ALSO @@ -89,4 +94,3 @@ .TP .I http://fceultra.sourceforge.net/ The - Index: fceultra.spec =================================================================== RCS file: /cvs/free/rpms/fceultra/devel/fceultra.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fceultra.spec 8 Feb 2012 21:46:35 -0000 1.4 +++ fceultra.spec 15 Apr 2012 17:10:41 -0000 1.5 @@ -1,19 +1,38 @@ Summary: A portable NES/Famicom emulator Name: fceultra Version: 0.98.13 -Release: 0.8.pre%{?dist} +Release: 0.9.pre%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://fceultra.sourceforge.net/ -Source: http://dl.sf.net/sourceforge/%{name}/fceu-%{version}-pre.src.tar.bz2 -Patch0: fceultra-0.98.13-man.patch -Patch1: fceultra-0.98.13-cheatdir.patch -Patch2: fceultra-0.98.13-configure_fix_non_x86.patch +Source: http://downloads.sourceforge.net/%{name}/fceu-%{version}-pre.src.tar.bz2 +# Debian +# Fix man page +Patch0: %{name}-0.98.13-man.patch +# Gentoo 109359 +# Fix saving cheats +Patch1: %{name}-0.98.13-cheatdir.patch +# Hans de Goede +# Fix compiling on non-x86 systems +Patch2: %{name}-0.98.13-configure_fix_non_x86.patch +# OpenSUSE +# Fix a potential buffer overflow +Patch3: %{name}-0.98.13-buffer_overflow.patch +# OpenSUSE +# Fix state saving +Patch4: %{name}-0.98.13-state-saving.patch +# Andrea Musuruane +# Fix linking against libm +Patch5: %{name}-0.98.13-lib.patch +# Andrea Musuruane +# Correctly quote definition of AM_PATH_SDL +Patch6: %{name}-0.98.13-acinclude.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf +BuildRequires: automake BuildRequires: SDL-devel >= 1.2.0 BuildRequires: libGLU-devel BuildRequires: zlib-devel -BuildRequires: automake16 %description FCE Ultra is a portable NES/Famicom emulator based on Bero's original @@ -25,12 +44,17 @@ %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p0 +%patch4 -p0 +%patch5 -p1 +%patch6 -p1 perl -pi -e's/-mcpu=i686/\$(RPM_OPT_FLAGS)/' Makefile* chmod 644 src/drivers/sexyal/convert.inc mv Documentation/fceu-sdl.6 Documentation/fceultra.6 %build +autoreconf -fvi %configure --with-opengl make %{?_smp_mflags} @@ -52,6 +76,14 @@ %{_mandir}/man6/fceultra.6* %changelog +* Mon Apr 09 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.98.13-0.9.pre +- Fixed Source0 URL +- Updated man patch from Debian +- Made a patch to fix FTBFS +- Made a patch to correctly quote definition of AM_PATH_SDL +- Added a patch from OpenSUSE to fix a potential buffer overflow and to fix + state saving (split into two patches for better clarity) + * Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.98.13-0.8.pre - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -61,7 +93,7 @@ * Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.98.13-0.6.pre - rebuild for buildsys cflags issue -* Fri Nov 02 2007 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.98.13-0.5.pre +* Fri Nov 02 2007 Andrea Musuruane <musuruan(a)gmail.com&gt; 0.98.13-0.5.pre - Changed license due to new guidelines. - Removed %%{?dist} tag from changelog.