[oe,meta-qt5,2/2] qt3d: Fix build with clang

Message ID 20170809063259.373-2-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-qt5,1/2] qtwebkit: Backport a patch to fix build with icu-59
Related show

Commit Message

Khem Raj Aug. 9, 2017, 6:32 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch | 46 ++++++++++++++++++++++
 recipes-qt/qt5/qt3d_git.bb                         |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch

-- 
2.14.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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 0000000..8b36a0a
--- /dev/null
+++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
@@ -0,0 +1,46 @@ 
+From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 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.
+
+---
+ 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 b380fbe8d..437e44349 100644
+--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
++++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
+@@ -56,10 +56,10 @@ using namespace Assimp::Formatter;
+ #define for_each BOOST_FOREACH
+ 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]);
+ }
+@@ -344,10 +344,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);
+ 
+-- 
+2.13.3
+
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index f39208a..2891470 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -13,6 +13,7 @@  DEPENDS_class-target += "qtdeclarative qt3d-native"
 
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
+    file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
 "
 
 PACKAGECONFIG ??= ""