[oe-commits] org.oe.dev scummvm-0.9.1: update packaging, make default, openmoko integration

[pH5 commit]

scummvm-0.9.1: update packaging, make default, openmoko integration
* remove DEFAULT_PREFERENCE="-1"
* don't strip executable during install, we do that while packaging
* add openmoko-scummvm script for fic-gta01 and scummvm.desktop file.
* package the modern theme by default - maybe this should go
  into a separate scummvm-theme package, RRECOMMENDED by scummvm

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 470abd3e031218485cbc8e340327fcfa663ed504
ViewMTN: http://monotone.openembedded.org/revision.psp?id=470abd3e031218485cbc8e340327fcfa663ed504
Files:
1
packages/scummvm/files/fic-gta01
packages/scummvm/files/fic-gta01/openmoko-scummvm
packages/scummvm/files/makefile-nostrip.patch
packages/scummvm/files/scummvm.desktop
packages/scummvm/scummvm_0.9.1.bb
mtn:execute
true
Diffs:

#
# mt diff -r3ee0c672b5c684b76d4974adb8cb597566d0ebbe -r470abd3e031218485cbc8e340327fcfa663ed504
#
# 
# 
# add_dir "packages/scummvm/files/fic-gta01"
# 
# add_file "packages/scummvm/files/fic-gta01/openmoko-scummvm"
#  content [2151aa3ba2826c460d0618140846150531a098bd]
# 
# add_file "packages/scummvm/files/makefile-nostrip.patch"
#  content [800d2b32c57cf34ae64bbeab62971be259376c87]
# 
# add_file "packages/scummvm/files/scummvm.desktop"
#  content [555a291650cf69e4657db44f746545b8179c89cd]
# 
# patch "packages/scummvm/scummvm_0.9.1.bb"
#  from [7a143213146b4e648a364d33165d80b505cff402]
#    to [a7d83e6abecad479aeba9199278c19affc862fde]
# 
#   set "packages/scummvm/files/fic-gta01/openmoko-scummvm"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/scummvm/files/fic-gta01/openmoko-scummvm	2151aa3ba2826c460d0618140846150531a098bd
+++ packages/scummvm/files/fic-gta01/openmoko-scummvm	2151aa3ba2826c460d0618140846150531a098bd
@@ -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"
============================================================
--- packages/scummvm/files/makefile-nostrip.patch	800d2b32c57cf34ae64bbeab62971be259376c87
+++ packages/scummvm/files/makefile-nostrip.patch	800d2b32c57cf34ae64bbeab62971be259376c87
@@ -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/"
============================================================
--- packages/scummvm/files/scummvm.desktop	555a291650cf69e4657db44f746545b8179c89cd
+++ packages/scummvm/files/scummvm.desktop	555a291650cf69e4657db44f746545b8179c89cd
@@ -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
============================================================
--- packages/scummvm/scummvm_0.9.1.bb	7a143213146b4e648a364d33165d80b505cff402
+++ packages/scummvm/scummvm_0.9.1.bb	a7d83e6abecad479aeba9199278c19affc862fde
@@ -1,8 +1,12 @@
-DEFAULT_PREFERENCE = "-1"
-
 require scummvm.inc
 DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
 
+SRC_URI += "file://makefile-nostrip.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 \
@@ -10,7 +14,20 @@ do_compile() {
 
 do_compile() {
 	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
-                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT  -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+	           DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
 }
 
 
+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/
+}