summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-13 13:04:44 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2021-04-10 01:39:16 +0200
commitd404dc581116014b814f05ed780bc9691006f12c (patch)
tree7b22abf0be3ff541b783288bfed62756d66ec07c
parentfd463388e1ecbe7f8c0749f1805a48531e48ed75 (diff)
downloadmeta-qt5-d404dc581116014b814f05ed780bc9691006f12c.tar.gz
ogl-runtime: Fix build on ppc64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch59
-rw-r--r--recipes-qt/qt5/ogl-runtime_git.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch b/recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch
new file mode 100644
index 00000000..494d598a
--- /dev/null
+++ b/recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch
@@ -0,0 +1,59 @@
1From c70df6bf52cdcdceb73ed965a28642177df32943 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 13 Mar 2021 12:58:32 -0800
4Subject: [PATCH] Qt3D: Add support to fix build on ppc64
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 src/foundation/Qt3DSPreprocessor.h | 2 +-
10 src/foundation/Qt3DSSystem.cpp | 8 +++++++-
11 2 files changed, 8 insertions(+), 2 deletions(-)
12
13diff --git a/src/foundation/Qt3DSPreprocessor.h b/src/foundation/Qt3DSPreprocessor.h
14index 066a38e..98ff573 100644
15--- a/src/foundation/Qt3DSPreprocessor.h
16+++ b/src/foundation/Qt3DSPreprocessor.h
17@@ -114,7 +114,7 @@ Platform define
18 #define QT3DS_X64
19 #elif defined(__ppc__)
20 #define QT3DS_PPC
21-#elif defined(__ppc64__)
22+#elif defined(__powerpc64__)
23 #define QT3DS_PPC
24 #define QT3DS_PPC64
25 //# elif defined(__aarch64__)
26diff --git a/src/foundation/Qt3DSSystem.cpp b/src/foundation/Qt3DSSystem.cpp
27index e87a25e..81f563f 100644
28--- a/src/foundation/Qt3DSSystem.cpp
29+++ b/src/foundation/Qt3DSSystem.cpp
30@@ -62,6 +62,10 @@ const char *qt3ds::foundation::System::g_FloatingPointModel = "";
31 const char *qt3ds::foundation::System::g_Processor = "x64";
32 const char *qt3ds::foundation::System::g_BitWidth = "64";
33 const char *qt3ds::foundation::System::g_FloatingPointModel = "";
34+#elif defined(QT3DS_PPC64)
35+const char *qt3ds::foundation::System::g_Processor = "ppc64";
36+const char *qt3ds::foundation::System::g_BitWidth = "64";
37+const char *qt3ds::foundation::System::g_FloatingPointModel = "";
38 #elif defined(QT3DS_ARM)
39 #if defined(__aarch64__) || defined(__ARM64__)
40 const char *qt3ds::foundation::System::g_Processor = "arm";
41@@ -97,6 +101,8 @@ const char *qt3ds::foundation::System::g_GPUType = "gles3";
42 const char *qt3ds::foundation::System::g_GPUType = "";
43 #elif defined(QT3DS_X64)
44 const char *qt3ds::foundation::System::g_GPUType = "";
45+#elif defined(QT3DS_PPC64)
46+const char *qt3ds::foundation::System::g_GPUType = "";
47 #else
48 #error "Must define a processor type (QT3DS_ARM or QT3DS_X86)"
49 #endif
50@@ -136,4 +142,4 @@ const char *System::getPlatformGLStr()
51 strcpy(text, str.c_str());
52 }
53 return text;
54-}
55\ No newline at end of file
56+}
57--
582.30.2
59
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index 1669382e..fd362864 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -20,6 +20,7 @@ SRC_URI += " \
20 ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ 20 ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
21 file://0001-Fix-examples-build-error.patch \ 21 file://0001-Fix-examples-build-error.patch \
22 file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \ 22 file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \
23 file://0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch \
23" 24"
24 25
25SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c" 26SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c"