diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-10-07 12:18:23 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-08 20:02:46 +0000 |
| commit | c3732724cad7056899c05097e28041ef0a3b173f (patch) | |
| tree | c376396a2a99415f2623aebcdde516b1888938ac | |
| parent | 9172ba1c74db752f31f92833f581a27a0be60d72 (diff) | |
ogl-runtime: Fix build on x86_64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/ogl-runtime/0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch | 35 | ||||
| -rw-r--r-- | recipes-qt/qt5/ogl-runtime_git.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch b/recipes-qt/qt5/ogl-runtime/0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch new file mode 100644 index 00000000..94ca4f5c --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch @@ -0,0 +1,35 @@ +From 84a9dd3f1bce450b3a6eb589ab9794178d74d1d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 7 Oct 2019 11:58:21 -0700 +Subject: [PATCH] Qt3DSSimpleTypes: make QT3DSU64 as unsigned long on linux as + well + +linux 64bit platform defines uint64_t as unsigned long as well, which +inturn is used to define GLuint64, therefore its needed to be compatible +or else we get compile errors + +src/render/backends/gl/Qt3DSRenderBackendGL3.cpp:754:80: error: cannot initialize a parameter of type 'GLuint64 *' (aka 'unsigned long *') with an lvalue of type 'qt3ds::QT3DSU64 *' (aka 'unsigned long long *') +| queryID, m_Conversion.fromQueryResultTypeToGL(resultType), params)); + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/foundation/Qt3DSSimpleTypes.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/foundation/Qt3DSSimpleTypes.h b/src/foundation/Qt3DSSimpleTypes.h +index 05ac8d9..adb72e9 100644 +--- a/src/foundation/Qt3DSSimpleTypes.h ++++ b/src/foundation/Qt3DSSimpleTypes.h +@@ -54,7 +54,7 @@ typedef quint32 QT3DSU32; + typedef qint32 QT3DSI32; + + // Android's definition of GLuint64 as unsigned long (64-bits) requires this workaround +-#if Q_PROCESSOR_WORDSIZE == 8 && (defined(Q_OS_ANDROID) || defined(Q_OS_INTEGRITY)) ++#if Q_PROCESSOR_WORDSIZE == 8 && (defined(Q_OS_ANDROID) || defined(Q_OS_INTEGRITY) || defined(Q_OS_LINUX)) + typedef unsigned long QT3DSU64; + #else + typedef quint64 QT3DSU64; +-- +2.23.0 + diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index 049f885a..97e25bc1 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -19,6 +19,7 @@ SRC_URI += " \ file://0001-Fix-examples-build-error.patch \ file://0002-Fix-format-security-issues.patch \ file://0003-Fix-build-on-musl-libc.patch \ + file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \ " SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" |