Merge remote-tracking branch 'origin/fido' into dev

* origin/fido:
  otf-noto: update url and license file name
  qtmultimedia: make sure audio plugins are built
  qt5: update submodules and meta-qt5

Conflicts:
	conf/distro/b2qt.conf
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I54a02e91a49a3be3fa6359b5af69929d63b962e4

3 files changed, 8 insertions, 6 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index ce00d12..bf0a05b 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -57,7 +57,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 
 # backport from oe/krogoth, needed by meta-qt5
-PACKAGECONFIG_CONFARGS = "${EXTRA_OECONF}"
+PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}"
 
 # use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
 DISTRO_FEATURES += "gstreamer"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend
index c17ad80..16561f8 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_git.bbappend
@@ -27,6 +27,8 @@
 ##
 ############################################################################
 
-PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+                  ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}"
 
 SRCREV = "f2b9fb776b78fc10424c0325ab4316a45360130e"
diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb
index 468516b..c868329 100644
--- a/recipes/fonts/otf-noto.bb
+++ b/recipes/fonts/otf-noto.bb
@@ -31,17 +31,17 @@ SUMMARY = "Noto Sans CJK"
 SECTION = "fonts"
 HOMEPAGE = "http://www.google.com/get/noto"
 LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_CJK.txt;md5=55719faa0112708e946b820b24b14097"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE_OFL.txt;md5=55719faa0112708e946b820b24b14097"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
 inherit allarch fontcache
 
 PV = "1.004"
-SRC_URI = "https://noto-website.storage.googleapis.com/pkgs/NotoSansCJKSC-hinted.zip"
+SRC_URI = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKsc-hinted.zip"
 
-SRC_URI[md5sum] = "c0fa6153aa826ee96041ba4470a1f51f"
-SRC_URI[sha256sum] = "31459f6d8c36a1136bec3f8d720b2b637e4dded681b7bb610186c9986be25848"
+SRC_URI[md5sum] = "3a2e70a4cd1f4ca4b546146b8556dffb"
+SRC_URI[sha256sum] = "89646c86a48c1d5d25d435c31d673695bbd5751534004e9746f7d4aa71402a8f"
 
 S = "${WORKDIR}"