[PATCH 1/3] matrix-gui-aps-git: bump SRCREV for fixes and additions

[PATCH 1/3] matrix-gui-aps-git: bump SRCREV for fixes and additions

[Jacob Stiffler]

* ivahd_multimedia_h264dec: update demo scripts for amixer and using playbin
* ivahd_multimedia_h264dec: update demo scripts to use "$AUDIO_SINK" for playbin
* machinevision_apps: add barcode ROI detection demo
* ivahd_multimedia_vip_vpe_mpeg4encdec: update scripts to detect video node for vip

Signed-off-by: Jacob Stiffler <j-stiffler@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 3592cd4..c8e1ce1 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 = "e6651c1a79b5949817b09e06cc36d828fed8ff3e"
+SRCREV = "847f3353dc29927417f31430d1b6dc5982146240"
 BRANCH = "master"
-INC_PR = "r42"
+INC_PR = "r43"
 
 # Pull in the base package for installing matrix applications
 require matrix-gui-apps.inc
-- 
2.7.4

[PATCH 2/3] matrix-gui-settings-demos: add weston-terminal shortcut

[Jacob Stiffler]

* This new package adds a shortcut to weston-terminal in matrix under
  the "Settings" menu.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../recipes-core/matrix/matrix-gui-settings-demos_2.0.bb   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
index 927c8f9..a84e5c1 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-settings-demos_2.0.bb
@@ -3,13 +3,23 @@ HOMEPAGE = "https://gitorious.org/matrix-gui-v2/matrix-gui-v2-apps"
 
 require matrix-gui-apps-git.inc
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 inherit allarch
 
 S = "${WORKDIR}/git/settings_apps"
 
+PACKAGES =+ "matrix-gui-weston-terminal-demo"
+
 # Make sure setting submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-settings am-sysinfo"
+SETTINGS_DEMOS_RDEPENDS = " \
+    matrix-gui-apps-images \
+    matrix-gui-submenus-settings \
+    am-sysinfo \
+"
+
+RDEPENDS_${PN} += "${SETTINGS_DEMOS_RDEPENDS}"
+RDEPENDS_matrix-gui-weston-terminal-demo += "${SETTINGS_DEMOS_RDEPENDS}"
 
 FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES_matrix-gui-weston-terminal-demo = "${MATRIX_APP_DIR}/terminal"
-- 
2.7.4

[PATCH 3/3] packagegroup-arago-tisdk-matrix: add weston-terminal

[Jacob Stiffler]

* Only add if "wayland" is a distro feature

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb      | 3 ++-
 1 file changed, 2 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 cbb4a03..a851ed5 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 = "r60"
+PR = "r61"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -25,6 +25,7 @@ MATRIX_COMMON_APPS = "              \
     matrix-gui-settings-demos       \
     matrix-gui-usb-demos            \
     matrix-gui-submenus-ethernet    \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'matrix-gui-weston-terminal-demo', '', d)} \
 "
 
 #    matrix-gui-thermostat-demo
-- 
2.7.4