diff options
35 files changed, 253 insertions, 140 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf index 7ab090aa..51961c6b 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf @@ -46,5 +46,7 @@ DISTRO_FEATURES_remove = "webengine wayland vulkan" BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser" +QT_USE_SOFTWARE_CONTEXT = "1" + # try to limit the maximum size of the tezi image RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf index f3f59ec5..05be89f1 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf @@ -46,5 +46,7 @@ DISTRO_FEATURES_remove = "webengine wayland vulkan" BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser" +QT_USE_SOFTWARE_CONTEXT = "1" + # try to limit the maximum size of the tezi image RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf index dab6b814..2937acc7 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf @@ -43,3 +43,5 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" DISTRO_FEATURES_remove = "webengine wayland vulkan" BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser" + +QT_USE_SOFTWARE_CONTEXT = "1" diff --git a/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf index 962077ce..cfd47efb 100644 --- a/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf +++ b/meta-boot2qt-distro/conf/distro/include/imx7dsabresd.conf @@ -32,3 +32,5 @@ include conf/distro/include/fsl.inc DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual" DISTRO_FEATURES_remove = "webengine" + +QT_USE_SOFTWARE_CONTEXT = "1" diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf index eeba4a50..65f0dd23 100644 --- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf +++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf @@ -40,4 +40,6 @@ DISTRO_FEATURES_remove = "webengine wayland vulkan" BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser" +QT_USE_SOFTWARE_CONTEXT = "1" + KERNEL_DEVICETREE = "imx7d-warp.dtb" diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf index f8e2b128..af355c63 100644 --- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf +++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf @@ -37,3 +37,5 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" DISTRO_FEATURES_remove = "webengine wayland vulkan" BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser" + +QT_USE_SOFTWARE_CONTEXT = "1" diff --git a/meta-boot2qt-distro/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/recipes-qt/boot2qt-addons/default-qt-envs.bbappend new file mode 100644 index 00000000..1319cc99 --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -0,0 +1,35 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +do_configure_append_emulator() { + echo "QT_QPA_GENERIC_PLUGINS=simulator" >> ${WORKDIR}/defaults + echo "QT_QPA_EGLFS_HIDECURSOR=1" >> ${WORKDIR}/defaults + echo "QTGLESSTREAM_DISPLAY=192.168.56.1" >> ${WORKDIR}/defaults + echo "SIMULATOR_HOSTNAME=192.168.56.1" >> ${WORKDIR}/defaults +} diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf deleted file mode 100644 index 3f06e3bd..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/appcontroller.conf +++ /dev/null @@ -1,7 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf deleted file mode 100644 index d59ca371..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/colibri-vf/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=QMLSCENE_DEVICE=softwarecontext -env=QT_QPA_PLATFORM=linuxfb -env=QSG_RENDER_LOOP=basic -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf deleted file mode 100644 index e619fff9..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/emulator/appcontroller.conf +++ /dev/null @@ -1,10 +0,0 @@ -env=QT_QPA_GENERIC_PLUGINS=simulator -env=QT_QPA_EGLFS_HIDECURSOR=1 -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QTGLESSTREAM_DISPLAY=192.168.56.1 -env=SIMULATOR_HOSTNAME=192.168.56.1 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf deleted file mode 100644 index 38d06e69..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx6ull/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=QMLSCENE_DEVICE=softwarecontext -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_QPA_PLATFORM=linuxfb -env=QSG_RENDER_LOOP=basic -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx7s-warp/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx7s-warp/appcontroller.conf deleted file mode 100644 index 38d06e69..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/imx7s-warp/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=QMLSCENE_DEVICE=softwarecontext -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_QPA_PLATFORM=linuxfb -env=QSG_RENDER_LOOP=basic -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx1/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx1/appcontroller.conf deleted file mode 100644 index 85227c24..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx1/appcontroller.conf +++ /dev/null @@ -1,8 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QSG_RENDER_LOOP=basic -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx2/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx2/appcontroller.conf deleted file mode 100644 index 85227c24..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/jetson-tx2/appcontroller.conf +++ /dev/null @@ -1,8 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QSG_RENDER_LOOP=basic -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf deleted file mode 100644 index 411ec02d..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx6/appcontroller.conf +++ /dev/null @@ -1,10 +0,0 @@ -env=FB_MULTI_BUFFER=2 -env=QT_QPA_EGLFS_FORCEVSYNC=1 -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 -env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf deleted file mode 100644 index 38d06e69..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx7/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=QMLSCENE_DEVICE=softwarecontext -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_QPA_PLATFORM=linuxfb -env=QSG_RENDER_LOOP=basic -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx8/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx8/appcontroller.conf deleted file mode 100644 index ce89f0ab..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/mx8/appcontroller.conf +++ /dev/null @@ -1,8 +0,0 @@ -env=FB_MULTI_BUFFER=2 -env=QT_QPA_EGLFS_FORCE888=1 -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf deleted file mode 100644 index f129589a..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/rpi/appcontroller.conf +++ /dev/null @@ -1,7 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=1 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf deleted file mode 100644 index 85227c24..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/tegra-t18x/appcontroller.conf +++ /dev/null @@ -1,8 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QSG_RENDER_LOOP=basic -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf deleted file mode 100644 index 76313a87..00000000 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller/ti33x/appcontroller.conf +++ /dev/null @@ -1,8 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=QT_QPA_EGLFS_INTEGRATION=none -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb index b921c23d..58cde634 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb @@ -36,22 +36,20 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" -SRC_URI += "file://appcontroller.conf" - -SRCREV = "5ab7fdbf0845c40418272bafa565295511055d3b" +SRCREV = "474fa4b7aee62e704158d213d9e67eba74c69401" DEPENDS = "qtbase" +RDEPENDS_${PN} = " \ + default-qt-envs \ + " do_configure_append() { - sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf - echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf + echo "base=linux" >> ${WORKDIR}/appcontroller.conf + echo "platform=${MACHINE}" >> ${WORKDIR}/appcontroller.conf + echo "environmentFile=/etc/default/qt" >> ${WORKDIR}/appcontroller.conf } do_install_append() { install -m 0755 -d ${D}${sysconfdir} install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ - - # loginctl enable-linger root - install -d ${D}/var/lib/systemd/linger - touch ${D}/var/lib/systemd/linger/root } diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb new file mode 100644 index 00000000..24292474 --- /dev/null +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs.bb @@ -0,0 +1,51 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +DESCRIPTION = "Common default environment variables for running Qt applications" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI += "file://defaults" + +do_configure() { + if [ "${QT_USE_SOFTWARE_CONTEXT}" ]; then + echo "QMLSCENE_DEVICE=softwarecontext" >> ${WORKDIR}/defaults + echo "QT_QPA_PLATFORM=linuxfb" >> ${WORKDIR}/defaults + echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults + fi +} + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/defaults ${D}${sysconfdir}/default/qt + + # loginctl enable-linger root + install -d ${D}/var/lib/systemd/linger + touch ${D}/var/lib/systemd/linger/root +} diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults new file mode 100644 index 00000000..00c7d0fe --- /dev/null +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/default-qt-envs/defaults @@ -0,0 +1,5 @@ +QML2_IMPORT_PATH=/data/user/qt/qmlplugins +QT_IM_MODULE=qtvirtualkeyboard +QT_QUICK_CONTROLS_1_STYLE=Flat +QTWEBENGINE_DISABLE_SANDBOX=1 +XDG_RUNTIME_DIR=/run/user/0 diff --git a/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend new file mode 100644 index 00000000..b4aa97d9 --- /dev/null +++ b/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -0,0 +1,38 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +do_configure_append() { + echo "FB_MULTI_BUFFER=2" >> ${WORKDIR}/defaults + echo "QT_QPA_EGLFS_FORCEVSYNC=1" >> ${WORKDIR}/defaults + echo "QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src" >> ${WORKDIR}/defaults +} + +do_configure_append_mx8() { + echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults +} diff --git a/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend b/meta-intel-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend index 708ed85e..b709228f 100644 --- a/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend +++ b/meta-intel-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -31,7 +31,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://kms.conf" -FILES_${PN} += "${sysconfdir}/kms.conf" +do_configure_append() { + echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults +} do_install_append() { install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ diff --git a/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf b/meta-intel-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf index d6da06c4..d6da06c4 100644 --- a/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf +++ b/meta-intel-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf diff --git a/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf deleted file mode 100644 index c2615adc..00000000 --- a/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf +++ /dev/null @@ -1,8 +0,0 @@ -env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-nvidia-extras/recipes/qt5/default-qt-envs.bbappend b/meta-nvidia-extras/recipes/qt5/default-qt-envs.bbappend new file mode 100644 index 00000000..7c5b7d68 --- /dev/null +++ b/meta-nvidia-extras/recipes/qt5/default-qt-envs.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +do_configure_append() { + echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults +} diff --git a/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend new file mode 100644 index 00000000..2b371506 --- /dev/null +++ b/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +do_configure_append() { + echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults +} diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend index 708ed85e..55b6cc83 100644 --- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend +++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -31,7 +31,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://kms.conf" -FILES_${PN} += "${sysconfdir}/kms.conf" +do_configure_append() { + echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults + echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults +} do_install_append() { install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf index 4cbbf498..4cbbf498 100644 --- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf +++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf index 4cbbf498..4cbbf498 100644 --- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf +++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf index db7a5032..db7a5032 100644 --- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf +++ b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf deleted file mode 100644 index 60ee1f17..00000000 --- a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QSG_RENDER_LOOP=basic -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-tegra-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-tegra-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend new file mode 100644 index 00000000..7c5b7d68 --- /dev/null +++ b/meta-tegra-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +do_configure_append() { + echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults +} |