From bd6439169d5f5dbf8f49a93f9bcedffda777112a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:44:25 +0000 Subject: import qt5-qt3d-5.9.2-1.el7 --- diff --git a/.gitignore b/.gitignore index c2fad60..5cabf57 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qt3d-opensource-src-5.6.2.tar.xz +SOURCES/qt3d-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qt3d.metadata b/.qt5-qt3d.metadata index 4aba092..a6bae48 100644 --- a/.qt5-qt3d.metadata +++ b/.qt5-qt3d.metadata @@ -1 +1 @@ -2aee770a5ba984a2cc83f180b3891ccbca1157e0 SOURCES/qt3d-opensource-src-5.6.2.tar.xz +9fe5322a3d3b71bc47e58c6272908be3937b64cf SOURCES/qt3d-opensource-src-5.9.2.tar.xz diff --git a/SOURCES/qt3d-fix-build-on-big-endian-architectures.patch b/SOURCES/qt3d-fix-build-on-big-endian-architectures.patch deleted file mode 100644 index e73bf0f..0000000 --- a/SOURCES/qt3d-fix-build-on-big-endian-architectures.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/3rdparty/assimp/code/Bitmap.cpp b/src/3rdparty/assimp/code/Bitmap.cpp -index 30b5744..e1f58b0 100644 ---- a/src/3rdparty/assimp/code/Bitmap.cpp -+++ b/src/3rdparty/assimp/code/Bitmap.cpp -@@ -80,10 +80,15 @@ namespace Assimp { - } - } - -- template -- inline std::size_t Copy(uint8_t* data, T& field) { -- std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field); -- } -+ template -+ inline std::size_t Copy(uint8_t* data, T& field) { -+#ifdef AI_BUILD_BIG_ENDIAN -+ T field_swapped=AI_BE(field); -+ std::memcpy(data, &field_swapped, sizeof(field)); return sizeof(field); -+#else -+ std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field); -+#endif -+ } - - void Bitmap::WriteHeader(Header& header, IOStream* file) { - uint8_t data[Header::header_size]; diff --git a/SOURCES/qt3d-fix-build-on-secondary-arches.patch b/SOURCES/qt3d-fix-build-on-secondary-arches.patch new file mode 100644 index 0000000..b894dd6 --- /dev/null +++ b/SOURCES/qt3d-fix-build-on-secondary-arches.patch @@ -0,0 +1,24 @@ +diff --git a/src/3rdparty/assimp/code/glTFAssetWriter.inl b/src/3rdparty/assimp/code/glTFAssetWriter.inl +index 595cb8a..d620f10 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(b.byteLength), w.mAl); + obj.AddMember("type", StringRef(type), w.mAl); + obj.AddMember("uri", Value(dataURI, w.mAl).Move(), w.mAl); + } +@@ -113,8 +114,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(bv.byteOffset), w.mAl); ++ obj.AddMember("byteLength", static_cast(bv.byteLength), w.mAl); + obj.AddMember("target", int(bv.target), w.mAl); + } + diff --git a/SOURCES/qt3d-namespace-big-endian.patch b/SOURCES/qt3d-namespace-big-endian.patch new file mode 100644 index 0000000..bfa9605 --- /dev/null +++ b/SOURCES/qt3d-namespace-big-endian.patch @@ -0,0 +1,11 @@ +diff -up qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl.than qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl +--- qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl.than 2017-05-10 11:48:47.727867274 -0400 ++++ qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl 2017-05-10 11:48:29.407529841 -0400 +@@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + + #include "StringUtils.h" + ++using namespace Assimp; + namespace glTF { + + namespace { diff --git a/SPECS/qt5-qt3d.spec b/SPECS/qt5-qt3d.spec index c348f18..4a34d40 100644 --- a/SPECS/qt5-qt3d.spec +++ b/SPECS/qt5-qt3d.spec @@ -6,28 +6,26 @@ Summary: Qt5 - Qt3D QML bindings and C++ APIs Name: qt5-%{qt_module} -Version: 5.6.2 +Version: 5.9.2 Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://doc.qt.io/qt-5/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -Patch0: qt3d-fix-build-on-big-endian-architectures.patch +# namespace on big endian platforms +Patch0: qt3d-namespace-big-endian.patch +Patch1: qt3d-fix-build-on-secondary-arches.patch -BuildRequires: cmake -BuildRequires: qt5-qtbase-static >= %{version} -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5XmlPatterns) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5XmlPatterns) -BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: cmake +BuildRequires: qt5-qtbase-static >= %{version} +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtimageformats +BuildRequires: qt5-qtxmlpatterns-devel -Requires: qt5-qtimageformats%{?_isa} >= %{version} +Requires: qt5-qtimageformats%{?_isa} >= %{version} %{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} @@ -64,12 +62,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version} -%patch0 -p1 -b .fix-build-on-big-endian-architectures +%patch0 -p1 -b .namespace-big-endian +%patch1 -p1 -b .fix-build-on-secondary-arches %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} make %{?_smp_mflags} @@ -79,13 +76,12 @@ make %{?_smp_mflags} QT_HASH_SEED=0; export QT_HASH_SEED make %{?_smp_mflags} docs %endif -popd %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install INSTALL_ROOT=%{buildroot} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install_docs INSTALL_ROOT=%{buildroot} %endif ## .prl/.la file love @@ -112,49 +108,82 @@ popd %{_qt5_libdir}/libQt53DCore.so.5* %{_qt5_libdir}/libQt53DLogic.so.5* %{_qt5_libdir}/libQt53DQuickInput.so.5* -%{_qt5_archdatadir}/qml/Qt3D/ -%{_qt5_archdatadir}/qml/QtQuick/Scene3D -%{_qt5_plugindir}/sceneparsers/libassimpsceneparser.so -%{_qt5_plugindir}/sceneparsers/libgltfsceneparser.so +%{_qt5_libdir}/libQt53DExtras.so.5* +%{_qt5_libdir}/libQt53DAnimation.so.5* +%{_qt5_libdir}/libQt53DQuickAnimation.so.5* +%{_qt5_libdir}/libQt53DQuickScene2D.so.5* +%{_qt5_libdir}/libQt53DQuickExtras.so.5* +%{_qt5_qmldir}/Qt3D/ +%{_qt5_qmldir}/QtQuick/Scene3D/ +%{_qt5_qmldir}/QtQuick/Scene2D/ +%{_qt5_plugindir}/sceneparsers/ +%{_qt5_plugindir}/renderplugins/ +%{_qt5_plugindir}/geometryloaders/ %files devel %{_qt5_bindir}/qgltf %{_qt5_libdir}/libQt53DQuick.so %{_qt5_libdir}/libQt53DQuick.prl %{_qt5_libdir}/cmake/Qt53DQuick -%{_qt5_headerdir}/Qt3DQuick +%{_qt5_includedir}/Qt3DQuick %{_qt5_libdir}/pkgconfig/Qt53DQuick.pc %{_qt5_libdir}/libQt53DInput.so %{_qt5_libdir}/libQt53DInput.prl %{_qt5_libdir}/cmake/Qt53DInput -%{_qt5_headerdir}/Qt3DInput/ +%{_qt5_includedir}/Qt3DInput/ %{_qt5_libdir}/pkgconfig/Qt53DInput.pc %{_qt5_libdir}/libQt53DCore.so %{_qt5_libdir}/libQt53DCore.prl %{_qt5_libdir}/cmake/Qt53DCore/ -%{_qt5_headerdir}/Qt3DCore/ +%{_qt5_includedir}/Qt3DCore/ %{_qt5_libdir}/pkgconfig/Qt53DCore.pc %{_qt5_libdir}/libQt53DQuickRender.so %{_qt5_libdir}/libQt53DQuickRender.prl %{_qt5_libdir}/cmake/Qt53DQuickRender/ -%{_qt5_headerdir}/Qt3DQuickRender/ +%{_qt5_includedir}/Qt3DQuickRender/ %{_qt5_libdir}/pkgconfig/Qt53DQuickRender.pc %{_qt5_libdir}/libQt53DRender.so %{_qt5_libdir}/libQt53DRender.prl %{_qt5_libdir}/cmake/Qt53DRender/ -%{_qt5_headerdir}/Qt3DRender/ +%{_qt5_includedir}/Qt3DRender/ %{_qt5_libdir}/pkgconfig/Qt53DRender.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri %{_qt5_libdir}/libQt53DLogic.so %{_qt5_libdir}/libQt53DLogic.prl -%{_qt5_headerdir}/Qt3DLogic/ +%{_qt5_includedir}/Qt3DLogic/ %{_qt5_libdir}/cmake/Qt53DLogic %{_qt5_libdir}/pkgconfig/Qt53DLogic.pc %{_qt5_libdir}/libQt53DQuickInput.so %{_qt5_libdir}/libQt53DQuickInput.prl -%{_qt5_headerdir}/Qt3DQuickInput/ +%{_qt5_includedir}/Qt3DQuickInput/ %{_qt5_libdir}/cmake/Qt53DQuickInput %{_qt5_libdir}/pkgconfig/Qt53DQuickInput.pc +%{_qt5_libdir}/libQt53DExtras.so +%{_qt5_libdir}/libQt53DExtras.prl +%{_qt5_libdir}/cmake/Qt53DExtras +%{_qt5_includedir}/Qt3DExtras +%{_qt5_libdir}/pkgconfig/Qt53DExtras.pc +%{_qt5_libdir}/libQt53DQuickExtras.so +%{_qt5_libdir}/libQt53DQuickExtras.prl +%{_qt5_libdir}/cmake/Qt53DQuickExtras +%{_qt5_includedir}/Qt3DQuickExtras +%{_qt5_libdir}/pkgconfig/Qt53DQuickExtras.pc +%{_qt5_libdir}/libQt53DAnimation.so +%{_qt5_libdir}/libQt53DAnimation.prl +%{_qt5_libdir}/cmake/Qt53DAnimation +%{_qt5_includedir}/Qt3DAnimation +%{_qt5_libdir}/pkgconfig/Qt53DAnimation.pc +%{_qt5_libdir}/libQt53DQuickAnimation.so +%{_qt5_libdir}/libQt53DQuickAnimation.prl +%{_qt5_libdir}/cmake/Qt53DQuickAnimation +%{_qt5_includedir}/Qt3DQuickAnimation +%{_qt5_libdir}/pkgconfig/Qt53DQuickAnimation.pc +%{_qt5_libdir}/libQt53DQuickScene2D.so +%{_qt5_libdir}/libQt53DQuickScene2D.prl +%{_qt5_libdir}/cmake/Qt53DQuickScene2D +%{_qt5_includedir}/Qt3DQuickScene2D +%{_qt5_libdir}/pkgconfig/Qt53DQuickScene2D.pc + %if 0%{?docs} %files doc @@ -168,6 +197,14 @@ popd %changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.2-1 +- Update to 5.9.2 + Resolves: bz#1482774 + +* Mon Aug 28 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482774 + * Wed Jan 11 2017 Jan Grulich - 5.6.2-1 - Update to 5.6.2 Resolves: bz#1384836