rpms/sdlmess/F-9 sdlmess-bne.patch, NONE, 1.1 sdlmess-expat.patch, 1.1, 1.2 sdlmess.spec, 1.2, 1.3

[Julian Sikorski]

Author: belegdol

Update of /cvs/nonfree/rpms/sdlmess/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9021

Modified Files:
	sdlmess-expat.patch sdlmess.spec 
Added Files:
	sdlmess-bne.patch 
Log Message:
* Mon Jul 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-2
- Added ppc64 arch_flags
- Patched bne-- inline assembly to allow ppc64 build
- Updated the expat patch to make new rpm happy


sdlmess-bne.patch:

--- NEW FILE sdlmess-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)

sdlmess-expat.patch:

Index: sdlmess-expat.patch
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-9/sdlmess-expat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdlmess-expat.patch	4 Jun 2008 14:16:45 -0000	1.1
+++ sdlmess-expat.patch	14 Jul 2008 12:42:54 -0000	1.2
@@ -1,7 +1,7 @@
---- makefile.sdl~	2007-08-14 17:25:18.000000000 +0200
-+++ makefile.sdl	2007-08-31 01:41:46.000000000 +0200
-@@ -99,10 +99,10 @@
- # PTR64 = 1
+--- makefile.sdl.expat~	2008-07-14 14:33:46.000000000 +0200
++++ makefile.sdl	2008-07-14 14:33:46.000000000 +0200
+@@ -125,10 +125,10 @@
+ # BIGENDIAN = 1
  
  # uncomment next line to build expat as part of MAME build
 -BUILD_EXPAT = 1


Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-9/sdlmess.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmess.spec	11 Jul 2008 11:24:53 -0000	1.2
+++ sdlmess.spec	14 Jul 2008 12:42:54 -0000	1.3
@@ -4,10 +4,13 @@
 %ifarch ppc
 %define arch_flags BIGENDIAN=1
 %endif
+%ifarch ppc64
+%define arch_flags BIGENDIAN=1 PTR64=1
+%endif
 
 Name:           sdlmess
 Version:        0126
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SDL Multiple Emulator Super System
 
 Group:          Applications/Emulators
@@ -17,6 +20,7 @@
 Source1:        %{name}-ctrlr.tgz
 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
@@ -59,6 +63,7 @@
 %setup -qn %{name}%{version}
 %patch0 -p0 -b .warnings~
 %patch1 -p0 -b .expat~
+%patch2 -p0 -b .bne~
 
 # Create mess.ini file
 cat > mess.ini << EOF
@@ -189,6 +194,11 @@
 
 
 %changelog
+* Mon Jul 14 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-2
+- Added ppc64 arch_flags
+- Patched bne-- inline assembly to allow ppc64 build
+- Updated the expat patch to make new rpm happy
+
 * Mon Jul 11 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0126-1
 - Updated to 0.126
 - Dropped DEBUGGER=1, it is default now