rpm/libqt5-qt3d
SHA256
1
0
Fork 0
forked from pool/libqt5-qt3d
Code Pull Requests Activity

Accepting request 578999 from KDE:Qt5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/578999
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qt3d?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2018-02-22 14:03:59 +00:00 committed by Git OBS Bridge
parent e27b96dca2
commit 28f5c74cb6
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fix-assimp-bigendian-lvalue.diff
View File

@ -1,17 +0,0 @@
Index: qt3d-opensource-src-5.6.0/src/3rdparty/3rdparty/assimp/code/Bitmap.cpp
===================================================================
--- qt3d-opensource-src-5.6.0.orig/src/3rdparty/assimp/code/Bitmap.cpp
+++ qt3d-opensource-src-5.6.0/src/3rdparty/3rdparty/assimp/code/Bitmap.cpp
@@ -82,7 +82,12 @@ namespace Assimp {
template<typename T>
inline std::size_t Copy(uint8_t* data, T& field) {
+#if (defined AI_BUILD_BIG_ENDIAN)
+ T swapped=AI_BE(field);
+ std::memcpy(data, &swapped, sizeof(swapped)); return sizeof(field);
+#else
std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field);
+#endif
}
void Bitmap::WriteHeader(Header& header, IOStream* file) {

10
libqt5-qt3d.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Feb 22 08:06:32 UTC 2018 - mlin@suse.com
- Drop fix-assimp-bigendian-lvalue.diff (bsc#1082225)
* The fix was part of assimp lib 3.3.1 already and Qt 5.10 has been updated
to assimp lib 3.3.1, thus we don't need that patch anymore.
- Add use-Assimp-namespace-to-fix-build-for-big-endian.patch
* Use Assimp namespace to fix build for big-endian architectures
https://github.com/assimp/assimp/pull/986
-------------------------------------------------------------------
Fri Dec 8 23:10:53 UTC 2017 - christophe@krop.fr

4
libqt5-qt3d.spec
View File

@ -33,7 +33,7 @@ Url: https://www.qt.io
%define tar_version qt3d-everywhere-src-5.10.0
Source: https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
Patch0: fix-assimp-bigendian-lvalue.diff
Patch0: use-Assimp-namespace-to-fix-build-for-big-endian.patch
BuildRequires: fdupes
BuildRequires: libQt5Bootstrap-devel-static >= %{version}
BuildRequires: libQt5Concurrent-devel >= %{version}
@ -58,9 +58,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica
%prep
%setup -q -n %{tar_version}
%ifarch s390 s390x
%patch0 -p1
%endif
%package -n %libname
Summary: Qt 5 3D Addon

26
use-Assimp-namespace-to-fix-build-for-big-endian.patch Normal file
View File

@ -0,0 +1,26 @@
From 50a2e80e96caf458b7a70d4dcc1003ab0441b6c2 Mon Sep 17 00:00:00 2001
From: Daniel Knezevic <danielknezevic90@gmail.com>
Date: Thu, 18 Aug 2016 10:51:20 +0200
Subject: [PATCH] Use Assimp namespace to fix build for big-endian
architectures
---
src/3rdparty/assimp/code/glTFAsset.inl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/3rdparty/assimp/code/glTFAsset.inl b/src/3rdparty/assimp/code/glTFAsset.inl
index d52c825c..470246c9 100644
--- a/src/3rdparty/assimp/code/glTFAsset.inl
+++ b/src/3rdparty/assimp/code/glTFAsset.inl
@@ -40,6 +40,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "StringUtils.h"
+using namespace Assimp;
+
namespace glTF {
namespace {
--
2.16.1