[oe-commits] Koen Kooi : matrix-gui: update to latest svn

[git version control]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue May  4 08:30:33 2010 +0200

matrix-gui: update to latest svn

---

 recipes/ti/matrix-gui/init   |    3 ++-
 recipes/ti/matrix-gui_svn.bb |    7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes/ti/matrix-gui/init b/recipes/ti/matrix-gui/init
index fc2aacf..9cd7412 100755
--- a/recipes/ti/matrix-gui/init
+++ b/recipes/ti/matrix-gui/init
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 matrixgui="/usr/bin/matrix_gui"
+GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
 
 test -x "$matrixgui" || exit 0
 
@@ -16,7 +17,7 @@ case "$1" in
     if [ ! -f /etc/pointercal ] ; then
         ts_calibrate
     fi
-    start-stop-daemon --start --quiet --background --exec $matrixgui
+    start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
     echo "."
     ;;
   stop)
diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
index a8e51dc..fd2f905 100644
--- a/recipes/ti/matrix-gui_svn.bb
+++ b/recipes/ti/matrix-gui_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "TI"
 SECTION = "multimedia"
 PRIORITY = "optional"
 
-SRCREV = "21"
+SRCREV = "52"
 PV = "1.0"
 PR = "r1+svnr${SRCPV}"
 
@@ -19,13 +19,14 @@ INITSCRIPT_PARAMS = "defaults 99"
 
 inherit qt4e update-rc.d
 
-do_install() {
+do_install(52) {
 	install -d ${D}/${bindir}
 	install -m 0755 ${S}/matrix_gui ${D}/${bindir}
 	install -d ${D}/${datadir}/matrix/html
 	install -m 0644 ${S}/*.html ${D}/${datadir}/matrix/html/
 	install -d ${D}/${datadir}/matrix/images
-	install -m 0644 ${S}/images/*.bmp ${D}/${datadir}/matrix/images/
+	install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
+	install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
 	install -d ${D}${sysconfdir}/init.d/
 	install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui
 }