From ae4b6421c0bb4771e2cedfcdadd44c04dc8e93f5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 11:01:04 +0300 Subject: Build Qt5 and all addons Use meta-qt5 layer to build Qt5, commercial addons and b2qt addons. Create new image and toolchain recipes with Qt5 content, so that the existing image and toolchain remain as-is without Qt5. Currently support only for imx6 targets. Change-Id: I398750dd1a62c6ff8ea216cfe364da273d8e9a77 Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 3 + conf/distro/include/am335x-evm.conf | 3 + conf/distro/include/beagleboard.conf | 3 + conf/distro/include/beaglebone.conf | 3 + conf/distro/include/colibri-vf.conf | 3 + conf/distro/include/raspberrypi2.conf | 6 +- conf/layer.conf | 1 + meta-fsl-extras/recipes/qt5/qtbase_%.bbappend | 38 ++++++++++++ .../recipes/qt5/qtbase_%.bbappend | 42 +++++++++++++ meta-ti-extras/recipes/qt5/qtbase_%.bbappend | 33 +++++++++++ recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 51 ++++++++++++++++ .../b2qt-appcontroller/appcontroller.conf | 5 ++ .../colibri-vf/appcontroller.conf | 7 +++ .../b2qt-appcontroller/mx6/appcontroller.conf | 7 +++ .../b2qt-appcontroller/rpi/appcontroller.conf | 5 ++ recipes-qt/b2qt-addons/b2qt-demos.bb | 68 ++++++++++++++++++++++ recipes-qt/b2qt-addons/b2qt-launcher.bb | 51 ++++++++++++++++ .../b2qt-addons/b2qt-launcher/b2qt-startup.sh | 42 +++++++++++++ recipes-qt/b2qt-addons/b2qt-utils.bb | 48 +++++++++++++++ recipes-qt/images/b2qt-embedded-qt5-image.bb | 45 ++++++++++++++ .../meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 31 ++++++++++ ...ackagegroup-b2qt-embedded-qt5-toolchain-host.bb | 34 +++++++++++ ...up-b2qt-embedded-qt5-addons-toolchain-target.bb | 36 ++++++++++++ .../packagegroup-b2qt-embedded-qt5-addons.bb | 40 +++++++++++++ ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 55 +++++++++++++++++ .../packagegroup-b2qt-embedded-qt5.bb | 47 +++++++++++++++ recipes-qt/qt5-addons/qtcharts_2.0.bb | 47 +++++++++++++++ recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 43 ++++++++++++++ recipes-qt/qt5-addons/qtquick2drenderer.bb | 38 ++++++++++++ .../qt5-addons/qtquickenterprisecontrols_1.3.bb | 65 +++++++++++++++++++++ recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 46 +++++++++++++++ recipes-qt/qt5/qtbase_%.bbappend | 54 +++++++++++++++++ recipes-qt/qt5/qtconnectivity_%.bbappend | 23 ++++++++ recipes-qt/qt5/qtlocation_%.bbappend | 23 ++++++++ recipes-qt/qt5/qtmultimedia_%.bbappend | 23 ++++++++ 35 files changed, 1065 insertions(+), 4 deletions(-) create mode 100644 meta-fsl-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 meta-raspberrypi-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 meta-ti-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller.bb create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-demos.bb create mode 100644 recipes-qt/b2qt-addons/b2qt-launcher.bb create mode 100755 recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh create mode 100644 recipes-qt/b2qt-addons/b2qt-utils.bb create mode 100644 recipes-qt/images/b2qt-embedded-qt5-image.bb create mode 100644 recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb create mode 100644 recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb create mode 100644 recipes-qt/qt5-addons/qtcharts_2.0.bb create mode 100644 recipes-qt/qt5-addons/qtdatavisualization_1.2.bb create mode 100644 recipes-qt/qt5-addons/qtquick2drenderer.bb create mode 100644 recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb create mode 100644 recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb create mode 100644 recipes-qt/qt5/qtbase_%.bbappend create mode 100644 recipes-qt/qt5/qtconnectivity_%.bbappend create mode 100644 recipes-qt/qt5/qtlocation_%.bbappend create mode 100644 recipes-qt/qt5/qtmultimedia_%.bbappend diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index f4771f2..08bebd4 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -57,4 +57,7 @@ IMAGE_FSTYPES = "tar.gz" LICENSE_CREATE_PACKAGE = "1" COPY_LIC_MANIFEST = "1" +QT5_VERSION = "5.4.1" +include conf/distro/include/qt5-versions.inc + include conf/distro/include/${MACHINE}.conf diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index dffbe94..3c32f49 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -26,6 +26,9 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy" +PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" +PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" + PREFERRED_VERSION_libgles-omap3 = "5.01.01.01" PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.01" diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 87c986c..b597481 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -26,6 +26,9 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy" +PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" +PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" + PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 96662d6..dea5330 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -27,6 +27,9 @@ EXTRA_IMAGEDEPENDS += "u-boot-uenv-script" PREFERRED_VERSION_libgles-omap3 = "4.10.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01" +PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" +PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" + PREFERRED_PROVIDER_u-boot = "u-boot" EXTRA_IMAGEDEPENDS_remove = "u-boot-denx" UBOOT_MACHINE = "am335x_boneblack_config" diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 483511c..715bd62 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -30,6 +30,9 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" +PREFERRED_PROVIDER_virtual/egl = "opengldummy" +PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" + MACHINE_EXTRA_INSTALL = "\ opengldummy \ " diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf index 23b457a..28989aa 100644 --- a/conf/distro/include/raspberrypi2.conf +++ b/conf/distro/include/raspberrypi2.conf @@ -26,15 +26,13 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" -PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics-hardfp" - MACHINE_EXTRA_INSTALL = "\ - vc-graphics-hardfp \ + userland \ omxplayer \ " MACHINE_EXTRA_INSTALL_SDK = " \ - vc-graphics-hardfp-dev \ + userland \ " KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2" diff --git a/conf/layer.conf b/conf/layer.conf index 97eb8ae..ea30841 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -33,3 +33,4 @@ BBFILE_PATTERN_b2qt := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt = "20" LICENSE_PATH += "${LAYERDIR}/licenses" +QT_LICENCE = "${LAYERDIR}/licenses/QtEnterprise" diff --git a/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend b/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend new file mode 100644 index 0000000..11fbab1 --- /dev/null +++ b/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend @@ -0,0 +1,38 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +do_configure_prepend_mx6() { + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${WORKDIR}/appcontroller.conf +} + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ +} + +FILES_${PN} += "${sysconfdir}/appcontroller.conf" diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf new file mode 100644 index 0000000..cefd3a9 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf @@ -0,0 +1,5 @@ +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EGLFS_FORCE888=0 +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf new file mode 100644 index 0000000..ff4d0da --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf @@ -0,0 +1,7 @@ +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_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf new file mode 100644 index 0000000..8960985 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf @@ -0,0 +1,7 @@ +env=FB_MULTI_BUFFER=2 +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=mfw_v4lsrc,v4l2src +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf new file mode 100644 index 0000000..bc143da --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf @@ -0,0 +1,5 @@ +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EGLFS_FORCE888=1 +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb new file mode 100644 index 0000000..d031b0a --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -0,0 +1,68 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Boot to Qt Demos" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" + +inherit qmake5 + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \ + git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ + " +QT_BRANCH = "dev" +SRCREV_demos = "d6979299a7809e5b832738c4cf39bba2c9a185eb" +SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" +GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" + + +S = "${WORKDIR}/git/basicsuite" + +DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtwebengine" + +do_install_append() { + # we only need plugins from the demos + rm -rf ${D}/data/user/camera + rm -rf ${D}/data/user/sensorexplorer + + cp -r ${S}/* ${D}/data/user/qt/ + cp -r ${S}/../images ${D}/data/ + cp -r ${S}/../videos ${D}/data/ + + cp -r ${WORKDIR}/qt5-everywhere-demo/QtDemo/qml ${D}/data/user/qt/qt5-everywhere/ + + # we can't have several top-level windows in b2qt, replace Window -> Rectangle + sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml + sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml +} + +FILES_${PN} += " \ + /data/images/ \ + /data/videos/ \ + /data/user \ + " + +FILES_${PN}-dbg += " \ + /data/user/*/.debug/ \ + /data/user/qt/*/*/.debug/ \ + " diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb new file mode 100644 index 0000000..9e9c94b --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Boot to Qt Demo Launcher" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" + +inherit qmake5 + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/b2qt-launcher;branch=${QT_BRANCH};protocol=ssh \ + file://b2qt-startup.sh \ + " + +SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4" +QT_BRANCH = "dev" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative qtwebengine" + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ +} + +FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h" + +INITSCRIPT_NAME = "b2qt-startup.sh" +INITSCRIPT_PARAMS = "defaults 30" + +inherit update-rc.d diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh new file mode 100755 index 0000000..3acbd65 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh @@ -0,0 +1,42 @@ +#!/bin/sh +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +case "$1" in +start) + if [ -x /data/user/b2qt ]; then + APP="/data/user/b2qt" + elif [ -x /usr/bin/b2qt ]; then + APP="/usr/bin/b2qt" + else + APP="/usr/bin/qtlauncher --applications-root /data/user/qt" + fi + /usr/bin/appcontroller ${APP} & + ;; +stop) + /usr/bin/appcontroller --stop + ;; +*) + echo "Usage: $0 {start|stop}" + exit 1 +esac +exit 0 diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb new file mode 100644 index 0000000..e25c1ae --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -0,0 +1,48 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Boot to Qt Utils module" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/b2qt-utils;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "7b14c47d6adbc6ab3cdfc9d10bef25029215a85f" +QT_BRANCH = "dev" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative wpa-supplicant" + +FILES_${PN}-examples-dbg = " \ + /data/user/qt/.debug/* \ + /data/user/qt/wifi-cpp/.debug/* \ + " + +FILES_${PN}-examples = " \ + /data/user/qt/wifi-cpp/wifi-cpp \ + /data/user/qt/wifi-qml \ + " diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb new file mode 100644 index 0000000..4631a58 --- /dev/null +++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -0,0 +1,45 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "B2Qt embedded Qt5 image" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" +PR = "r0" + +IMAGE_FEATURES += "\ + package-management \ + ssh-server-dropbear \ + tools-debug \ + debug-tweaks \ + hwcodecs \ + " + +inherit core-image +inherit bootfs-image + +IMAGE_INSTALL += "\ + packagegroup-b2qt-embedded-base \ + packagegroup-b2qt-embedded-tools \ + packagegroup-b2qt-embedded-gstreamer \ + packagegroup-b2qt-embedded-qt5 \ + packagegroup-b2qt-embedded-qt5-addons \ + " diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb new file mode 100644 index 0000000..1199da9 --- /dev/null +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb @@ -0,0 +1,31 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" +PR = "r0" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" + +inherit populate_sdk populate_sdk_qt5 + +TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" +TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target" diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb new file mode 100644 index 0000000..1979879 --- /dev/null +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -0,0 +1,34 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK" +LICENSE = "QtEnterprise" +PR = "r0" + +inherit nativesdk packagegroup + +RDEPENDS_${PN} += "\ + nativesdk-packagegroup-b2qt-embedded-toolchain-host \ + nativesdk-qttools \ + nativesdk-qtbase-tools \ + nativesdk-qtbase-tools-staticdev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb new file mode 100644 index 0000000..66e7457 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb @@ -0,0 +1,36 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt5 addons toolchain packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtdatavisualization-dev \ + qtenterprisecontrols-dev \ + qtcharts-dev \ + qtvirtualkeyboard-dev \ + b2qt-utils-dev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb new file mode 100644 index 0000000..3ba3f83 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt5 addons packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtdatavisualization \ + qtquickenterprisecontrols \ + qtquickenterprisecontrols-fonts \ + qtcharts \ + qtvirtualkeyboard \ + b2qt-appcontroller \ + b2qt-utils \ + b2qt-launcher \ + b2qt-demos \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb new file mode 100644 index 0000000..d740991 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK" +LICENSE = "QtEnterprise" +PR = "r0" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + packagegroup-b2qt-embedded-toolchain-target \ + qt3d-dev \ + qtbase-dev \ + qtbase-staticdev \ + qtconnectivity-dev \ + qtdeclarative-dev \ + qtdeclarative-staticdev \ + qtgraphicaleffects-dev \ + qtimageformats-dev \ + qtlocation-dev \ + qtmultimedia-dev \ + qtsensors-dev \ + qtserialport-dev \ + qtsvg-dev \ + qtsystems-dev \ + qttools-dev \ + qttools-staticdev \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ + qtwebsockets-dev \ + qtwebchannel-dev \ + qtxmlpatterns-dev \ + qtquickcontrols-dev \ + qtwebengine-dev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb new file mode 100644 index 0000000..970da82 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt5 modules" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtbase \ + qtbase-fonts \ + qtconnectivity \ + qtdeclarative \ + qtdeclarative-tools \ + qtgraphicaleffects \ + qtimageformats \ + qtlocation \ + qtmultimedia \ + qtsensors \ + qtserialport \ + qtsvg \ + qtwebsockets \ + qtxmlpatterns \ + qtquickcontrols \ + qtwebengine \ + " diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb new file mode 100644 index 0000000..4b350de --- /dev/null +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Charts" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "f818972d3617493c74d694184aa877f606e1a5a0" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative qtmultimedia" + +PACKAGES =+ "${PN}-designer" +DEBIAN_NOAUTONAME_${PN}-designer = "1" + +FILES_${PN}-designer = " \ + ${OE_QMAKE_PATH_QML}/QtCharts/designer \ + " + +RRECOMMENDS_${PN}-dev += "${PN}-designer" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb new file mode 100644 index 0000000..759bb44 --- /dev/null +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Data Visualization" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_p.h;md5=b6f0a53c44e6ba165a7d2dbd58832be5;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtdatavis3d.git;branch=${QT_BRANCH};protocol=ssh \ + " + +# v1.2.0 +SRCREV = "62f90e25eec23cfac83985993f355feeac5b9f2c" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS += "qtbase qtdeclarative qtmultimedia" + +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ + " diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb new file mode 100644 index 0000000..59fd2fe --- /dev/null +++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb @@ -0,0 +1,38 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick 2D Rendender" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=d90663d6d3096fe0989549d52fec6554;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb new file mode 100644 index 0000000..7736d9b --- /dev/null +++ b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb @@ -0,0 +1,65 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick Enterprise Controls" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/controls/Styles/Base/DialStyle.qml;md5=caa6d9db463140360114e567721eb580;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtquick-extras.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "ed6f7049e06717113d5f500595c5a1f2074fb13d" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +PACKAGES += "${PN}-fonts" + +RRECOMMENDS_${PN} = "${PN}-fonts" + +DEPENDS += "qtbase qtdeclarative qtgraphicaleffects" + +FILES_${PN}-fonts += " \ + /usr/lib/qt5/qml/QtQuick/Controls/Styles/Flat/fonts \ + " +FILES_${PN} += " \ + /opt/dashboard/bin/dashboard \ + /opt/gallery/bin/gallery \ + " +FILES_${PN}-dbg += " \ + /opt/dashboard/bin/.debug \ + /opt/gallery/bin/.debug \ + " +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*.qml \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/designer/* \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*/* \ + " +FILES_${PN}-examples += " \ + /opt/flat/bin/flat \ + " +FILES_${PN}-examples-dbg += " \ + /opt/flat/bin/.debug \ + " diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb new file mode 100644 index 0000000..40669e1 --- /dev/null +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -0,0 +1,46 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Virtual Keyboard" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17" + +inherit qt5-module + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "fa1aae525f94e9a870d0fcc0fb1be50648b76739" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative hunspell" + +EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-xcb" + +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \ + " diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend new file mode 100644 index 0000000..27b476b --- /dev/null +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -0,0 +1,54 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +PACKAGECONFIG_GL = "gles2" +PACKAGECONFIG += " \ + accessibility \ + alsa \ + cups \ + fontconfig \ + glib \ + iconv \ + icu \ + linuxfb \ + sql-sqlite \ + tslib \ + " + +do_configure_prepend() { + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <