[morty/master][PATCH v2 0/4] matrix-gui: add browser demos

[morty/master][PATCH v2 0/4] matrix-gui: add browser demos

[Eric Ruei]

OOB Matrix Gui: add browser submenu and browser demos

Eric Ruei (4):
  matrix-gui-apps-git: bump SRCREV to pick up the browser demos
  matix-gui-browser-demos: add browser demos
  matrix-gui-submenu: add browser submenu
  packagegroup-arago-tisdk-matrix: add browser demos for AM5/DRA7

 .../packagegroups/packagegroup-arago-tisdk-matrix.bb     |  3 ++-
 .../recipes-core/matrix/matrix-gui-apps-git.inc          |  4 ++--
 .../recipes-core/matrix/matrix-gui-browser-demos_2.0.bb  | 16 ++++++++++++++++
 .../recipes-core/matrix/matrix-gui-submenus_2.0.bb       |  5 ++++-
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb

-- 
1.9.1

[morty/master][PATCH v2 1/4] matrix-gui-apps-git: bump SRCREV to pick up the browser 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 0ae0d21..b805f5e 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 = "7ab39e827e65c35f4e37d1142a45071f670395fe"
+SRCREV = "38afccb5335216ececa874cf4cf72a67c4164fc3"
 BRANCH = "master"
-INC_PR = "r46"
+INC_PR = "r47"
 
 # Pull in the base package for installing matrix applications
 require matrix-gui-apps.inc
-- 
1.9.1

[morty/master][PATCH v2 2/4] matix-gui-browser-demos: add browser demos

[Eric Ruei]

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

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
new file mode 100644
index 0000000..482991f
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser-demos_2.0.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Various Demo Browsers for Matrix v2"
+HOMEPAGE = "https://git.ti.com/matrix-gui-v2/matrix-gui-v2-apps"
+
+require matrix-gui-apps-git.inc
+
+PR = "${INC_PR}.0"
+
+inherit allarch
+
+S = "${WORKDIR}/git/browser_apps"
+
+# Make sure browser submenu and app images has been installed
+RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-browser"
+
+FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+FILES_${PN} += "${bindir}/runGoogleChrome.sh"
-- 
1.9.1

[morty/master][PATCH v2 3/4] matrix-gui-submenu: add browser 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 7e1f7d1..f592f7a 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}.17"
+PR = "${INC_PR}.18"
 
 # These packages make submenus in matrix and are not architecture specific
 inherit allarch
@@ -34,6 +34,7 @@ SUBMENUS = " arm_submenu \
              videoanalytics_submenu \
              machinevision_submenu \
              touch_submenu \
+             browser_submenu \
 "
 
 do_install(){
@@ -66,6 +67,7 @@ PACKAGES += " ${PN}-arm \
               ${PN}-videoanalytics \
               ${PN}-machinevision \
               ${PN}-touch \
+              ${PN}-browser \
 "
 
 # Make sure app images has been installed
@@ -93,3 +95,4 @@ 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/*"
+FILES_${PN}-browser = "${MATRIX_APP_DIR}/browser_submenu/*"
-- 
1.9.1

[morty/master][PATCH v2 4/4] packagegroup-arago-tisdk-matrix: add browser demos for AM5/DRA7

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@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 7402427..02d46c4 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 = "r66"
+PR = "r67"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -128,6 +128,7 @@ MATRIX_APPS_append_omap-a15 = "     \
     matrix-gui-generic-pm           \
     matrix-gui-clocks               \
     matrix-gui-pm-demos-governor    \
+    ${@['','matrix-gui-browser-demos'][bb.utils.contains('MACHINE_FEATURES','sgx',True,False,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \
 "
 
 MATRIX_APPS_append_dra7xx += " \
-- 
1.9.1