diff options
Diffstat (limited to 'recipes-qt')
53 files changed, 195 insertions, 278 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4039c97a..321b3067 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "4f116f00fcd93decbf6fc01b61b0be7c293d3c39" +SRCREV = "76be819345228d589cbc4f5129617151ea604750" diff --git a/recipes-qt/qt5/ogl-runtime/0002-Adapt-distance-field-cache-to-5.14.patch b/recipes-qt/qt5/ogl-runtime/0002-Adapt-distance-field-cache-to-5.14.patch new file mode 100644 index 00000000..619a49e0 --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0002-Adapt-distance-field-cache-to-5.14.patch @@ -0,0 +1,50 @@ +From e177fb4a0fcf4068cef6a0e018cd98e00f248a13 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Tue, 13 Aug 2019 10:13:47 +0200 +Subject: [PATCH] Adapt distance field cache to 5.14 + +There is a new pure virtual in the base class in 5.14. It is not very +relevant here since this glyph cache is not used in combination with +the df text materials of Qt Quick. We can nonetheless implement the +virtual and return the correct value. + +Task-number: QT3DS-3856 +Change-Id: I97b807ec73a664488b63c8888bc8cd90a9c53589 +--- + src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp | 7 +++++++ + src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h | 4 ++++ + 2 files changed, 11 insertions(+) + +diff --git a/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp b/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp +index e945335..52f01ea 100644 +--- a/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp ++++ b/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp +@@ -513,6 +513,13 @@ bool Q3DSDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font) + return true; + } + ++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) ++bool Q3DSDistanceFieldGlyphCache::eightBitFormatIsAlphaSwizzled() const ++{ ++ return m_context.GetRenderContext().GetRenderContextType() == qt3ds::render::NVRenderContextValues::GLES2; ++} ++#endif // QT_VERSION >= QT_VERSION_CHECK(5,14,0) ++ + QT_END_NAMESPACE + + #endif // QT_VERSION >= QT_VERSION_CHECK(5,12,2) +diff --git a/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h b/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h +index 679d3ad..fb4826e 100644 +--- a/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h ++++ b/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h +@@ -76,6 +76,10 @@ public: + + qreal fontSize() const; + ++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) ++ bool eightBitFormatIsAlphaSwizzled() const override; ++#endif ++ + private: + bool loadPregeneratedCache(const QRawFont &font); + TextureInfo *textureInfo(int index) const; diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch deleted file mode 100644 index fcf6915d..00000000 --- a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 5 Aug 2019 14:24:44 +0300 -Subject: [PATCH] Fix format-security issues - -format not a string literal and no format arguments [-Wformat-security] - -Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7 ---- - src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++-- - src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp -index ac5b992..02046ac 100644 ---- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp -+++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp -@@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s - // check for error - GLenum error = m_glFunctions->glGetError(); - if (error != GL_NO_ERROR) { -- qCCritical(GL_ERROR, GLConversion::processGLError(error)); -+ qCCritical(GL_ERROR) << GLConversion::processGLError(error); - QT3DS_ASSERT(false); - GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID)); - bufID = 0; -@@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj - // check for error - GLenum error = m_glFunctions->glGetError(); - if (error != GL_NO_ERROR) { -- qCCritical(GL_ERROR, GLConversion::processGLError(error)); -+ qCCritical(GL_ERROR) << GLConversion::processGLError(error); - QT3DS_ASSERT(false); - success = false; - } -diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp -index 0fe6e0f..5dfe9d1 100644 ---- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp -+++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp -@@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla - } else { - GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID)); - bufID = 0; -- qCCritical(GL_ERROR, GLConversion::processGLError(target)); -+ qCCritical(GL_ERROR) << GLConversion::processGLError(target); - } - } - -@@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor - // check for error - GLenum error = m_glFunctions->glGetError(); - if (error != GL_NO_ERROR) { -- qCCritical(GL_ERROR, GLConversion::processGLError(error)); -+ qCCritical(GL_ERROR) << GLConversion::processGLError(error); - QT3DS_ASSERT(false); - GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID)); - bufID = 0; -@@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject - // check for error - GLenum error = m_glFunctions->glGetError(); - if (error != GL_NO_ERROR) { -- qCCritical(GL_ERROR, GLConversion::processGLError(error)); -+ qCCritical(GL_ERROR) << GLConversion::processGLError(error); - QT3DS_ASSERT(false); - success = false; - } -@@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI - GLenum binaryError = m_glFunctions->glGetError(); - if (binaryError != GL_NO_ERROR) { - shaderStatus = GL_FALSE; -- qCCritical(GL_ERROR, GLConversion::processGLError(binaryError)); -+ qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError); - } - } - diff --git a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch deleted file mode 100644 index 5fe840a0..00000000 --- a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Thu, 8 Aug 2019 08:34:47 +0300 -Subject: [PATCH] Fix build on musl libc - -Use bits/local_lim.h only with glibc as it's not available -on musl libc. - -Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5 ---- - src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp -index fa6e069..99c4c3a 100644 ---- a/src/foundation/linux/Qt3DSLinuxThread.cpp -+++ b/src/foundation/linux/Qt3DSLinuxThread.cpp -@@ -35,7 +35,7 @@ - #include "foundation/Qt3DSAssert.h" - #include "foundation/Qt3DSIntrinsics.h" - #include "foundation/Qt3DSBroadcastingAllocator.h" --#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) -+#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__) - #include <bits/local_lim.h> // PTHREAD_STACK_MIN - #endif - #include <stdio.h> diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index 049f885a..58d31e98 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -9,19 +9,18 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" -QT_MODULE_BRANCH = "2.4" +QT_MODULE_BRANCH = "master" QT_MODULE_BRANCH_EASTL = "master" QT_GIT_PROJECT = "qt3dstudio" -PV = "2.4+git${SRCPV}" +PV = "2.5+git${SRCPV}" SRC_URI += " \ ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ file://0001-Fix-examples-build-error.patch \ - file://0002-Fix-format-security-issues.patch \ - file://0003-Fix-build-on-musl-libc.patch \ + file://0002-Adapt-distance-field-cache-to-5.14.patch \ " -SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" +SRCREV_ogl-runtime = "bd488ea03ec4a969e86c55909c60deecdc9f9af2" SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" SRCREV = "${SRCREV_ogl-runtime}" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index daddcaac..d23a2d36 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "b9e24eee0f43061730445e5400aa6a5795774660" +SRCREV = "d2c52680884095238ec3859fabaad03157af3985" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index a2c3691c..918e117b 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.13" +QT_MODULE_BRANCH ?= "dev" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" # each module needs to define valid SRCREV @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.13.1+git${SRCPV}" +PV = "5.14.0+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 8565aa35..6849c683 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -135,11 +135,9 @@ do_install() { done fi - install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} - # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++") # override this until somebody finds a better way echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "4f116f00fcd93decbf6fc01b61b0be7c293d3c39" +SRCREV = "76be819345228d589cbc4f5129617151ea604750" diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index b9cc9d44..c5815c0f 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From d8eb5531c444bcae2c2067a7f67e5229acc75fac Mon Sep 17 00:00:00 2001 +From 723d7ab6150f7ef7b33892b54ddc0931a5e71341 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc @@ -7,13 +7,13 @@ musl does not have feenableexcept function Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +- + tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index 5d344834e6..1afc70d255 100644 ---- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +index 676c66d..ba05aad 100644 +--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp ++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -46,7 +46,7 @@ #include <private/qlocale_tools_p.h> #include <qnumeric.h> diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index 61a5b80f..192385a5 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -22,20 +22,20 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf -index 5800aaa5b4..7b4901ce46 100644 +index aead581478..8e06a069b4 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf -@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX - CONFIG += clang_pch_style - QMAKE_PCH_OUTPUT_EXT = .pch +@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch + + QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz -QMAKE_CFLAGS_ISYSTEM = -isystem +QMAKE_CFLAGS_ISYSTEM = QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} - QMAKE_CFLAGS_LTCG = -flto + QMAKE_CFLAGS_LTCG = -flto=thin diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index c2669e4833..3fde8dc85f 100644 +index 44b4267207..9756a02014 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3cb613ce..cad653f3 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "4f116f00fcd93decbf6fc01b61b0be7c293d3c39" +SRCREV = "76be819345228d589cbc4f5129617151ea604750" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index e1aba8d7..9fd00fbb 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "0bebc937ce87bf28d815444e720e17619c916a91" +SRCREV = "9a052d7a7e56d312fa52eaef7ff7844ec7019783" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index 2a6fd3e7..9a848367 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" DEPENDS += "qtbase" -SRCREV = "f3b29d9327aef74bcd5668c4a7377513c9b16b11" +SRCREV = "5b6a1c27ee73be2068705037e09f095d6dc210fa" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index f17ae89b..403d86c7 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "37cd27fac015d8d3b823321a2e2f04826ea844b4" +SRCREV = "f2f9da656fd77330cce44dfe0721b3f68f1d809d" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index f7ffb72d..c06e2f63 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "ddc28d060d2ae05f221d779bdd04e18f282aa090" +SRCREV = "422856bb470e1380309c66a8ba4b40e06d1df830" diff --git a/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch new file mode 100644 index 00000000..d2bac1f7 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch @@ -0,0 +1,36 @@ +From 5ae643e2ab69892e0dbe296cf14e020c7938ebee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= <joerg.bornemann@qt.io> +Date: Fri, 2 Aug 2019 11:03:06 +0000 +Subject: [PATCH] Revert "Yield error if qtquickcompiler is used in non-QML + projects" + +This reverts commit c5578b16d6454e708c8ce12661a85d41eeaaa758, because +it prevents enabling the qtquickcompiler feature globally. + +Fixes: QTBUG-77277 +Change-Id: Ic80835c462570a67ae3105bb3d1b6452800d2c94 +Reviewed-by: Kai Koehne <kai.koehne@qt.io> +--- + tools/qmlcachegen/qtquickcompiler.prf | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf +index 967d55a5b..b98d8a019 100644 +--- a/tools/qmlcachegen/qtquickcompiler.prf ++++ b/tools/qmlcachegen/qtquickcompiler.prf +@@ -1,15 +1,5 @@ + if(qtc_run|lupdate_run): return() + +-!contains(QT, qml) { +- qt_modules = \ +- $$replace(QT, -private$, _private) \ +- $$replace(QT_PRIVATE, -private$, _private) +- qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends") +- !contains(qt_modules, qml): \ +- error("The qtquickcompiler feature cannot be used without the QML module.") +- unset(qt_modules) +-} +- + qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER) + qtPrepareTool(QMAKE_RCC, rcc, _DEP) + diff --git a/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch b/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch new file mode 100644 index 00000000..3de99517 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch @@ -0,0 +1,23 @@ +From 258a0c6a231f2f853858229e9e069aae71290bba Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff <mikko.gronoff@qt.io> +Date: Mon, 12 Aug 2019 08:27:19 +0300 +Subject: [PATCH] scenegraph: fix error: 'QOffscreenSurface' does not name a + type + +Change-Id: I41a8b30b316b038ed1e3910adb0254931f385a2a +--- + src/quick/scenegraph/qsgrhisupport_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/quick/scenegraph/qsgrhisupport_p.h b/src/quick/scenegraph/qsgrhisupport_p.h +index 48ad2f0..0e1881a 100644 +--- a/src/quick/scenegraph/qsgrhisupport_p.h ++++ b/src/quick/scenegraph/qsgrhisupport_p.h +@@ -86,6 +86,7 @@ QT_BEGIN_NAMESPACE + + class QSGDefaultRenderContext; + class QVulkanInstance; ++class QOffscreenSurface; + + // Opting in/out of QRhi and choosing the default/requested backend is managed + // by this singleton. This is because this information may be needed before diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index c0eec9db..4906272d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -12,10 +12,14 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRC_URI += "file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch" - DEPENDS += "qtbase" +SRC_URI += "\ + file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ + file://0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch \ + file://0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch \ +" + PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" @@ -26,6 +30,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "02b47ec4a5f956b45436e078fbc7505c664d3bea" +SRCREV = "d1b72c98b4e617530bfb23c3a5b7ebc68c15c089" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 4132de4c..efa139eb 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "28385f28cbe11d367e78b497625bb8a282cd4bd4" +SRCREV = "ea0457b8058191b4bb22477c7b51975a70af0b0e" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 8d21531b..09569195 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "52d3083d3ac1154414245187ad5bcc65d69c0145" +SRCREV = "c76eb211ff12fc3a1588c3092dd76a41eb5551c7" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 654f4ae2..9e890c65 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "efe5998c3d9121e18660f3105b9ae144c3232ff5" +SRCREV = "e7940d951e211837ed45b759fb97282e8d65e4c5" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 6d22a218..cd525271 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3bc0dfd9c2a59cb8abcbfa2fb8ea47e7fcdd626d" +SRCREV = "99dd0e8203d789caf2edfd2105c398654f5b5748" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f197ef5e..47c5d463 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -36,7 +36,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "8a08b56e71ff3d842cbfb6460a18d5ff991689db" +SRCREV_qtlocation = "f8694e1f3430b7851fc90e26c6d778a86219379a" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 3928a987..a2310b21 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "86c7306ebc0d011a096f0554e0c206fe17bb577c" +SRCREV = "03b666a967fb7501248e9f40a5b187ec3a16c453" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index ef8cc0ed..e986dc91 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "fedb18dd772d715267d733dc74e1511a78b51b39" +SRCREV = "9e7eba636ebb5ca42822f682be2b442be50cde6e" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 02153c5d..4370d9d8 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "a5ddec658526e47e5783a89c1fd1c463d464fbe7" +SRCREV = "435557691c3c28e9c63aa4bb5f4b9ec8fe3f8923" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index ec816f25..b56b3706 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "d7931d733e679c00c313ecff89052ed59bf49c30" +SRCREV = "272ea7f508d8ee30311c08c07c6e0501f17338c2" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 09258ff6..e1bc4c87 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "b886f45d068764fffaf6a13fca6f8f86f0b22531" +SRCREV = "42980b31c57cf7a93c7015df5cd1820db0f4d08b" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 337cadd2..735df4fc 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "6ef05a39b1ac00496ead66c8e143a05078e148e8" +SRCREV = "f58adac04ad8e36a840a66d14e02e5993b8099e7" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 9b370cda..16e134e9 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee" +SRCREV = "2ee78aafc81cd35073e9d90c9186e81676dea2ac" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 8945dc0f..12563e8c 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "8f4eb455f93fa582a041c49595903eed81c59924" +SRCREV = "b74071e607e824d3adbe6bfbe0c9a720f91f3662" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b475f686..8d22d0b5 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "085935e7c2e7793ca915e64f2ed9d6ae37570e21" +SRCREV = "35516bfec49c5da9b0e6bcd0731bb5d5b7983944" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 6e6f20aa..e2c035bb 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "fbf37dd7fa79509aec1d202c77331b0c4114488a" +SRCREV = "40b5d325b6105d4e520c76a079f530168b58efec" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 1a10d573..8842b9d6 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "1323d465b4698296533cf6c73ea5ace65dd0ce94" +SRCREV = "279d63c4f6632237e6a0d9c4be91b466876c260a" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index c10167c0..d01efbee 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "4c65318cd544980524aa600f4b4e3f97e6b46e0b" +SRCREV = "4dfa95538ff15f59880c93675676ce609b365d89" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 82a0e15c..e3670cf1 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "bf3fe5100df93369997aa9bf3f9ca71c3a908cca" +SRCREV = "b8dbe5524bd15ea0acc03dc5c5c4bf9f0d912f42" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index d5bc4431..a8f88c50 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "5faf8cc2ea0f757327c23e086caa6309eebeaec3" +SRCREV = "ad2628329e1685dbccd0ac3c5011336cd2c4f786" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 7bb0ddea..8a05ea2d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "fe7d20286e50c5ac08fb153436580d985d7530ea" +SRCREV = "b80a1676c9f5cc0b428f15ac09f6648a80aacb26" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index eedbc5b5..b44f874b 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \ " -SRCREV = "f4a51baca04fdaa0fc6a1106db9f7dd91b5a3b2a" +SRCREV = "61c0d8017044263dde21f1db57383f6d19f9eb03" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 6f6fd291..de74f4fb 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native" do_install_append() { # remove qtquick1 translations - qtquick1 is gone - for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do + for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do rm $transfile done } @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "55b11294296a7bbc3a3bdfe9d2f5b381abf01d92" +SRCREV = "66952c79bc648e1074936dddb7fa2cffc17b1777" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index eb0fe6cf..a0d5e252 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "d0cd32798fa9c36dc4294ed78596ed2b798d37f8" +SRCREV = "68375389bf09427103ab3ff2b7fb1517e9b55615" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 3431dd9e..ac929622 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f4636b934f90b2a07b09f1925a86440cf1944d08" +SRCREV = "ae43ed466e62cc198b7ab85c7f40faaada39c968" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index f91dac1b..fd66bfed 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "81b39fbe9eb4dbfff34ff9c3e6017eea12bf76ce" +SRCREV = "29496e3f08e20398e253e6d32bb95879a1a68978" diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch deleted file mode 100644 index cc534fad..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ /dev/null @@ -1,91 +0,0 @@ -From f290da1132af09f4cba13d5e551c75621b623247 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 2 Feb 2019 19:28:59 -0800 -Subject: [PATCH] chromium: fix build with clang - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - chromium/build/config/compiler/BUILD.gn | 27 ++----------------------- - 1 file changed, 2 insertions(+), 25 deletions(-) - -diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index dbf94c9ab6b..6f2eff6f5ef 100644 ---- a/chromium/build/config/compiler/BUILD.gn -+++ b/chromium/build/config/compiler/BUILD.gn -@@ -570,13 +570,6 @@ config("compiler") { - } - } - -- # Tells the compiler not to use absolute paths when passing the default -- # paths to the tools it invokes. We don't want this because we don't -- # really need it and it can mess up the goma cache entries. -- if (is_clang && !is_nacl) { -- cflags += [ "-no-canonical-prefixes" ] -- } -- - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -815,8 +808,6 @@ config("compiler_cpu_abi") { - } - } else if (current_cpu == "arm") { - if (is_clang && !is_android && !is_nacl) { -- cflags += [ "--target=arm-linux-gnueabihf" ] -- ldflags += [ "--target=arm-linux-gnueabihf" ] - } - if (!is_nacl) { - cflags += [ -@@ -829,8 +820,6 @@ config("compiler_cpu_abi") { - } - } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -- cflags += [ "--target=aarch64-linux-gnu" ] -- ldflags += [ "--target=aarch64-linux-gnu" ] - } - } else if (current_cpu == "mipsel" && !is_nacl) { - ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -839,9 +828,6 @@ config("compiler_cpu_abi") { - if (is_android) { - cflags += [ "--target=mipsel-linux-android" ] - ldflags += [ "--target=mipsel-linux-android" ] -- } else { -- cflags += [ "--target=mipsel-linux-gnu" ] -- ldflags += [ "--target=mipsel-linux-gnu" ] - } - } else { - cflags += [ "-EL" ] -@@ -920,10 +906,7 @@ config("compiler_cpu_abi") { - } else if (current_cpu == "mips" && !is_nacl) { - ldflags += [ "-Wl,--hash-style=sysv" ] - if (custom_toolchain == "") { -- if (is_clang) { -- cflags += [ "--target=mips-linux-gnu" ] -- ldflags += [ "--target=mips-linux-gnu" ] -- } else { -+ if (!is_clang) { - cflags += [ "-EB" ] - ldflags += [ "-EB" ] - } -@@ -970,9 +953,6 @@ config("compiler_cpu_abi") { - if (is_android) { - cflags += [ "--target=mips64el-linux-android" ] - ldflags += [ "--target=mips64el-linux-android" ] -- } else { -- cflags += [ "--target=mips64el-linux-gnuabi64" ] -- ldflags += [ "--target=mips64el-linux-gnuabi64" ] - } - } else { - cflags += [ -@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") { - } else if (current_cpu == "mips64") { - ldflags += [ "-Wl,--hash-style=sysv" ] - if (custom_toolchain == "") { -- if (is_clang) { -- cflags += [ "--target=mips64-linux-gnuabi64" ] -- ldflags += [ "--target=mips64-linux-gnuabi64" ] -- } else { -+ if (!is_clang) { - cflags += [ - "-EB", - "-mabi=64", diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch index e54cdc6b..4eba389f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From 3cacf1082e11c8047a42eb74dfa0e34f37995d92 Mon Sep 17 00:00:00 2001 +From 07161d6cffe2f38f8de1d176047548ea448c0b8f Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 458f428b7ce..18b4f23f769 100644 +index b9f1bba6062..354bd444482 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { - # implement the CRC32* instructions. These are optional in ARMv8.0." - # - Fuchsia just added a syscall for feature detection. - # TODO(cavalcantii): crbug.com/810125. +@@ -77,8 +77,11 @@ if (use_arm_neon_optimizations) { + # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: + # "All implementations of the ARMv8.1 architecture are required to + # implement the CRC32* instructions. These are optional in ARMv8.0." + defines = [] - if (is_clang && (!is_ios && !is_fuchsia)) { + if (is_clang && !is_ios) { - defines = [ "CRC32_ARMV8_CRC32" ] + if (current_cpu == "arm64") { + defines += [ "CRC32_ARMV8_CRC32" ] diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch index d8eca0c6..5f7901e8 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch @@ -1,4 +1,4 @@ -From 27d1c407b98979445e216c6fd105e78014e928b1 Mon Sep 17 00:00:00 2001 +From f49c5d488951027f1577f79681d448c3f30f6ae3 Mon Sep 17 00:00:00 2001 From: Johannes Pointner <johannes.pointner@br-automation.com> Date: Fri, 3 May 2019 09:12:38 +0200 Subject: [PATCH] chromium: Do not try to set the guessed values for @@ -17,12 +17,12 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> 1 file changed, 9 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index 6f2eff6f5ef..57a950a435a 100644 +index 127d0c444bd..b653e933d6f 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -809,15 +809,6 @@ config("compiler_cpu_abi") { - } else if (current_cpu == "arm") { - if (is_clang && !is_android && !is_nacl) { +@@ -749,15 +749,6 @@ config("compiler_cpu_abi") { + cflags += [ "--target=arm-linux-gnueabihf" ] + ldflags += [ "--target=arm-linux-gnueabihf" ] } - if (!is_nacl) { - cflags += [ @@ -35,4 +35,4 @@ index 6f2eff6f5ef..57a950a435a 100644 - } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { - } + cflags += [ "--target=aarch64-linux-gnu" ] diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch index e1754c1a..96eedc5f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From 9f526ef03263867d7fb305d5fc91f95e2c9564ea Mon Sep 17 00:00:00 2001 +From 22793b4cab2ceaf7301136fa2df06947c9cb424c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc -index 277a7e9338d..2a6e060fa32 100644 +index 095c49b8dc0..d1479b54d48 100644 --- a/chromium/base/threading/platform_thread_linux.cc +++ b/chromium/base/threading/platform_thread_linux.cc @@ -186,7 +186,8 @@ void TerminateOnThread() {} @@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 100644 // ThreadSanitizer bloats the stack heavily. Evidence has been that the // default stack size isn't enough for some browser tests. diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -index 248f93968a6..4bc5ac692af 100644 +index b2421649ff3..a31b96e90e6 100644 --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() { +@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. @@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644 +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ defined(OS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). -@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { + // pthread_create() (e.g., the main thread of blink_unittests). +@@ -97,7 +97,7 @@ return Threading::ThreadStackSize(); } void* GetStackStart() { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 54026cfa..bad5d45e 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -132,7 +132,7 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "73-based" +QT_MODULE_BRANCH_CHROMIUM = "75-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13 # 5.13.meta-qt5.1 @@ -151,7 +151,6 @@ SRC_URI_append_libc-musl = "\ SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ - file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ @@ -173,8 +172,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "a6c32599a14e1c4c61f7b9c4968f8d8635f5e29c" -SRCREV_chromium = "65c74dd3316c12a4457a6fd202f9b4437186898c" +SRCREV_qtwebengine = "33a2c9aed3ee621c91853570087b500c830792e0" +SRCREV_chromium = "f5613a4bc321972b8f72654d4c4bc9ba0c36ffbe" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index def9b152..5fce7d7f 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "27495743080cbf0ff7fef2f83f82362d147ae519" +SRCREV = "e51341cf20447c42a62281e633513837058f62e5" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index fc4c695e..3e71e542 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "e406bf83a963cb1efae6a5869fc5a2a62249a6cf" +SRCREV = "e108b1f06d18003d7a758b07bc3bea9922b2e116" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index c7c1ad91..eabce2d4 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "13dfe272a387a2f56229df916a580ab9ac92e332" +SRCREV = "fb2a2003fbb41ac91b319afb56f290b415befb64" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index bc5942a0..b8da0d29 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "839e33dc17d24ec41bb95b76ef6ed208d8f4f492" +SRCREV = "15ffa33a162325d2d16437a057e79cd3b0e3d61c" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index ad2788d7..dc8fca6b 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "04e770cfbafa16c09dd527897bfac2a457b47644" +SRCREV = "9da08816e1072fc1391377a38d6afd9e73d756e0" BBCLASSEXTEND =+ "native nativesdk" |