From c4a0a450b4275cc3869cf389c92e86b62f09fcea Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 1 Dec 2016 16:46:14 +0200
Subject: qt5: update submodules

New configuration system is now used for more modules, so add new
EXTRA_QMAKEVARS_CONFIGURE variable that can be used for configure
modules with -[no-]feature flags.

SHA1s are now from the release 5.8.0 branches, so need to add "nobranch=1"
option so that there is no build break when release branches are removed.

Add recipe for QtGamepad module, it's already used by Qt3D.

Change-Id: I152b3b66b68c802d07445f4a7f1e81802308418e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 recipes-qt/qt5/qtwebengine_git.bb | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'recipes-qt/qt5/qtwebengine_git.bb')

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 4152ef0a..7dc37a92 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -20,14 +20,9 @@ DEPENDS += " \
     libdrm fontconfig pixman openssl pango cairo icu pciutils \
     libcap \
     gperf-native \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
 "
 
-# when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES),
-# qtwebengine will have additional dependencies:
-# contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst
-# xscreensaver isn't covered in qtbase DEPENDS
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}"
-
 DEPENDS += "yasm-native"
 EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm"
 
@@ -52,6 +47,7 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
 COMPATIBLE_MACHINE_armv6 = "(.*)"
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_armv7ve = "(.*)"
+COMPATIBLE_MACHINE_aarch64 = "(.*)"
 
 inherit qmake5
 inherit gettext
@@ -65,10 +61,6 @@ def gettext_oeconf(d):
 require qt5.inc
 require qt5-git.inc
 
-# To avoid trouble start with not separated build directory
-SEPB = "${S}"
-B = "${SEPB}"
-
 export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja"
 
 do_configure() {
@@ -86,7 +78,7 @@ do_configure() {
 
     # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
     # arguments here
-    ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \
+    ${OE_QMAKE_QMAKE} ${OE_QMAKE_QTCONF} -r ${EXTRA_QMAKEVARS_PRE} ${S} \
         QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \
         QMAKE_LINK="${OE_QMAKE_LINK}" \
         QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \
@@ -123,13 +115,11 @@ SRC_URI += " \
     file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
 "
 
-SRCREV_qtwebengine = "ac3d8780a0293793dbc3cd47b96aab4613dec5d9"
-SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d"
+SRCREV_qtwebengine = "a79fd91391c489ea1cd7baf717778b75e4847b92"
+SRCREV_chromium = "93b3786290ac16c95f15c95e2c2f3d8254171ab6"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
 
-S = "${WORKDIR}/git"
-
 # WARNING: qtwebengine-5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0 do_package_qa: QA Issue: ELF binary '/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-rc+gitAUTOINC+3f02c25de4_779a2388fc-r0/packages-split/qtwebengine/usr/lib/libQt5WebEngineCore.so.5.6.0' has relocations in .text [textrel]
 INSANE_SKIP_${PN} += "textrel"
-- 
cgit v1.2.3-54-g00ecf