diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-05-17 17:40:46 +0200 |
|---|---|---|
| committer | Francesco Dolcini <francesco.dolcini@toradex.com> | 2023-06-05 09:51:23 +0000 |
| commit | d7c1e46d73f4af78a4f9c95f89e42f0aafdfb200 (patch) | |
| tree | 4eb17f0f9d17fdde3a737d44669df2e079f75881 | |
| parent | 5ed72fdbe6f52abbc7c966396175eaf10b3829a5 (diff) | |
qt5: sync with meta-arago
Sync the files taken from meta-arago @ dunfell to what now is
available for kirkstone.
Related-to: ELB-5190
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | qt5-layer/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json | 11 | ||||
| -rw-r--r-- | qt5-layer/recipes-qt/qt5/qtbase-conf/qt_env.sh | 3 | ||||
| -rw-r--r-- | qt5-layer/recipes-qt/qt5/qtbase-conf_1.0.bb | 2 | ||||
| -rw-r--r-- | qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 4 |
4 files changed, 7 insertions, 13 deletions
diff --git a/qt5-layer/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json b/qt5-layer/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json index ac19b8e..5667d11 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json +++ b/qt5-layer/recipes-qt/qt5/qtbase-conf/eglfs_kms_cfg.json @@ -1,14 +1,5 @@ { "device": "/dev/dri/card0", "hwcursor": false, - "pbuffers": true, - "outputs": [ - { - "name": "VGA1", - "mode": "off" - }, - { - "name": "HDMI1" - } - ] + "pbuffers": true } diff --git a/qt5-layer/recipes-qt/qt5/qtbase-conf/qt_env.sh b/qt5-layer/recipes-qt/qt5/qtbase-conf/qt_env.sh index c79ccd4..5180c8e 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase-conf/qt_env.sh +++ b/qt5-layer/recipes-qt/qt5/qtbase-conf/qt_env.sh @@ -11,3 +11,6 @@ export QT_WAYLAND_SHELL_INTEGRATION=xdg-shell # from the pthread implementation. Disable this feature temporarily until # those issues are resolved. export QTWEBENGINE_CHROMIUM_FLAGS="--disable-seccomp-filter-sandbox" + +export QTWEBENGINE_DISABLE_SANDBOX=1 +#export QT_QPA_PLATFORM=eglfs diff --git a/qt5-layer/recipes-qt/qt5/qtbase-conf_1.0.bb b/qt5-layer/recipes-qt/qt5/qtbase-conf_1.0.bb index 5c2974e..63894c4 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase-conf_1.0.bb +++ b/qt5-layer/recipes-qt/qt5/qtbase-conf_1.0.bb @@ -17,4 +17,4 @@ do_install () { install -m 0644 ${WORKDIR}/eglfs_kms_cfg.json ${D}${sysconfdir}/qt5/ } -FILES_${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*" +FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/qt5/*" diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 1edf8bd..426640e 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # am62xx extra gles2 packageconfig flags GLES_EXTRA_DEPS:am62xx = "libdrm wayland" -PACKAGECONFIG:append:am62xx = " gles2extra" +# rename from gles2 to gles2extra to preserve the original one for non am62xx machines PACKAGECONFIG[gles2extra] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}" PR:append:am62xx = ".arago17" @@ -52,7 +52,7 @@ PACKAGE_ARCH:am62xx = "${MACHINE_ARCH}" ############################### TDX added # from meta-arago/conf/layer.conf -PACKAGECONFIG_GL:am62xx = "gles2 linuxfb" +PACKAGECONFIG_GL:am62xx = "gles2extra linuxfb" PACKAGECONFIG_DISTRO:am62xx = "icu examples accessibility gif gbm kms libinput" PACKAGECONFIG_FONTS:am62xx = "fontconfig" |