[SCM] qt3d packaging branch, experimental, updated. debian/5.7.1+dfsg-2-33-g4fcff43

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=4fcff43

The following commit has been merged in the experimental branch:
commit 4fcff43b40e10f6fb3f63558e54788deffefc4d6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 16 21:05:24 2017 +0300

    Backport a patch to fix Assimp build on big endian architectures.
---
 debian/changelog                      |  2 ++
 debian/patches/assimp_big_endian.diff | 15 +++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 726fe1c..a0f1092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ qt3d-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
     - Disable code which was using them (nonfree_resources.diff).
   * Drop Build-Conflicts on qtmultimedia5-dev, not needed with this patch.
   * Bump Standards-Version to 4.0.0, no changes needed.
+  * Backport a patch to fix Assimp build on big endian architectures
+    (assimp_big_endian.diff).
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
diff --git a/debian/patches/assimp_big_endian.diff b/debian/patches/assimp_big_endian.diff
new file mode 100644
index 0000000..260281e
--- /dev/null
+++ b/debian/patches/assimp_big_endian.diff
@@ -0,0 +1,15 @@
+Description: use Assimp namespace to fix build for big-endian architectures
+Origin: assimp upstream, https://github.com/assimp/assimp/commit/9afb760e06a22149
+Last-Update: 2017-07-16
+
+--- a/src/3rdparty/assimp/code/glTFAsset.inl
++++ b/src/3rdparty/assimp/code/glTFAsset.inl
+@@ -40,6 +40,8 @@
+ 
+ #include "StringUtils.h"
+ 
++using namespace Assimp;
++
+ namespace glTF {
+ 
+ namespace {
diff --git a/debian/patches/series b/debian/patches/series
index 30c7a2c..a837734 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 nonfree_resources.diff
+assimp_big_endian.diff

-- 
qt3d packaging