merge of 28b5204f533562d4df4b43cde7bbc16981fb0d0a

     and 2bb3d19276030cbe60359b8392b763021c776513

7 files changed, 74 insertions, 3 deletions

diff --git a/packages/scummvm/files/gcc-4.x.x-accept.patch b/packages/scummvm/files/gcc-4.x.x-accept.patch
new file mode 100644
index 0000000000..f69eb0f229
--- /dev/null
+++ b/packages/scummvm/files/gcc-4.x.x-accept.patch
@@ -0,0 +1,11 @@
+--- scummvm-0.6.1b/configure_orig	2006-07-01 16:42:17.000000000 +0000
++++ scummvm-0.6.1b/configure	2006-07-01 16:48:04.000000000 +0000
+@@ -362,7 +362,7 @@
+ fi
+ 
+ case $cxx_version in
+-	2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
++	2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.[0-9].[0-9])
+ 		_cxx_major=`echo $cxx_version | cut -d '.' -f 1`
+ 		_cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
+ 		cxx_version="$cxx_version, ok"
diff --git a/packages/scummvm/files/sh3-arch-0.9.0+.patch b/packages/scummvm/files/sh3-arch-0.9.0+.patch
new file mode 100644
index 0000000000..3cd0505654
--- /dev/null
+++ b/packages/scummvm/files/sh3-arch-0.9.0+.patch
@@ -0,0 +1,18 @@
+--- scummvm-0.9.0/configure_orig	2006-07-01 18:16:04.000000000 +0000
++++ scummvm-0.9.0/configure	2006-07-01 18:19:09.000000000 +0000
+@@ -762,6 +762,15 @@
+ 			type_2_byte='short'
+ 			type_4_byte='int'
+ 			;;
++		sh3-linux)
++		        echo "Cross-compiling to $_host, forcing endianness, aligment and type sizes"
++                        DEFINES="$DEFINES -DUNIX"
++			_def_endianness='#define SCUMM_LITTLE_ENDIAN'
++			_def_align='#define SCUMM_NEED_ALIGMENT'
++			type_1_byte='char'
++			type_2_byte='short'
++			type_4_byte='int'
++			;;		
+ 		ppc-amigaos)
+ 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
+ 			_def_endianness='#define SCUMM_BIG_ENDIAN'
diff --git a/packages/scummvm/files/sh3-linux-new-arch.patch b/packages/scummvm/files/sh3-linux-new-arch.patch
new file mode 100644
index 0000000000..b59d727458
--- /dev/null
+++ b/packages/scummvm/files/sh3-linux-new-arch.patch
@@ -0,0 +1,18 @@
+--- scummvm-0.6.1b/configure_orig	2006-07-01 17:15:30.000000000 +0000
++++ scummvm-0.6.1b/configure	2006-07-01 17:19:41.000000000 +0000
+@@ -462,6 +462,15 @@
+ 	    type_2_byte='short'
+ 	    type_4_byte='int'
+ 	    ;;
++	sh3-linux)
++	    echo "Crosscompiling to $_host, forcing endianess, aligment and type sizes"
++	    DEFINES="$DEFINES -DUNIX"
++	    _def_endianess='#define SCUMM_LITTLE_ENDIAN'
++	    _def_align='#define SCUMM_NEED_ALiGMENT'
++	    type_1_byte='char'
++	    type_2_byte='short'
++	    type_4_byte='int'
++	    ;;
+ 	*)
+ 	    echo "Cross-compiling to unknown target, please add your target to configure."
+ 	    exit 1
diff --git a/packages/scummvm/files/tail-obselete-fix.patch b/packages/scummvm/files/tail-obselete-fix.patch
new file mode 100644
index 0000000000..1737133e25
--- /dev/null
+++ b/packages/scummvm/files/tail-obselete-fix.patch
@@ -0,0 +1,11 @@
+--- scummvm-0.6.1b/configure_orig	2006-07-01 16:42:17.000000000 +0000
++++ scummvm-0.6.1b/configure	2006-07-01 16:43:12.000000000 +0000
+@@ -355,7 +355,7 @@
+ 
+ echocheck "compiler version"
+ 
+-cxx_name=`( $cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
++cxx_name=`( $cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1`
+ cxx_version=`( $CXX -dumpversion ) 2>&1`
+ if test "$?" -gt 0; then
+ 	cxx_version="not found"
diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc
index 88c6f13d9d..e39397be06 100644
--- a/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@ -3,8 +3,7 @@ SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
-			file://tremor.patch;patch=1"
+SRC_URI = "http://puzzle.dl.sourceforge.net/scummvm/scummvm-${PV}.tar.bz2"
 
 inherit autotools 
 
diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb
index 6f805b6b4d..313737bc92 100644
--- a/packages/scummvm/scummvm_0.6.1b.bb
+++ b/packages/scummvm/scummvm_0.6.1b.bb
@@ -1,6 +1,10 @@
 include scummvm.inc
 DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2"
-SRC_URI += " file://mouse.patch;patch=1 "
+SRC_URI += " file://mouse.patch;patch=1 \
+             file://gcc-4.x.x-accept.patch;patch=1 \
+	     file://sh3-linux-new-arch.patch;patch=1 \
+	     file://tail-obselete-fix.patch;patch=1 \
+	     file://tremor.patch;patch=1"
 
 do_compile() {
 	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb
new file mode 100644
index 0000000000..2f8e9382bb
--- /dev/null
+++ b/packages/scummvm/scummvm_0.9.0.bb
@@ -0,0 +1,10 @@
+include scummvm.inc
+DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2"
+SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
+
+do_compile() {
+	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT  -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+}
+
+