matrix-gui: numerous updates and fixes (from Arago)

* Bump the revision
* Fix the license
* Don't set redundant variables
* Display message when calibrating TS
* Install additional binaries/scripts

Signed-off-by: Denys Dmytriyenko <denis@denix.org>

diff --git a/recipes/ti/matrix-gui/init b/recipes/ti/matrix-gui/init
index 9cd7412..8259417 100755 (executable)
--- a/recipes/ti/matrix-gui/init
+++ b/recipes/ti/matrix-gui/init
@@ -5,18 +5,17 @@ GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
 
 test -x "$matrixgui" || exit 0
 
-export LD_LIBRARY_PATH=/usr/lib
-export TSLIB_PLUGINDIR=/usr/lib/ts
 export TSLIB_TSDEVICE=/dev/input/touchscreen0
-export TSLIB_CONFFILE=/etc/ts.conf
 export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
 
 case "$1" in
   start)
-    echo -n "Starting Matrix GUI application"
     if [ ! -f /etc/pointercal ] ; then
+        echo -n "Calibrating touchscreen (first time only)"
         ts_calibrate
+        echo "."
     fi
+    echo -n "Starting Matrix GUI application"
     start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
     echo "."
     ;;

diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
index 794ffbc..6042d96 100644 (file)
--- a/recipes/ti/matrix-gui_svn.bb
+++ b/recipes/ti/matrix-gui_svn.bb
@@ -1,15 +1,15 @@
 DESCRIPTION = "Matrix GUI"
 HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
-LICENSE = "TI"
+LICENSE = "Apache"
 SECTION = "multimedia"
 PRIORITY = "optional"
 
-SRCREV = "52"
+SRCREV = "54"
 PV = "1.0"
-PR = "r1+svnr${SRCPV}"
+PR = "r4+svnr${SRCPV}"
 
 SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
-           file://init \
+       file://init \
 "
 
 S = "${WORKDIR}/trunk"
@@ -19,13 +19,32 @@ INITSCRIPT_PARAMS = "defaults 99"
 
 inherit qt4e update-rc.d
 
+MATRIX_EXTRA_BINS = " \
+       memInfo \
+       networkSettings \
+       runOGLES2Coverflow \
+       runOGLES2Shaders \
+       runOGLESChameleonMan \
+       runOGLESVase \
+       setopp1 \
+       setopp2 \
+       setopp3 \
+       setopp4 \
+       standby \
+       sysSettings \
+       taskInfo \
+"
+
 do_install() {
        install -d ${D}/${bindir}
        install -m 0755 ${S}/matrix_gui ${D}/${bindir}
+       for i in ${MATRIX_EXTRA_BINS}; do
+               install -m 0755 ${S}/bin/${i} ${D}/${bindir}
+       done
        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/*.png ${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 -d ${D}${sysconfdir}/init.d/
        install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui