[oe-commits] Thomas Zimmermann : scummvm: update version to 1.0.0

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 38c5fb678fc9977e2e813c7869a73d175bba87f5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=38c5fb678fc9977e2e813c7869a73d175bba87f5

Author: Thomas Zimmermann <ml at vdm-design.de>
Date:   Fri Nov 27 12:22:26 2009 +0000

scummvm: update version to 1.0.0

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/checksums.ini                           |    4 ++
 recipes/scummvm/scummvm-1.0.0/no-strip.patch |   20 +++++++++++++
 recipes/scummvm/scummvm_1.0.0.bb             |   39 ++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0095cc9..b6369df 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -23974,6 +23974,10 @@ sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
 md5=30a82ad466bae223875e66ee14b94904
 sha256=5cd5d9c06281a4f81d85d9a9f9b0410045d4a764a855f06f574183b528c15d1a
 
+[http://downloads.sourceforge.net/scummvm/scummvm-1.0.0.tar.bz2]
+md5=11b911937e0fc73c94a7bdc374ab617c
+sha256=920932b9d0cfca019f35c2451d93d94ca3b9f981f0b82c418bfbc864fb8c00ec
+
 [ftp://ftp.debian.org/debian/pool/main/s/scw/scw_0.4.3.orig.tar.gz]
 md5=4c9fb66fa496cf32542e92f32f821818
 sha256=fca3763b05f064728c9ff248fa0766808d1ceae561b88ad202811924e4ccdb45
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 0000000..c69402e
--- /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_1.0.0.bb b/recipes/scummvm/scummvm_1.0.0.bb
new file mode 100644
index 0000000..28465f4
--- /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
+}