From 74e614260a20fee63f38e906071af7ef706c8247 Mon Sep 17 00:00:00 2001 From: Jeff Lance Date: Thu, 23 Sep 2010 09:41:36 +0000 Subject: [PATCH] matrix-gui-e: updating to latest source revision * Updated recipe to use the latest source revision 131 * Included platform support * Removed init files from OE repository since they are now part of the matrix repository. * Bumped SRCREV to 136 in version 2 of this patch Signed-off-by: Chase Maupin Signed-off-by: Jeff Lance Acked-by: Denys Dmytriyenko Signed-off-by: Denys Dmytriyenko --- recipes/ti/matrix-gui-e/dm365-evm/init | 29 --------------------- recipes/ti/matrix-gui-e/init | 35 -------------------------- recipes/ti/matrix-gui-e_svn.bb | 25 ++++++++++++------ 3 files changed, 18 insertions(+), 71 deletions(-) delete mode 100755 recipes/ti/matrix-gui-e/dm365-evm/init delete mode 100755 recipes/ti/matrix-gui-e/init diff --git a/recipes/ti/matrix-gui-e/dm365-evm/init b/recipes/ti/matrix-gui-e/dm365-evm/init deleted file mode 100755 index d860ad9083..0000000000 --- a/recipes/ti/matrix-gui-e/dm365-evm/init +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -matrixgui="/usr/bin/matrix_guiE" -GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html" - -test -x "$matrixgui" || exit 0 - -case "$1" in - start) - - chvt 4 - - # switch to component 480p mode - echo 480P-60 > /sys/class/davinci_display/ch0/mode - echo COMPONENT > /sys/class/davinci_display/ch0/output - echo -n "Starting Matrix GUI application" - start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS - echo "." - ;; - stop) - echo -n "Stopping Matrix GUI application" - start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid - echo "." - ;; - *) - echo "Usage: /etc/init.d/matrix-gui-e {start|stop}" - exit 1 -esac - -exit 0 diff --git a/recipes/ti/matrix-gui-e/init b/recipes/ti/matrix-gui-e/init deleted file mode 100755 index 266fdcae82..0000000000 --- a/recipes/ti/matrix-gui-e/init +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh - -matrixgui="/usr/bin/matrix_guiE" -GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html" - -test -x "$matrixgui" || exit 0 - -export TSLIB_TSDEVICE=/dev/input/touchscreen0 -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 - echo -n "Starting Matrix GUI application" - start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS - echo "." - ;; - stop) - echo -n "Stopping Matrix GUI application" - start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid - echo "." - ;; - *) - echo "Usage: /etc/init.d/matrix-gui-e {start|stop}" - exit 1 -esac - -exit 0 diff --git a/recipes/ti/matrix-gui-e_svn.bb b/recipes/ti/matrix-gui-e_svn.bb index 35abd25738..5570d9258f 100644 --- a/recipes/ti/matrix-gui-e_svn.bb +++ b/recipes/ti/matrix-gui-e_svn.bb @@ -4,13 +4,19 @@ LICENSE = "BSD" SECTION = "multimedia" PRIORITY = "optional" -SRCREV = "58" -PV = "1.0" -PR = "r16+svnr${SRCPV}" +SRCREV = "136" +PV = "1.1" +PR = "r18+svnr${SRCPV}" -SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \ - file://init \ -" +PLATFORM_dm365 = "dm365" +PLATFORM_da850-omapl138-evm = "omapl138" +PLATFORM_omap3evm = "omap3530" +PLATFORM_dm37x-evm = "dm3730" +PLATFORM_am37x-evm = "am3715" +PLATFORM_beagleboard = "am3715" +PLATFORM ?= "" + +SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' " S = "${WORKDIR}/trunk" @@ -18,13 +24,18 @@ INITSCRIPT_NAME = "matrix-gui-e" INITSCRIPT_PARAMS = "defaults 99" #INITSCRIPT_PARAMS = "start 99 3 . stop 99 3 ." +CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 " +CXXFLAGS_dm365_append = " -DPlatform_dm365 " +PACKAGE_ARCH = ${MACHINE_ARCH} + inherit qt4e update-rc.d do_install() { install -d ${D}/${bindir} install -m 0755 ${S}/matrix_gui ${D}/${bindir}/matrix_guiE install -d ${D}${sysconfdir}/init.d/ - install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui-e + install -c -m 0755 ${S}/${PLATFORM}/etc/init ${D}${sysconfdir}/init.d/matrix-gui-e + } RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib qt4-embedded-fonts" -- 2.39.5