diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 10:38:35 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-28 12:14:34 +0000 |
| commit | 651adf5a48ebb74db1f93f6e00cc5f426a194bf9 (patch) | |
| tree | 34fda0758f23655b5185023dc84d8eed0ba2328a | |
| parent | e794cd92f9f6cfe6334a55974f433de6ea743c15 (diff) | |
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>
4 files changed, 21 insertions, 3 deletions
diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf index 268f6d37..9a218d92 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 f42e1214..0271b6d5 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 e7c7adfe..5f62fbb2 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 \ diff --git a/scripts/manifest.xml b/scripts/manifest.xml index c2cc83d7..212b4f5e 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -26,7 +26,7 @@ path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="b84881444814a361fcc17e7eb34407fb175541da" + revision="5a1ae484fa523568dd9c47f08c25ef336c2626fb" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" |