[PATCH 1/7] qtbase: Fix runtime issues

[PATCH 1/7] qtbase: Fix runtime issues

[Franklin S. Cooper Jr]

* Insure that Qt is built with touchscreen/tslib support.
* Insure that that proper display plugin is used by default.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../recipes-qt/qt5/qtbase_5.1.1.bbappend           |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
index d35a948..cd935d7 100644
--- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.1.bbappend
@@ -2,9 +2,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PACKAGECONFIG_GL = "icu linuxfb"
 
+# Enable SGX support
+DEPENDS += "${@base_contains('MACHINE_FEATURES','sgx','virtual/egl','',d)}"
+
+# Select default platform plugin
+QT_CONFIG_FLAGS += "-qpa ${@base_contains('MACHINE_FEATURES','sgx','eglfs','linuxfb',d)}"
+
+PACKAGECONFIG_DISTRO = "tslib"
+
 SRC_URI += " \
 	file://0001-qeglfswindow.cpp.patch \
 	file://0002-qeglfswindow.cpp.patch \
 "
 
-PR_append = "-arago0"
+PR_append = "-arago1"
-- 
1.7.0.4

[PATCH 2/7] packagegroup-arago-qt5: Create Qt5 target package group

[Franklin S. Cooper Jr]

* Create package group that by default includes essential Qt 5 plugins.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../packagegroups/packagegroup-arago-qt5.bb        |   33 ++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
new file mode 100644
index 0000000..57d9a6c
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Task to add Qt 5 embedded related packages"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+QT_SGX_SUPPORT = "\
+    qt3d \
+    qt3d-qmlplugins \
+"
+
+RDEPENDS_${PN} = "\
+    qtbase \
+    qtbase-plugins \
+    qtbase-fonts \
+    qtbase-fonts-pfa \
+    qtbase-fonts-pfb \
+    qtbase-fonts-qpf \
+    qtbase-fonts-ttf-dejavu \
+    qtbase-fonts-ttf-vera \
+    qtwebkit-qmlplugins \
+    qtwebkit \
+    qtdeclarative \
+    qtdeclarative-qmlplugins \
+    qtjsbackend \
+    qtlocation \
+    qtsvg \
+    qtsvg-plugins \
+    ${@base_contains('MACHINE_FEATURES','sgx','${QT_SGX_SUPPORT}','',d)} \
+"
+
-- 
1.7.0.4

Re: [PATCH 2/7] packagegroup-arago-qt5: Create Qt5 target package group

[Denys Dmytriyenko]

On Mon, Nov 25, 2013 at 10:53:57AM -0600, Franklin S. Cooper Jr wrote:
> * Create package group that by default includes essential Qt 5 plugins.
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../packagegroups/packagegroup-arago-qt5.bb        |   33 ++++++++++++++++++++
>  1 files changed, 33 insertions(+), 0 deletions(-)
>  create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
> new file mode 100644
> index 0000000..57d9a6c
> --- /dev/null
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
> @@ -0,0 +1,33 @@
> +DESCRIPTION = "Task to add Qt 5 embedded related packages"
> +LICENSE = "MIT"
> +PR = "r0"
> +
> +inherit packagegroup
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +QT_SGX_SUPPORT = "\
> +    qt3d \
> +    qt3d-qmlplugins \
> +"
> +
> +RDEPENDS_${PN} = "\
> +    qtbase \
> +    qtbase-plugins \
> +    qtbase-fonts \
> +    qtbase-fonts-pfa \
> +    qtbase-fonts-pfb \
> +    qtbase-fonts-qpf \
> +    qtbase-fonts-ttf-dejavu \
> +    qtbase-fonts-ttf-vera \

Please drop the specific fonts - qtbase-fonts pulls all the individual fonts 
already.


> +    qtwebkit-qmlplugins \
> +    qtwebkit \
> +    qtdeclarative \
> +    qtdeclarative-qmlplugins \
> +    qtjsbackend \
> +    qtlocation \
> +    qtsvg \
> +    qtsvg-plugins \
> +    ${@base_contains('MACHINE_FEATURES','sgx','${QT_SGX_SUPPORT}','',d)} \
> +"
> +
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 2/7] packagegroup-arago-qt5: Create Qt5 target package group

[Denys Dmytriyenko]

And BTW, here I was hoping to be able to use (and extend if necessary) all 
those variables I started defining QT_RDEPENDS_* so we won't need to create a 
new Qt5-specific packagegroup...

So, I was toying with this idea, but wasn't yet sure if it would be easier to 
read and maintain instead of the new packagegroup AND all the conditionals 
elsewhere...


On Mon, Nov 25, 2013 at 11:19:43AM -0500, Denys Dmytriyenko wrote:
> On Mon, Nov 25, 2013 at 10:53:57AM -0600, Franklin S. Cooper Jr wrote:
> > * Create package group that by default includes essential Qt 5 plugins.
> > 
> > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > ---
> >  .../packagegroups/packagegroup-arago-qt5.bb        |   33 ++++++++++++++++++++
> >  1 files changed, 33 insertions(+), 0 deletions(-)
> >  create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
> > 
> > diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
> > new file mode 100644
> > index 0000000..57d9a6c
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.bb
> > @@ -0,0 +1,33 @@
> > +DESCRIPTION = "Task to add Qt 5 embedded related packages"
> > +LICENSE = "MIT"
> > +PR = "r0"
> > +
> > +inherit packagegroup
> > +
> > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> > +
> > +QT_SGX_SUPPORT = "\
> > +    qt3d \
> > +    qt3d-qmlplugins \
> > +"
> > +
> > +RDEPENDS_${PN} = "\
> > +    qtbase \
> > +    qtbase-plugins \
> > +    qtbase-fonts \
> > +    qtbase-fonts-pfa \
> > +    qtbase-fonts-pfb \
> > +    qtbase-fonts-qpf \
> > +    qtbase-fonts-ttf-dejavu \
> > +    qtbase-fonts-ttf-vera \
> 
> Please drop the specific fonts - qtbase-fonts pulls all the individual fonts 
> already.
> 
> 
> > +    qtwebkit-qmlplugins \
> > +    qtwebkit \
> > +    qtdeclarative \
> > +    qtdeclarative-qmlplugins \
> > +    qtjsbackend \
> > +    qtlocation \
> > +    qtsvg \
> > +    qtsvg-plugins \
> > +    ${@base_contains('MACHINE_FEATURES','sgx','${QT_SGX_SUPPORT}','',d)} \
> > +"
> > +
> > -- 
> > 1.7.0.4
> > 
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 2/7] packagegroup-arago-qt5: Create Qt5 target package group

[Cooper Jr., Franklin]

> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Monday, November 25, 2013 10:32 AM
> To: Cooper Jr., Franklin
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 2/7] packagegroup-arago-qt5: Create Qt5
> target package group
> 
> And BTW, here I was hoping to be able to use (and extend if necessary) all those
> variables I started defining QT_RDEPENDS_* so we won't need to create a new
> Qt5-specific packagegroup...
> 
> So, I was toying with this idea, but wasn't yet sure if it would be easier to read
> and maintain instead of the new packagegroup AND all the conditionals
> elsewhere...
[Franklin] I tried to reuse packagegroups as much as possible but  this packagegroup was so different that it looked ugly to combine both Qt 4 and Qt 5 in a single recipe. All my other patches I did reuse packagegroups so I think this was the only exception.
> 
> 
> On Mon, Nov 25, 2013 at 11:19:43AM -0500, Denys Dmytriyenko wrote:
> > On Mon, Nov 25, 2013 at 10:53:57AM -0600, Franklin S. Cooper Jr wrote:
> > > * Create package group that by default includes essential Qt 5 plugins.
> > >
> > > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > > ---
> > >  .../packagegroups/packagegroup-arago-qt5.bb        |   33
> ++++++++++++++++++++
> > >  1 files changed, 33 insertions(+), 0 deletions(-)  create mode
> > > 100644
> > > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt5.
> > > bb
> > >
> > > diff --git
> > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt
> > > 5.bb
> > > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qt
> > > 5.bb
> > > new file mode 100644
> > > index 0000000..57d9a6c
> > > --- /dev/null
> > > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arag
> > > +++ o-qt5.bb
> > > @@ -0,0 +1,33 @@
> > > +DESCRIPTION = "Task to add Qt 5 embedded related packages"
> > > +LICENSE = "MIT"
> > > +PR = "r0"
> > > +
> > > +inherit packagegroup
> > > +
> > > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> > > +
> > > +QT_SGX_SUPPORT = "\
> > > +    qt3d \
> > > +    qt3d-qmlplugins \
> > > +"
> > > +
> > > +RDEPENDS_${PN} = "\
> > > +    qtbase \
> > > +    qtbase-plugins \
> > > +    qtbase-fonts \
> > > +    qtbase-fonts-pfa \
> > > +    qtbase-fonts-pfb \
> > > +    qtbase-fonts-qpf \
> > > +    qtbase-fonts-ttf-dejavu \
> > > +    qtbase-fonts-ttf-vera \
> >
> > Please drop the specific fonts - qtbase-fonts pulls all the individual
> > fonts already.
> >
> >
> > > +    qtwebkit-qmlplugins \
> > > +    qtwebkit \
> > > +    qtdeclarative \
> > > +    qtdeclarative-qmlplugins \
> > > +    qtjsbackend \
> > > +    qtlocation \
> > > +    qtsvg \
> > > +    qtsvg-plugins \
> > > +
> > >
> +${@base_contains('MACHINE_FEATURES','sgx','${QT_SGX_SUPPORT}','',d)} \ "
> > > +
> > > --
> > > 1.7.0.4
> > >
> > > _______________________________________________
> > > meta-arago mailing list
> > > meta-arago@arago-project.org
> > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 3/7] packagegroup-arago-tisdk-qt: Make packagegroup generic

[Franklin S. Cooper Jr]

* Update packagegroup so it applies to Qt 5 users along with Qt 4 users.
* To reflect this change also rename recipe top reflect that its a generic qt
  packagegroup.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-qt.bb   |   27 ++++++++++++++++++++
 .../packagegroups/packagegroup-arago-tisdk-qte.bb  |   19 --------------
 2 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb
new file mode 100644
index 0000000..c981f9e
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Task to add Qt embedded related packages"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+QT4_DEMOS = "\
+    qt4-embedded-examples \
+    qt4-embedded-demos \
+    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \
+"
+
+QT5_DEMOS = "\
+    qtwebkit-examples-examples \
+"
+
+QT_DEMOS = "\
+    ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS}', '${QT4_DEMOS}', d)} \
+    qt-tstat \
+"
+
+RDEPENDS_${PN} = "\
+    ${@base_conditional('QT_PROVIDER', 'qt5', 'packagegroup-arago-qt5', 'packagegroup-arago-qte', d)} \
+    ${QT_DEMOS} \
+"
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
deleted file mode 100644
index 10187a6..0000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Task to add Qt embedded related packages"
-LICENSE = "MIT"
-PR = "r4"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-QT_DEMOS = "\
-    qt4-embedded-examples \
-    qt4-embedded-demos \
-    qt-tstat \
-    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \
-"
-
-RDEPENDS_${PN} = "\
-    packagegroup-arago-qte \
-    ${QT_DEMOS} \
-"
-- 
1.7.0.4

Re: [PATCH 3/7] packagegroup-arago-tisdk-qt: Make packagegroup generic

[Denys Dmytriyenko]

On Mon, Nov 25, 2013 at 10:53:58AM -0600, Franklin S. Cooper Jr wrote:
> * Update packagegroup so it applies to Qt 5 users along with Qt 4 users.
> * To reflect this change also rename recipe top reflect that its a generic qt
>   packagegroup.
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../packagegroups/packagegroup-arago-tisdk-qt.bb   |   27 ++++++++++++++++++++
>  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |   19 --------------
>  2 files changed, 27 insertions(+), 19 deletions(-)
>  create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb
>  delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb
> new file mode 100644
> index 0000000..c981f9e
> --- /dev/null
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt.bb
> @@ -0,0 +1,27 @@
> +DESCRIPTION = "Task to add Qt embedded related packages"
> +LICENSE = "MIT"
> +PR = "r0"
> +
> +inherit packagegroup
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +QT4_DEMOS = "\
> +    qt4-embedded-examples \
> +    qt4-embedded-demos \
> +    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \

BTW, should we drop ARAGO_QT_PROVIDER?
We now have QT_PROVIDER for qt4 vs qt5 (can possibly extend it to cover 
qt4-gles too)
Otherwise, we started using "sgx" in MACHINE_FEATURES to determine whether to 
enable gles or not. So, if we unify on that, we can drop ARAGO_QT_PROVIDER to 
avoid confusion with QT_PROVIDER.


> +"
> +
> +QT5_DEMOS = "\
> +    qtwebkit-examples-examples \
> +"
> +
> +QT_DEMOS = "\
> +    ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS}', '${QT4_DEMOS}', d)} \
> +    qt-tstat \
> +"
> +
> +RDEPENDS_${PN} = "\
> +    ${@base_conditional('QT_PROVIDER', 'qt5', 'packagegroup-arago-qt5', 'packagegroup-arago-qte', d)} \
> +    ${QT_DEMOS} \
> +"
> 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
> deleted file mode 100644
> index 10187a6..0000000
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -DESCRIPTION = "Task to add Qt embedded related packages"
> -LICENSE = "MIT"
> -PR = "r4"
> -
> -inherit packagegroup
> -
> -PACKAGE_ARCH = "${MACHINE_ARCH}"
> -
> -QT_DEMOS = "\
> -    qt4-embedded-examples \
> -    qt4-embedded-demos \
> -    qt-tstat \
> -    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \
> -"
> -
> -RDEPENDS_${PN} = "\
> -    packagegroup-arago-qte \
> -    ${QT_DEMOS} \
> -"
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/7] packagegroup-arago-tisdk-qt: Make packagegroup generic

[Cooper Jr., Franklin]

> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Monday, November 25, 2013 10:22 AM
> To: Cooper Jr., Franklin
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 3/7] packagegroup-arago-tisdk-qt: Make
> packagegroup generic
> 
> On Mon, Nov 25, 2013 at 10:53:58AM -0600, Franklin S. Cooper Jr wrote:
> > * Update packagegroup so it applies to Qt 5 users along with Qt 4 users.
> > * To reflect this change also rename recipe top reflect that its a generic qt
> >   packagegroup.
> >
> > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > ---
> >  .../packagegroups/packagegroup-arago-tisdk-qt.bb   |   27
> ++++++++++++++++++++
> >  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |   19 --------------
> >  2 files changed, 27 insertions(+), 19 deletions(-)  create mode
> > 100644
> > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-
> > qt.bb  delete mode 100644
> > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-
> > qte.bb
> >
> > diff --git
> > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > k-qt.bb
> > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > k-qt.bb
> > new file mode 100644
> > index 0000000..c981f9e
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > +++ tisdk-qt.bb
> > @@ -0,0 +1,27 @@
> > +DESCRIPTION = "Task to add Qt embedded related packages"
> > +LICENSE = "MIT"
> > +PR = "r0"
> > +
> > +inherit packagegroup
> > +
> > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> > +
> > +QT4_DEMOS = "\
> > +    qt4-embedded-examples \
> > +    qt4-embedded-demos \
> > +    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
> > +'quick-playground', '', d)} \
> 
> BTW, should we drop ARAGO_QT_PROVIDER?
[Franklin] Yeah I think we should. But should we drop QT_PROVIDER and use ARAGO_QT_PROVIDER instead since this is Arago specific? Or were you planning on pushing that up to meta-qt5?

No matter what choice we make would you want to make this change before this patchset, after this patchset or after my remaining Qt 5 patches that I have yet to send?
> We now have QT_PROVIDER for qt4 vs qt5 (can possibly extend it to cover qt4-
> gles too) Otherwise, we started using "sgx" in MACHINE_FEATURES to
> determine whether to enable gles or not. 
[Franklin] We would still need to check for sgx in MACHINE_FEATURES since we don't have a concept of qt5-gles.
So, if we unify on that, we can drop
> ARAGO_QT_PROVIDER to avoid confusion with QT_PROVIDER.
> 
> 
> > +"
> > +
> > +QT5_DEMOS = "\
> > +    qtwebkit-examples-examples \
> > +"
> > +
> > +QT_DEMOS = "\
> > +    ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS}',
> '${QT4_DEMOS}', d)} \
> > +    qt-tstat \
> > +"
> > +
> > +RDEPENDS_${PN} = "\
> > +    ${@base_conditional('QT_PROVIDER', 'qt5', 'packagegroup-arago-qt5',
> 'packagegroup-arago-qte', d)} \
> > +    ${QT_DEMOS} \
> > +"
> > diff --git
> > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > k-qte.bb
> > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > k-qte.bb
> > deleted file mode 100644
> > index 10187a6..0000000
> > ---
> > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > k-qte.bb
> > +++ /dev/null
> > @@ -1,19 +0,0 @@
> > -DESCRIPTION = "Task to add Qt embedded related packages"
> > -LICENSE = "MIT"
> > -PR = "r4"
> > -
> > -inherit packagegroup
> > -
> > -PACKAGE_ARCH = "${MACHINE_ARCH}"
> > -
> > -QT_DEMOS = "\
> > -    qt4-embedded-examples \
> > -    qt4-embedded-demos \
> > -    qt-tstat \
> > -    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
> 'quick-playground', '', d)} \
> > -"
> > -
> > -RDEPENDS_${PN} = "\
> > -    packagegroup-arago-qte \
> > -    ${QT_DEMOS} \
> > -"
> > --
> > 1.7.0.4
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/7] packagegroup-arago-tisdk-qt: Make packagegroup generic

[Denys Dmytriyenko]

On Mon, Nov 25, 2013 at 11:35:54AM -0500, Cooper Jr., Franklin wrote:
> 
> 
> > -----Original Message-----
> > From: Dmytriyenko, Denys
> > Sent: Monday, November 25, 2013 10:22 AM
> > To: Cooper Jr., Franklin
> > Cc: meta-arago@arago-project.org
> > Subject: Re: [meta-arago] [PATCH 3/7] packagegroup-arago-tisdk-qt: Make
> > packagegroup generic
> > 
> > On Mon, Nov 25, 2013 at 10:53:58AM -0600, Franklin S. Cooper Jr wrote:
> > > * Update packagegroup so it applies to Qt 5 users along with Qt 4 users.
> > > * To reflect this change also rename recipe top reflect that its a generic qt
> > >   packagegroup.
> > >
> > > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > > ---
> > >  .../packagegroups/packagegroup-arago-tisdk-qt.bb   |   27
> > ++++++++++++++++++++
> > >  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |   19 --------------
> > >  2 files changed, 27 insertions(+), 19 deletions(-)  create mode
> > > 100644
> > > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-
> > > qt.bb  delete mode 100644
> > > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-
> > > qte.bb
> > >
> > > diff --git
> > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > > k-qt.bb
> > > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > > k-qt.bb
> > > new file mode 100644
> > > index 0000000..c981f9e
> > > --- /dev/null
> > > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > > +++ tisdk-qt.bb
> > > @@ -0,0 +1,27 @@
> > > +DESCRIPTION = "Task to add Qt embedded related packages"
> > > +LICENSE = "MIT"
> > > +PR = "r0"
> > > +
> > > +inherit packagegroup
> > > +
> > > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> > > +
> > > +QT4_DEMOS = "\
> > > +    qt4-embedded-examples \
> > > +    qt4-embedded-demos \
> > > +    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
> > > +'quick-playground', '', d)} \
> > 
> > BTW, should we drop ARAGO_QT_PROVIDER?

> [Franklin] Yeah I think we should. But should we drop QT_PROVIDER and use 
> ARAGO_QT_PROVIDER instead since this is Arago specific? Or were you planning 
> on pushing that up to meta-qt5?

That was my plan and hope...


> No matter what choice we make would you want to make this change before this 
> patchset, after this patchset or after my remaining Qt 5 patches that I have 
> yet to send?

I have few comments for this patchset and I'm realizing that I want to do 
couple of things here differently. So, if you don't mind holding on this set 
for a bit longer, let's cleanup and restructure few things before anything 
else, Ok?


> > We now have QT_PROVIDER for qt4 vs qt5 (can possibly extend it to cover qt4-
> > gles too) Otherwise, we started using "sgx" in MACHINE_FEATURES to
> > determine whether to enable gles or not. 

> [Franklin] We would still need to check for sgx in MACHINE_FEATURES since we 
> don't have a concept of qt5-gles.
> So, if we unify on that, we can drop

Yeah, extending and combining QT_PROVIDER to cover qt4, qt4-gles, qt5, 
qt5-gles (and hopefully we'll support x11/wayland one day) is probably too 
much. So, as I was trying to say, let's drop ARAGO_QT_PROVIDER as a way to 
check for gles and unify on MACHINE_FEATURES containing "sgx".


> > ARAGO_QT_PROVIDER to avoid confusion with QT_PROVIDER.
> > 
> > 
> > > +"
> > > +
> > > +QT5_DEMOS = "\
> > > +    qtwebkit-examples-examples \
> > > +"
> > > +
> > > +QT_DEMOS = "\
> > > +    ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS}',
> > '${QT4_DEMOS}', d)} \
> > > +    qt-tstat \
> > > +"
> > > +
> > > +RDEPENDS_${PN} = "\
> > > +    ${@base_conditional('QT_PROVIDER', 'qt5', 'packagegroup-arago-qt5',
> > 'packagegroup-arago-qte', d)} \
> > > +    ${QT_DEMOS} \
> > > +"
> > > diff --git
> > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > > k-qte.bb
> > > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > > k-qte.bb
> > > deleted file mode 100644
> > > index 10187a6..0000000
> > > ---
> > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisd
> > > k-qte.bb
> > > +++ /dev/null
> > > @@ -1,19 +0,0 @@
> > > -DESCRIPTION = "Task to add Qt embedded related packages"
> > > -LICENSE = "MIT"
> > > -PR = "r4"
> > > -
> > > -inherit packagegroup
> > > -
> > > -PACKAGE_ARCH = "${MACHINE_ARCH}"
> > > -
> > > -QT_DEMOS = "\
> > > -    qt4-embedded-examples \
> > > -    qt4-embedded-demos \
> > > -    qt-tstat \
> > > -    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
> > 'quick-playground', '', d)} \
> > > -"
> > > -
> > > -RDEPENDS_${PN} = "\
> > > -    packagegroup-arago-qte \
> > > -    ${QT_DEMOS} \
> > > -"
> > > --
> > > 1.7.0.4
> > >
> > > _______________________________________________
> > > meta-arago mailing list
> > > meta-arago@arago-project.org
> > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 3/7] packagegroup-arago-tisdk-qt: Make packagegroup generic

[Cooper Jr., Franklin]

> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Monday, November 25, 2013 10:44 AM
> To: Cooper Jr., Franklin
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 3/7] packagegroup-arago-tisdk-qt: Make
> packagegroup generic
> 
> On Mon, Nov 25, 2013 at 11:35:54AM -0500, Cooper Jr., Franklin wrote:
> >
> >
> > > -----Original Message-----
> > > From: Dmytriyenko, Denys
> > > Sent: Monday, November 25, 2013 10:22 AM
> > > To: Cooper Jr., Franklin
> > > Cc: meta-arago@arago-project.org
> > > Subject: Re: [meta-arago] [PATCH 3/7] packagegroup-arago-tisdk-qt:
> > > Make packagegroup generic
> > >
> > > On Mon, Nov 25, 2013 at 10:53:58AM -0600, Franklin S. Cooper Jr wrote:
> > > > * Update packagegroup so it applies to Qt 5 users along with Qt 4 users.
> > > > * To reflect this change also rename recipe top reflect that its a generic qt
> > > >   packagegroup.
> > > >
> > > > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > > > ---
> > > >  .../packagegroups/packagegroup-arago-tisdk-qt.bb   |   27
> > > ++++++++++++++++++++
> > > >  .../packagegroups/packagegroup-arago-tisdk-qte.bb  |   19 --------------
> > > >  2 files changed, 27 insertions(+), 19 deletions(-)  create mode
> > > > 100644
> > > > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-ti
> > > > sdk-
> > > > qt.bb  delete mode 100644
> > > > meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-ti
> > > > sdk-
> > > > qte.bb
> > > >
> > > > diff --git
> > > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > > > tisd
> > > > k-qt.bb
> > > > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > > > tisd
> > > > k-qt.bb
> > > > new file mode 100644
> > > > index 0000000..c981f9e
> > > > --- /dev/null
> > > > +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-ar
> > > > +++ ago-
> > > > +++ tisdk-qt.bb
> > > > @@ -0,0 +1,27 @@
> > > > +DESCRIPTION = "Task to add Qt embedded related packages"
> > > > +LICENSE = "MIT"
> > > > +PR = "r0"
> > > > +
> > > > +inherit packagegroup
> > > > +
> > > > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> > > > +
> > > > +QT4_DEMOS = "\
> > > > +    qt4-embedded-examples \
> > > > +    qt4-embedded-demos \
> > > > +    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
> > > > +'quick-playground', '', d)} \
> > >
> > > BTW, should we drop ARAGO_QT_PROVIDER?
> 
> > [Franklin] Yeah I think we should. But should we drop QT_PROVIDER and
> > use ARAGO_QT_PROVIDER instead since this is Arago specific? Or were
> > you planning on pushing that up to meta-qt5?
> 
> That was my plan and hope...
> 
> 
> > No matter what choice we make would you want to make this change
> > before this patchset, after this patchset or after my remaining Qt 5
> > patches that I have yet to send?
> 
> I have few comments for this patchset and I'm realizing that I want to do couple
> of things here differently. So, if you don't mind holding on this set for a bit
> longer, let's cleanup and restructure few things before anything else, Ok?
[Franklin] np
> 
> 
> > > We now have QT_PROVIDER for qt4 vs qt5 (can possibly extend it to
> > > cover qt4- gles too) Otherwise, we started using "sgx" in
> > > MACHINE_FEATURES to determine whether to enable gles or not.
> 
> > [Franklin] We would still need to check for sgx in MACHINE_FEATURES
> > since we don't have a concept of qt5-gles.
> > So, if we unify on that, we can drop
> 
> Yeah, extending and combining QT_PROVIDER to cover qt4, qt4-gles, qt5, qt5-
> gles (and hopefully we'll support x11/wayland one day) is probably too much.
> So, as I was trying to say, let's drop ARAGO_QT_PROVIDER as a way to check for
> gles and unify on MACHINE_FEATURES containing "sgx".
> 
> 
> > > ARAGO_QT_PROVIDER to avoid confusion with QT_PROVIDER.
> > >
> > >
> > > > +"
> > > > +
> > > > +QT5_DEMOS = "\
> > > > +    qtwebkit-examples-examples \
> > > > +"
> > > > +
> > > > +QT_DEMOS = "\
> > > > +    ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS}',
> > > '${QT4_DEMOS}', d)} \
> > > > +    qt-tstat \
> > > > +"
> > > > +
> > > > +RDEPENDS_${PN} = "\
> > > > +    ${@base_conditional('QT_PROVIDER', 'qt5',
> > > > +'packagegroup-arago-qt5',
> > > 'packagegroup-arago-qte', d)} \
> > > > +    ${QT_DEMOS} \
> > > > +"
> > > > diff --git
> > > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > > > tisd
> > > > k-qte.bb
> > > > b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > > > tisd
> > > > k-qte.bb
> > > > deleted file mode 100644
> > > > index 10187a6..0000000
> > > > ---
> > > > a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> > > > tisd
> > > > k-qte.bb
> > > > +++ /dev/null
> > > > @@ -1,19 +0,0 @@
> > > > -DESCRIPTION = "Task to add Qt embedded related packages"
> > > > -LICENSE = "MIT"
> > > > -PR = "r4"
> > > > -
> > > > -inherit packagegroup
> > > > -
> > > > -PACKAGE_ARCH = "${MACHINE_ARCH}"
> > > > -
> > > > -QT_DEMOS = "\
> > > > -    qt4-embedded-examples \
> > > > -    qt4-embedded-demos \
> > > > -    qt-tstat \
> > > > -    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles',
> > > 'quick-playground', '', d)} \
> > > > -"
> > > > -
> > > > -RDEPENDS_${PN} = "\
> > > > -    packagegroup-arago-qte \
> > > > -    ${QT_DEMOS} \
> > > > -"
> > > > --
> > > > 1.7.0.4
> > > >
> > > > _______________________________________________
> > > > meta-arago mailing list
> > > > meta-arago@arago-project.org
> > > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 4/7] packagegroup-arago-tisdk-qt-sdk-host: Make packagegroup generic

[Franklin S. Cooper Jr]

* Update package group so that it applies to both Qt 4 and Qt 5.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../packagegroup-arago-tisdk-qt-sdk-host.bb        |   22 ++++++++++++++++++++
 .../packagegroup-arago-tisdk-qte-sdk-host.bb       |   16 --------------
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt-sdk-host.bb
new file mode 100644
index 0000000..936f463
--- /dev/null
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qt-sdk-host.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Task to add Qt embedded related sources into the sdk"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+QT4_DEMOS_SRC = "\
+     ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-src', '', d)} \
+"
+
+QT5_DEMOS_SRC = ""
+
+QT_DEMOS = "\
+    qt-tstat-src \
+    ${@base_conditional('QT_PROVIDER', 'qt5', '${QT5_DEMOS_SRC}', '${QT4_DEMOS_SRC}', d)} \
+"
+
+RDEPENDS_${PN} = "\
+    ${QT_DEMOS} \
+"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
deleted file mode 100644
index 4cb85fe..0000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Task to add Qt embedded related sources into the sdk"
-LICENSE = "MIT"
-PR = "r3"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-QT_DEMOS = "\
-    qt-tstat-src \
-    ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-src', '', d)} \
-"
-
-RDEPENDS_${PN} = "\
-    ${QT_DEMOS} \
-"
-- 
1.7.0.4

[PATCH 5/7] packagegroup-arago-qt5-toolchain-target: Only include qt3D when using SGX

[Franklin S. Cooper Jr]

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../packagegroup-arago-qt5-toolchain-target.bb     |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
index 7e0d12c..28c7e3d 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qt5-toolchain-target.bb
@@ -1,12 +1,16 @@
 DESCRIPTION = "Target packages for Qt5 SDK"
 LICENSE = "MIT"
 
-PR = "r1"
+PR = "r2"
 
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+QT_SGX_SUPPORT = "\
+    qt3d-dev \
+"
+
 RDEPENDS_${PN} += " \
         packagegroup-arago-standalone-sdk-target \
         libsqlite3-dev \
@@ -24,7 +28,7 @@ RDEPENDS_${PN} += " \
         qtdeclarative-dev \
         qtscript-dev \
         qtwebkit-dev \
-        qt3d-dev \
+        ${@base_contains('MACHINE_FEATURES','sgx','qt3d-dev','',d)} \
         qtlocation-dev \
         qtsensors-dev \
         qtsvg-dev \
-- 
1.7.0.4

[PATCH 6/7] packagegroup-arago-toolchain-tisdk-target: Select packagegroup depending on Qt

[Franklin S. Cooper Jr]

* Determine which packagegroup to use depending on the version of Qt being used

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../packagegroup-arago-toolchain-tisdk-target.bb   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
index 495a0e4..99ac983 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-toolchain-tisdk-target.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Task to build and install header and libs into the sdk"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 RDEPENDS_${PN} = "\
-    packagegroup-arago-qte-toolchain-target \
+    ${@base_conditional('QT_PROVIDER', 'qt5', 'packagegroup-arago-qt5-toolchain-target', 'packagegroup-arago-qte-toolchain-target', d)} \
     packagegroup-arago-tisdk-multimedia-sdk-target \
     packagegroup-arago-tisdk-connectivity-sdk-target \
     packagegroup-arago-tisdk-crypto-sdk-target \
-- 
1.7.0.4

[PATCH 7/7] images: Update images to reflect packagegroup renaming

[Franklin S. Cooper Jr]

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../recipes-core/images/arago-core-tisdk-image.inc |    2 +-
 .../recipes-core/images/tisdk-rootfs-image.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
index 74c2b87..30e1da5 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
@@ -33,6 +33,6 @@ IMAGE_INSTALL = "\
     packagegroup-arago-tisdk-crypto-sdk-host \
     packagegroup-arago-tisdk-matrix-sdk-host \
     packagegroup-arago-tisdk-multimedia-sdk-host \
-    packagegroup-arago-tisdk-qte-sdk-host \
+    packagegroup-arago-tisdk-qt-sdk-host \
     packagegroup-arago-tisdk-amsdk-sdk-host \
 "
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 1bc6a36..2c3210f 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -5,7 +5,7 @@ require arago-base-tisdk-image.bb
 IMAGE_INSTALL += "\
     packagegroup-arago-test \
     ${@base_contains('MACHINE_FEATURES','sgx','packagegroup-arago-tisdk-graphics','',d)} \
-    packagegroup-arago-tisdk-qte \
+    packagegroup-arago-tisdk-qt \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
-- 
1.7.0.4