aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch')
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
new file mode 100644
index 00000000..1f2f682f
--- /dev/null
+++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
@@ -0,0 +1,44 @@
+From 99fb23c0258ed0dacb03dc2eb57792c42b33316f Mon Sep 17 00:00:00 2001
+From: Kim Kulling <kim.kulling@googlemail.com>
+Date: Mon, 7 Nov 2016 17:19:49 +0100
+Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp
+index 18ec9f2b4..5b0b2090f 100644
+--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
++++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
+@@ -55,10 +55,10 @@ using namespace Assimp::Formatter;
+
+ bool match4(StreamReaderAny& stream, const char* string) {
+ char tmp[] = {
+- (stream).GetI1(),
+- (stream).GetI1(),
+- (stream).GetI1(),
+- (stream).GetI1()
++ (const char)(stream).GetI1(),
++ (const char)(stream).GetI1(),
++ (const char)(stream).GetI1(),
++ (const char)(stream).GetI1()
+ };
+ return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
+ }
+@@ -345,10 +345,10 @@ void SectionParser :: Next()
+ stream.SetCurrentPos(current.start + current.size);
+
+ const char tmp[] = {
+- stream.GetI1(),
+- stream.GetI1(),
+- stream.GetI1(),
+- stream.GetI1()
++ (const char)stream.GetI1(),
++ (const char)stream.GetI1(),
++ (const char)stream.GetI1(),
++ (const char)stream.GetI1()
+ };
+ current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
+