Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

5 files changed, 91 insertions, 0 deletions

diff --git a/recipes/scummvm/files/shr/openmoko-scummvm b/recipes/scummvm/files/shr/openmoko-scummvm
new file mode 100644
index 0000000000..58eb2bbded
--- /dev/null
+++ b/recipes/scummvm/files/shr/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/shr/scummvm.desktop b/recipes/scummvm/files/shr/scummvm.desktop
new file mode 100644
index 0000000000..96c025050e
--- /dev/null
+++ b/recipes/scummvm/files/shr/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/scummvm-1.0.0/no-strip.patch b/recipes/scummvm/scummvm-1.0.0/no-strip.patch
new file mode 100644
index 0000000000..c69402e469
--- /dev/null
+++ b/recipes/scummvm/scummvm-1.0.0/no-strip.patch
@@ -0,0 +1,20 @@
+--- scummvm-1.0.0/ports.mk~	2009-11-27 12:51:50.000000000 +0100
++++ scummvm-1.0.0/ports.mk	2009-11-27 12:51:50.000000000 +0100
+@@ -10,7 +10,7 @@
+ #
+ install: all
+ 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)"
++	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)"
+ 	$(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) -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/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb
index 630db67f21..9d76426ab1 100644
--- a/recipes/scummvm/scummvm_0.12.0.bb
+++ b/recipes/scummvm/scummvm_0.12.0.bb
@@ -9,6 +9,7 @@ SRC_URI += " file://scummvm.desktop \
 	file://no-strip.patch;patch=1"
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
+SRC_URI_append_shr = " file://openmoko-scummvm "
 
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
diff --git a/recipes/scummvm/scummvm_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb
new file mode 100644
index 0000000000..28465f409e
--- /dev/null
+++ b/recipes/scummvm/scummvm_1.0.0.bb
@@ -0,0 +1,39 @@
+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_append_shr = " file://openmoko-scummvm "
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+EXTRA_OECONF += " \
+		--disable-scumm-7-8 \ 
+		--disable-he \
+		"
+
+# Workaround, because some env variables aren't recognised correctly
+do_configure_append() {
+	sed -i "s/AS := as/AS := ${AS}/" ${S}/config.mk
+	sed -i "s/AR := ar cru/AR := ${AR} cru/" ${S}/config.mk
+	sed -i "s/STRIP := strip/STRIP := ${STRIP}/" ${S}/config.mk
+	sed -i "s/RANLIB := ranlib/RANLIB := ${RANLIB}/" ${S}/config.mk
+}
+
+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
+}