diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-08-08 23:32:59 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-10 18:27:51 +0200 |
| commit | 7efcea9ab79888af4dcfc8266d75a17ef42e02c4 (patch) | |
| tree | 6c0deb1ff552edc2f8f9ef32af75c35c95e1f155 /recipes-qt | |
| parent | 3963daa20d00a98ee7a4966d52561632256e083c (diff) | |
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')
| -rw-r--r-- | recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 46 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 1 |
2 files changed, 47 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 @@ +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 f39208a8..2891470d 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 ??= "" |