9 files changed, 73 insertions, 1 deletions
diff --git a/recipes/scummvm/scummvm-1.1.1/no-strip.patch b/recipes/scummvm/scummvm-1.1.1/no-strip.patch
new file mode 100644
index 0000000000..02bc71ec51
--- /dev/null
+++ b/recipes/scummvm/scummvm-1.1.1/no-strip.patch
@@ -0,0 +1,22 @@
+Index: scummvm-1.1.1/ports.mk
+===================================================================
+--- scummvm-1.1.1.orig/ports.mk
++++ scummvm-1.1.1/ports.mk
+@@ -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: 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 $(PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
++	$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
+ endif
+ 
+ uninstall:
diff --git a/recipes/scummvm/scummvm-qpe_0.6.1b.bb b/recipes/scummvm/scummvm-qpe_0.6.1b.bb
index 2c90efe1d5..1ff2b0b7e3 100644
--- a/recipes/scummvm/scummvm-qpe_0.6.1b.bb
+++ b/recipes/scummvm/scummvm-qpe_0.6.1b.bb
@@ -4,5 +4,7 @@ DEPENDS = "libsdl-qpe tremor libogg zlib ${@base_conditional('ENTERPRISE_DISTRO'
 
 S = "${WORKDIR}/scummvm-${PV}/"
 
+PR = "${INC_PR}.0"
+
 SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055"
 SRC_URI[sha256sum] = "29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6"
diff --git a/recipes/scummvm/scummvm.inc b/recipes/scummvm/scummvm.inc
index 6be99ca26e..9f7a4f2d21 100644
--- a/recipes/scummvm/scummvm.inc
+++ b/recipes/scummvm/scummvm.inc
@@ -3,7 +3,8 @@ HOMEPAGE = "http://www.scummvm.org"
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r6"
+
+INC_PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
diff --git a/recipes/scummvm/scummvm_0.12.0.bb b/recipes/scummvm/scummvm_0.12.0.bb
index 38944b2b3d..cc94a5d0ca 100644
--- a/recipes/scummvm/scummvm_0.12.0.bb
+++ b/recipes/scummvm/scummvm_0.12.0.bb
@@ -11,6 +11,7 @@ SRC_URI += " file://scummvm.desktop \
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
 SRC_URI_append_shr = " file://openmoko-scummvm "
 
+PR = "${INC_PR}.0"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
diff --git a/recipes/scummvm/scummvm_0.6.1b.bb b/recipes/scummvm/scummvm_0.6.1b.bb
index 3c76fea7c4..adc6b20855 100644
--- a/recipes/scummvm/scummvm_0.6.1b.bb
+++ b/recipes/scummvm/scummvm_0.6.1b.bb
@@ -7,6 +7,7 @@ SRC_URI += " file://mouse.patch \
 	     file://tail-obselete-fix.patch \
 	     file://tremor.patch"
 
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "143dd7cfe0995922c49e1f8a6cdf2055"
 SRC_URI[sha256sum] = "29007f54d9e5a37a3da9f51670de7828dde9a3559beddbdd5c2f59796fb220f6"
diff --git a/recipes/scummvm/scummvm_0.9.0.bb b/recipes/scummvm/scummvm_0.9.0.bb
index 600e723908..474bc5e236 100644
--- a/recipes/scummvm/scummvm_0.9.0.bb
+++ b/recipes/scummvm/scummvm_0.9.0.bb
@@ -7,6 +7,7 @@ EXTRA_OECONF += "--enable-lure \
 		 --enable-agi \
 		 --enable-cine \
 		 "
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "5eede9c97d1883f80770a3e211419783"
 SRC_URI[sha256sum] = "5824f67aa37b00fc8b92ac4fcc413a9a7d868174dcd6df580c4d706807e4545e"
diff --git a/recipes/scummvm/scummvm_0.9.1.bb b/recipes/scummvm/scummvm_0.9.1.bb
index 4901de234b..7865220758 100644
--- a/recipes/scummvm/scummvm_0.9.1.bb
+++ b/recipes/scummvm/scummvm_0.9.1.bb
@@ -8,6 +8,8 @@ SRC_URI += "file://makefile-nostrip.patch \
 SRC_URI_append_openmoko = " file://openmoko-scummvm \
                            file://scummvm.desktop"
 
+PR = "${INC_PR}.0"
+
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
 EXTRA_OECONF += "--enable-lure \
diff --git a/recipes/scummvm/scummvm_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb
index 1c4a251678..6ab59be008 100644
--- a/recipes/scummvm/scummvm_1.0.0.bb
+++ b/recipes/scummvm/scummvm_1.0.0.bb
@@ -8,6 +8,7 @@ DEPENDS = "virtual/libsdl libvorbis libogg zlib \
 SRC_URI += " file://scummvm.desktop \
              file://no-strip.patch \
            "
+PR = "${INC_PR}.0"
 
 SRC_URI_append_openmoko = " file://openmoko-scummvm "
 SRC_URI_append_shr = " file://openmoko-scummvm "
diff --git a/recipes/scummvm/scummvm_1.1.1.bb b/recipes/scummvm/scummvm_1.1.1.bb
new file mode 100644
index 0000000000..4ee3031e68
--- /dev/null
+++ b/recipes/scummvm/scummvm_1.1.1.bb
@@ -0,0 +1,41 @@
+require scummvm.inc
+
+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 \
+           "
+PR = "${INC_PR}.0"
+
+SRC_URI_append_openmoko = " file://openmoko-scummvm "
+SRC_URI_append_shr = " file://openmoko-scummvm "
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+# Make this a plugin enabled build. Bigger binary, less memory usage. Makes more games run on lower end platforms.
+# These plugins are not normal Linux shared libs so will fall foul of the sanity checker.
+INSANE_SKIP_${PN} = True
+EXTRA_OECONF += " --enable-plugins --default-dynamic "
+
+# 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
+}
+
+SRC_URI[md5sum] = "ed9098a78022d07fa1482f14325e3ab8"
+SRC_URI[sha256sum] = "9cc865c5690bfc1df4970d35984455031467381180a71d84b08dcc9f51e39d4a"