1:33 p.m.
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20670
Modified Files:
.cvsignore mame.spec sources
Added Files:
mame-gcc47.patch
Log Message:
* Tue Jan 10 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u5-1
- Updated to 0.144u5
- Fixed building with gcc-4.7
mame-gcc47.patch:
emu/video/polynew.h | 36 ++++++++++++++++++------------------
osd/sdl/sdlsocket.c | 1 +
2 files changed, 19 insertions(+), 18 deletions(-)
--- NEW FILE mame-gcc47.patch ---
diff -up mame-0.144u5/src/emu/video/polynew.h.gcc47 mame-0.144u5/src/emu/video/polynew.h
--- mame-0.144u5/src/emu/video/polynew.h.gcc47 2012-01-10 14:30:31.704364582 +0100
+++ mame-0.144u5/src/emu/video/polynew.h 2012-01-10 14:30:34.672381892 +0100
@@ -70,6 +70,24 @@
// TYPE DEFINITIONS
//**************************************************************************
+//-------------------------------------------------
+// global helpers for float base types
+//-------------------------------------------------
+
+inline float poly_floor(float x) { return floorf(x); }
+inline float poly_abs(float x) { return fabsf(x); }
+inline float poly_recip(float x) { return 1.0f / x; }
+
+
+//-------------------------------------------------
+// global helpers for double base types
+//-------------------------------------------------
+
+inline double poly_floor(double x) { return floor(x); }
+inline double poly_abs(double x) { return fabs(x); }
+inline double poly_recip(double x) { return 1.0 / x; }
+
+
// poly_manager is a template class
template<typename _BaseType, class _ObjectData, int _MaxParams, int _MaxPolys>
class poly_manager
@@ -254,24 +272,6 @@ private:
//-------------------------------------------------
-// global helpers for float base types
-//-------------------------------------------------
-
-inline float poly_floor(float x) { return floorf(x); }
-inline float poly_abs(float x) { return fabsf(x); }
-inline float poly_recip(float x) { return 1.0f / x; }
-
-
-//-------------------------------------------------
-// global helpers for double base types
-//-------------------------------------------------
-
-inline double poly_floor(double x) { return floor(x); }
-inline double poly_abs(double x) { return fabs(x); }
-inline double poly_recip(double x) { return 1.0 / x; }
-
-
-//-------------------------------------------------
// poly_manager - constructor
//-------------------------------------------------
diff -up mame-0.144u5/src/osd/sdl/sdlsocket.c.gcc47 mame-0.144u5/src/osd/sdl/sdlsocket.c
--- mame-0.144u5/src/osd/sdl/sdlsocket.c.gcc47 2012-01-10 14:30:12.061249998 +0100
+++ mame-0.144u5/src/osd/sdl/sdlsocket.c 2012-01-10 14:30:34.672381892 +0100
@@ -23,6 +23,7 @@
#endif
#include <errno.h>
+#define NO_MEM_TRACKING
#include "emu.h"
#include "sdlfile.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 25 Dec 2011 09:33:04 -0000 1.45
+++ .cvsignore 10 Jan 2012 13:33:49 -0000 1.46
@@ -3,3 +3,4 @@
0144u2_diff.zip
0144u3_diff.zip
0144u4_diff.zip
+0144u5_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mame.spec 25 Dec 2011 09:33:04 -0000 1.53
+++ mame.spec 10 Jan 2012 13:33:49 -0000 1.54
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-%global sourceupdate 4
+%global sourceupdate 5
Name: mame
%if 0%{?sourceupdate}
@@ -26,13 +26,14 @@
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
-#Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
+Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
#Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
#Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip
%endif
Patch0: %{name}-fortify.patch
+Patch1: %{name}-gcc47.patch
Patch2: %{name}-verbosebuild.patch
BuildRequires: expat-devel
@@ -101,6 +102,7 @@
done
%endif
%patch0 -p1 -b .fortify
+%patch1 -p1 -b .gcc47
%patch2 -p1 -b .verbosebuild
#fix encoding
@@ -248,6 +250,10 @@
%changelog
+* Tue Jan 10 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u5-1
+- Updated to 0.144u5
+- Fixed building with gcc-4.7
+
* Sun Dec 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u4-1
- Updated to 0.144u4
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 25 Dec 2011 09:33:04 -0000 1.45
+++ sources 10 Jan 2012 13:33:49 -0000 1.46
@@ -3,3 +3,4 @@
5b54e7357a9133a38f3021f610354530 0144u2_diff.zip
5bb7dbbb8e37b151dce8f4824a95ed12 0144u3_diff.zip
fd2b7811b53a61028daff87cdfd775eb 0144u4_diff.zip
+2425f1d27514c16b1044177b4374d9ec 0144u5_diff.zip