summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch6
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch14
2 files changed, 9 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index b19f963e..ba4e2d01 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001 1From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow a tools-only build
9 2 files changed, 7 insertions(+), 2 deletions(-) 9 2 files changed, 7 insertions(+), 2 deletions(-)
10 10
11diff --git a/qt3d.pro b/qt3d.pro 11diff --git a/qt3d.pro b/qt3d.pro
12index 2cc347a..81cdeef 100644 12index 2cc347a1c..81cdeefb0 100644
13--- a/qt3d.pro 13--- a/qt3d.pro
14+++ b/qt3d.pro 14+++ b/qt3d.pro
15@@ -1,4 +1,4 @@ 15@@ -1,4 +1,4 @@
@@ -28,7 +28,7 @@ index 2cc347a..81cdeef 100644
28+ SUBDIRS = sub_tools 28+ SUBDIRS = sub_tools
29+} 29+}
30diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 30diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
31index 8ba2d9a..e973d93 100644 31index 8ba2d9a41..e973d93dd 100644
32--- a/src/3rdparty/assimp/assimp_dependency.pri 32--- a/src/3rdparty/assimp/assimp_dependency.pri
33+++ b/src/3rdparty/assimp/assimp_dependency.pri 33+++ b/src/3rdparty/assimp/assimp_dependency.pri
34@@ -1,5 +1,5 @@ 34@@ -1,5 +1,5 @@
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
index 8b36a0a6..95b5479e 100644
--- 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
@@ -1,14 +1,15 @@
1From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 Mon Sep 17 00:00:00 2001 1From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kim.kulling@googlemail.com> 2From: Kim Kulling <kim.kulling@googlemail.com>
3Date: Mon, 7 Nov 2016 17:19:49 +0100 3Date: Mon, 7 Nov 2016 17:19:49 +0100
4Subject: [PATCH] Fix BlenderDNA for clang cross compiler. 4Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
5 5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
6--- 7---
7 src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++-------- 8 src/3rdparty/assimp/code/BlenderDNA.cpp | 16 ++++++++--------
8 1 file changed, 8 insertions(+), 8 deletions(-) 9 1 file changed, 8 insertions(+), 8 deletions(-)
9 10
10diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp 11diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp
11index b380fbe8d..437e44349 100644 12index b380fbe8d..3cc27dff1 100644
12--- a/src/3rdparty/assimp/code/BlenderDNA.cpp 13--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
13+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp 14+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
14@@ -56,10 +56,10 @@ using namespace Assimp::Formatter; 15@@ -56,10 +56,10 @@ using namespace Assimp::Formatter;
@@ -19,9 +20,9 @@ index b380fbe8d..437e44349 100644
19- (stream).GetI1(), 20- (stream).GetI1(),
20- (stream).GetI1(), 21- (stream).GetI1(),
21- (stream).GetI1() 22- (stream).GetI1()
22+ (const char)(stream).GetI1(), 23+ (const char)(stream).GetI1(),
23+ (const char)(stream).GetI1(), 24+ (const char)(stream).GetI1(),
24+ (const char)(stream).GetI1(), 25+ (const char)(stream).GetI1(),
25+ (const char)(stream).GetI1() 26+ (const char)(stream).GetI1()
26 }; 27 };
27 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); 28 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
@@ -41,6 +42,3 @@ index b380fbe8d..437e44349 100644
41 }; 42 };
42 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); 43 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
43 44
44--
452.13.3
46