diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-17 20:44:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-17 20:44:17 +0200 |
| commit | 142f8880b5d18ed90cf0c34a0c970379ff769e47 (patch) | |
| tree | d479903e67dbc5e47ab26e07a18ce35058152667 | |
| parent | 246ec7b7d9078400d0509468b560a272e8b40e0f (diff) | |
qt3d: refresh patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch | 6 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch | 14 |
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 @@ -From 64f46f5399627430f9ce1a888fb9212b33977231 Mon Sep 17 00:00:00 2001 +From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build @@ -9,7 +9,7 @@ Subject: [PATCH] Allow a tools-only build 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 2cc347a..81cdeef 100644 +index 2cc347a1c..81cdeefb0 100644 --- a/qt3d.pro +++ b/qt3d.pro @@ -1,4 +1,4 @@ @@ -28,7 +28,7 @@ index 2cc347a..81cdeef 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a..e973d93 100644 +index 8ba2d9a41..e973d93dd 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -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 @@ -From b28ad8e101d4e2ffae00e43d53b22ace35f8c308 Mon Sep 17 00:00:00 2001 +From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 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 b380fbe8d..437e44349 100644 +index b380fbe8d..3cc27dff1 100644 --- a/src/3rdparty/assimp/code/BlenderDNA.cpp +++ b/src/3rdparty/assimp/code/BlenderDNA.cpp @@ -56,10 +56,10 @@ using namespace Assimp::Formatter; @@ -19,9 +20,9 @@ index b380fbe8d..437e44349 100644 - (stream).GetI1(), - (stream).GetI1(), - (stream).GetI1() -+ (const char)(stream).GetI1(), -+ (const char)(stream).GetI1(), -+ (const char)(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]); @@ -41,6 +42,3 @@ index b380fbe8d..437e44349 100644 }; current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); --- -2.13.3 - |