diff options
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime')
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch | 75 | ||||
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch | 26 |
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 @@ | |||
1 | From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Mon, 5 Aug 2019 14:24:44 +0300 | ||
4 | Subject: [PATCH] Fix format-security issues | ||
5 | |||
6 | format not a string literal and no format arguments [-Wformat-security] | ||
7 | |||
8 | Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7 | ||
9 | --- | ||
10 | src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | 4 ++-- | ||
11 | src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++---- | ||
12 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
15 | index ac5b992..02046ac 100644 | ||
16 | --- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
17 | +++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp | ||
18 | @@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s | ||
19 | // check for error | ||
20 | GLenum error = m_glFunctions->glGetError(); | ||
21 | if (error != GL_NO_ERROR) { | ||
22 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
23 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
24 | QT3DS_ASSERT(false); | ||
25 | GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID)); | ||
26 | bufID = 0; | ||
27 | @@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj | ||
28 | // check for error | ||
29 | GLenum error = m_glFunctions->glGetError(); | ||
30 | if (error != GL_NO_ERROR) { | ||
31 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
32 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
33 | QT3DS_ASSERT(false); | ||
34 | success = false; | ||
35 | } | ||
36 | diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
37 | index 0fe6e0f..5dfe9d1 100644 | ||
38 | --- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
39 | +++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | ||
40 | @@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla | ||
41 | } else { | ||
42 | GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID)); | ||
43 | bufID = 0; | ||
44 | - qCCritical(GL_ERROR, GLConversion::processGLError(target)); | ||
45 | + qCCritical(GL_ERROR) << GLConversion::processGLError(target); | ||
46 | } | ||
47 | } | ||
48 | |||
49 | @@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor | ||
50 | // check for error | ||
51 | GLenum error = m_glFunctions->glGetError(); | ||
52 | if (error != GL_NO_ERROR) { | ||
53 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
54 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
55 | QT3DS_ASSERT(false); | ||
56 | GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID)); | ||
57 | bufID = 0; | ||
58 | @@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject | ||
59 | // check for error | ||
60 | GLenum error = m_glFunctions->glGetError(); | ||
61 | if (error != GL_NO_ERROR) { | ||
62 | - qCCritical(GL_ERROR, GLConversion::processGLError(error)); | ||
63 | + qCCritical(GL_ERROR) << GLConversion::processGLError(error); | ||
64 | QT3DS_ASSERT(false); | ||
65 | success = false; | ||
66 | } | ||
67 | @@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI | ||
68 | GLenum binaryError = m_glFunctions->glGetError(); | ||
69 | if (binaryError != GL_NO_ERROR) { | ||
70 | shaderStatus = GL_FALSE; | ||
71 | - qCCritical(GL_ERROR, GLConversion::processGLError(binaryError)); | ||
72 | + qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError); | ||
73 | } | ||
74 | } | ||
75 | |||
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 @@ | |||
1 | From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 8 Aug 2019 08:34:47 +0300 | ||
4 | Subject: [PATCH] Fix build on musl libc | ||
5 | |||
6 | Use bits/local_lim.h only with glibc as it's not available | ||
7 | on musl libc. | ||
8 | |||
9 | Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5 | ||
10 | --- | ||
11 | src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp | ||
15 | index fa6e069..99c4c3a 100644 | ||
16 | --- a/src/foundation/linux/Qt3DSLinuxThread.cpp | ||
17 | +++ b/src/foundation/linux/Qt3DSLinuxThread.cpp | ||
18 | @@ -35,7 +35,7 @@ | ||
19 | #include "foundation/Qt3DSAssert.h" | ||
20 | #include "foundation/Qt3DSIntrinsics.h" | ||
21 | #include "foundation/Qt3DSBroadcastingAllocator.h" | ||
22 | -#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) | ||
23 | +#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__) | ||
24 | #include <bits/local_lim.h> // PTHREAD_STACK_MIN | ||
25 | #endif | ||
26 | #include <stdio.h> | ||