rpms/bsnes/devel bsnes-0.054-noppcelfppc64.patch, NONE, 1.1 bsnes.spec, 1.22, 1.23

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/bsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6955

Modified Files:
	bsnes.spec 
Added Files:
	bsnes-0.054-noppcelfppc64.patch 
Log Message:
Don't use ppc-elf.c on ppc64

bsnes-0.054-noppcelfppc64.patch:

--- NEW FILE bsnes-0.054-noppcelfppc64.patch ---
diff -up bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 bsnes-0.054/src/lib/libco/libco.c
--- bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64	2009-10-18 09:26:09.000000000 +0200
+++ bsnes-0.054/src/lib/libco/libco.c	2009-10-28 20:17:02.000000000 +0100
@@ -8,7 +8,7 @@
   #include "x86.c"
 #elif defined(__GNUC__) && defined(__amd64__)
   #include "amd64.c"
-#elif defined(__GNUC__) && defined(__powerpc__) && defined(__ELF__)
+#elif defined(__GNUC__) && defined(__PPC32__) && defined(__ELF__)
   #include "ppc-elf.c"
 #elif defined(__GNUC__)
   #include "sjlj.c"


Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bsnes.spec	28 Oct 2009 18:35:09 -0000	1.22
+++ bsnes.spec	28 Oct 2009 19:20:18 -0000	1.23
@@ -14,6 +14,7 @@
 Source2:        README.bsnes
 Patch0:         bsnes-0.037a-strip.patch
 Patch1:         libco.ppc-elf-2.diff
+Patch2:         bsnes-0.054-noppcelfppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #bsnes does not use system snes_ntsc because the modified video processing
@@ -40,8 +41,9 @@
 %setup -qc
 %patch0 -p0 -b .strip
 pushd src/lib/libco
-%patch1 -p1 -b .noppcelf
+%patch1 -p1 -b .newppcelf
 popd
+%patch2 -p1 -b .noppcelfppc64
 
 #fix permissions
 find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;