[PATCH 0/5] Matrix Gui: Add touchscreen demo and submenu

[PATCH 0/5] Matrix Gui: Add touchscreen demo and submenu

[Eric Ruei]

Add matrix gui submenu touch and the touch interact demo

Eric Ruei (5):
  matrix-gui-touch-demos: add touch demo: touchscreen interaction
  matrix-gui-submenu: add touch submenu
  packagegroup-arago-tisdk-matrix: add touch demos
  matrix-gui-apps-git: bump SRCREV to pick up the touch demos
  matrix-gui: Update the "execute-command" patch to support category
    "touch"

 .../packagegroups/packagegroup-arago-tisdk-matrix.bb  |  8 +++++++-
 .../recipes-core/matrix/matrix-gui-apps-git.inc       |  4 ++--
 .../recipes-core/matrix/matrix-gui-submenus_2.0.bb    |  5 ++++-
 .../recipes-core/matrix/matrix-gui-touch-demos_2.0.bb | 15 +++++++++++++++
 ..._command-workaround-for-GUI-apps-with-weston.patch | 19 ++++++++++---------
 .../recipes-core/matrix/matrix-gui_2.0.bb             |  2 +-
 6 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb

-- 
1.9.1

[PATCH 1/5] matrix-gui-touch-demos: add touch demo: touch interact

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-core/matrix/matrix-gui-touch-demos_2.0.bb     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
new file mode 100644
index 0000000..49b85ed
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-touch-demos_2.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Touch demo descriptions for Matrix v2"
+HOMEPAGE = "https://gitorious.org/matrix-gui-v2/matrix-gui-v2-apps"
+
+require matrix-gui-apps-git.inc
+
+PR = "${INC_PR}.0"
+
+inherit allarch
+
+S = "${WORKDIR}/git/touch_apps"
+
+# Make sure touch submenu and app images has been installed
+RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-touch"
+
+FILES_${PN} += "${MATRIX_BASE_DIR}/*"
-- 
1.9.1

[PATCH 2/5] matrix-gui-submenu: add touch submenu

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
index 71d76f8..7e1f7d1 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-submenus_2.0.bb
@@ -7,7 +7,7 @@ require matrix-gui-apps-git.inc
 # reset the LIC_FILES_CHKSUM setting from the matrix-gui-apps-git.inc file
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9"
 
-PR = "${INC_PR}.16"
+PR = "${INC_PR}.17"
 
 # These packages make submenus in matrix and are not architecture specific
 inherit allarch
@@ -33,6 +33,7 @@ SUBMENUS = " arm_submenu \
              opencl_submenu \
              videoanalytics_submenu \
              machinevision_submenu \
+             touch_submenu \
 "
 
 do_install(){
@@ -64,6 +65,7 @@ PACKAGES += " ${PN}-arm \
               ${PN}-opencl \
               ${PN}-videoanalytics \
               ${PN}-machinevision \
+              ${PN}-touch \
 "
 
 # Make sure app images has been installed
@@ -90,3 +92,4 @@ FILES_${PN}-mc-demo = "${MATRIX_APP_DIR}/mc_demo_submenu/*"
 FILES_${PN}-opencl = "${MATRIX_APP_DIR}/opencl_submenu/*"
 FILES_${PN}-videoanalytics = "${MATRIX_APP_DIR}/videoanalytics_submenu/*"
 FILES_${PN}-machinevision = "${MATRIX_APP_DIR}/machinevision_submenu/*"
+FILES_${PN}-touch = "${MATRIX_APP_DIR}/touch_submenu/*"
-- 
1.9.1

[PATCH 3/5] packagegroup-arago-tisdk-matrix: add touch demos

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 4027889..4fcc504 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to include Matrix v2"
 LICENSE = "MIT"
-PR = "r59"
+PR = "r60"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -30,8 +30,13 @@ MATRIX_COMMON_APPS = "              \
 #    matrix-gui-thermostat-demo
 MATRIX_QT_APPS = " \
     matrix-gui-qt5-demos \
+"
+
+MATRIX_TOUCH_APPS = " \
+    matrix-gui-touch-demos \
 "
 
+
 MATRIX_QT_APPS_keystone = ""
 
 MATRIX_SGX_DEMOS = " \
@@ -117,6 +122,7 @@ RDEPENDS_${PN} = "        \
     ${MATRIX_GUI}         \
     ${MATRIX_COMMON_APPS} \
     ${MATRIX_QT_APPS}     \
+    ${MATRIX_TOUCH_APPS}  \
     ${MATRIX_APPS}        \
     ${@bb.utils.contains('MACHINE_FEATURES','sgx',"${MATRIX_SGX_DEMOS}",'',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','opencl',"${MATRIX_OPENCL_APPS}",'',d)} \
-- 
1.9.1

[PATCH 4/5] matrix-gui-apps-git: bump SRCREV to pick up the touch demos

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
index 3641a50..3592cd4 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps-git.inc
@@ -4,9 +4,9 @@ LICENSE_CHECKSUM = "LICENSE;md5=6e0ae7214f6c74c149cb25f373057fa9"
 LIC_FILES_CHKSUM := "file://../${LICENSE_CHECKSUM}"
 
 SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix-gui-v2-apps.git;protocol=git;branch=${BRANCH}"
-SRCREV = "a51c0d791e5b15452196f6903ef077401738e631"
+SRCREV = "e6651c1a79b5949817b09e06cc36d828fed8ff3e"
 BRANCH = "master"
-INC_PR = "r41"
+INC_PR = "r42"
 
 # Pull in the base package for installing matrix applications
 require matrix-gui-apps.inc
-- 
1.9.1

[PATCH 5/5] matrix-gui: Update the "execute-command" patch to support category "touch"

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 ..._command-workaround-for-GUI-apps-with-weston.patch | 19 ++++++++++---------
 .../recipes-core/matrix/matrix-gui_2.0.bb             |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
index 860fbcd..4dbdbab 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
@@ -1,6 +1,6 @@
-From 1fcef8505e6cb8769e84c3bd3e0abd67579bcd68 Mon Sep 17 00:00:00 2001
+From 9169773b546cfea3c829b3c5e79c68c7979ceea4 Mon Sep 17 00:00:00 2001
 From: Jacob Stiffler <j-stiffler@ti.com>
-Date: Wed, 2 Sep 2015 09:55:05 -0400
+Date: Sat, 13 Aug 2016 13:27:30 -0400
 Subject: [PATCH] execute_command: workaround for GUI apps with weston
 
 * For all GUI apps, shutdown matrix before launching
@@ -10,14 +10,15 @@ Subject: [PATCH] execute_command: workaround for GUI apps with weston
   - These apps use KMS sink, which collides with weston.
 
 Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
 ---
- execute_command.sh | 34 +++++++++++++++++++++++++++++++++-
- generate.php       |  2 ++
- run_script.php     |  2 +-
+ execute_command.sh |   34 +++++++++++++++++++++++++++++++++-
+ generate.php       |    2 ++
+ run_script.php     |    2 +-
  3 files changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/execute_command.sh b/execute_command.sh
-index 018c632..86d7106 100755
+index 2be1278..b8d98a5 100755
 --- a/execute_command.sh
 +++ b/execute_command.sh
 @@ -59,7 +59,17 @@ do
@@ -47,7 +48,7 @@ index 018c632..86d7106 100755
 +then
 +  /etc/init.d/matrix-gui-2.0 stop
 +
-+  if [ $category == 3d -o $category == multimedia ]
++  if [ $category == 3d -o $category == multimedia -o $category == touch ]
 +  then
 +    /etc/init.d/weston stop
 +    sleep 1
@@ -60,7 +61,7 @@ index 018c632..86d7106 100755
  
 +if [ $program_type == gui ]
 +then
-+  if [ $category == 3d -o $category == multimedia ]
++  if [ $category == 3d -o $category == multimedia -o $category == touch ]
 +  then
 +    /etc/init.d/weston start
 +    sleep 1
@@ -99,5 +100,5 @@ index 9dd7a10..1481b17 100644
  	$last_line = system($script_command." > /dev/null 2>/dev/null & ", $retval);
  }
 -- 
-1.9.1
+1.7.9.5
 
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index 9b1ba47..9928df7 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d"
 
 SECTION = "multimedia"
 
-PR = "r30"
+PR = "r31"
 
 INITSCRIPT_NAME = "matrix-gui-2.0"
 INITSCRIPT_PARAMS = "defaults 97"
-- 
1.9.1