Hello community, here is the log from the commit of package libqt5-qt3d for openSUSE:Factory checked in at 2018-02-23 15:31:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qt3d (Old) and /work/SRC/openSUSE:Factory/.libqt5-qt3d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qt3d" Fri Feb 23 15:31:29 2018 rev:13 rq:579323 version:5.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qt3d/libqt5-qt3d.changes 2018-02-22 15:04:03.546514853 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qt3d.new/libqt5-qt3d.changes 2018-02-23 15:31:48.582161742 +0100 @@ -1,0 +2,7 @@ +Fri Feb 23 07:12:27 UTC 2018 - m...@suse.com + +- Add add-typecasts-in-glTFAssetWriter.inl.patch (bsc#1082475) + * Add typecasts in glTFAssetWriter.inl to fix compile errors on s390 + about ambiguous constructors https://github.com/assimp/assimp/issues/980 + +------------------------------------------------------------------- New: ---- add-typecasts-in-glTFAssetWriter.inl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qt3d.spec ++++++ --- /var/tmp/diff_new_pack.KQ0n8m/_old 2018-02-23 15:31:50.474093384 +0100 +++ /var/tmp/diff_new_pack.KQ0n8m/_new 2018-02-23 15:31:50.478093240 +0100 @@ -34,6 +34,7 @@ Source: https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf Patch0: use-Assimp-namespace-to-fix-build-for-big-endian.patch +Patch1: add-typecasts-in-glTFAssetWriter.inl.patch BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version} @@ -59,6 +60,7 @@ %prep %setup -q -n %{tar_version} %patch0 -p1 +%patch1 -p1 %package -n %libname Summary: Qt 5 3D Addon ++++++ add-typecasts-in-glTFAssetWriter.inl.patch ++++++ >From e9ecd6f8a7bce581655d88fe331ed7fc65af310e Mon Sep 17 00:00:00 2001 From: James Walker <jam...@frameforge3d.com> Date: Wed, 17 Aug 2016 17:35:16 -0700 Subject: [PATCH] Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: <https://github.com/assimp/assimp/issues/980> This patch is merged e9ecd6f8 and 666d1ce1. --- src/3rdparty/assimp/code/glTFAssetWriter.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/3rdparty/assimp/code/glTFAssetWriter.inl b/src/3rdparty/assimp/code/glTFAssetWriter.inl index 0fa8556c..f14afc4d 100644 --- a/src/3rdparty/assimp/code/glTFAssetWriter.inl +++ b/src/3rdparty/assimp/code/glTFAssetWriter.inl @@ -105,7 +105,7 @@ namespace glTF { type = "arraybuffer"; } - obj.AddMember("byteLength", b.byteLength, w.mAl); + obj.AddMember("byteLength", static_cast<uint64_t>(b.byteLength), w.mAl); obj.AddMember("type", StringRef(type), w.mAl); obj.AddMember("uri", Value(dataURI, w.mAl).Move(), w.mAl); } @@ -113,8 +113,8 @@ namespace glTF { inline void Write(Value& obj, BufferView& bv, AssetWriter& w) { obj.AddMember("buffer", Value(bv.buffer->id, w.mAl).Move(), w.mAl); - obj.AddMember("byteOffset", bv.byteOffset, w.mAl); - obj.AddMember("byteLength", bv.byteLength, w.mAl); + obj.AddMember("byteOffset", static_cast<uint64_t>(bv.byteOffset), w.mAl); + obj.AddMember("byteLength", static_cast<uint64_t>(bv.byteLength), w.mAl); obj.AddMember("target", int(bv.target), w.mAl); } -- 2.16.1
