forked from pool/libqt5-qt3d
Accepting request 401297 from KDE:Qt5
Update to 5.6.1 OBS-URL: https://build.opensuse.org/request/show/401297 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qt3d?expand=0&rev=2
This commit is contained in:
parent
45ed78fa13
commit
ebac906337
17
fix-assimp-bigendian-lvalue.diff
Normal file
17
fix-assimp-bigendian-lvalue.diff
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
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) {
|
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 8 14:15:14 UTC 2016 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
- Update to 5.6.1
|
||||||
|
* For more details please see:
|
||||||
|
http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 30 08:38:15 UTC 2016 - alarrosa@suse.com
|
||||||
|
|
||||||
|
- Add fix-assimp-bigendian-lvalue.diff to fix a non-lvalue being
|
||||||
|
referenced by an unary & in assimp on s390/s390x
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 18 19:02:58 UTC 2016 - hrvoje.senjan@gmail.com
|
Fri Mar 18 19:02:58 UTC 2016 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -21,18 +21,19 @@
|
|||||||
%define libname libQt53DCore5
|
%define libname libQt53DCore5
|
||||||
|
|
||||||
Name: libqt5-qt3d
|
Name: libqt5-qt3d
|
||||||
Version: 5.6.0
|
Version: 5.6.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Qt 5 3D Addon
|
Summary: Qt 5 3D Addon
|
||||||
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
|
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
|
||||||
Group: Development/Libraries/X11
|
Group: Development/Libraries/X11
|
||||||
Url: http://qt.digia.com
|
Url: http://qt.digia.com
|
||||||
%define base_name libqt5
|
%define base_name libqt5
|
||||||
%define real_version 5.6.0
|
%define real_version 5.6.1
|
||||||
%define so_version 5.6.0
|
%define so_version 5.6.1
|
||||||
%define tar_version qt3d-opensource-src-%{real_version}
|
%define tar_version qt3d-opensource-src-%{real_version}
|
||||||
Source: %{tar_version}.tar.xz
|
Source: %{tar_version}.tar.xz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
|
Patch0: fix-assimp-bigendian-lvalue.diff
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: libQt5Bootstrap-devel-static >= %{version}
|
BuildRequires: libQt5Bootstrap-devel-static >= %{version}
|
||||||
BuildRequires: libQt5Concurrent-devel >= %{version}
|
BuildRequires: libQt5Concurrent-devel >= %{version}
|
||||||
@ -57,6 +58,9 @@ handling.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n qt3d-opensource-src-%{real_version}
|
%setup -q -n qt3d-opensource-src-%{real_version}
|
||||||
|
%ifarch s390 s390x
|
||||||
|
%patch0 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%package -n %libname
|
%package -n %libname
|
||||||
Summary: Qt 5 3D Addon
|
Summary: Qt 5 3D Addon
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b961789daecebed030ad36568301d1fe6c1ad97e9a2726fad5bd96ad603f439d
|
|
||||||
size 19907260
|
|
3
qt3d-opensource-src-5.6.1.tar.xz
Normal file
3
qt3d-opensource-src-5.6.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ad93015165b1ab1a8b458e08503c8f4c8450c2b58024a3ac074281a1a90ea80d
|
||||||
|
size 19763900
|
Loading…
Reference in New Issue
Block a user