On Fri, Mar 08, 2019 at 07:16:47PM -0500, Ruei, Eric wrote: > On 3/8/2019 6:48 PM, Denys Dmytriyenko wrote: > >>[PATCH 2/2] atbase-config: add eglfs_kms configuration file and change wl > >>shell > > > >atbase? typo? > > > > > Should I change it to wayland?
I was merely pointing to a typo in the subject - atbase instead of qtbase But if you think this should go to wayland-conf instead of qtbase-conf, it's ok, but I thought eglfs was Qt-specific feature... > Eric > > > >On Fri, Mar 08, 2019 at 06:02:07PM -0500, Eric Ruei wrote: > >>- add eglfs_kms configuration file > >>- switch to wl-shell because xdb-shell-v5 is obsolete > >> > >>Signed-off-by: Eric Ruei <[email protected]> > >>--- > >> .../recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 15 > >> +++++++++++++++ > >> meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 ++- > >> .../recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh | 3 ++- > >> meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb | 10 +++++++--- > >> 4 files changed, 26 insertions(+), 5 deletions(-) > >> create mode 100644 > >> meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json > >> > >>diff --git > >>a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json > >>b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json > >>new file mode 100644 > >>index 0000000..61b834b > >>--- /dev/null > >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json > >>@@ -0,0 +1,15 @@ > >>+{ > >>+ "device": "/dev/dri/card0", > >>+ "hwcursor": false, > >>+ "pbuffers": true, > >>+ "outputs": [ > >>+ { > >>+ "name": "VGA1", > >>+ "mode": "off" > >>+ }, > >>+ { > >>+ "name": "HDMI1", > >>+ "mode": "1024x768" > >>+ } > >>+ ] > >>+} > >>\ No newline at end of file > >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh > >>b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh > >>index 9701a8e..2014d20 100644 > >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh > >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/qt_env.sh > >>@@ -2,5 +2,6 @@ > >> ### QT Environment Variables ### > >> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt > >>+export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json > >> export QT_QPA_EGLFS_INTEGRATION=none > >>-export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5 > >>+export QT_WAYLAND_SHELL_INTEGRATION=wl-shell > >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh > >>b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh > >>index 68ccf04..8ff0508 100644 > >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh > >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf/ti33x/qt_env.sh > >>@@ -3,5 +3,6 @@ > >> ### QT Environment Variables ### > >> export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=180" > >> export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt > >>+export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json > >> export QT_QPA_EGLFS_INTEGRATION=none > >>-export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5 > >>+export QT_WAYLAND_SHELL_INTEGRATION=wl-shell > >>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb > >>b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb > >>index b2ad0a8..5c2974e 100644 > >>--- a/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb > >>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase-conf_1.0.bb > >>@@ -5,12 +5,16 @@ LIC_FILES_CHKSUM = > >>"file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 > >> PACKAGE_ARCH = "${MACHINE_ARCH}" > >>-SRC_URI = "file://qt_env.sh" > >>+SRC_URI = "file://qt_env.sh \ > >>+ file://eglfs_kms_cfg.json \ > >>+ " > >>-# Add custom Arago qtbase Environment script file > >>+# Add custom Arago qtbase Environment script and eglfs_kms configuration > >>file > >> do_install () { > >> install -d ${D}${sysconfdir}/profile.d > >> install -m 0644 ${WORKDIR}/qt_env.sh ${D}${sysconfdir}/profile.d/ > >>+ install -d ${D}${sysconfdir}/qt5 > >>+ install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/ > >> } > >>-FILES_${PN} += "${sysconfdir}/profile.d/*" > >>+FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*" > >>-- > >>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
