[morty/master][PATCH 1/4] qt-vars: add QtWebEngine dependency variable

[morty/master][PATCH 1/4] qt-vars: add QtWebEngine dependency variable

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/classes/qt-vars.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-arago-distro/classes/qt-vars.bbclass b/meta-arago-distro/classes/qt-vars.bbclass
index 4c4cb11..866b5ad 100644
--- a/meta-arago-distro/classes/qt-vars.bbclass
+++ b/meta-arago-distro/classes/qt-vars.bbclass
@@ -9,6 +9,7 @@ QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embe
 QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}"
 QT_DEPENDS_SVG = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtsvg', '', d)}"
 QT_DEPENDS_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtscript', '', d)}"
+QT_DEPENDS_WEBENGINE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebengine', '', d)}"
 
 # Run-time dependencies
 QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', '', 'qt4-embedded-fonts', d)}"
-- 
2.7.4

[morty/master][PATCH 2/4] matrix-gui-browser: Matrix browser is now QtWebEngine based, update DEPENDS

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
index 1f91f57..0455962 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
@@ -9,9 +9,9 @@ inherit qt-provider
 # Make sure that QT font libraries have been installed
 RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
 
-DEPENDS += "${QT_DEPENDS_WEBKIT}"
+DEPENDS += "${QT_DEPENDS_WEBENGINE}"
 
-PR = "r14"
+PR = "r15"
 
 QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79"
 QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc"
-- 
2.7.4

[morty/master][PATCH 3/4] packagegroup-*-graphics: add chromium-wayland for A15 platforms

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-graphics.bb        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index 5dae1b5..b19e759 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -1,23 +1,26 @@
 DESCRIPTION = "Task to install graphics binaries"
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 
 inherit packagegroup
 
-GRAPHICS_WESTON = "\
+GRAPHICS_WAYLAND = "\
     weston \
     weston-init \
     weston-examples \
     wayland-ivi-extension \
 "
 
+GRAPHICS_WAYLAND_append_omap-a15 = "\
+    chromium-wayland \
+"
+
 GRAPHICS_RDEPENDS = "\
     libgbm \
     ti-sgx-ddk-km \
     ti-sgx-ddk-um \
 "
 
-
 GRAPHICS_RDEPENDS_append_omap-a15 = "\
     ti-gc320-tests \
     ti-gc320-driver \
@@ -25,6 +28,6 @@ GRAPHICS_RDEPENDS_append_omap-a15 = "\
 "
 
 RDEPENDS_${PN} = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', "${GRAPHICS_WESTON}", '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', "${GRAPHICS_WAYLAND}", '', d)} \
     ${GRAPHICS_RDEPENDS} \
 "
-- 
2.7.4

[morty/master][PATCH 4/4] packagegroup-*-qte*: remove QtWebKit dependency

[Denys Dmytriyenko]

Replaced with either QtWebEngine or full Chromium on A15 platforms.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-qte.bb             | 5 +----
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb       | 4 +---
 .../packagegroups/packagegroup-arago-qte-toolchain-target.bb         | 5 +----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index f6788f3..fb38ab8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add Qt embedded related packages"
 LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -36,9 +36,6 @@ QT5_ESSENTIALS = "\
     qtmultimedia-qmlplugins \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins', '', d)} \
     qt3d-qmlplugins \
-    qtwebkit-qmlplugins \
-    qtquick1-plugins \
-    qtquick1-qmlplugins \
     qtquickcontrols-qmlplugins \
     qtquickcontrols2-qmlplugins \
     qtgraphicaleffects-qmlplugins \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index 30bac7b..f6f7468 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add Qt embedded related packages"
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -20,14 +20,12 @@ QT5_DEMOS = "\
     qtdeclarative-tools \
     qtlocation-examples \
     qtmultimedia-examples \
-    qtquick1-examples \
     qtscript-examples \
     qtsvg-examples \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
     qtwebbrowser \
     qtwebbrowser-examples \
     qtwebengine-examples \
-    qtwebkit-examples-examples \
 "
 
 QT_DEMOS = "\
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index 73bae9d..88c5c6b 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Target packages for Qt Embedded SDK"
 LICENSE = "MIT"
 
-PR = "r11"
+PR = "r12"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -47,7 +47,6 @@ QT5_DEV = " \
         qtbase-mkspecs \
         qtdeclarative-mkspecs \
         qtscript-mkspecs \
-        qtwebkit-mkspecs \
         qt3d-mkspecs \
         qtlocation-mkspecs \
         qtsensors-mkspecs \
@@ -57,13 +56,11 @@ QT5_DEV = " \
         qtbase-staticdev \
         qtdeclarative-dev \
         qtscript-dev \
-        qtwebkit-dev \
         qt3d-dev \
         qtlocation-dev \
         qtsensors-dev \
         qtsvg-dev \
         qtxmlpatterns-dev \
-        qtquick1-dev \
         qtwebengine-mkspecs \
         qtwebengine-dev \
 "
-- 
2.7.4

Re: [morty/master][PATCH 4/4] packagegroup-*-qte*: remove QtWebKit dependency

[Denys Dmytriyenko]

Eric, Jake, et al,

I'll take the first 3 patches in this series into morty-next for testing to 
get into rc2, but I'll leave out this #4 for now - waiting for your comments. 
Thanks.

-- 
Denys


On Tue, Sep 05, 2017 at 07:09:52PM -0400, Denys Dmytriyenko wrote:
> Replaced with either QtWebEngine or full Chromium on A15 platforms.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  .../recipes-core/packagegroups/packagegroup-arago-qte.bb             | 5 +----
>  .../recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb       | 4 +---
>  .../packagegroups/packagegroup-arago-qte-toolchain-target.bb         | 5 +----
>  3 files changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
> index f6788f3..fb38ab8 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to add Qt embedded related packages"
>  LICENSE = "MIT"
> -PR = "r12"
> +PR = "r13"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
> @@ -36,9 +36,6 @@ QT5_ESSENTIALS = "\
>      qtmultimedia-qmlplugins \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins', '', d)} \
>      qt3d-qmlplugins \
> -    qtwebkit-qmlplugins \
> -    qtquick1-plugins \
> -    qtquick1-qmlplugins \
>      qtquickcontrols-qmlplugins \
>      qtquickcontrols2-qmlplugins \
>      qtgraphicaleffects-qmlplugins \
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> index 30bac7b..f6f7468 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to add Qt embedded related packages"
>  LICENSE = "MIT"
> -PR = "r16"
> +PR = "r17"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
> @@ -20,14 +20,12 @@ QT5_DEMOS = "\
>      qtdeclarative-tools \
>      qtlocation-examples \
>      qtmultimedia-examples \
> -    qtquick1-examples \
>      qtscript-examples \
>      qtsvg-examples \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
>      qtwebbrowser \
>      qtwebbrowser-examples \
>      qtwebengine-examples \
> -    qtwebkit-examples-examples \
>  "
>  
>  QT_DEMOS = "\
> diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
> index 73bae9d..88c5c6b 100644
> --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
> +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
> @@ -1,7 +1,7 @@
>  DESCRIPTION = "Target packages for Qt Embedded SDK"
>  LICENSE = "MIT"
>  
> -PR = "r11"
> +PR = "r12"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
> @@ -47,7 +47,6 @@ QT5_DEV = " \
>          qtbase-mkspecs \
>          qtdeclarative-mkspecs \
>          qtscript-mkspecs \
> -        qtwebkit-mkspecs \
>          qt3d-mkspecs \
>          qtlocation-mkspecs \
>          qtsensors-mkspecs \
> @@ -57,13 +56,11 @@ QT5_DEV = " \
>          qtbase-staticdev \
>          qtdeclarative-dev \
>          qtscript-dev \
> -        qtwebkit-dev \
>          qt3d-dev \
>          qtlocation-dev \
>          qtsensors-dev \
>          qtsvg-dev \
>          qtxmlpatterns-dev \
> -        qtquick1-dev \
>          qtwebengine-mkspecs \
>          qtwebengine-dev \
>  "
> -- 
> 2.7.4
> 

Re: [morty/master][PATCH 4/4] packagegroup-*-qte*: remove QtWebKit dependency

[Denys Dmytriyenko]

Ping. If there are no objections, I'll merge this patch on Tuesday.


On Tue, Sep 05, 2017 at 07:19:27PM -0400, Denys Dmytriyenko wrote:
> Eric, Jake, et al,
> 
> I'll take the first 3 patches in this series into morty-next for testing to 
> get into rc2, but I'll leave out this #4 for now - waiting for your comments. 
> Thanks.
> 
> -- 
> Denys
> 
> 
> On Tue, Sep 05, 2017 at 07:09:52PM -0400, Denys Dmytriyenko wrote:
> > Replaced with either QtWebEngine or full Chromium on A15 platforms.
> > 
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >  .../recipes-core/packagegroups/packagegroup-arago-qte.bb             | 5 +----
> >  .../recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb       | 4 +---
> >  .../packagegroups/packagegroup-arago-qte-toolchain-target.bb         | 5 +----
> >  3 files changed, 3 insertions(+), 11 deletions(-)
> > 
> > diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
> > index f6788f3..fb38ab8 100644
> > --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
> > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
> > @@ -1,6 +1,6 @@
> >  DESCRIPTION = "Task to add Qt embedded related packages"
> >  LICENSE = "MIT"
> > -PR = "r12"
> > +PR = "r13"
> >  
> >  PACKAGE_ARCH = "${MACHINE_ARCH}"
> >  
> > @@ -36,9 +36,6 @@ QT5_ESSENTIALS = "\
> >      qtmultimedia-qmlplugins \
> >      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins', '', d)} \
> >      qt3d-qmlplugins \
> > -    qtwebkit-qmlplugins \
> > -    qtquick1-plugins \
> > -    qtquick1-qmlplugins \
> >      qtquickcontrols-qmlplugins \
> >      qtquickcontrols2-qmlplugins \
> >      qtgraphicaleffects-qmlplugins \
> > diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> > index 30bac7b..f6f7468 100644
> > --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> > @@ -1,6 +1,6 @@
> >  DESCRIPTION = "Task to add Qt embedded related packages"
> >  LICENSE = "MIT"
> > -PR = "r16"
> > +PR = "r17"
> >  
> >  PACKAGE_ARCH = "${MACHINE_ARCH}"
> >  
> > @@ -20,14 +20,12 @@ QT5_DEMOS = "\
> >      qtdeclarative-tools \
> >      qtlocation-examples \
> >      qtmultimedia-examples \
> > -    qtquick1-examples \
> >      qtscript-examples \
> >      qtsvg-examples \
> >      ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
> >      qtwebbrowser \
> >      qtwebbrowser-examples \
> >      qtwebengine-examples \
> > -    qtwebkit-examples-examples \
> >  "
> >  
> >  QT_DEMOS = "\
> > diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
> > index 73bae9d..88c5c6b 100644
> > --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
> > +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
> > @@ -1,7 +1,7 @@
> >  DESCRIPTION = "Target packages for Qt Embedded SDK"
> >  LICENSE = "MIT"
> >  
> > -PR = "r11"
> > +PR = "r12"
> >  
> >  PACKAGE_ARCH = "${MACHINE_ARCH}"
> >  
> > @@ -47,7 +47,6 @@ QT5_DEV = " \
> >          qtbase-mkspecs \
> >          qtdeclarative-mkspecs \
> >          qtscript-mkspecs \
> > -        qtwebkit-mkspecs \
> >          qt3d-mkspecs \
> >          qtlocation-mkspecs \
> >          qtsensors-mkspecs \
> > @@ -57,13 +56,11 @@ QT5_DEV = " \
> >          qtbase-staticdev \
> >          qtdeclarative-dev \
> >          qtscript-dev \
> > -        qtwebkit-dev \
> >          qt3d-dev \
> >          qtlocation-dev \
> >          qtsensors-dev \
> >          qtsvg-dev \
> >          qtxmlpatterns-dev \
> > -        qtquick1-dev \
> >          qtwebengine-mkspecs \
> >          qtwebengine-dev \
> >  "
> > -- 
> > 2.7.4
> > 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago