Use more of the default distro features from poky

Remove unwanted features instead of overwriting full set. This brings
e.g., wayland support by default to all targets.

Add fixes for building weston on TI and RPi targets

Change-Id: If3bd23a289e34ebe9656a03494e65ba7d8c843b0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

15 files changed, 83 insertions, 16 deletions

diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index 86bb442..e376bea 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -45,6 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-raspberrypi-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 81cc98b..3048fff 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -51,16 +51,14 @@ SANITY_TESTED_DISTROS += " \
 
 SYSVINIT_ENABLED_GETTYS = ""
 
-DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs webengine"
-POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
+DISTRO_FEATURES_DEFAULT_remove = "irda pcmcia pci 3g nfc zeroconf x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
-DISTRO_FEATURES += "gstreamer"
+DISTRO_FEATURES += "gstreamer webengine systemd"
 
-DISTRO_FEATURES += "systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
 PREFERRED_PROVIDER_udev ?= "systemd"
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 4a4d460..2c3b32a 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -38,4 +38,4 @@ BOOT_SCRIPTS += " \
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
-DISTRO_FEATURES_remove = "webengine"
+DISTRO_FEATURES_remove = "webengine wayland"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index bbe596f..e4c025b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -40,4 +40,4 @@ BOOT_SCRIPTS += " \
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
-DISTRO_FEATURES_remove = "webengine"
+DISTRO_FEATURES_remove = "webengine wayland"
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 61bc248..21b2e65 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -43,7 +43,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client"
 
 KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
 
-DISTRO_FEATURES_remove = "webengine opengl"
+DISTRO_FEATURES_remove = "webengine opengl wayland"
 
 MACHINE_EXTRA_INSTALL += "\
         mount-vboxsf \
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 9983af3..683c601 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -32,8 +32,6 @@ include conf/distro/include/opencv.inc
 
 DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
 
-DISTRO_FEATURES_DEFAULT += "wayland"
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
 # add support for both imx6qsabresd and imx6dlsabresd
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index 3b959a4..a72ff0c 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -29,8 +29,6 @@
 
 DEPLOY_CONF_NAME = "Intel NUC"
 
-DISTRO_FEATURES_DEFAULT += "wayland"
-
 DISTRO_FEATURES_remove = "usbgadget"
 
 IMAGE_CLASSES += "image_dd_efi"
diff --git a/conf/distro/include/jetson-tx1.conf b/conf/distro/include/jetson-tx1.conf
index 4ae287c..80435f3 100644
--- a/conf/distro/include/jetson-tx1.conf
+++ b/conf/distro/include/jetson-tx1.conf
@@ -28,7 +28,6 @@
 ############################################################################
 
 DEPLOY_CONF_NAME = "NVIDIA Jetson TX1"
-DISTRO_FEATURES_DEFAULT += "wayland"
 
 # use mmc0
 ROOTFS_DEVICE = "mmcblk1p1"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index a8db798..e59faca 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -82,8 +82,6 @@ KERNEL_DEVICETREE += "\
     imx6dl-nit6xlite.dtb \
     "
 
-DISTRO_FEATURES_DEFAULT += "wayland"
-
 MACHINE_EXTRA_INSTALL += "\
         bcm4330-nvram-config \
         "
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 854ac2c..262fe81 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -69,7 +69,7 @@ KERNEL_MODULE_AUTOLOAD += " \
 GLES_DRIVER = "sgx"
 GLES_DRIVER_r8a7790 = "rgx"
 
-DISTRO_FEATURES += "wayland bluetooth bluez5 h264avcenc_lib"
+DISTRO_FEATURES += "h264avcenc_lib"
 MACHINE_FEATURES += "multimedia ${GLES_DRIVER}"
 
 PREFERRED_VERSION_gstreamer1.0-libav = "1.2.3"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 80f4d57..85b0b6c 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -30,7 +30,7 @@
 OLDEST_KERNEL_aarch64 = "3.18"
 
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
-DISTRO_FEATURES_DEFAULT += "wayland"
+
 IMAGE_FSTYPES += "tar.gz"
 
 QBSP_IMAGE_CONTENT = "\
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index 4c9f803..80f90f2 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -40,3 +40,4 @@ EXTRA_IMAGEDEPENDS += "u-boot"
 PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
 PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/mesa = "ti-sgx-ddk-um"
diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf
new file mode 100644
index 0000000..9e64b87
--- /dev/null
+++ b/meta-raspberrypi-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2016 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$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_rpi"
+BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_rpi = "20"
diff --git a/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend b/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend
new file mode 100644
index 0000000..25ec264
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2017 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$
+##
+############################################################################
+
+# from https://www.mail-archive.com/yocto@yoctoproject.org/msg33193.html
+PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', 'kms', d)}"
diff --git a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
index 64feb7e..6079659 100644
--- a/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
+++ b/meta-ti-extras/recipes/libgles/ti-sgx-ddk-um_%.bbappend
@@ -30,6 +30,9 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += "file://99-fb.rules"
 
+# for supporting weston
+PROVIDES += "virtual/mesa"
+
 do_install_append() {
     install -d ${D}${base_libdir}/udev/rules.d
     install -m 0644 ${WORKDIR}/99-fb.rules ${D}${base_libdir}/udev/rules.d