Hi, Denys: Should I resubmit those patches in right order to rocko/master?
Best regards, Eric -----Original Message----- From: Dmytriyenko, Denys Sent: Wednesday, February 07, 2018 12:29 PM To: Ruei, Eric Cc: [email protected] Subject: Re: [meta-arago] [morty/master][PATCH 4/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support This should be the first patch in the series, not last. Also, morty is pretty much done. On Tue, Feb 06, 2018 at 03:15:50PM -0500, Eric Ruei wrote: > - update the git URL and SRCREV > - select matrix desktop file based on QT vesion > - add qt-tstat.sh to force the QT5 demo to run as eglfs full-screen > app Why is it eglfs-forced? > Signed-off-by: Eric Ruei <[email protected]> > --- > .../thermostat-demo/qt-tstat/qt_tstat.sh | 13 +++++++++++++ > .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb | 21 > +++++++++++---------- > 2 files changed, 24 insertions(+), 10 deletions(-) create mode > 100755 > meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/qt_tstat.sh > > diff --git > a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/qt_tstat.sh > b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/qt_tstat.sh > new file mode 100755 > index 0000000..01ca4f9 > --- /dev/null > +++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat/qt_tstat > +++ .sh > @@ -0,0 +1,13 @@ > +#!/bin/bash > + > +/etc/init.d/weston stop > +sleep 1 > + > +echo 0 > /sys/class/graphics/fbcon/cursor_blink > + > +ThermostatDemo -platform eglfs > + > +echo 1 > /sys/class/graphics/fbcon/cursor_blink > + > +/etc/init.d/weston start > +sleep 1 > 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..acb0720 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,32 @@ 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 = "db7959b200e0ecbe59ff1c867251b1a8b17bd567" > > -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} \ > + file://qt_tstat.sh" > > 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 ${WORKDIR}/qt_tstat.sh ${D}/usr/bin/qt_tstat.sh > 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 > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
