matrix: merge changes from arago/next/fa8563ae1238c38c779226ebed375c61560c647e

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

diff --git a/recipes-ti/matrix/matrix-gui-submenus_1.0.bb b/recipes-ti/matrix/matrix-gui-submenus_1.0.bb
index b517ce2b16780ef32463b1ae727180c958fb4e62..9dfb1b31385be19cf18eb1f4785dd6d6867b6cd2 100644 (file)
--- a/recipes-ti/matrix/matrix-gui-submenus_1.0.bb
+++ b/recipes-ti/matrix/matrix-gui-submenus_1.0.bb
@@ -39,6 +39,8 @@ do_install(){
 }
 
 PACKAGES += "${PN}-arm ${PN}-3d ${PN}-cryptos ${PN}-display ${PN}-ethernet ${PN}-multimedia ${PN}-power ${PN}-pru ${PN}-qt4 ${PN}-settings ${PN}-usb ${PN}-wifi"
+# This should be automatic, but isn't :(
+PROVIDES += "${PACKAGES}"
 
 # All submenu packages should depend on matrix-gui being installed
 RDEPENDS +=  matrix-gui

diff --git a/recipes-ti/matrix/matrix-gui/init b/recipes-ti/matrix/matrix-gui/init
index 41f89cf2b560cc8323284a77852421b38511b0ba..c9253d4f37a046ad0eaa3dcbe50ca68c244b3da8 100644 (file)
--- a/recipes-ti/matrix/matrix-gui/init
+++ b/recipes-ti/matrix/matrix-gui/init
@@ -12,21 +12,22 @@ export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
 case "$1" in
   start)
     chvt 4
-    if [ ! -f /etc/pointercal ] ; then
-        echo -n "Calibrating touchscreen (first time only)"
-        ts_calibrate
-        echo "."
-    fi
 
     # Temporarily create the /dev/input/touchscreen0 symlink if it is
     # not already present.  On devices like am335x the driver does not
     # report the right string in /sys/devices/platform/tsc/input/input0/modalias
     # to match the regular expression in /etc/udev/rules.d/local.rules
     # to have this symlink created automatically.
-    if [ ! -e /dev/input/touchscreen0 ]
+    if [ -e /dev/input/event0 ]
     then
         # assume we are going to use event0
         ln -s /dev/input/event0 /dev/input/touchscreen0
+
+        if [ ! -f /etc/pointercal ] ; then
+            echo -n "Calibrating touchscreen (first time only)"
+            ts_calibrate
+            echo "."
+        fi
     fi
 
        if [ -e $PIDFILE ]; then

diff --git a/recipes-ti/matrix/matrix-gui_2.0.bb b/recipes-ti/matrix/matrix-gui_2.0.bb
index f9981b4cd7d25bb909dd29bdebb0bcafd9325099..60b1a040e821969204e266a5a10c6dbeea5a3e62 100644 (file)
--- a/recipes-ti/matrix/matrix-gui_2.0.bb
+++ b/recipes-ti/matrix/matrix-gui_2.0.bb
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://scripts/jquery-1.6.2.min.js;md5=a1a8cb16a060f6280a767
 
 SECTION = "multimedia"
 
-PR = "r1"
+PR = "r2"
 
 inherit allarch
 
 BRANCH ?= "master"
-SRCREV = "c6db82baffcd96b20e67aa5cfdb4c0c98ef208b9"
+SRCREV = "9f5d27fec216f223c43b48fa146edf4a4bb7aa24"
 
 SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH} \
            file://matrix-gui.service"