[PATCH v2 0/2] Use the webkit-based broswer as the qt5 demo broswer for k3 devices

[PATCH v2 0/2] Use the webkit-based broswer as the qt5 demo broswer for k3 devices

[Eric Ruei]

V2 changes:
rebase patch "matrix-gui: qt5-demos: break qt5 demos package into individual 
ones"

Eric Ruei (2):
  matrix-gui: qt5-demos: break qt5 demos package into individual ones
  packagegroup-arago-tisdk-matrix: replace qt5 demo browser with webkit
    broswer for K3 devices

 .../packagegroup-arago-tisdk-matrix.bb              | 11 +++++++++--
 .../recipes-core/matrix/matrix-gui-apps-git.inc     |  4 ++--
 .../recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb | 21 ++++++++++++++++++++-
 3 files changed, 31 insertions(+), 5 deletions(-)

-- 
1.9.1

[PATCH v2 1/2] matrix-gui: qt5-demos: break qt5 demos package into individual ones

[Eric Ruei]

- bump SRCREV of matrix-gui-v2-apps to pickup webkit-browser demo
- break qt5 demos package into individual one for each demo to to be
  selected based on certain conditions.

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-core/matrix/matrix-gui-apps-git.inc     |  4 ++--
 .../recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 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 3620e85..a5da492 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 = "1fab50f6ceac640bf946e8716a68b1c827256489"
+SRCREV = "28aa0adb7733f103e07d82123924c5a6d1a9bfeb"
 BRANCH = "master"
-INC_PR = "r57"
+INC_PR = "r58"
 
 # Pull in the base package for installing matrix applications
 require matrix-gui-apps.inc
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
index 2dfeba3..cdc9824 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb
@@ -10,6 +10,25 @@ inherit allarch
 S = "${WORKDIR}/git/qt5_apps"
 
 # Make sure qt5 submenu and app images has been installed
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-qt5"
+QT5_RDEPENDS += "matrix-gui-apps-images matrix-gui-submenus-qt5"
 
 FILES_${PN} += "${MATRIX_BASE_DIR}/*"
+PACKAGES = "matrix-qt5-demo-animated \
+            matrix-qt5-demo-browser \
+            matrix-qt5-demo-calculator \
+            matrix-qt5-demo-deform \
+            matrix-qt5-demo-webkit-browser \
+"
+
+RDEPENDS_matrix-qt5-demo-animated = "${QT5_RDEPENDS}"
+RDEPENDS_matrix-qt5-demo-browser = "${QT5_RDEPENDS}"
+RDEPENDS_matrix-qt5-demo-calculator = "${QT5_RDEPENDS}"
+RDEPENDS_matrix-qt5-demo-deform = "${QT5_RDEPENDS}"
+RDEPENDS_matrix-qt5-demo-webkit-browser = "${QT5_RDEPENDS}"
+
+# Split the matrix files by qt5 demos
+FILES_matrix-qt5-demo-animated = "${MATRIX_APP_DIR}/qt5_animated_tiles/*"
+FILES_matrix-qt5-demo-browser = "${MATRIX_APP_DIR}/qt5_browser/*"
+FILES_matrix-qt5-demo-calculator = "${MATRIX_APP_DIR}/qt5_calculator/*"
+FILES_matrix-qt5-demo-deform = "${MATRIX_APP_DIR}/qt5_deform/*"
+FILES_matrix-qt5-demo-webkit-browser = "${MATRIX_APP_DIR}/qt5_webkit_browser/*"
-- 
1.9.1

[PATCH v2 2/2] packagegroup-arago-tisdk-matrix: replace qt5 demo browser with webkit broswer for K3 devices

[Eric Ruei]

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-matrix.bb          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 919bd41..edb7a50 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 = "r73"
+PR = "r74"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -32,7 +32,10 @@ MATRIX_COMMON_APPS = "              \
 "
 
 MATRIX_QT_APPS = " \
-    matrix-gui-qt5-demos \
+    matrix-qt5-demo-animated \
+    matrix-qt5-demo-browser \
+    matrix-qt5-demo-calculator \
+    matrix-qt5-demo-deform \
     matrix-gui-thermostat-demo \
 "
 
@@ -42,6 +45,10 @@ MATRIX_TOUCH_APPS = " \
 
 MATRIX_QT_APPS_keystone = ""
 MATRIX_QT_APPS_omapl138 = ""
+MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser"
+MATRIX_QT_APPS_append_k3 = " \
+    matrix-qt5-demo-webkit-browser \
+"
 
 MATRIX_SGX_DEMOS = " \
     matrix-3d-demo-chameleon \
-- 
1.9.1

Re: [EXTERNAL] [PATCH v2 0/2] Use the webkit-based broswer as the qt5 demo broswer for k3 devices

[Jacob Stiffler]

[-- Attachment #1: Type: text/plain, Size: 717 bytes --]

Denys,

Can you please backport these to ti2018.03?


Thank you,

Jake


On 9/14/2018 5:07 PM, Eric Ruei wrote:
> V2 changes:
> rebase patch "matrix-gui: qt5-demos: break qt5 demos package into individual
> ones"
>
> Eric Ruei (2):
>    matrix-gui: qt5-demos: break qt5 demos package into individual ones
>    packagegroup-arago-tisdk-matrix: replace qt5 demo browser with webkit
>      broswer for K3 devices
>
>   .../packagegroup-arago-tisdk-matrix.bb              | 11 +++++++++--
>   .../recipes-core/matrix/matrix-gui-apps-git.inc     |  4 ++--
>   .../recipes-core/matrix/matrix-gui-qt5-demos_2.0.bb | 21 ++++++++++++++++++++-
>   3 files changed, 31 insertions(+), 5 deletions(-)
>


[-- Attachment #2: Type: text/html, Size: 1087 bytes --]