[morty/rocko/master][PATCH v3 0/4] Re-enable thermostat demo for Qt5

[morty/rocko/master][PATCH v3 0/4] Re-enable thermostat demo for Qt5

[Eric Ruei]

Eric Ruei (4):
  qt-tstat: pickup the latest version for both Qt4/Qt5 support
  packagegroup-arago-tisdk-matrix: add thermostat demo back to
    MATRIX_QT_APPS
  packagegroup-arago-tisdk-qte(-sdk-host): move qt-tstat to QT_DEMOS
  ti-tisdk-makefile: add qt-tstat to MAKEFILES_MATRIX_GUI
    unconditionally

 .../packagegroups/packagegroup-arago-tisdk-matrix.bb  |  4 ++--
 .../packagegroup-arago-tisdk-qte-sdk-host.bb          |  5 ++---
 .../packagegroups/packagegroup-arago-tisdk-qte.bb     |  5 ++---
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb        |  4 ++--
 .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb      | 19 +++++++++----------
 5 files changed, 17 insertions(+), 20 deletions(-)

-- 
1.9.1

[morty/rocko/master][PATCH v3 1/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support

[Eric Ruei]

- update the git URL and SRCREV
- select matrix desktop file based on QT vesion

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
index 494d582..43e35ab 100644
--- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
@@ -12,31 +12,30 @@ require recipes-core/matrix/matrix-gui-paths.inc
 
 inherit qt-provider
 
-PR = "r9"
+PR = "r10"
 
 DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
 
 BRANCH ?= "master"
-SRCREV = "2512773c2d9da989e6a42c1e90b2b34496713072"
+SRCREV = "3429dfc4333f11b9022e3aa6fd2850c5093777f9"
 
-SRC_URI = " \
-	git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \
-"
-
-SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch \
-	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch', '', d)}"
+SRC_URI = "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git/"
 
+DESKTOP_FILE = "${@base_conditional('QT_PROVIDER', 'qt5', 'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}"
+
+
 do_install() {
 	install -d ${D}/usr/bin
 	install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
 	install -d ${D}${MATRIX_APP_DIR}/qt_tstat
-	cp -rf ${S}/matrix-files/*  ${D}${MATRIX_APP_DIR}/qt_tstat
+	install ${S}/matrix-files/desc_thermostat_demo.html  ${D}${MATRIX_APP_DIR}/qt_tstat
+	install ${S}/matrix-files/${DESKTOP_FILE}  ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
 }
 
 PACKAGES += "matrix-gui-thermostat-demo"
 
-RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt4"
+RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images ${@base_conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5', 'matrix-gui-submenus-qt4', d)}"
 
 FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
-- 
1.9.1

[morty/rocko/master][PATCH v3 2/4] packagegroup-arago-tisdk-matrix: add thermostat demo back to MATRIX_QT_APPS

[Eric Ruei]

note: The thermostat demo was removed from MATRIX_QT_APPS because it was for
      Qt4 only

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb     | 4 ++--
 1 file changed, 2 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 0cae08d..f1c3083 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 = "r68"
+PR = "r69"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -31,9 +31,9 @@ MATRIX_COMMON_APPS = "              \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'matrix-gui-weston-terminal-demo', '', d)} \
 "
 
-#    matrix-gui-thermostat-demo
 MATRIX_QT_APPS = " \
     matrix-gui-qt5-demos \
+    matrix-gui-thermostat-demo \
 "
 
 MATRIX_TOUCH_APPS = " \
-- 
1.9.1

[morty/rocko/master][PATCH v3 3/4] packagegroup-arago-tisdk-qte(-sdk-host): move qt-tstat to QT_DEMOS

[Eric Ruei]

qt-tstat has been enhanced to support both Qt4 and Qt5

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb           | 5 ++---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb       | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

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
index 5d596f8..1cef6bb 100644
--- 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
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add Qt embedded related sources into the sdk"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -8,12 +8,11 @@ inherit packagegroup
 
 QT4_DEMOS = "\
     ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-src', '', d)} \
-    qt-tstat-src \
 "
 
 QT_DEMOS = "\
+    qt-tstat-src \
 "
-#    qt-tstat-src 
 
 RDEPENDS_${PN} = "\
     ${@base_conditional('QT_PROVIDER', 'qt5', '', "${QT4_DEMOS}", d)} \
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 f6f7468..4215653 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 = "r17"
+PR = "r18"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -10,7 +10,6 @@ QT4_DEMOS = "\
     qt4-embedded-examples \
     qt4-embedded-demos \
     ${@base_conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \
-    qt-tstat \
 "
 
 QT5_DEMOS = "\
@@ -29,8 +28,8 @@ QT5_DEMOS = "\
 "
 
 QT_DEMOS = "\
+    qt-tstat \
 "
-#    qt-tstat 
 
 RDEPENDS_${PN} = "\
     packagegroup-arago-qte \
-- 
1.9.1

[morty/rocko/master][PATCH v3 4/4] ti-tisdk-makefile: add qt-tstat to MAKEFILES_MATRIX_GUI unconditionally

[Eric Ruei]

qt-tstat has been enhanced to support both Qt4 and Qt5

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
 .../recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 29e74b0..0f7670c 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -50,11 +50,11 @@ SRC_URI = "\
     file://Makefile_barcode-roi \
 "
 
-PR = "r84"
+PR = "r85"
 
 MAKEFILES_MATRIX_GUI = "matrix-gui-browser \
                         refresh-screen \
-                        ${@base_conditional('QT_PROVIDER', 'qt5', '', 'qt-tstat', d)} \
+                        qt-tstat \
 "
 
 MAKEFILES_MATRIX_GUI_keystone = ""
-- 
1.9.1

Re: [morty/rocko/master][PATCH v3 1/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support

[Denys Dmytriyenko]

On Wed, Feb 28, 2018 at 01:40:57PM -0500, Eric Ruei wrote:
> - update the git URL and SRCREV
> - select matrix desktop file based on QT vesion
> 
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
>  .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb      | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
> index 494d582..43e35ab 100644
> --- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
> +++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
> @@ -12,31 +12,30 @@ require recipes-core/matrix/matrix-gui-paths.inc
>  
>  inherit qt-provider
>  
> -PR = "r9"
> +PR = "r10"
>  
>  DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
>  
>  BRANCH ?= "master"
> -SRCREV = "2512773c2d9da989e6a42c1e90b2b34496713072"
> +SRCREV = "3429dfc4333f11b9022e3aa6fd2850c5093777f9"

^^^^^^^^^^^^^^^^^^^^^^^^^^^
Where is this commit ID?


> -SRC_URI = " \
> -	git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \
> -"
> -
> -SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch \
> -	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch', '', d)}"
> +SRC_URI = "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANCH}"
>  
>  S = "${WORKDIR}/git/"
>  
> +DESKTOP_FILE = "${@base_conditional('QT_PROVIDER', 'qt5', 'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}"
> +
> +
>  do_install() {
>  	install -d ${D}/usr/bin
>  	install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
>  	install -d ${D}${MATRIX_APP_DIR}/qt_tstat
> -	cp -rf ${S}/matrix-files/*  ${D}${MATRIX_APP_DIR}/qt_tstat
> +	install ${S}/matrix-files/desc_thermostat_demo.html  ${D}${MATRIX_APP_DIR}/qt_tstat
> +	install ${S}/matrix-files/${DESKTOP_FILE}  ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
>  }
>  
>  PACKAGES += "matrix-gui-thermostat-demo"
>  
> -RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt4"
> +RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images ${@base_conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5', 'matrix-gui-submenus-qt4', d)}"
>  
>  FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [morty/rocko/master][PATCH v3 1/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support

[Ruei, Eric]

Denys:

-----Original Message-----
From: Dmytriyenko, Denys 
Sent: Friday, March 02, 2018 10:46 PM
To: Ruei, Eric
Cc: meta-arago@arago-project.org
Subject: Re: [meta-arago] [morty/rocko/master][PATCH v3 1/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support

On Wed, Feb 28, 2018 at 01:40:57PM -0500, Eric Ruei wrote:
> - update the git URL and SRCREV
> - select matrix desktop file based on QT vesion
> 
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
>  .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb      | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
> index 494d582..43e35ab 100644
> --- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
> +++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
> @@ -12,31 +12,30 @@ require recipes-core/matrix/matrix-gui-paths.inc
>  
>  inherit qt-provider
>  
> -PR = "r9"
> +PR = "r10"
>  
>  DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
>  
>  BRANCH ?= "master"
> -SRCREV = "2512773c2d9da989e6a42c1e90b2b34496713072"
> +SRCREV = "3429dfc4333f11b9022e3aa6fd2850c5093777f9"

^^^^^^^^^^^^^^^^^^^^^^^^^^^
Where is this commit ID?

It is a typo and it should be 665bff9a7bc0dbf82f9d6a58ff2778c03fe04fd1.
I shall verify and submit patch-v4 shortly.

Eric



> -SRC_URI = " \
> -	git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \
> -"
> -
> -SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch \
> -	file://0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch', '', d)}"
> +SRC_URI = "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANCH}"
>  
>  S = "${WORKDIR}/git/"
>  
> +DESKTOP_FILE = "${@base_conditional('QT_PROVIDER', 'qt5', 'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}"
> +
> +
>  do_install() {
>  	install -d ${D}/usr/bin
>  	install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
>  	install -d ${D}${MATRIX_APP_DIR}/qt_tstat
> -	cp -rf ${S}/matrix-files/*  ${D}${MATRIX_APP_DIR}/qt_tstat
> +	install ${S}/matrix-files/desc_thermostat_demo.html  ${D}${MATRIX_APP_DIR}/qt_tstat
> +	install ${S}/matrix-files/${DESKTOP_FILE}  ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
>  }
>  
>  PACKAGES += "matrix-gui-thermostat-demo"
>  
> -RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt4"
> +RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images ${@base_conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5', 'matrix-gui-submenus-qt4', d)}"
>  
>  FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [morty/rocko/master][PATCH v3 1/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support

[Denys Dmytriyenko]

On Sat, Mar 03, 2018 at 02:26:39PM -0500, Ruei, Eric wrote:
>    Denys:
> 
>    -----Original Message-----
>    From: Dmytriyenko, Denys
>    Sent: Friday, March 02, 2018 10:46 PM
>    To: Ruei, Eric
>    Cc: meta-arago@arago-project.org
>    Subject: Re: [meta-arago] [morty/rocko/master][PATCH v3 1/4] qt-tstat:
>    pickup the latest version for both Qt4/Qt5 support
> 
>    On Wed, Feb 28, 2018 at 01:40:57PM -0500, Eric Ruei wrote:
>    > - update the git URL and SRCREV
>    > - select matrix desktop file based on QT vesion
>    >
>    > Signed-off-by: Eric Ruei <e-ruei1@ti.com>
>    > ---
>    >  .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb      | 19
>    +++++++++----------
>    >  1 file changed, 9 insertions(+), 10 deletions(-)
>    >
>    > diff --git
>    a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
>    b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
>    > index 494d582..43e35ab 100644
>    > --- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
>    > +++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb
>    > @@ -12,31 +12,30 @@ require recipes-core/matrix/matrix-gui-paths.inc
>    > 
>    >  inherit qt-provider
>    > 
>    > -PR = "r9"
>    > +PR = "r10"
>    > 
>    >  DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
>    > 
>    >  BRANCH ?= "master"
>    > -SRCREV = "2512773c2d9da989e6a42c1e90b2b34496713072"
>    > +SRCREV = "3429dfc4333f11b9022e3aa6fd2850c5093777f9"
> 
>    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>    Where is this commit ID?
> 
>    It is a typo and it should be 665bff9a7bc0dbf82f9d6a58ff2778c03fe04fd1.
>    I shall verify and submit patch-v4 shortly.

Eric,

It was a rhetorical question, as I already faced the failure and fixed it 
myself...


>    > -SRC_URI = " \
>    > -    
>    git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \
>    > -"
>    > -
>    > -SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5',
>    'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch \
>    > -    
>    file://0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch',
>    '', d)}"
>    > +SRC_URI =
>    "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANCH}"
>    > 
>    >  S = "${WORKDIR}/git/"
>    > 
>    > +DESKTOP_FILE = "${@base_conditional('QT_PROVIDER', 'qt5',
>    'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}"
>    > +
>    > +
>    >  do_install() {
>    >        install -d ${D}/usr/bin
>    >        install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
>    >        install -d ${D}${MATRIX_APP_DIR}/qt_tstat
>    > -     cp -rf ${S}/matrix-files/*  ${D}${MATRIX_APP_DIR}/qt_tstat
>    > +     install ${S}/matrix-files/desc_thermostat_demo.html 
>    ${D}${MATRIX_APP_DIR}/qt_tstat
>    > +     install ${S}/matrix-files/${DESKTOP_FILE} 
>    ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop
>    >  }
>    > 
>    >  PACKAGES += "matrix-gui-thermostat-demo"
>    > 
>    > -RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images
>    matrix-gui-submenus-qt4"
>    > +RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images
>    ${@base_conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5',
>    'matrix-gui-submenus-qt4', d)}"
>    > 
>    >  FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*"
>    > --
>    > 1.9.1
>    >
>    > _______________________________________________
>    > meta-arago mailing list
>    > meta-arago@arago-project.org
>    > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago