SHA256
1
0
forked from pool/libqt5-qt3d

Accepting request 687053 from KDE:Qt5

- Drop use-Assimp-namespace-to-fix-build-for-big-endian.patch,
  merged upstream (since 5.11.0-beta1 already)
- Adjust filelist for Leap 42.3 to fix the build, assimp is only
  compiled with gcc5 or higher now

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

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

OBS-URL: https://build.opensuse.org/request/show/687053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qt3d?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2019-03-22 14:07:21 +00:00 committed by Git OBS Bridge
parent 7452438522
commit 9526d517ab
5 changed files with 33 additions and 32 deletions

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sun Mar 17 14:26:40 UTC 2019 - wbauer@tmo.at
- Drop use-Assimp-namespace-to-fix-build-for-big-endian.patch,
merged upstream (since 5.11.0-beta1 already)
- Adjust filelist for Leap 42.3 to fix the build, assimp is only
compiled with gcc5 or higher now
-------------------------------------------------------------------
Thu Mar 14 08:46:55 UTC 2019 - fabian@ritter-vogt.de
- Update to 5.12.2:
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.12.2/?h=5.12.2
-------------------------------------------------------------------
Fri Feb 1 08:39:15 UTC 2019 - fabian@ritter-vogt.de
- Update to 5.12.1:
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.12.1/?h=v5.12.1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 6 13:34:59 UTC 2018 - fabian@ritter-vogt.de Thu Dec 6 13:34:59 UTC 2018 - fabian@ritter-vogt.de

View File

@ -21,19 +21,18 @@
%define libname libQt53DCore5 %define libname libQt53DCore5
Name: libqt5-qt3d Name: libqt5-qt3d
Version: 5.12.0 Version: 5.12.2
Release: 0 Release: 0
Summary: Qt 5 3D Addon Summary: Qt 5 3D Addon
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: https://www.qt.io Url: https://www.qt.io
%define base_name libqt5 %define base_name libqt5
%define real_version 5.12.0 %define real_version 5.12.2
%define so_version 5.12.0 %define so_version 5.12.2
%define tar_version qt3d-everywhere-src-5.12.0 %define tar_version qt3d-everywhere-src-5.12.2
Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
Patch0: use-Assimp-namespace-to-fix-build-for-big-endian.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Bootstrap-devel-static >= %{version}
BuildRequires: libQt5Concurrent-devel >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version}
@ -58,7 +57,6 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica
%prep %prep
%setup -q -n %{tar_version} %setup -q -n %{tar_version}
%autopatch -p1
%package -n %libname %package -n %libname
Summary: Qt 5 3D Addon Summary: Qt 5 3D Addon
@ -465,7 +463,9 @@ popd
%dir %{_libqt5_libdir}/qt5/plugins/sceneparsers %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so
%if 0%{suse_version} >= 1500
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so
%endif
%dir %{_libqt5_libdir}/qt5/plugins/geometryloaders %dir %{_libqt5_libdir}/qt5/plugins/geometryloaders
%{_libqt5_libdir}/qt5/plugins/geometryloaders/libdefaultgeometryloader.so %{_libqt5_libdir}/qt5/plugins/geometryloaders/libdefaultgeometryloader.so
%{_libqt5_libdir}/qt5/plugins/geometryloaders/libgltfgeometryloader.so %{_libqt5_libdir}/qt5/plugins/geometryloaders/libgltfgeometryloader.so

View File

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

View File

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

View File

@ -1,23 +0,0 @@
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(+)
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
using namespace Assimp;
+using namespace Assimp;
+
namespace glTF {
namespace {