meta-qt5: update layer

* Includes merged commits from upstream/master & new recipe for
  Qt3DStudio runtime libraries
* gsteamer1.0-plugins-bad appends added to meta-boot2qt-distro specific
  bbappend as plugins-bad was moved to plugins-good as upstream/master
  is built against poky (sumo) and we're still at pyro branch.
* qtbase bbappend updated with new getentropy packageconfig.

Change-Id: I612040526fa73ba8866187c0f6931b2194444b9a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

3 files changed, 20 insertions, 2 deletions

diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf
index 268f6d3..9a218d9 100644
--- a/meta-boot2qt-distro/conf/layer.conf
+++ b/meta-boot2qt-distro/conf/layer.conf
@@ -34,6 +34,7 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
             ${LAYERDIR}/recipes*/*/*.bbappend \
             "
+BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend"
 
 BBFILE_COLLECTIONS += "b2qt-distro"
 BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/"
diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index f42e121..0271b6d 100644
--- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,3 +28,19 @@
 ############################################################################
 
 PACKAGECONFIG_append = " faad"
+
+inherit qmake5_paths
+
+PACKAGECONFIG[qt5] = '--enable-qt \
+                      --with-moc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc" \
+                      --with-uic="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic" \
+                      --with-rcc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc" \
+                     ,--disable-qt,qtbase qtdeclarative qtbase-native'
+
+# The GStreamer Qt5 plugin needs desktop OpenGL or OpenGL ES to work, so make sure it is enabled
+python() {
+    cur_packageconfig = d.getVar('PACKAGECONFIG',True).split()
+    if 'qt5' in cur_packageconfig and not (('opengl' in cur_packageconfig) or ('gles2' in cur_packageconfig)):
+        gl_packageconfig = d.getVar('PACKAGECONFIG_GL',True)
+        d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig)
+}
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index e7c7adf..5f62fbb 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -37,6 +37,7 @@ PACKAGECONFIG += " \
     cups \
     fontconfig \
     freetype \
+    getentropy \
     gif \
     glib \
     ico \