aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/ogl-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime')
-rw-r--r--recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch75
-rw-r--r--recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch26
2 files changed, 0 insertions, 101 deletions
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>