Author: belegdol Update of /cvs/nonfree/rpms/mame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2064 Modified Files: .cvsignore mame-systemlibs.patch mame.spec sources Log Message: * Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145-1 - Updated to 0.145 - Updated the systemlibs patch Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 1 Feb 2012 21:50:44 -0000 1.48 +++ .cvsignore 6 Feb 2012 17:27:41 -0000 1.49 @@ -1,8 +1 @@ -mame0144s.exe -0144u1_diff.zip -0144u2_diff.zip -0144u3_diff.zip -0144u4_diff.zip -0144u5_diff.zip -0144u6_diff.zip -0144u7_diff.zip +mame0145s.exe mame-systemlibs.patch: makefile | 31 ++++++++++++++++++++++++++----- src/emu/sound/samples.c | 6 +++++- src/lib/util/chd.c | 6 +++++- src/mame/drivers/sliver.c | 2 +- 4 files changed, 37 insertions(+), 8 deletions(-) Index: mame-systemlibs.patch =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/mame-systemlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mame-systemlibs.patch 1 Feb 2012 21:50:44 -0000 1.1 +++ mame-systemlibs.patch 6 Feb 2012 17:27:41 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up mame-0.144u7/makefile.systemlibs mame-0.144u7/makefile ---- mame-0.144u7/makefile.systemlibs 2012-02-01 19:33:24.321723366 +0100 -+++ mame-0.144u7/makefile 2012-02-01 19:33:27.444741982 +0100 +diff -up mame-0.145/makefile.systemlibs mame-0.145/makefile +--- mame-0.145/makefile.systemlibs 2012-02-06 02:05:28.087005745 +0100 ++++ mame-0.145/makefile 2012-02-06 07:35:08.478866051 +0100 @@ -211,6 +211,12 @@ BUILD_EXPAT = 1 # uncomment next line to build zlib as part of MAME build BUILD_ZLIB = 1 @@ -57,19 +57,20 @@ #------------------------------------------------- # 'default' target needs to go here, before the # include files which define additional targets -@@ -639,8 +663,6 @@ default: maketree buildtools emulator +@@ -639,9 +663,6 @@ default: maketree buildtools emulator all: default tools --FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a +-FLAC_LIB = $(OBJ)/libflac.a +-# $(OBJ)/libflac++.a - #------------------------------------------------- # defines needed by multiple make files -diff -up mame-0.144u7/src/emu/sound/samples.c.systemlibs mame-0.144u7/src/emu/sound/samples.c ---- mame-0.144u7/src/emu/sound/samples.c.systemlibs 2012-02-01 19:33:24.436724052 +0100 -+++ mame-0.144u7/src/emu/sound/samples.c 2012-02-01 19:33:25.185728517 +0100 -@@ -1,7 +1,11 @@ +diff -up mame-0.145/src/emu/sound/samples.c.systemlibs mame-0.145/src/emu/sound/samples.c +--- mame-0.145/src/emu/sound/samples.c.systemlibs 2012-02-06 02:05:39.105092912 +0100 ++++ mame-0.145/src/emu/sound/samples.c 2012-02-06 02:06:02.576278597 +0100 +@@ -16,7 +16,11 @@ #include "emu.h" #include "emuopts.h" #include "samples.h" @@ -82,9 +83,9 @@ typedef struct _sample_channel sample_channel; struct _sample_channel -diff -up mame-0.144u7/src/lib/util/chd.c.systemlibs mame-0.144u7/src/lib/util/chd.c ---- mame-0.144u7/src/lib/util/chd.c.systemlibs 2012-02-01 19:33:24.573724868 +0100 -+++ mame-0.144u7/src/lib/util/chd.c 2012-02-01 19:33:25.187728529 +0100 +diff -up mame-0.145/src/lib/util/chd.c.systemlibs mame-0.145/src/lib/util/chd.c +--- mame-0.145/src/lib/util/chd.c.systemlibs 2012-02-06 02:05:28.422008396 +0100 ++++ mame-0.145/src/lib/util/chd.c 2012-02-06 02:06:02.578278613 +0100 @@ -48,7 +48,11 @@ #include <stdlib.h> #include <new> @@ -98,9 +99,9 @@ /*************************************************************************** -diff -up mame-0.144u7/src/mame/drivers/sliver.c.systemlibs mame-0.144u7/src/mame/drivers/sliver.c ---- mame-0.144u7/src/mame/drivers/sliver.c.systemlibs 2012-02-01 19:33:24.785726133 +0100 -+++ mame-0.144u7/src/mame/drivers/sliver.c 2012-02-01 19:33:25.189728541 +0100 +diff -up mame-0.145/src/mame/drivers/sliver.c.systemlibs mame-0.145/src/mame/drivers/sliver.c +--- mame-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-06 02:05:53.837209459 +0100 ++++ mame-0.145/src/mame/drivers/sliver.c 2012-02-06 02:06:02.580278628 +0100 @@ -67,7 +67,7 @@ Notes: #include "sound/okim6295.h" #include "cpu/mcs51/mcs51.h" Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- mame.spec 1 Feb 2012 21:50:44 -0000 1.56 +++ mame.spec 6 Feb 2012 17:27:41 -0000 1.57 @@ -4,8 +4,8 @@ %bcond_with ldplayer %bcond_with debug -%global baseversion 144 -%global sourceupdate 7 +%global baseversion 145 +#global sourceupdate 7 Name: mame %if 0%{?sourceupdate} @@ -22,13 +22,13 @@ Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe %if 0%{?sourceupdate} #Source updates -Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip -Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip -Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip -Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip -Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip -Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip -Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip +#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip +#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip +#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip +#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip +#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip +#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip +#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip #Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip #Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip %endif @@ -107,9 +107,6 @@ %patch1 -p1 -b .systemlibs %patch2 -p1 -b .verbosebuild -#fix encoding -iconv -f cp1252 -t utf-8 whatsnew.txt > whatsnew.txt.conv && mv -f whatsnew.txt.conv whatsnew.txt - # Create ini file cat > %{name}.ini << EOF # Define multi-user paths @@ -255,6 +252,10 @@ %changelog +* Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145-1 +- Updated to 0.145 +- Updated the systemlibs patch + * Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.144u7-1 - Updated to 0.144u7 - Dropped upstreamed gcc-4.7 patch Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 1 Feb 2012 21:50:44 -0000 1.48 +++ sources 6 Feb 2012 17:27:41 -0000 1.49 @@ -1,8 +1 @@ -2b47706f55d3263f8a7ab1a480ad1dcb mame0144s.exe -f01001d40417f8f0d3963dae01b04200 0144u1_diff.zip -5b54e7357a9133a38f3021f610354530 0144u2_diff.zip -5bb7dbbb8e37b151dce8f4824a95ed12 0144u3_diff.zip -fd2b7811b53a61028daff87cdfd775eb 0144u4_diff.zip -2425f1d27514c16b1044177b4374d9ec 0144u5_diff.zip -006609c0896cb3c2d65d501123e277be 0144u6_diff.zip -f80e425a280406ae6e767f4676dcade0 0144u7_diff.zip +4514ecf6dc5331cd0e803704f95e206f mame0145s.exe