summaryrefslogtreecommitdiff
path: root/recipes/scummvm
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/scummvm
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/scummvm')
-rw-r--r--recipes/scummvm/files/gcc-4.x.x-accept.patch11
-rw-r--r--recipes/scummvm/files/makefile-nostrip.patch13
-rw-r--r--recipes/scummvm/files/mouse.patch36
-rw-r--r--recipes/scummvm/files/no-strip.patch22
-rwxr-xr-xrecipes/scummvm/files/om-gta01/openmoko-scummvm19
-rw-r--r--recipes/scummvm/files/openmoko/openmoko-scummvm19
-rw-r--r--recipes/scummvm/files/openmoko/scummvm.desktop12
-rw-r--r--recipes/scummvm/files/scummvm-targetcheck.patch17
-rw-r--r--recipes/scummvm/files/scummvm.desktop12
-rw-r--r--recipes/scummvm/files/sh3-arch-0.9.0+.patch18
-rw-r--r--recipes/scummvm/files/sh3-linux-new-arch.patch18
-rw-r--r--recipes/scummvm/files/tail-obselete-fix.patch11
-rw-r--r--recipes/scummvm/files/tremor.patch32
-rw-r--r--recipes/scummvm/opie-scummvm_1.0.1.bb18
-rw-r--r--recipes/scummvm/scummvm-0.6.0/mouse.patch36
-rw-r--r--recipes/scummvm/scummvm-0.6.0/sword1.patch16
-rw-r--r--recipes/scummvm/scummvm-0.6.0/tremor.patch32
-rw-r--r--recipes/scummvm/scummvm-qpe_0.6.1b.bb5
-rw-r--r--recipes/scummvm/scummvm.inc27
-rw-r--r--recipes/scummvm/scummvm_0.12.0.bb33
-rw-r--r--recipes/scummvm/scummvm_0.6.0.bb34
-rw-r--r--recipes/scummvm/scummvm_0.6.1b.bb9
-rw-r--r--recipes/scummvm/scummvm_0.9.0.bb9
-rw-r--r--recipes/scummvm/scummvm_0.9.1.bb30
24 files changed, 489 insertions, 0 deletions
diff --git a/recipes/scummvm/files/gcc-4.x.x-accept.patch b/recipes/scummvm/files/gcc-4.x.x-accept.patch
new file mode 100644
index 0000000000..f69eb0f229
--- /dev/null
+++ b/recipes/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/recipes/scummvm/files/makefile-nostrip.patch b/recipes/scummvm/files/makefile-nostrip.patch
new file mode 100644
index 0000000000..7f9c8b49d2
--- /dev/null
+++ b/recipes/scummvm/files/makefile-nostrip.patch
@@ -0,0 +1,13 @@
+Index: scummvm-0.9.1/Makefile
+===================================================================
+--- scummvm-0.9.1.orig/Makefile 2007-08-18 13:02:07.000000000 +0200
++++ scummvm-0.9.1/Makefile 2007-08-18 13:02:24.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ install: all
+ $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
++ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
+ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+ $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
diff --git a/recipes/scummvm/files/mouse.patch b/recipes/scummvm/files/mouse.patch
new file mode 100644
index 0000000000..1697ac811d
--- /dev/null
+++ b/recipes/scummvm/files/mouse.patch
@@ -0,0 +1,36 @@
+--- ./backends/sdl/sdl-common.cpp~mouse.patch 2004-03-05 07:23:04.000000000 +1030
++++ ./backends/sdl/sdl-common.cpp 2004-05-16 07:53:24.000000000 +0930
+@@ -866,6 +866,9 @@
+ return true;
+
+ case SDL_MOUSEBUTTONDOWN:
++#ifdef QTOPIA
++ event->event_code = EVENT_LBUTTONDOWN;
++#else
+ if (ev.button.button == SDL_BUTTON_LEFT)
+ event->event_code = EVENT_LBUTTONDOWN;
+ else if (ev.button.button == SDL_BUTTON_RIGHT)
+@@ -878,18 +881,23 @@
+ #endif
+ else
+ break;
++#endif
+
+ fillMouseEvent(*event, ev.button.x, ev.button.y);
+
+ return true;
+
+ case SDL_MOUSEBUTTONUP:
++#ifdef QTOPIA
++ event->event_code = EVENT_LBUTTONUP;
++#else
+ if (ev.button.button == SDL_BUTTON_LEFT)
+ event->event_code = EVENT_LBUTTONUP;
+ else if (ev.button.button == SDL_BUTTON_RIGHT)
+ event->event_code = EVENT_RBUTTONUP;
+ else
+ break;
++#endif
+ fillMouseEvent(*event, ev.button.x, ev.button.y);
+
+ return true;
diff --git a/recipes/scummvm/files/no-strip.patch b/recipes/scummvm/files/no-strip.patch
new file mode 100644
index 0000000000..4df1283263
--- /dev/null
+++ b/recipes/scummvm/files/no-strip.patch
@@ -0,0 +1,22 @@
+Index: scummvm-0.12.0/ports.mk
+===================================================================
+--- scummvm-0.12.0.orig/ports.mk
++++ scummvm-0.12.0/ports.mk
+@@ -10,7 +10,7 @@
+ #
+ install: all
+ $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
++ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)"
+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/"
+ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6"
+ $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
+@@ -21,7 +21,7 @@ install: all
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/"
+ ifdef DYNAMIC_MODULES
+ $(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/"
+- $(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
++ $(INSTALL) -c -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
+ endif
+
+ uninstall:
diff --git a/recipes/scummvm/files/om-gta01/openmoko-scummvm b/recipes/scummvm/files/om-gta01/openmoko-scummvm
new file mode 100755
index 0000000000..e8c5cb3984
--- /dev/null
+++ b/recipes/scummvm/files/om-gta01/openmoko-scummvm
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Save current AUX Key mapping
+SAVE_KEY="$(xmodmap -pke | grep 'keycode 8')"
+
+# Map AUX Key to F5
+xmodmap -e "keycode 8 = F5"
+
+# Turn LCD feft
+xrandr -o left
+
+# Start the scummvm in fullscreen mode
+scummvm --fullscreen --themepath=/usr/share/scummvm/
+
+# Turn LCD normal
+xrandr -o normal
+
+# Restore the AUX Key mapping
+xmodmap -e "$SAVE_KEY"
diff --git a/recipes/scummvm/files/openmoko/openmoko-scummvm b/recipes/scummvm/files/openmoko/openmoko-scummvm
new file mode 100644
index 0000000000..58eb2bbded
--- /dev/null
+++ b/recipes/scummvm/files/openmoko/openmoko-scummvm
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Save current AUX Key mapping
+SAVE_KEY="$(xmodmap -pke | grep 'keycode 177')"
+
+# Map AUX Key to F5
+xmodmap -e "keycode 177 = F5"
+
+# Turn LCD feft
+xrandr -o left
+
+# Start the scummvm in fullscreen mode
+scummvm --fullscreen --themepath=/usr/share/scummvm/
+
+# Turn LCD normal
+xrandr -o normal
+
+# Restore the AUX Key mapping
+xmodmap -e "$SAVE_KEY"
diff --git a/recipes/scummvm/files/openmoko/scummvm.desktop b/recipes/scummvm/files/openmoko/scummvm.desktop
new file mode 100644
index 0000000000..96c025050e
--- /dev/null
+++ b/recipes/scummvm/files/openmoko/scummvm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=openmoko-scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
diff --git a/recipes/scummvm/files/scummvm-targetcheck.patch b/recipes/scummvm/files/scummvm-targetcheck.patch
new file mode 100644
index 0000000000..6f245294b4
--- /dev/null
+++ b/recipes/scummvm/files/scummvm-targetcheck.patch
@@ -0,0 +1,17 @@
+upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1959138&group_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 of 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, 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
diff --git a/recipes/scummvm/files/scummvm.desktop b/recipes/scummvm/files/scummvm.desktop
new file mode 100644
index 0000000000..5a0f88b355
--- /dev/null
+++ b/recipes/scummvm/files/scummvm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ScummVM
+Name[pl]=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Exec=scummvm
+Icon=scummvm.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;AdventureGame;
+StartupNotify=false
diff --git a/recipes/scummvm/files/sh3-arch-0.9.0+.patch b/recipes/scummvm/files/sh3-arch-0.9.0+.patch
new file mode 100644
index 0000000000..3cd0505654
--- /dev/null
+++ b/recipes/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/recipes/scummvm/files/sh3-linux-new-arch.patch b/recipes/scummvm/files/sh3-linux-new-arch.patch
new file mode 100644
index 0000000000..b59d727458
--- /dev/null
+++ b/recipes/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/recipes/scummvm/files/tail-obselete-fix.patch b/recipes/scummvm/files/tail-obselete-fix.patch
new file mode 100644
index 0000000000..1737133e25
--- /dev/null
+++ b/recipes/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/recipes/scummvm/files/tremor.patch b/recipes/scummvm/files/tremor.patch
new file mode 100644
index 0000000000..3acf302ec8
--- /dev/null
+++ b/recipes/scummvm/files/tremor.patch
@@ -0,0 +1,32 @@
+--- ./sound/vorbis.cpp.old 2004-05-16 04:23:59.000000000 +0930
++++ ./sound/vorbis.cpp 2004-05-16 04:24:23.000000000 +0930
+@@ -29,7 +29,7 @@
+ #include "sound/audiostream.h"
+ #include "sound/audiocd.h"
+
+-#include <vorbis/vorbisfile.h>
++#include <tremor/ivorbisfile.h>
+
+
+ AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
+--- ./configure.old 2004-05-16 04:46:47.000000000 +0930
++++ ./configure 2004-05-16 04:50:42.000000000 +0930
+@@ -560,15 +560,15 @@
+ if test "$_vorbis" = auto ; then
+ _vorbis=no
+ cat > $TMPC << EOF
+-#include <vorbis/codec.h>
++#include <tremor/ivorbiscodec.h>
+ int main(void) { vorbis_packet_blocksize(0,0); return 0; }
+ EOF
+ cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
+- -lvorbis -logg -lm && _vorbis=yes
++ -lvorbisidec -logg -lm && _vorbis=yes
+ fi
+ if test "$_vorbis" = yes ; then
+ _def_vorbis='#define USE_VORBIS'
+- LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
++ LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisidec -logg"
+ INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
+ else
+ _def_vorbis='#undef USE_VORBIS'
diff --git a/recipes/scummvm/opie-scummvm_1.0.1.bb b/recipes/scummvm/opie-scummvm_1.0.1.bb
new file mode 100644
index 0000000000..45116eb333
--- /dev/null
+++ b/recipes/scummvm/opie-scummvm_1.0.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "opie-scummvm"
+SECTION = "opie/games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opie-scummvm"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+RDEPENDS = "scummvm-qpe"
+SRC_URI = "http://sickpeople.wmc-allstars.com/law/files/scummvm/opie-scummvm-${PV}-r0_arm.tar.bz2"
+
+inherit opie
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}
+ install -m 0755 ${WORKDIR}/${APPNAME}-1.0.1/scummvm.png ${D}${palmtopdir}/pics/
+}
+
diff --git a/recipes/scummvm/scummvm-0.6.0/mouse.patch b/recipes/scummvm/scummvm-0.6.0/mouse.patch
new file mode 100644
index 0000000000..1697ac811d
--- /dev/null
+++ b/recipes/scummvm/scummvm-0.6.0/mouse.patch
@@ -0,0 +1,36 @@
+--- ./backends/sdl/sdl-common.cpp~mouse.patch 2004-03-05 07:23:04.000000000 +1030
++++ ./backends/sdl/sdl-common.cpp 2004-05-16 07:53:24.000000000 +0930
+@@ -866,6 +866,9 @@
+ return true;
+
+ case SDL_MOUSEBUTTONDOWN:
++#ifdef QTOPIA
++ event->event_code = EVENT_LBUTTONDOWN;
++#else
+ if (ev.button.button == SDL_BUTTON_LEFT)
+ event->event_code = EVENT_LBUTTONDOWN;
+ else if (ev.button.button == SDL_BUTTON_RIGHT)
+@@ -878,18 +881,23 @@
+ #endif
+ else
+ break;
++#endif
+
+ fillMouseEvent(*event, ev.button.x, ev.button.y);
+
+ return true;
+
+ case SDL_MOUSEBUTTONUP:
++#ifdef QTOPIA
++ event->event_code = EVENT_LBUTTONUP;
++#else
+ if (ev.button.button == SDL_BUTTON_LEFT)
+ event->event_code = EVENT_LBUTTONUP;
+ else if (ev.button.button == SDL_BUTTON_RIGHT)
+ event->event_code = EVENT_RBUTTONUP;
+ else
+ break;
++#endif
+ fillMouseEvent(*event, ev.button.x, ev.button.y);
+
+ return true;
diff --git a/recipes/scummvm/scummvm-0.6.0/sword1.patch b/recipes/scummvm/scummvm-0.6.0/sword1.patch
new file mode 100644
index 0000000000..0c934ef20f
--- /dev/null
+++ b/recipes/scummvm/scummvm-0.6.0/sword1.patch
@@ -0,0 +1,16 @@
+--- ./sword1/sword1.cpp.old 2004-05-16 03:17:26.000000000 +0930
++++ ./sword1/sword1.cpp 2004-05-16 03:12:42.000000000 +0930
+@@ -1061,8 +1061,11 @@
+ _systemVars.runningFromCd = true;
+ _systemVars.currentCD = 2;
+ test.close();
+- } else
+- error("Unable to find files.\nPlease read the instructions again");
++ } else {
++ _systemVars.runningFromCd = false;
++ _systemVars.playSpeech = false;
++// error("Unable to find files.\nPlease read the instructions again");
++ }
+ }
+ }
+
diff --git a/recipes/scummvm/scummvm-0.6.0/tremor.patch b/recipes/scummvm/scummvm-0.6.0/tremor.patch
new file mode 100644
index 0000000000..3acf302ec8
--- /dev/null
+++ b/recipes/scummvm/scummvm-0.6.0/tremor.patch
@@ -0,0 +1,32 @@
+--- ./sound/vorbis.cpp.old 2004-05-16 04:23:59.000000000 +0930
++++ ./sound/vorbis.cpp 2004-05-16 04:24:23.000000000 +0930
+@@ -29,7 +29,7 @@
+ #include "sound/audiostream.h"
+ #include "sound/audiocd.h"
+
+-#include <vorbis/vorbisfile.h>
++#include <tremor/ivorbisfile.h>
+
+
+ AudioStream *makeVorbisStream(OggVorbis_File *file, int duration);
+--- ./configure.old 2004-05-16 04:46:47.000000000 +0930
++++ ./configure 2004-05-16 04:50:42.000000000 +0930
+@@ -560,15 +560,15 @@
+ if test "$_vorbis" = auto ; then
+ _vorbis=no
+ cat > $TMPC << EOF
+-#include <vorbis/codec.h>
++#include <tremor/ivorbiscodec.h>
+ int main(void) { vorbis_packet_blocksize(0,0); return 0; }
+ EOF
+ cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
+- -lvorbis -logg -lm && _vorbis=yes
++ -lvorbisidec -logg -lm && _vorbis=yes
+ fi
+ if test "$_vorbis" = yes ; then
+ _def_vorbis='#define USE_VORBIS'
+- LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
++ LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisidec -logg"
+ INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
+ else
+ _def_vorbis='#undef USE_VORBIS'
diff --git a/recipes/scummvm/scummvm-qpe_0.6.1b.bb b/recipes/scummvm/scummvm-qpe_0.6.1b.bb
new file mode 100644
index 0000000000..7618e09d9d
--- /dev/null
+++ b/recipes/scummvm/scummvm-qpe_0.6.1b.bb
@@ -0,0 +1,5 @@
+require scummvm.inc
+
+DEPENDS = "libsdl-qpe tremor libogg zlib ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+
+S = "${WORKDIR}/scummvm-${PV}/"
diff --git a/recipes/scummvm/scummvm.inc b/recipes/scummvm/scummvm.inc
new file mode 100644
index 0000000000..6be99ca26e
--- /dev/null
+++ b/recipes/scummvm/scummvm.inc
@@ -0,0 +1,27 @@
+DESCRIPTION = "Virtual Machine for several classic graphical point-and-click adventure games"
+HOMEPAGE = "http://www.scummvm.org"
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r6"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--host=${HOST_SYS} \
+ --backend=sdl \
+ --with-sdl-prefix=${STAGING_BINDIR_CROSS} \
+ --disable-alsa \
+ --prefix=${prefix} \
+ --with-ogg-prefix=${STAGING_LIBDIR}/.. \
+ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mpeg2', '--with-mpeg2-prefix=${STAGING_LIBDIR}/..', d)} \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--with-mad-prefix=${STAGING_LIBDIR}/..', d)} \
+ "
+
+EXTRA_OEMAKE = "MANDIR=${mandir}"
+
+do_configure() {
+ ./configure ${EXTRA_OECONF}
+}
diff --git a/recipes/scummvm/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb
new file mode 100644
index 0000000000..630db67f21
--- /dev/null
+++ b/recipes/scummvm/scummvm_0.12.0.bb
@@ -0,0 +1,33 @@
+require scummvm.inc
+
+CCACHE = ""
+
+DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+
+SRC_URI += " file://scummvm.desktop \
+ file://no-strip.patch;patch=1"
+
+SRC_URI_append_openmoko = " file://openmoko-scummvm "
+
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+EXTRA_OECONF += " \
+ --disable-scumm-7-8 \
+ --disable-he \
+ "
+
+do_install_append() {
+ if [ -f ${WORKDIR}/openmoko-scummvm ]; then
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/openmoko-scummvm ${D}${bindir}/openmoko-scummvm
+ fi
+ if [ -f ${WORKDIR}/scummvm.desktop ]; then
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/scummvm.desktop ${D}${datadir}/applications
+ fi
+ install -d ${D}${datadir}/scummvm
+ install -m 0644 gui/themes/modern.ini ${D}${datadir}/scummvm/
+ install -m 0644 gui/themes/modern.zip ${D}${datadir}/scummvm/
+}
diff --git a/recipes/scummvm/scummvm_0.6.0.bb b/recipes/scummvm/scummvm_0.6.0.bb
new file mode 100644
index 0000000000..6ff76e6eb2
--- /dev/null
+++ b/recipes/scummvm/scummvm_0.6.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
+SECTION = "opie/games"
+PRIORITY = "optional"
+DEPENDS = "libsdl-qpe tremor libogg zlib \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
+ file://sword1.patch;patch=1 \
+ file://tremor.patch;patch=1 \
+ file://mouse.patch;patch=1 "
+PR="r1"
+
+inherit autotools
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
+EXTRA_OECONF = "--host=${HOST_SYS} \
+ --backend=sdl \
+ --disable-alsa \
+ --with-ogg-prefix=${STAGING_LIBDIR}/.. \
+ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mpeg2', '--with-mpeg2-prefix=${STAGING_LIBDIR}/..', d)} \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--with-mad-prefix=${STAGING_BINDIR_CROSS}/..', d)} \
+ "
+do_configure() {
+ ./configure ${EXTRA_OECONF}
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 scummvm ${D}${bindir}/scummvm
+}
+
diff --git a/recipes/scummvm/scummvm_0.6.1b.bb b/recipes/scummvm/scummvm_0.6.1b.bb
new file mode 100644
index 0000000000..7c85caff8e
--- /dev/null
+++ b/recipes/scummvm/scummvm_0.6.1b.bb
@@ -0,0 +1,9 @@
+require scummvm.inc
+DEPENDS = "virtual/libsdl tremor libogg zlib \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+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"
+
diff --git a/recipes/scummvm/scummvm_0.9.0.bb b/recipes/scummvm/scummvm_0.9.0.bb
new file mode 100644
index 0000000000..f521e13fd1
--- /dev/null
+++ b/recipes/scummvm/scummvm_0.9.0.bb
@@ -0,0 +1,9 @@
+require scummvm.inc
+DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
+
+EXTRA_OECONF += "--enable-lure \
+ --enable-agi \
+ --enable-cine \
+ "
diff --git a/recipes/scummvm/scummvm_0.9.1.bb b/recipes/scummvm/scummvm_0.9.1.bb
new file mode 100644
index 0000000000..b64ac1d93b
--- /dev/null
+++ b/recipes/scummvm/scummvm_0.9.1.bb
@@ -0,0 +1,30 @@
+require scummvm.inc
+
+DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
+
+SRC_URI += "file://makefile-nostrip.patch;patch=1 \
+ file://scummvm-targetcheck.patch;patch=1"
+SRC_URI_append_openmoko = " file://openmoko-scummvm \
+ file://scummvm.desktop"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+EXTRA_OECONF += "--enable-lure \
+ --enable-agi \
+ --enable-cine \
+ "
+
+do_install_append() {
+ if [ -f ${WORKDIR}/openmoko-scummvm ]; then
+ install -d ${D}${bindir}
+ install -m 0755 ${WORKDIR}/openmoko-scummvm ${D}${bindir}/openmoko-scummvm
+ fi
+ if [ -f ${WORKDIR}/scummvm.desktop ]; then
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/scummvm.desktop ${D}${datadir}/applications
+ fi
+ install -d ${D}${datadir}/scummvm
+ install -m 0644 gui/themes/modern.ini ${D}${datadir}/scummvm/
+ install -m 0644 gui/themes/modern.zip ${D}${datadir}/scummvm/
+}