Author: belegdol Update of /cvs/nonfree/rpms/mame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3175 Modified Files: .cvsignore mame-systemlibs.patch mame.spec sources Added Files: mame-disable-ldtools.patch Log Message: * Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145u1-1 - Updated to 0.145u1 - Added artwork/* and hlsl/* to the installed files - Fixed the line ending fix to spare all the *.png files - Added bundled(libjpeg) and bundled(lzma-sdk) Provides - Temporarily disabled ldresample and ldverify mame-disable-ldtools.patch: tools.mak | 28 ---------------------------- 1 file changed, 28 deletions(-) --- NEW FILE mame-disable-ldtools.patch --- diff -up mame-0.145u1/src/tools/tools.mak.disable-ldtools mame-0.145u1/src/tools/tools.mak --- mame-0.145u1/src/tools/tools.mak.disable-ldtools 2012-02-19 19:36:31.466241947 +0100 +++ mame-0.145u1/src/tools/tools.mak 2012-02-19 20:25:29.340015401 +0100 @@ -55,8 +55,6 @@ TOOLS += \ chdman$(EXE) \ jedutil$(EXE) \ unidasm$(EXE) \ - ldresample$(EXE) \ - ldverify$(EXE) \ regrep$(EXE) \ srcclean$(EXE) \ src2html$(EXE) \ @@ -117,32 +115,6 @@ unidasm$(EXE): $(UNIDASMOBJS) $(LIBDASM) -#------------------------------------------------- -# ldresample -#------------------------------------------------- - -LDRESAMPLEOBJS = \ - $(TOOLSOBJ)/ldresample.o \ - -ldresample$(EXE): $(LDRESAMPLEOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(EXPAT) - @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@ - - - -#------------------------------------------------- -# ldverify -#------------------------------------------------- - -LDVERIFYOBJS = \ - $(TOOLSOBJ)/ldverify.o \ - -ldverify$(EXE): $(LDVERIFYOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(FLAC_LIB) $(EXPAT) - @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) $(FLAC_LIB) -o $@ - - - #------------------------------------------------- # regrep #------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 6 Feb 2012 17:27:41 -0000 1.49 +++ .cvsignore 19 Feb 2012 19:44:37 -0000 1.50 @@ -1 +1,2 @@ mame0145s.exe +0145u1_diff.zip mame-systemlibs.patch: makefile | 31 ++++++++++++++++++++++++++----- src/lib/util/flac.h | 6 +++++- src/mame/drivers/sliver.c | 2 +- 3 files changed, 32 insertions(+), 7 deletions(-) Index: mame-systemlibs.patch =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/mame-systemlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mame-systemlibs.patch 6 Feb 2012 17:27:41 -0000 1.2 +++ mame-systemlibs.patch 19 Feb 2012 19:44:37 -0000 1.3 @@ -1,6 +1,6 @@ -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 +diff -up mame-0.145u1/makefile.systemlibs mame-0.145u1/makefile +--- mame-0.145u1/makefile.systemlibs 2012-02-19 18:50:05.671231564 +0100 ++++ mame-0.145u1/makefile 2012-02-19 18:50:06.439236391 +0100 @@ -211,6 +211,12 @@ BUILD_EXPAT = 1 # uncomment next line to build zlib as part of MAME build BUILD_ZLIB = 1 @@ -65,31 +65,15 @@ -# $(OBJ)/libflac++.a - - #------------------------------------------------- - # defines needed by multiple make files -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" --#include "../../lib/libflac/include/flac/all.h" -+#ifdef FLAC__NO_DLL -+#include <flac/all.h> -+#else -+#include <FLAC/all.h> -+#endif /* FLAC__NO_DLL */ + 7Z_LIB = $(OBJ)/lib7z.a - typedef struct _sample_channel sample_channel; - struct _sample_channel -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> +diff -up mame-0.145u1/src/lib/util/flac.h.systemlibs mame-0.145u1/src/lib/util/flac.h +--- mame-0.145u1/src/lib/util/flac.h.systemlibs 2012-02-19 18:50:06.082234146 +0100 ++++ mame-0.145u1/src/lib/util/flac.h 2012-02-19 18:50:06.440236397 +0100 +@@ -44,7 +44,11 @@ + #include "osdcore.h" + #include "corefile.h" -#include "../../lib/libflac/include/flac/all.h" +#ifdef FLAC__NO_DLL +#include <flac/all.h> @@ -98,10 +82,10 @@ +#endif /* FLAC__NO_DLL */ - /*************************************************************************** -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 + //************************************************************************** +diff -up mame-0.145u1/src/mame/drivers/sliver.c.systemlibs mame-0.145u1/src/mame/drivers/sliver.c +--- mame-0.145u1/src/mame/drivers/sliver.c.systemlibs 2012-02-19 18:49:57.477180052 +0100 ++++ mame-0.145u1/src/mame/drivers/sliver.c 2012-02-19 18:50:06.441236403 +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.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- mame.spec 6 Feb 2012 17:27:41 -0000 1.57 +++ mame.spec 19 Feb 2012 19:44:37 -0000 1.58 @@ -5,7 +5,7 @@ %bcond_with debug %global baseversion 145 -#global sourceupdate 7 +%global sourceupdate 1 Name: mame %if 0%{?sourceupdate} @@ -22,7 +22,7 @@ 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 +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 @@ -35,6 +35,7 @@ Patch0: %{name}-fortify.patch Patch1: %{name}-systemlibs.patch Patch2: %{name}-verbosebuild.patch +Patch3: %{name}-disable-ldtools.patch BuildRequires: expat-devel BuildRequires: flac-devel @@ -46,6 +47,8 @@ BuildRequires: zlib-devel Provides: sdlmame = 0%{baseversion}-%{release} +Provides: bundled(libjpeg) = 8c +Provides: bundled(lzma-sdk) = 9.22 Obsoletes: sdlmame < 0136-2 %description @@ -95,7 +98,7 @@ for sourcefile in %{sources}; do 7za x $sourcefile done -find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \; +find . -type f -not -name *.png -exec sed -i 's/\r//' {} \; %if 0%{?sourceupdate} i=1 while [ $i -le %{sourceupdate} ]; do @@ -106,6 +109,7 @@ %patch0 -p1 -b .fortify %patch1 -p1 -b .systemlibs %patch2 -p1 -b .verbosebuild +%patch3 -p1 -b .disable-ldtools # Create ini file cat > %{name}.ini << EOF @@ -143,13 +147,13 @@ %if %{with ldplayer} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \ - BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \ - OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer + BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=ldplayer \ + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" %endif %if %{with debug} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \ - BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \ - OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all + BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 \ + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all %else make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \ @@ -179,6 +183,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hash +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples @@ -194,14 +199,17 @@ %else install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir} %endif -install -pm 755 chdman jedutil ldresample ldverify \ +#install -pm 755 chdman jedutil ldresample ldverify \ +install -pm 755 chdman jedutil \ romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir} #for tool in regrep runtest split src2html srcclean for tool in regrep split src2html srcclean do install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool done +install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash +install -pm 644 hlsl/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hlsl install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps pushd src/osd/sdl/man %if %{with ldplayer} @@ -228,8 +236,8 @@ %files tools %{_bindir}/chdman %{_bindir}/jedutil -%{_bindir}/ldresample -%{_bindir}/ldverify +#%{_bindir}/ldresample +#%{_bindir}/ldverify %{_bindir}/%{name}-regrep %{_bindir}/romcmp #%{_bindir}/%{name}-runtest @@ -252,6 +260,13 @@ %changelog +* Sun Feb 19 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145u1-1 +- Updated to 0.145u1 +- Added artwork/* and hlsl/* to the installed files +- Fixed the line ending fix to spare all the *.png files +- Added bundled(libjpeg) and bundled(lzma-sdk) Provides +- Temporarily disabled ldresample and ldverify + * Mon Feb 06 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.145-1 - Updated to 0.145 - Updated the systemlibs patch Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 6 Feb 2012 17:27:41 -0000 1.49 +++ sources 19 Feb 2012 19:44:37 -0000 1.50 @@ -1 +1,2 @@ 4514ecf6dc5331cd0e803704f95e206f mame0145s.exe +2b555a2fda60eac45743bbef3ef0481d 0145u1_diff.zip