Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14076
Modified Files:
.cvsignore mame-verbosebuild.patch mame.spec sources
Log Message:
* Sat Jan 03 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.157-1
- Updated to 0.157
- Updated the verbosebuild patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-20/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore 27 Nov 2014 18:21:03 -0000 1.83
+++ .cvsignore 3 Jan 2015 08:14:28 -0000 1.84
@@ -1 +1 @@
-mame0156s.exe
+mame0157s.exe
mame-verbosebuild.patch:
makefile | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
Index: mame-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-20/mame-verbosebuild.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mame-verbosebuild.patch 10 Nov 2013 10:22:14 -0000 1.6
+++ mame-verbosebuild.patch 3 Jan 2015 08:14:28 -0000 1.7
@@ -1,7 +1,7 @@
-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
+diff -up mame-0.157/makefile.verbosebuild mame-0.157/makefile
+--- mame-0.157/makefile.verbosebuild 2015-01-03 09:00:43.512311253 +0100
++++ mame-0.157/makefile 2015-01-03 09:10:12.905229834 +0100
+@@ -346,14 +346,14 @@ endif
# compiler, linker and utilities
ifneq ($(TARGETOS),emscripten)
@@ -22,7 +22,7 @@
#-------------------------------------------------
-@@ -890,49 +890,49 @@ $(OBJ)/%.o: $(SRC)/%.c | $(OSPREBUILD)
+@@ -947,49 +947,49 @@ $(OBJ)/%.o: $(SRC)/%.c | $(OSPREBUILD)
@echo Compiling $<...
$(CC) $(CDEFS) $(CFLAGS) -c $< -o $@
ifdef CPPCHECK
@@ -54,17 +54,17 @@
+ $(CPPCHECK) $(CPPCHECKFLAGS) $<
endif
- $(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
+ $(OBJ)/%.lh: $(SRC)/%.lay $(SRC)/build/file2str.py
@echo Converting $<...
-- @$(FILE2STR) $< $@ layout_$(basename $(notdir $<))
-+ $(FILE2STR) $< $@ layout_$(basename $(notdir $<))
+- @$(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
++ $(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
- $(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC_TARGET) $(FILE2STR_TARGET)
+ $(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC_TARGET) $(SRC)/build/file2str.py
@echo Converting $<...
- @$(PNG2BDC) $< $(OBJ)/temp.bdc
-- @$(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
+- @$(PYTHON) $(SRC)/build/file2str.py $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<))
UINT8
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
-+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
++ $(PYTHON) $(SRC)/build/file2str.py $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<))
UINT8
$(DRIVLISTOBJ): $(DRIVLISTSRC)
@echo Compiling $<...
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-20/mame.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mame.spec 27 Nov 2014 18:21:04 -0000 1.98
+++ mame.spec 3 Jan 2015 08:14:28 -0000 1.99
@@ -5,7 +5,7 @@
%bcond_with debug
%bcond_with simd
-%global baseversion 156
+%global baseversion 157
#global sourceupdate 1
#global svn 21418
@@ -389,6 +389,10 @@
%changelog
+* Sat Jan 03 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.157-1
+- Updated to 0.157
+- Updated the verbosebuild patch
+
* Thu Nov 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.156-1
- Updated to 0.156
- Switched to SDL2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-20/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources 27 Nov 2014 18:21:04 -0000 1.83
+++ sources 3 Jan 2015 08:14:28 -0000 1.84
@@ -1 +1 @@
-42182044071c4aed2675e28df62fa210 mame0156s.exe
+813b68c8b6d668cf5f40a8f034877ebd mame0157s.exe