[oe-commits] org.oe.dev snes9x: fix linkage and gcc4 problems, closes #2154

[manuel.teira commit]

snes9x: fix linkage and gcc4 problems, closes #2154

Author: manuel.teira at telefonica.net
Branch: org.openembedded.dev
Revision: 2ead7798d940d6b5da523ef9c61da00f5dd618d2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2ead7798d940d6b5da523ef9c61da00f5dd618d2
Files:
1
packages/snes9x/snes9x-sdl/gcc-4.1.patch
packages/snes9x/snes9x-sdl_1.39.bb
Diffs:

#
# mt diff -r6f54d314925e61cac9f7a6c66544fa07c6281950 -r2ead7798d940d6b5da523ef9c61da00f5dd618d2
#
# 
# 
# add_file "packages/snes9x/snes9x-sdl/gcc-4.1.patch"
#  content [796b139b5909de01f9a3ceb33b582feaac9c5bf4]
# 
# patch "packages/snes9x/snes9x-sdl_1.39.bb"
#  from [e9195f70916d4b1774b10f725c169a10f903a4e9]
#    to [2a76f6065419714d292500f62cd3a1cb902f755e]
# 
============================================================
--- packages/snes9x/snes9x-sdl/gcc-4.1.patch	796b139b5909de01f9a3ceb33b582feaac9c5bf4
+++ packages/snes9x/snes9x-sdl/gcc-4.1.patch	796b139b5909de01f9a3ceb33b582feaac9c5bf4
@@ -0,0 +1,28 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- snes9x-sdl-1.39/dsp1.h~gcc-4.1
++++ snes9x-sdl-1.39/dsp1.h
+@@ -233,8 +233,8 @@
+ void S9xResetDSP1 ();
+ uint8 S9xGetDSP (uint16 Address);
+ void S9xSetDSP (uint8 Byte, uint16 Address);
+-END_EXTERN_C
+ 
+ extern struct SDSP1 DSP1;
++END_EXTERN_C
+ 
+ #endif
+--- snes9x-sdl-1.39/unix/unix.cpp~gcc-4.1
++++ snes9x-sdl-1.39/unix/unix.cpp
+@@ -1046,7 +1046,7 @@
+ {
+ }
+ 
+-static uint8 Buf[MAX_BUFFER_SIZE];
++static uint8 Buf[MAX_BUFFER_SIZE] __attribute__((aligned(4)));
+ 
+ #define FIXED_POINT 0x10000
+ #define FIXED_POINT_SHIFT 16
============================================================
--- packages/snes9x/snes9x-sdl_1.39.bb	e9195f70916d4b1774b10f725c169a10f903a4e9
+++ packages/snes9x/snes9x-sdl_1.39.bb	2a76f6065419714d292500f62cd3a1cb902f755e
@@ -1,12 +1,13 @@ LICENSE = "snes9x"
 DESCRIPTION = "Super Nintendo Emulator based on SDL"
 SECTION = "games"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl zlib"
 LICENSE = "snes9x"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.vanille.de/mirror/snes9x-sdl-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1"
+	   file://compile.patch;patch=1 \
+	   file://gcc-4.1.patch;patch=1"
 S = "${WORKDIR}/snes9x-sdl-${PV}"
 
 do_compile() {