I don't mind working on this but for now can we just have two versions of this init script. Qt4 version and Qt5 version then select the version based on Qt provider. I don't mind working on consolidating the two but at least its not as much of a hack and won't break things for Qt 4 and Qt 5 users now.
> -----Original Message----- > From: [email protected] [mailto:meta-arago- > [email protected]] On Behalf Of Dmytriyenko, Denys > Sent: Friday, July 18, 2014 3:19 PM > To: [email protected] > Subject: Re: [meta-arago] [PATCH 06/11] HACK: matrix-gui: run on top of > Wayland > > On Fri, Jul 18, 2014 at 02:51:57PM -0400, Denys Dmytriyenko wrote: > > From: Denys Dmytriyenko <[email protected]> > > > > Signed-off-by: Denys Dmytriyenko <[email protected]> > > This would require some cleanup - exporting additional env variables should > be fine, but there were some problems with -qws option and chvt, so I had to > drop them. Of course, if we want to preserve the old behavior, this would > need to be done conditionally... > > > > --- > > meta-arago-extras/recipes-core/matrix/matrix-gui/init | 7 +++++-- > > meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb | 2 +- > > 2 files changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/init > > b/meta-arago-extras/recipes-core/matrix/matrix-gui/init > > index dab7dc6..6286028 100644 > > --- a/meta-arago-extras/recipes-core/matrix/matrix-gui/init > > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/init > > @@ -2,17 +2,20 @@ > > > > matrixgui="/usr/bin/matrix_browser" > > ROTATION=__MATRIX_ROT__ > > -GUI_OPTS="-qws $ROTATION http://localhost:80/"; > > +GUI_OPTS="http://localhost:80/"; > > PIDFILE="/var/run/matrix-gui-2.0.pid" > > > > test -x "$matrixgui" || exit 0 > > > > export TSLIB_TSDEVICE=/dev/input/touchscreen0 > > export QWS_MOUSE_PROTO=Auto > > +export QT_QPA_PLATFORM=wayland > > +export XDG_RUNTIME_DIR=/run/user/root export > > +WAYLAND_DISPLAY=wayland-0 > > > > case "$1" in > > start) > > - chvt 4 > > +# chvt 4 > > > > # ARM9 devices get a lot of alignment trap errors with the current > > # version of Qt (4.7.2) that we use. The printing of these > > messages diff --git > > a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > index 523cfe1..16f2eeb 100644 > > --- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb > > @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = > "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d" > > > > SECTION = "multimedia" > > > > -PR = "r16" > > +PR = "r17" > > > > INITSCRIPT_NAME = "matrix-gui-2.0" > > INITSCRIPT_PARAMS = "defaults 97" > > -- > > 2.0.0 > > > _______________________________________________ > 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
