From 09f4a09bd2cdb5631dab707c38fdcc746e339ce7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 25 Oct 2019 14:30:33 +0300 Subject: ogl-runtime: update to 2.5 Change-Id: Ia0e41696bceb06b76aaac21cca5930b2ff03b9ae Reviewed-by: Mikko Gronoff --- .../0002-Fix-format-security-issues.patch | 75 ---------------------- .../ogl-runtime/0003-Fix-build-on-musl-libc.patch | 26 -------- recipes-qt/qt5/ogl-runtime_git.bb | 8 +-- 3 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch delete mode 100644 recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch 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 -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, NVConstDataRefglGetError(); - 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 -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 // PTHREAD_STACK_MIN - #endif - #include diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index 049f885a..70ab89a7 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -9,19 +9,17 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" -QT_MODULE_BRANCH = "2.4" +QT_MODULE_BRANCH = "2.5" 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 \ " -SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" +SRCREV_ogl-runtime = "938c3e6f4b94713516ed7ba88f7118d92958f5bb" SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" SRCREV = "${SRCREV_ogl-runtime}" -- cgit v1.2.3-54-g00ecf From 6fca0e337ba1b8deaac9b6c0fa41a485e5bf5013 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 25 Oct 2019 14:33:55 +0300 Subject: qtbase: add openssl PACKAGECONFIG for native nativesdk Add PACKAGECONFIG option to enable openssl for qtbase-native and nativesdk-qtbase recipes, since some build tools require openssl to be enabled. Change-Id: Ic213e70b3983f99245e6ea7668eb48369ac5e61d Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 74672bf3..e3d4c3b4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -77,6 +77,7 @@ DEBIAN_NOAUTONAME_${PN} = "1" PACKAGECONFIG ?= "" PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui," PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" QT_CONFIG_FLAGS += " \ -shared \ @@ -111,7 +112,6 @@ do_configure() { -no-sql-mysql \ -no-sql-sqlite \ -no-opengl \ - -no-openssl \ -no-xcb \ -no-feature-bearermanagement \ -no-icu \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a144689f..8bcea45c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -59,6 +59,7 @@ XPLATFORM ?= "linux-oe-g++" PACKAGECONFIG ?= "" PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui," PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl" QT_CONFIG_FLAGS = " \ -sysroot ${STAGING_DIR_NATIVE} \ @@ -74,7 +75,6 @@ QT_CONFIG_FLAGS = " \ -no-sql-psql \ -no-opengl \ -no-vulkan \ - -no-openssl \ -no-xcb \ -no-icu \ -verbose \ -- cgit v1.2.3-54-g00ecf From 8eec8855623ff16e838f6385ab9c39c20b72da27 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 28 Oct 2019 09:24:44 +0200 Subject: qt5: update submodules Update to latest version in Qt 5.13.2 branch. Task-number: QTBUG-78897 Change-Id: I080c9f2b8fcca21cc0ad657140471bec09e56d4b Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e3d4c3b4..667c018a 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 = "a254472a49a490d452b53663ec6c4914e910459d" +SRCREV = "d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830f" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 359ae7b4..33a2a310 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 = "93361f1a59c1edd2e4eb6d2aa7e2da5b73760a18" +SRCREV = "84fe56e60ee0668290911fa017fd58ffb9e4cd3e" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 8bcea45c..15a9a830 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -143,4 +143,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "a254472a49a490d452b53663ec6c4914e910459d" +SRCREV = "d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830f" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e8025f0e..79324186 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 = "a254472a49a490d452b53663ec6c4914e910459d" +SRCREV = "d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830f" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index a66a646b..3aa10c50 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -26,6 +26,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "4080025fed9d43a78b578bcab67397712459d28c" +SRCREV = "0ee5414e58c9c48401bb0361657dd9d252cb6ad9" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 16afde6a..7632f6e3 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 = "9a5e84b8f9ca0eeda8170eb93c093f3ab25de988" +SRCREV = "43a843142f0dfc43089594caaa2d5174498ffd91" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index c7299370..b9652f10 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 = "44d51ea7b45b2dce1b6772217269a4d1dff88a80" +SRCREV = "73e620404968c8b0c126db925687f82757933916" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 59cfe0b4..12e3ab64 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 = "e032fe21b6d8d2c92e93ab0ba7a367be23db82b8" +SRCREV = "151c71a860f69698e7470e3b997e48dcc937600e" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 07032cdb..938da0d9 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 = "9c498a990646f6d51b461a246b7cce477423721a" +SRCREV = "ed16064dc4ff340a27ee971f1f0276fe1bdfd403" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 886b8a63..da3f5774 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 = "2216279ffd43fb84042da2faa5bc432770351ec3" +SRCREV = "3f48932a92301ea4a5dbce536a7d9dcc17f467cb" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index a6782f46..ae711e93 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 = "8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb0" +SRCREV = "b11fb9ecacb3b2196e9568272c6e5489dfb5ddaf" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b0ed5a1e..ccb3beb8 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -177,8 +177,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "d8295dc15d8dd80089c8493a35c88d046d6a4884" -SRCREV_chromium = "18d4c6e8250324d084d89b17ad80721bb46ddbd9" +SRCREV_qtwebengine = "4a141b148d04be3b97d29d2ef808c30c2e8f54b1" +SRCREV_chromium = "c88d2026cc604c9cc7b42e4684eb480f12690e30" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 69fd08fd..a23f7af5 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 = "a8bbc056335719830a6b2746b7a85cfa2fd89164" +SRCREV = "07f8e5dae95ae78c200817cd73e612bdb4659d2b" -- cgit v1.2.3-54-g00ecf From f7afa0a4e1348db01be88b9c36372842fb902136 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 29 Oct 2019 13:00:46 +0200 Subject: qt5: update submodules Update to correct Qt 5.13.2 RC content. *** Previous submodule update commit 8eec8855623ff16e838f6385ab9c39c20b72da27 was an update from incorrect content actually "updating" to older content *** Task-number: QTBUG-78897 Change-Id: I39941e9062cf32dd920e66b2487b7aad099e65ff Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 667c018a..c810217c 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 = "d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830f" +SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 33a2a310..359ae7b4 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 = "84fe56e60ee0668290911fa017fd58ffb9e4cd3e" +SRCREV = "93361f1a59c1edd2e4eb6d2aa7e2da5b73760a18" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 15a9a830..5f24877e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -143,4 +143,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830f" +SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 79324186..bc44df50 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 = "d3d5eadf2432ddc874eabbb2d2f56c4b9ff8830f" +SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 94393b94..70921fc3 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 = "85145c9f7afdbcda54bc8ba9762c5a3ce0ff42f8" +SRCREV = "13b15ab1b1ee2ad56d0d37b07d694fbfc22e97a3" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3aa10c50..a66a646b 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -26,6 +26,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "0ee5414e58c9c48401bb0361657dd9d252cb6ad9" +SRCREV = "4080025fed9d43a78b578bcab67397712459d28c" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index e45ea410..bdf6340a 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 = "606ae7e0197f3bcff442c2df3beb918952d8e822" +SRCREV = "9fe1f2e918d39031852805f1add23125c061d3c3" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7632f6e3..16afde6a 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 = "43a843142f0dfc43089594caaa2d5174498ffd91" +SRCREV = "9a5e84b8f9ca0eeda8170eb93c093f3ab25de988" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b9652f10..c7299370 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 = "73e620404968c8b0c126db925687f82757933916" +SRCREV = "44d51ea7b45b2dce1b6772217269a4d1dff88a80" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 12e3ab64..59cfe0b4 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 = "151c71a860f69698e7470e3b997e48dcc937600e" +SRCREV = "e032fe21b6d8d2c92e93ab0ba7a367be23db82b8" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 938da0d9..07032cdb 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 = "ed16064dc4ff340a27ee971f1f0276fe1bdfd403" +SRCREV = "9c498a990646f6d51b461a246b7cce477423721a" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index da3f5774..886b8a63 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 = "3f48932a92301ea4a5dbce536a7d9dcc17f467cb" +SRCREV = "2216279ffd43fb84042da2faa5bc432770351ec3" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ae711e93..a6782f46 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 = "b11fb9ecacb3b2196e9568272c6e5489dfb5ddaf" +SRCREV = "8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb0" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ccb3beb8..3ee291d4 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -177,8 +177,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "4a141b148d04be3b97d29d2ef808c30c2e8f54b1" -SRCREV_chromium = "c88d2026cc604c9cc7b42e4684eb480f12690e30" +SRCREV_qtwebengine = "556576b55f6b4404c71c74a5ef8e21f87ed09854" +SRCREV_chromium = "843d70ac87de7482c1c1195aa73899bc05efc8f3" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index a23f7af5..69fd08fd 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 = "07f8e5dae95ae78c200817cd73e612bdb4659d2b" +SRCREV = "a8bbc056335719830a6b2746b7a85cfa2fd89164" -- cgit v1.2.3-54-g00ecf From 3e502778ee161bef4177e7e7f45c0c9b78d047da Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 31 Oct 2019 12:53:55 +0200 Subject: ogl-runtime: update to v2.5.0 release Change-Id: I1644d1cc3c71e69d58e36b4772231b46d1fe19c7 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/ogl-runtime_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index 70ab89a7..8bf3e2ca 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -12,14 +12,14 @@ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" QT_MODULE_BRANCH = "2.5" QT_MODULE_BRANCH_EASTL = "master" QT_GIT_PROJECT = "qt3dstudio" -PV = "2.5+git${SRCPV}" +PV = "2.5.0+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 \ " -SRCREV_ogl-runtime = "938c3e6f4b94713516ed7ba88f7118d92958f5bb" +SRCREV_ogl-runtime = "25236c672d81a73ee8754dbd764eb8a2a26d866e" SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" SRCREV = "${SRCREV_ogl-runtime}" -- cgit v1.2.3-54-g00ecf