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

Accepting request 611712 from KDE:Qt5

Browse Source 
- Update to 5.11.0
  * New bugfix release
  * For more details please see:
  * http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.11.0/?h=v5.11.0

- Update to 5.11.0-rc
  * New bugfix release
  * No changelog available

- Update to 5.11.0-beta4
  * New bugfix release
  * No changelog available

- Update to 5.11.0-beta3
  * New bugfix release
  * No changelog available

- Update to 5.11.0-beta2
  * New bugfix release
  * No changelog available

- Fix the license tag.

- Update to 5.11.0-beta1
  * New feature release
  * For more details please see:
  * http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1
- Remove patches, now upstream:
  * add-typecasts-in-glTFAssetWriter.inl.patch
- Refresh patches:

OBS-URL: https://build.opensuse.org/request/show/611712
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qt3d?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2018-06-03 10:38:06 +00:00 committed by Git OBS Bridge
parent 5447f31557
commit 0290ec53ed
6 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
add-typecasts-in-glTFAssetWriter.inl.patch
View File

@ -1,40 +0,0 @@
From e9ecd6f8a7bce581655d88fe331ed7fc65af310e Mon Sep 17 00:00:00 2001
From: James Walker <jamesw@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

69
libqt5-qt3d.changes
View File

@ -1,3 +1,56 @@
-------------------------------------------------------------------
Tue May 22 15:05:53 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.11.0/?h=v5.11.0
-------------------------------------------------------------------
Tue May 8 10:58:48 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-rc
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Mon Apr 23 08:55:10 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta4
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Wed Apr 11 09:13:24 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta3
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Wed Mar 28 09:17:03 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta2
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Tue Mar 13 13:40:37 UTC 2018 - christophe@krop.fr
- Fix the license tag.
-------------------------------------------------------------------
Thu Mar 1 09:54:38 CET 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta1
* New feature release
* For more details please see:
* http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1
- Remove patches, now upstream:
* add-typecasts-in-glTFAssetWriter.inl.patch
- Refresh patches:
* use-Assimp-namespace-to-fix-build-for-big-endian.patch
-------------------------------------------------------------------
Fri Feb 23 07:12:27 UTC 2018 - mlin@suse.com
@ -15,6 +68,22 @@ Thu Feb 22 08:06:32 UTC 2018 - mlin@suse.com
* Use Assimp namespace to fix build for big-endian architectures
https://github.com/assimp/assimp/pull/986
-------------------------------------------------------------------
Tue Feb 20 14:27:44 CET 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-alpha
* New feature release
* For more details please see:
* https://wiki.qt.io/New_Features_in_Qt_5.11
-------------------------------------------------------------------
Wed Feb 14 15:44:00 CET 2018 - fabian@ritter-vogt.de
- Update to 5.10.1
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.10.1/?h=v5.10.1
-------------------------------------------------------------------
Fri Dec 8 23:10:53 UTC 2017 - christophe@krop.fr

16
libqt5-qt3d.spec
View File

@ -21,20 +21,19 @@
%define libname libQt53DCore5
Name: libqt5-qt3d
Version: 5.10.0
Version: 5.11.0
Release: 0
Summary: Qt 5 3D Addon
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
%define real_version 5.10.0
%define so_version 5.10.0
%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
%define real_version 5.11.0
%define so_version 5.11.0
%define tar_version qt3d-everywhere-src-5.11.0
Source: https://download.qt.io/official_releases/qt/5.11/%{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,8 +58,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica
%prep
%setup -q -n %{tar_version}
%patch0 -p1
%patch1 -p1
%autopatch -p1
%package -n %libname
Summary: Qt 5 3D Addon

3
qt3d-everywhere-src-5.10.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12457e7227c793274329371c60b9028ab3e44db837e875e2c460367c1dbd34ab
size 28771400

3
qt3d-everywhere-src-5.11.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0
size 84760892

15
use-Assimp-namespace-to-fix-build-for-big-endian.patch
View File

@ -8,19 +8,16 @@ Subject: [PATCH] Use Assimp namespace to fix build for big-endian
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.
Index: qt3d-everywhere-src-5.11.0/src/3rdparty/assimp/code/glTFAsset.inl
===================================================================
--- qt3d-everywhere-src-5.11.0.orig/src/3rdparty/assimp/code/glTFAsset.inl
+++ qt3d-everywhere-src-5.11.0/src/3rdparty/assimp/code/glTFAsset.inl
@@ -52,6 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "StringUtils.h"
using namespace Assimp;
+using namespace Assimp;
+
namespace glTF {
namespace {
--
2.16.1