rpms/sdlmame/F-9 sdlmame-bne.patch, NONE, 1.1 sdlmame-expat.patch, 1.1, 1.2 sdlmame.spec, 1.5, 1.6
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7329
Modified Files:
sdlmame-expat.patch sdlmame.spec
Added Files:
sdlmame-bne.patch
Log Message:
* Mon Jul 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-3
- Patched bne-- inline assembly to allow ppc64 build
sdlmame-bne.patch:
--- NEW FILE sdlmame-bne.patch ---
--- src/emu/eigccppc.h.bne~ 2008-03-02 01:35:58.000000000 +0100
+++ src/emu/eigccppc.h 2008-07-14 12:48:03.000000000 +0200
@@ -343,7 +343,7 @@
" cmpd %[compare], %[result] \n"
" bne 2f \n"
" stdcx. %[exchange], 0, %[ptr] \n"
- " bne-- 1b \n"
+ " bne- 1b \n"
"2: "
: [dummy] "+m" (*ptr) /* Lets GCC know that *ptr will be read/written in
case it's not marked volatile */
, [result] "=&r" (result)
--- src/osd/sdl/osinline.h.bne~ 2008-06-29 00:26:53.000000000 +0200
+++ src/osd/sdl/osinline.h 2008-07-14 12:48:43.000000000 +0200
@@ -69,7 +69,7 @@
__asm__ __volatile__ (
"1: ldarx %[ret], 0, %[ptr] \n"
" stdcx. %[exchange], 0, %[ptr] \n"
- " bne-- 1b \n"
+ " bne- 1b \n"
: [ret] "=&r" (ret)
: [ptr] "r" (ptr)
, [exchange] "r" (exchange)
sdlmame-expat.patch:
Index: sdlmame-expat.patch
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sdlmame-expat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdlmame-expat.patch 9 Jun 2008 20:04:30 -0000 1.1
+++ sdlmame-expat.patch 14 Jul 2008 12:19:02 -0000 1.2
@@ -1,7 +1,7 @@
---- makefile~ 2007-07-26 20:18:36.000000000 -0700
-+++ makefile 2007-07-26 20:18:58.000000000 -0700
-@@ -99,10 +99,10 @@
- # PTR64 = 1
+--- makefile.expat~ 2008-07-14 10:53:06.000000000 +0200
++++ makefile 2008-07-14 10:53:06.000000000 +0200
+@@ -125,10 +125,10 @@
+ # BIGENDIAN = 1
# uncomment next line to build expat as part of MAME build
-BUILD_EXPAT = 1
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sdlmame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdlmame.spec 7 Jul 2008 09:37:54 -0000 1.5
+++ sdlmame.spec 14 Jul 2008 12:19:02 -0000 1.6
@@ -12,10 +12,13 @@
%ifarch ppc
%define arch_flags BIGENDIAN=1
%endif
+%ifarch ppc64
+%define arch_flags BIGENDIAN=1 PTR64=1
+%endif
Name: sdlmame
Version: 0126
-Release: 1%{?beta}%{?dist}
+Release: 3%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -24,6 +27,7 @@
Source0: http://rbelmont.mameworld.info/%{name}%{_version}.zip
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
+Patch2: %{name}-bne.patch
BuildRoot: %{_tmppath}/%{name}-%{_version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel
@@ -68,6 +72,7 @@
%setup -qn %{name}%{_version}
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
+%patch2 -p0 -b .bne~
# Create mame.ini file
cat > mame.ini << EOF
@@ -179,6 +184,12 @@
%changelog
+* Mon Jul 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-3
+- Patched bne-- inline assembly to allow ppc64 build
+
+* Mon Jul 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-2
+- Added ppc64 arch_flags
+
* Mon Jul 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-1
- Updated to 0.126