Author: belegdol Update of /cvs/nonfree/rpms/sdlmame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11017 Modified Files: .cvsignore sdlmame.spec sources Added Files: sdlmame-0134-nounidasm.patch Log Message: * Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1 - Updated to 0.134 - Turned the ldplayer back on, disabled unidasm instead sdlmame-0134-nounidasm.patch: --- NEW FILE sdlmame-0134-nounidasm.patch --- diff -up sdlmame-0134/src/tools/tools.mak.nounidasm sdlmame-0134/src/tools/tools.mak --- sdlmame-0134/src/tools/tools.mak.nounidasm 2009-09-10 15:45:02.000000000 +0200 +++ sdlmame-0134/src/tools/tools.mak 2009-09-11 10:31:56.000000000 +0200 @@ -26,7 +26,6 @@ TOOLS += \ romcmp$(EXE) \ chdman$(EXE) \ jedutil$(EXE) \ - unidasm$(EXE) \ ldresample$(EXE) \ ldverify$(EXE) \ regrep$(EXE) \ @@ -77,19 +76,6 @@ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL) #------------------------------------------------- -# unidasm -#------------------------------------------------- - -UNIDASMOBJS = \ - $(TOOLSOBJ)/unidasm.o \ - -unidasm$(EXE): $(UNIDASMOBJS) $(LIBUTIL) $(LIBOCORE) $(LIBDASM) $(ZLIB) $(EXPAT) - @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ - - - -#------------------------------------------------- # ldresample #------------------------------------------------- Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 10 Sep 2009 10:48:41 -0000 1.55 +++ .cvsignore 11 Sep 2009 08:34:20 -0000 1.56 @@ -1,2 +1,2 @@ ui.bdc -sdlmame0133u5.zip +sdlmame0134.zip Index: sdlmame.spec =================================================================== RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sdlmame.spec 10 Sep 2009 10:48:41 -0000 1.65 +++ sdlmame.spec 11 Sep 2009 08:34:20 -0000 1.66 @@ -1,4 +1,4 @@ -%define beta 0133u5 +#define beta 0133u5 %if "0%{?beta}" != "0" %define _version %{?beta} @@ -18,7 +18,7 @@ Name: sdlmame Version: 0134 -Release: 0.4.%{?beta}%{?dist} +Release: 1%{?beta}%{?dist} Summary: SDL Multiple Arcade Machine Emulator Group: Applications/Emulators @@ -30,6 +30,7 @@ Patch0: %{name}-warnings.patch Patch1: %{name}-expat.patch Patch3: %{name}-fortify.patch +Patch4: %{name}-0134-nounidasm.patch BuildRoot: %{_tmppath}/%{name}-%{_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel @@ -84,6 +85,7 @@ %patch0 -p0 -b .warnings~ %patch1 -p0 -b .expat~ %patch3 -p0 -b .fortify +%patch4 -p1 -b .nounidasm # Create mame.ini file cat > mame.ini << EOF @@ -116,8 +118,8 @@ %build -#make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\ -# OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""' +make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\ + OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""' make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""' make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\ @@ -153,8 +155,8 @@ install -pm 644 mame.ini %{buildroot}%{_sysconfdir}/mame install -pm 644 keymaps/* %{buildroot}%{_datadir}/mame/keymaps install -pm 644 ui.bdf %{SOURCE1} %{buildroot}%{_datadir}/mame/fonts -install -pm 755 chdman jedutil ldresample ldverify mame mamed romcmp \ - testkeys unidasm %{buildroot}%{_bindir} +install -pm 755 chdman jedutil ldplayer ldresample ldverify mame mamed romcmp \ + testkeys %{buildroot}%{_bindir} for tool in regrep runtest src2html srcclean do install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool @@ -193,13 +195,17 @@ %doc docs/license.txt %{_bindir}/mamed -#%files ldplayer -#%defattr(-,root,root,-) -#%doc docs/license.txt -#%{_bindir}/ldplayer +%files ldplayer +%defattr(-,root,root,-) +%doc docs/license.txt +%{_bindir}/ldplayer %changelog +* Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1 +- Updated to 0.134 +- Turned the ldplayer back on, disabled unidasm instead + * Mon Sep 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-0.4.0133u5 - Updated to 0.133u5 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 10 Sep 2009 10:48:41 -0000 1.56 +++ sources 11 Sep 2009 08:34:20 -0000 1.57 @@ -1,2 +1,2 @@ b64914c2a5589f6d5b00361464152acd ui.bdc -b06b34b543cf699873a6b5cdc9af9e58 sdlmame0133u5.zip +706429e5ecf2ed48c1a732d0dc9c0f94 sdlmame0134.zip