Hi all,
please apply the arm-oabi scummvm patch to stable branch.
best regards
Bernhard Guillon
$ mtn diff -r f74141b6df53f890c26db2848828471f337744ac -r
f53e24a28ccbcd6edf5da30eba9589641ebf8a55 packages/scummvm/
#
#
# add_file "packages/scummvm/files/scummvm-targetcheck.patch"
# content [71dd9d1fece0bc275c67b52a2d3af0cc5ef5b276]
#
# patch "packages/scummvm/scummvm_0.9.1.bb"
# from [a7d83e6abecad479aeba9199278c19affc862fde]
# to [a9b774f9c63517d5addf3137a8a49db1e753d9bc]
#
============================================================
--- packages/scummvm/files/scummvm-targetcheck.patch
71dd9d1fece0bc275c67b52a
2d3af0cc5ef5b276
+++ packages/scummvm/files/scummvm-targetcheck.patch
71dd9d1fece0bc275c67b52a
2d3af0cc5ef5b276
@@ -0,0 +1,17 @@
+upstream:
http://sourceforge.net/tracker/index.php?func=detail&aid=1959138&grou
p_id=37116&atid=418820
+status: accepted in revision 31912 (less than an hour for turnaround,
fantastic
!)
+origin: adapted from http://bugs.openembedded.net/show_bug.cgi?id=3522
+comment: the strict check for targets needs to be relaxed to compile
for some o
f OE targets
+
+diff -uNr scummvm-0.9.1.vanilla/configure scummvm-0.9.1/configure
+--- scummvm-0.9.1.vanilla/configure 2007-12-23 00:08:23.000000000 +0100
++++ scummvm-0.9.1/configure 2007-12-23 00:08:35.000000000 +0100
+@@ -763,7 +763,7 @@
+ type_2_byte='short'
+ type_4_byte='int'
+ ;;
+- arm-linux|arm-*-linux-gnueabi)
++ arm-linux|arm*-linux-gnueabi|arm-*-linux|*-angstrom-linux)
+ echo "Cross-compiling to $_host, forcing
endianness, ali
gnment and type sizes"
+ DEFINES="$DEFINES -DUNIX"
+ #not true for all ARM systems, but the
interesting ones
are all LE. Most (if not all) BE arm devices don't have a screen
============================================================
--- packages/scummvm/scummvm_0.9.1.bb
a7d83e6abecad479aeba9199278c19affc862fde
+++ packages/scummvm/scummvm_0.9.1.bb
a9b774f9c63517d5addf3137a8a49db1e753d9bc
@@ -1,7 +1,9 @@ require scummvm.inc
require scummvm.inc
+
DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
-SRC_URI += "file://makefile-nostrip.patch;patch=1"
+SRC_URI += "file://makefile-nostrip.patch;patch=1 \
+ file://scummvm-targetcheck.patch;patch=1"
SRC_URI_append_openmoko = " file://openmoko-scummvm \
file://scummvm.desktop"
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
