[oe-commits] org.oe.dev scummvm: target check too restrictive. Ease up. Closes bugs 3522, 3594, 3572, 4028 and 2464.

[Laibsch commit]

scummvm: target check too restrictive.  Ease up.  Closes bugs 3522, 3594, 3572, 4028 and 2464.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 8e375838e68b427990aeb8dcd049bc84c02423f7
ViewMTN: http://monotone.openembedded.org/revision/info/8e375838e68b427990aeb8dcd049bc84c02423f7
Files:
1
packages/scummvm/files/scummvm-targetcheck.patch
packages/scummvm/scummvm_0.9.1.bb
Diffs:

#
# mt diff -r0b2943182c1ccb549761dd3d2c2a252a468b8d3c -r8e375838e68b427990aeb8dcd049bc84c02423f7
#
#
#
# add_file "packages/scummvm/files/scummvm-targetcheck.patch"
#  content [85bd686c1129998657cf9d449177a98b49a24f7b]
# 
# patch "packages/scummvm/scummvm_0.9.1.bb"
#  from [a7d83e6abecad479aeba9199278c19affc862fde]
#    to [a9b774f9c63517d5addf3137a8a49db1e753d9bc]
#
============================================================
--- packages/scummvm/files/scummvm-targetcheck.patch	85bd686c1129998657cf9d449177a98b49a24f7b
+++ packages/scummvm/files/scummvm-targetcheck.patch	85bd686c1129998657cf9d449177a98b49a24f7b
@@ -0,0 +1,12 @@
+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, alignment 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"