summaryrefslogtreecommitdiff
path: root/packages/scummvm
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer_e1@hotmail.com>2006-07-01 17:36:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-01 17:36:39 +0000
commitd30b20595c8c682f10a1ab2ef6ec44b87583c561 (patch)
tree7f541ffc7b3d766298aaa65720f7bb29a80e8d3e /packages/scummvm
parent74f1ef81f915cf0df22c91214ca121fc373554e2 (diff)
scummvm/files/gcc-4.x.x-accept.patch: Makes scummvm approve of gcc 4.x.x
* Adds gcc 4.x.x to accept list scummvm/files/sh3-linux-new-arch.patch: Makes scummvm know of sh3 * Adds linux-sh3 to the configure script of known archs scummvm/files/tail-obselete-fix.patch: sets -n 1 instead of -1 * Sets tail -n 1 instead of -1, kept for future reference.
Diffstat (limited to 'packages/scummvm')
-rw-r--r--packages/scummvm/files/gcc-4.x.x-accept.patch11
-rw-r--r--packages/scummvm/files/sh3-linux-new-arch.patch18
-rw-r--r--packages/scummvm/files/tail-obselete-fix.patch11
-rw-r--r--packages/scummvm/scummvm_0.6.1b.bb5
4 files changed, 44 insertions, 1 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-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_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb
index 6f805b6b4d..a2c0459b3e 100644
--- a/packages/scummvm/scummvm_0.6.1b.bb
+++ b/packages/scummvm/scummvm_0.6.1b.bb
@@ -1,6 +1,9 @@
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"
do_compile() {
oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \