10:22 a.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26338
Modified Files:
.cvsignore mame-verbosebuild.patch mame.spec sources
Log Message:
* Sun Nov 10 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.151-1
- Updated to 0.151
- Updated the verbosebuild patch
- Use system-wide portmidi
- Fedora 17 is long EOL, always use system-wide libjpeg
- Added a conditional N64 SIMD
- Added new man pages
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- .cvsignore 19 Sep 2013 18:50:57 -0000 1.77
+++ .cvsignore 10 Nov 2013 10:22:14 -0000 1.78
@@ -1 +1 @@
-mame0150s.exe
+mame0151s.exe
mame-verbosebuild.patch:
makefile | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
Index: mame-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame-verbosebuild.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mame-verbosebuild.patch 17 Dec 2012 20:58:44 -0000 1.5
+++ mame-verbosebuild.patch 10 Nov 2013 10:22:14 -0000 1.6
@@ -1,16 +1,17 @@
-diff -up mame-0.147u4/makefile.verbosebuild mame-0.147u4/makefile
---- mame-0.147u4/makefile.verbosebuild 2012-12-17 21:53:58.176154755 +0100
-+++ mame-0.147u4/makefile 2012-12-17 21:55:26.559977075 +0100
-@@ -307,13 +307,13 @@ BUILD_EXE = $(EXE)
- endif
+diff -up mame-0.151/makefile.verbosebuild mame-0.151/makefile
+--- mame-0.151/makefile.verbosebuild 2013-11-10 09:48:28.461065621 +0100
++++ mame-0.151/makefile 2013-11-10 09:51:14.637247110 +0100
+@@ -330,14 +330,14 @@ endif
# compiler, linker and utilities
+ ifneq ($(TARGETOS),emscripten)
-AR = @ar
-CC = @gcc
-LD = @g++
+AR = ar
+CC = gcc
+LD = g++
+ endif
MD = -mkdir$(EXE)
-RM = @rm -f
-OBJDUMP = @objdump
@@ -21,7 +22,37 @@
#-------------------------------------------------
-@@ -786,12 +786,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+@@ -890,49 +890,49 @@ $(OBJ)/%.o: $(SRC)/%.c | $(OSPREBUILD)
+ @echo Compiling $<...
+ $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
+ ifdef CPPCHECK
+- @$(CPPCHECK) $(CPPCHECKFLAGS) $<
++ $(CPPCHECK) $(CPPCHECKFLAGS) $<
+ endif
+
+ $(OBJ)/%.o: $(OBJ)/%.c | $(OSPREBUILD)
+ @echo Compiling $<...
+ $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
+ ifdef CPPCHECK
+- @$(CPPCHECK) $(CPPCHECKFLAGS) $<
++ $(CPPCHECK) $(CPPCHECKFLAGS) $<
+ endif
+
+ $(OBJ)/%.pp: $(SRC)/%.c | $(OSPREBUILD)
+ @echo Compiling $<...
+ $(CC) $(CDEFS) $(CFLAGS) -E $< -o $@
+ ifdef CPPCHECK
+- @$(CPPCHECK) $(CPPCHECKFLAGS) $<
++ $(CPPCHECK) $(CPPCHECKFLAGS) $<
+ endif
+
+ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+ @echo Compiling $<...
+ $(CC) $(CDEFS) $(CFLAGS) -S $< -o $@
+ ifdef CPPCHECK
+- @$(CPPCHECK) $(CPPCHECKFLAGS) $<
++ $(CPPCHECK) $(CPPCHECKFLAGS) $<
+ endif
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
@echo Converting $<...
@@ -37,3 +68,16 @@
$(DRIVLISTOBJ): $(DRIVLISTSRC)
@echo Compiling $<...
+ $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
+ ifdef CPPCHECK
+- @$(CPPCHECK) $(CPPCHECKFLAGS) $<
++ $(CPPCHECK) $(CPPCHECKFLAGS) $<
+ endif
+
+ $(DRIVLISTSRC): $(SRC)/$(TARGET)/$(SUBTARGET).lst $(MAKELIST_TARGET)
+ @echo Building driver list $<...
+- @$(MAKELIST) $< >$@
++ $(MAKELIST) $< >$@
+
+ $(OBJ)/%.a:
+ @echo Archiving $@...
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mame.spec 30 Sep 2013 08:55:02 -0000 1.90
+++ mame.spec 10 Nov 2013 10:22:14 -0000 1.91
@@ -3,8 +3,9 @@
# --with debug to override
%bcond_without ldplayer
%bcond_with debug
+%bcond_with simd
-%global baseversion 150
+%global baseversion 151
#global sourceupdate 1
#global svn 21418
@@ -25,11 +26,10 @@
Version: 0.%{baseversion}
%endif
-Release: 2%{?svnrelease}%{?dist}
+Release: 1%{?svnrelease}%{?dist}
Summary: Multiple Arcade Machine Emulator
-#Files in src/lib/util and src/osd (except src/osd/sdl) are BSD
-License: MAME License
+License: MAME License and BSD
URL: http://mamedev.org/
%if 0%{?svn}
Source0: %{name}-svn%{svn}.tar.xz
@@ -54,21 +54,17 @@
BuildRequires: expat-devel
BuildRequires: flac-devel
-%if 0%{?fedora} >= 18
BuildRequires: libjpeg-turbo-devel
-%endif
%if !0%{?svn}
BuildRequires: p7zip
%endif
+BuildRequires: portmidi-devel
BuildRequires: python
BuildRequires: qt-devel
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
-%if 0%{?fedora} < 18
-Provides: bundled(libjpeg) = 8c
-%endif
Provides: bundled(lzma-sdk) = 9.22
%description
@@ -210,20 +206,21 @@
#make a copy for MESS
sed 's/%{name}/mess/g' %{name}.ini > mess.ini
+%if %{with simd}
+sed -i 's/USE_SIMD (0)/USE_SIMD (1)/' src/emu/cpu/rsp/rsp.h
+%endif
%build
#these flags are already included in the Makefile
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 -g -pipe -Wall //')
+
+%if %{with simd}
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e
's/-mtune=generic/-march=corei7-avx/')
+%endif
#save some space
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_FLAC=0 SUFFIX64="
-
-%if 0%{?fedora} >= 18
-MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=0"
-%else
-MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=1"
-%endif
+ BUILD_FLAC=0 BUILD_JPEGLIB=0 BUILD_MIDILIB=0 SUFFIX64="
%if %{with ldplayer}
make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
@@ -308,9 +305,9 @@
%if %{with ldplayer}
install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1
%endif
-install -pm 644 chdman.1 jedutil.1 ldverify.1 romcmp.1 testkeys.1 \
- $RPM_BUILD_ROOT%{_mandir}/man1
-install -pm 644 mame.6 $RPM_BUILD_ROOT%{_mandir}/man6
+install -pm 644 castool.1 chdman.1 imgtool.1 jedutil.1 ldresample.1 ldverify.1 \
+ romcmp.1 testkeys.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -pm 644 mame.6 mess.6 $RPM_BUILD_ROOT%{_mandir}/man6
popd
popd
@@ -346,6 +343,7 @@
%{_bindir}/unidasm
%{_mandir}/man1/chdman.1*
%{_mandir}/man1/jedutil.1*
+%{_mandir}/man1/ldresample.1*
%{_mandir}/man1/ldverify.1*
%{_mandir}/man1/romcmp.1*
%{_mandir}/man1/testkeys.1*
@@ -368,12 +366,15 @@
%else
%{_bindir}/mess
%endif
+%{_mandir}/man6/mess.6*
%files -n mess-tools
%doc docs/imgtool.txt
%{_bindir}/castool
%{_bindir}/floptool
%{_bindir}/imgtool
+%{_mandir}/man1/castool.1*
+%{_mandir}/man1/imgtool.1*
%files data
%{_datadir}/%{name}
@@ -387,6 +388,14 @@
%changelog
+* Sun Nov 10 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.151-1
+- Updated to 0.151
+- Updated the verbosebuild patch
+- Use system-wide portmidi
+- Fedora 17 is long EOL, always use system-wide libjpeg
+- Added a conditional N64 SIMD
+- Added new man pages
+
* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.150-2
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources 19 Sep 2013 18:50:57 -0000 1.77
+++ sources 10 Nov 2013 10:22:14 -0000 1.78
@@ -1 +1 @@
-3fbf35429f03412fcd19f2374183764d mame0150s.exe
+adccb17eb36dac39682819ec945e0393 mame0151s.exe