summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-08 23:32:59 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-10 18:27:51 +0200
commit7efcea9ab79888af4dcfc8266d75a17ef42e02c4 (patch)
tree6c0deb1ff552edc2f8f9ef32af75c35c95e1f155 /recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
parent3963daa20d00a98ee7a4966d52561632256e083c (diff)
downloadmeta-qt5-7efcea9ab79888af4dcfc8266d75a17ef42e02c4.tar.gz
qt3d: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch46
1 files changed, 46 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..8b36a0a6
--- /dev/null
+++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
@@ -0,0 +1,46 @@
1From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kim.kulling@googlemail.com>
3Date: Mon, 7 Nov 2016 17:19:49 +0100
4Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
5
6---
7 src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++--------
8 1 file changed, 8 insertions(+), 8 deletions(-)
9
10diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp
11index b380fbe8d..437e44349 100644
12--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
13+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
14@@ -56,10 +56,10 @@ using namespace Assimp::Formatter;
15 #define for_each BOOST_FOREACH
16 bool match4(StreamReaderAny& stream, const char* string) {
17 char tmp[] = {
18- (stream).GetI1(),
19- (stream).GetI1(),
20- (stream).GetI1(),
21- (stream).GetI1()
22+ (const char)(stream).GetI1(),
23+ (const char)(stream).GetI1(),
24+ (const char)(stream).GetI1(),
25+ (const char)(stream).GetI1()
26 };
27 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
28 }
29@@ -344,10 +344,10 @@ void SectionParser :: Next()
30 stream.SetCurrentPos(current.start + current.size);
31
32 const char tmp[] = {
33- stream.GetI1(),
34- stream.GetI1(),
35- stream.GetI1(),
36- stream.GetI1()
37+ (const char)stream.GetI1(),
38+ (const char)stream.GetI1(),
39+ (const char)stream.GetI1(),
40+ (const char)stream.GetI1()
41 };
42 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
43
44--
452.13.3
46