Author: belegdol Update of /cvs/nonfree/rpms/mame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21188 Modified Files: .cvsignore sources Added Files: mame-fortify.patch mame-ppc64.patch mame-verbosebuild.patch mame.spec Log Message: Initial import mame-fortify.patch: sdlprefix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE mame-fortify.patch --- diff -up mame-0.137/src/osd/sdl/sdlprefix.h.fortify mame-0.137/src/osd/sdl/sdlprefix.h --- mame-0.137/src/osd/sdl/sdlprefix.h.fortify 2010-03-21 14:20:41.000000000 +0100 +++ mame-0.137/src/osd/sdl/sdlprefix.h 2010-03-21 14:21:07.000000000 +0100 @@ -50,9 +50,9 @@ #endif // fix for Ubuntu 8.10 -#ifdef _FORTIFY_SOURCE -#undef _FORTIFY_SOURCE -#endif +// #ifdef _FORTIFY_SOURCE +// #undef _FORTIFY_SOURCE +// #endif #endif /* SDLMAME_UNIX */ mame-ppc64.patch: makefile | 3 +++ 1 file changed, 3 insertions(+) --- NEW FILE mame-ppc64.patch --- diff -up mame-0.137/makefile.ppc64 mame-0.137/makefile --- mame-0.137/makefile.ppc64 2010-03-21 14:20:40.000000000 +0100 +++ mame-0.137/makefile 2010-03-21 14:21:07.000000000 +0100 @@ -102,6 +102,9 @@ endif ifeq ($(firstword $(filter amd64,$(UNAME))),amd64) PTR64 = 1 endif +ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64) +PTR64 = 1 +endif endif # Autodetect BIGENDIAN mame-verbosebuild.patch: makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- NEW FILE mame-verbosebuild.patch --- diff -up mame-0.137/makefile.verbosebuild mame-0.137/makefile --- mame-0.137/makefile.verbosebuild 2010-03-21 15:38:37.000000000 +0100 +++ mame-0.137/makefile 2010-03-21 15:40:09.000000000 +0100 @@ -268,11 +268,11 @@ BUILD_EXE = $(EXE) endif # compiler, linker and utilities -AR = @ar -CC = @gcc -LD = @g++ +AR = ar +CC = gcc +LD = g++ MD = -mkdir$(EXE) -RM = @rm -f +RM = rm -f @@ -688,12 +688,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD) $(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR) @echo Converting $<... - @$(FILE2STR) $< $@ layout_$(basename $(notdir $<)) + $(FILE2STR) $< $@ layout_$(basename $(notdir $<)) $(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC) $(FILE2STR) @echo Converting $<... - @$(PNG2BDC) $< $(OBJ)/temp.bdc - @$(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8 + $(PNG2BDC) $< $(OBJ)/temp.bdc + $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8 $(OBJ)/%.a: @echo Archiving $@... --- NEW FILE mame.spec --- # the debug build is disabled by default, please use --with debug to override %bcond_with debug %global baseversion 137 #global sourceupdate 4 Name: mame %if 0%{?sourceupdate} Version: 0.%{baseversion}u%{sourceupdate} %else Version: 0.%{baseversion} %endif Release: 4%{?dist} Summary: Multiple Arcade Machine Emulator Group: Applications/Emulators #Files in src/lib/util and src/osd (except src/osd/sdl) are BSD License: MAME License and BSD URL: http://mamedev.org/ Source0: http://www.aarongiles.com/mirror/releases/%{name}0%{baseversion}s.exe #ui.bdc generated from ui.bdf #Source1: ui.bdc %if 0%{?sourceupdate} #Source updates %endif Patch0: %{name}-fortify.patch Patch1: %{name}-ppc64.patch Patch2: %{name}-verbosebuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel BuildRequires: GConf2-devel BuildRequires: gtk2-devel BuildRequires: p7zip BuildRequires: SDL-devel BuildRequires: zlib-devel Provides: sdlmame = 0%{baseversion}-%{release} Obsoletes: sdlmame < 0136-2 %description MAME stands for Multiple Arcade Machine Emulator. When used in conjunction with an arcade game's data files (ROMs), MAME will more or less faithfully reproduce that game on a PC. The ROM images that MAME utilizes are "dumped" from arcade games' original circuit-board ROM chips. MAME becomes the "hardware" for the games, taking the place of their original CPUs and support chips. Therefore, these games are NOT simulations, but the actual, original games that appeared in arcades. MAME's purpose is to preserve these decades of video-game history. As gaming technology continues to rush forward, MAME prevents these important "vintage" games from being lost and forgotten. This is achieved by documenting the hardware and how it functions, thanks to the talent of programmers from the MAME team and from other contributors. Being able to play the games is just a nice side-effect, which doesn't happen all the time. MAME strives for emulating the games faithfully. %package tools Summary: Tools used for the MAME package Group: Applications/Emulators Requires: %{name} = %{version}-%{release} Provides: sdlmame-tools = 0%{baseversion}-%{release} Obsoletes: sdlmame-tools < 0136-2 %description tools %{summary}. %package ldplayer Summary: Standalone laserdisc player based on MAME Group: Applications/Emulators Provides: sdlmame-ldplayer = 0%{baseversion}-%{release} Obsoletes: sdlmame-ldplayer < 0136-2 %description ldplayer %{summary}. %prep %setup -qcT for sourcefile in %{sources}; do 7za x $sourcefile done find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \; %patch0 -p1 -b .fortify %patch1 -p1 -b .ppc64 %patch2 -p1 -b .verbosebuild %if 0%{?sourceupdate} i=1 while [ $i -le %{sourceupdate} ]; do patch -p0 -E < 0%{baseversion}u${i}.diff i=`expr $i + 1` done %endif # Create ini file cat > %{name}.ini << EOF # Define multi-user paths artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects ctrlrpath %{_datadir}/%{name}/ctrlr fontpath %{_datadir}/%{name}/fonts rompath %{_datadir}/%{name}/roms;%{_datadir}/%{name}/chds samplepath %{_datadir}/%{name}/samples cheatpath %{_datadir}/%{name}/cheats # Allow user to override ini settings inipath \$HOME/.%{name}/ini;%{_sysconfdir}/%{name} # Set paths for local storage cfg_directory \$HOME/.%{name}/cfg comment_directory \$HOME/.%{name}/comments diff_directory \$HOME/.%{name}/diff input_directory \$HOME/.%{name}/inp memcard_directory \$HOME/.%{name}/memcard nvram_directory \$HOME/.%{name}/nvram snapshot_directory \$HOME/.%{name}/snap state_directory \$HOME/.%{name}/sta # Fedora custom defaults video opengl autosave 1 joystick 1 EOF %build make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' TARGET=ldplayer %if %{with debug} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all %else make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all %endif %install rm -rf %{buildroot} # create directories install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_datadir}/%{name}/artwork install -d %{buildroot}%{_datadir}/%{name}/chds install -d %{buildroot}%{_datadir}/%{name}/ctrlr install -d %{buildroot}%{_datadir}/%{name}/effects install -d %{buildroot}%{_datadir}/%{name}/fonts install -d %{buildroot}%{_datadir}/%{name}/keymaps install -d %{buildroot}%{_datadir}/%{name}/roms install -d %{buildroot}%{_datadir}/%{name}/samples install -d %{buildroot}%{_datadir}/%{name}/cheats install -d %{buildroot}%{_sysconfdir}/%{name} install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta # install binaries and config files install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name} install -pm 644 src/osd/sdl/keymaps/* %{buildroot}%{_datadir}/%{name}/keymaps #install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts %if %{with debug} install -pm 755 %{name}d %{buildroot}%{_bindir} %else install -pm 755 %{name} %{buildroot}%{_bindir} %endif install -pm 755 chdman jedutil ldplayer ldresample ldverify \ romcmp testkeys unidasm %{buildroot}%{_bindir} #for tool in regrep runtest split src2html srcclean for tool in regrep split src2html srcclean do install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool done %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc docs/* whatsnew*.txt %config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini %dir %{_sysconfdir}/%{name} %if %{with debug} %{_bindir}/%{name}d %else %{_bindir}/%{name} %endif %{_datadir}/%{name} %{_sysconfdir}/skel/.%{name} %files tools %defattr(-,root,root,-) %{_bindir}/chdman %{_bindir}/jedutil %{_bindir}/ldresample %{_bindir}/ldverify %{_bindir}/%{name}-regrep %{_bindir}/romcmp #%{_bindir}/%{name}-runtest %{_bindir}/%{name}-split %{_bindir}/%{name}-src2html %{_bindir}/%{name}-srcclean %{_bindir}/testkeys %{_bindir}/unidasm %files ldplayer %defattr(-,root,root,-) %{_bindir}/ldplayer %changelog * Sun Mar 21 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.137-4 - Stripped @ from the commands to make the build more verbose * Sun Mar 21 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.137-3 - Dropped suffix64 - Added ppc64 autodetection support - Re-diffed the fortify patch * Sat Mar 20 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0.137-2 - Changed the versioning scheme to include the dot - Changed the source URL to point to aarongiles.com mirror directly - Added missing application of the fortify patch - Added sparc64 and s390 to architectures getting suffix64 - Removed duplicate license.txt * Thu Mar 11 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 0137-1 - Initial package based on sdlmame Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Apr 2010 19:56:15 -0000 1.1 +++ .cvsignore 7 Apr 2010 20:54:15 -0000 1.2 @@ -0,0 +1 @@ +mame0137s.exe Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Apr 2010 19:56:15 -0000 1.1 +++ sources 7 Apr 2010 20:54:15 -0000 1.2 @@ -0,0 +1 @@ +1b70adfbe6aa35959881b82e48f93d82 mame0137s.exe