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