From 24ea1172e5e4e3fb36b5753ba9731a309d42e62f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 10 2017 20:42:15 +0000 Subject: Update to 5.9.1 --- diff --git a/.gitignore b/.gitignore index ab42c6f..dd138bc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qt3d-opensource-src-5.6.0.tar.xz /qt3d-opensource-src-5.7.1.tar.xz /qt3d-opensource-src-5.8.0.tar.xz +/qt3d-opensource-src-5.9.1.tar.xz diff --git a/mingw-qt5-qt3d.spec b/mingw-qt5-qt3d.spec index 80db1fe..73b0693 100644 --- a/mingw-qt5-qt3d.spec +++ b/mingw-qt5-qt3d.spec @@ -20,8 +20,8 @@ %global release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-%{qt_module} -Version: 5.8.0 -Release: 2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} +Version: 5.9.1 +Release: 1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} Summary: Qt5 for Windows - Qt3d component License: GPLv3 with exceptions or LGPLv2 with exceptions @@ -35,8 +35,6 @@ Source0: http://download.qt-project.org/%{?pre:development}%{?!pre:offici # Make sure -lz is added to the LDFLAGS Patch0: qt3d-fix-zlib-linker-flags.patch -# Fix build failure on bigendian due to "lvalue required as unary '&' operand" -Patch1: qt3d-fix-lvalue.patch BuildRequires: mingw32-filesystem >= 96 BuildRequires: mingw32-qt5-qtbase = %{version} @@ -137,54 +135,72 @@ find %{buildroot} -name "*.prl" -delete # Win32 %files -n mingw32-qt5-%{qt_module} -%license LICENSE.GPL LICENSE.LGPLv3 +%license LICENSE.LGPL* LICENSE.GPL* +%{mingw32_bindir}/Qt53DAnimation.dll %{mingw32_bindir}/Qt53DCore.dll %{mingw32_bindir}/Qt53DExtras.dll %{mingw32_bindir}/Qt53DInput.dll %{mingw32_bindir}/Qt53DLogic.dll %{mingw32_bindir}/Qt53DQuick.dll +%{mingw32_bindir}/Qt53DQuickAnimation.dll %{mingw32_bindir}/Qt53DQuickExtras.dll %{mingw32_bindir}/Qt53DQuickInput.dll %{mingw32_bindir}/Qt53DQuickRender.dll +%{mingw32_bindir}/Qt53DQuickScene2D.dll %{mingw32_bindir}/Qt53DRender.dll +%{mingw32_includedir}/qt5/Qt3DAnimation/ %{mingw32_includedir}/qt5/Qt3DCore/ %{mingw32_includedir}/qt5/Qt3DExtras/ %{mingw32_includedir}/qt5/Qt3DInput/ %{mingw32_includedir}/qt5/Qt3DLogic/ %{mingw32_includedir}/qt5/Qt3DQuick/ +%{mingw32_includedir}/qt5/Qt3DQuickAnimation/ %{mingw32_includedir}/qt5/Qt3DQuickExtras/ %{mingw32_includedir}/qt5/Qt3DQuickInput/ %{mingw32_includedir}/qt5/Qt3DQuickRender/ +%{mingw32_includedir}/qt5/Qt3DQuickScene2D/ %{mingw32_includedir}/qt5/Qt3DRender/ +%{mingw32_libdir}/libQt53DAnimation.dll.a %{mingw32_libdir}/libQt53DCore.dll.a %{mingw32_libdir}/libQt53DExtras.dll.a %{mingw32_libdir}/libQt53DInput.dll.a %{mingw32_libdir}/libQt53DLogic.dll.a %{mingw32_libdir}/libQt53DQuick.dll.a +%{mingw32_libdir}/libQt53DQuickAnimation.dll.a %{mingw32_libdir}/libQt53DQuickExtras.dll.a %{mingw32_libdir}/libQt53DQuickInput.dll.a %{mingw32_libdir}/libQt53DQuickRender.dll.a +%{mingw32_libdir}/libQt53DQuickScene2D.dll.a %{mingw32_libdir}/libQt53DRender.dll.a -%dir %{mingw32_libdir}/qt5/plugins/sceneparsers/ -%{mingw32_libdir}/qt5/plugins/sceneparsers/gltfsceneio.dll +%{mingw32_libdir}/qt5/plugins/geometryloaders/ +%{mingw32_libdir}/qt5/plugins/renderplugins/ +%{mingw32_libdir}/qt5/plugins/sceneparsers/ +%{mingw32_libdir}/cmake/Qt53DAnimation/ %{mingw32_libdir}/cmake/Qt53DCore/ %{mingw32_libdir}/cmake/Qt53DExtras/ %{mingw32_libdir}/cmake/Qt53DInput/ %{mingw32_libdir}/cmake/Qt53DLogic/ %{mingw32_libdir}/cmake/Qt53DQuick/ +%{mingw32_libdir}/cmake/Qt53DQuickAnimation/ %{mingw32_libdir}/cmake/Qt53DQuickExtras/ %{mingw32_libdir}/cmake/Qt53DQuickInput/ %{mingw32_libdir}/cmake/Qt53DQuickRender/ +%{mingw32_libdir}/cmake/Qt53DQuickScene2D/ %{mingw32_libdir}/cmake/Qt53DRender/ +%{mingw32_libdir}/pkgconfig/Qt53DAnimation.pc %{mingw32_libdir}/pkgconfig/Qt53DCore.pc %{mingw32_libdir}/pkgconfig/Qt53DExtras.pc %{mingw32_libdir}/pkgconfig/Qt53DInput.pc %{mingw32_libdir}/pkgconfig/Qt53DLogic.pc %{mingw32_libdir}/pkgconfig/Qt53DQuick.pc +%{mingw32_libdir}/pkgconfig/Qt53DQuickAnimation.pc %{mingw32_libdir}/pkgconfig/Qt53DQuickExtras.pc %{mingw32_libdir}/pkgconfig/Qt53DQuickInput.pc %{mingw32_libdir}/pkgconfig/Qt53DQuickRender.pc +%{mingw32_libdir}/pkgconfig/Qt53DQuickScene2D.pc %{mingw32_libdir}/pkgconfig/Qt53DRender.pc +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3danimation.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3danimation_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dcore.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dcore_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dextras.pri @@ -195,39 +211,22 @@ find %{buildroot} -name "*.prl" -delete %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquick.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquick_private.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickextras.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickinput.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickrender.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri +%{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3drender.pri %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_3drender_private.pri -%dir %{mingw32_datadir}/qt5/qml/Qt3D/ -%dir %{mingw32_datadir}/qt5/qml/Qt3D/Core/ -%{mingw32_datadir}/qt5/qml/Qt3D/Core/plugins.qmltypes -%{mingw32_datadir}/qt5/qml/Qt3D/Core/qmldir -%{mingw32_datadir}/qt5/qml/Qt3D/Core/quick3dcoreplugin.dll -%dir %{mingw32_datadir}/qt5/qml/Qt3D/Extras/ -%{mingw32_datadir}/qt5/qml/Qt3D/Extras/plugins.qmltypes -%{mingw32_datadir}/qt5/qml/Qt3D/Extras/qmldir -%{mingw32_datadir}/qt5/qml/Qt3D/Extras/quick3dextrasplugin.dll -%dir %{mingw32_datadir}/qt5/qml/Qt3D/Input/ -%{mingw32_datadir}/qt5/qml/Qt3D/Input/plugins.qmltypes -%{mingw32_datadir}/qt5/qml/Qt3D/Input/qmldir -%{mingw32_datadir}/qt5/qml/Qt3D/Input/quick3dinputplugin.dll -%dir %{mingw32_datadir}/qt5/qml/Qt3D/Logic -%{mingw32_datadir}/qt5/qml/Qt3D/Logic/plugins.qmltypes -%{mingw32_datadir}/qt5/qml/Qt3D/Logic/qmldir -%{mingw32_datadir}/qt5/qml/Qt3D/Logic/quick3dlogicplugin.dll -%dir %{mingw32_datadir}/qt5/qml/Qt3D/Render/ -%{mingw32_datadir}/qt5/qml/Qt3D/Render/plugins.qmltypes -%{mingw32_datadir}/qt5/qml/Qt3D/Render/qmldir -%{mingw32_datadir}/qt5/qml/Qt3D/Render/quick3drenderplugin.dll -%dir %{mingw32_datadir}/qt5/qml/QtQuick/Scene3D/ -%{mingw32_datadir}/qt5/qml/QtQuick/Scene3D/plugins.qmltypes -%{mingw32_datadir}/qt5/qml/QtQuick/Scene3D/qmldir -%{mingw32_datadir}/qt5/qml/QtQuick/Scene3D/qtquickscene3dplugin.dll +%{mingw32_libdir}/qt5/qml/Qt3D/ +%dir %{mingw32_libdir}/qt5/qml/QtQuick/ +%{mingw32_libdir}/qt5/qml/QtQuick/Scene2D/ +%{mingw32_libdir}/qt5/qml/QtQuick/Scene3D/ %files -n mingw32-qt5-%{qt_module}-tools %{_prefix}/%{mingw32_target}/bin/qt5/qgltf @@ -235,54 +234,72 @@ find %{buildroot} -name "*.prl" -delete # Win64 %files -n mingw64-qt5-%{qt_module} -%license LICENSE.GPL LICENSE.LGPLv3 +%license LICENSE.LGPL* LICENSE.GPL* +%{mingw64_bindir}/Qt53DAnimation.dll %{mingw64_bindir}/Qt53DCore.dll %{mingw64_bindir}/Qt53DExtras.dll %{mingw64_bindir}/Qt53DInput.dll %{mingw64_bindir}/Qt53DLogic.dll %{mingw64_bindir}/Qt53DQuick.dll +%{mingw64_bindir}/Qt53DQuickAnimation.dll %{mingw64_bindir}/Qt53DQuickExtras.dll %{mingw64_bindir}/Qt53DQuickInput.dll %{mingw64_bindir}/Qt53DQuickRender.dll +%{mingw64_bindir}/Qt53DQuickScene2D.dll %{mingw64_bindir}/Qt53DRender.dll +%{mingw64_includedir}/qt5/Qt3DAnimation/ %{mingw64_includedir}/qt5/Qt3DCore/ %{mingw64_includedir}/qt5/Qt3DExtras/ %{mingw64_includedir}/qt5/Qt3DInput/ %{mingw64_includedir}/qt5/Qt3DLogic/ %{mingw64_includedir}/qt5/Qt3DQuick/ +%{mingw64_includedir}/qt5/Qt3DQuickAnimation/ %{mingw64_includedir}/qt5/Qt3DQuickExtras/ %{mingw64_includedir}/qt5/Qt3DQuickInput/ %{mingw64_includedir}/qt5/Qt3DQuickRender/ +%{mingw64_includedir}/qt5/Qt3DQuickScene2D/ %{mingw64_includedir}/qt5/Qt3DRender/ +%{mingw64_libdir}/libQt53DAnimation.dll.a %{mingw64_libdir}/libQt53DCore.dll.a %{mingw64_libdir}/libQt53DExtras.dll.a %{mingw64_libdir}/libQt53DInput.dll.a %{mingw64_libdir}/libQt53DLogic.dll.a %{mingw64_libdir}/libQt53DQuick.dll.a +%{mingw64_libdir}/libQt53DQuickAnimation.dll.a %{mingw64_libdir}/libQt53DQuickExtras.dll.a %{mingw64_libdir}/libQt53DQuickInput.dll.a %{mingw64_libdir}/libQt53DQuickRender.dll.a +%{mingw64_libdir}/libQt53DQuickScene2D.dll.a %{mingw64_libdir}/libQt53DRender.dll.a -%dir %{mingw64_libdir}/qt5/plugins/sceneparsers/ -%{mingw64_libdir}/qt5/plugins/sceneparsers/gltfsceneio.dll +%{mingw64_libdir}/qt5/plugins/geometryloaders/ +%{mingw64_libdir}/qt5/plugins/renderplugins/ +%{mingw64_libdir}/qt5/plugins/sceneparsers/ +%{mingw64_libdir}/cmake/Qt53DAnimation/ %{mingw64_libdir}/cmake/Qt53DCore/ %{mingw64_libdir}/cmake/Qt53DExtras/ %{mingw64_libdir}/cmake/Qt53DInput/ %{mingw64_libdir}/cmake/Qt53DLogic/ %{mingw64_libdir}/cmake/Qt53DQuick/ +%{mingw64_libdir}/cmake/Qt53DQuickAnimation/ %{mingw64_libdir}/cmake/Qt53DQuickExtras/ %{mingw64_libdir}/cmake/Qt53DQuickInput/ %{mingw64_libdir}/cmake/Qt53DQuickRender/ +%{mingw64_libdir}/cmake/Qt53DQuickScene2D/ %{mingw64_libdir}/cmake/Qt53DRender/ +%{mingw64_libdir}/pkgconfig/Qt53DAnimation.pc %{mingw64_libdir}/pkgconfig/Qt53DCore.pc %{mingw64_libdir}/pkgconfig/Qt53DExtras.pc %{mingw64_libdir}/pkgconfig/Qt53DInput.pc %{mingw64_libdir}/pkgconfig/Qt53DLogic.pc %{mingw64_libdir}/pkgconfig/Qt53DQuick.pc +%{mingw64_libdir}/pkgconfig/Qt53DQuickAnimation.pc %{mingw64_libdir}/pkgconfig/Qt53DQuickExtras.pc %{mingw64_libdir}/pkgconfig/Qt53DQuickInput.pc %{mingw64_libdir}/pkgconfig/Qt53DQuickRender.pc +%{mingw64_libdir}/pkgconfig/Qt53DQuickScene2D.pc %{mingw64_libdir}/pkgconfig/Qt53DRender.pc +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3danimation.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3danimation_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dcore.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dcore_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dextras.pri @@ -293,45 +310,34 @@ find %{buildroot} -name "*.prl" -delete %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquick.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquick_private.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickextras.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickinput.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickrender.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri +%{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3drender.pri %{mingw64_datadir}/qt5/mkspecs/modules/qt_lib_3drender_private.pri -%dir %{mingw64_datadir}/qt5/qml/Qt3D/ -%dir %{mingw64_datadir}/qt5/qml/Qt3D/Core/ -%{mingw64_datadir}/qt5/qml/Qt3D/Core/plugins.qmltypes -%{mingw64_datadir}/qt5/qml/Qt3D/Core/qmldir -%{mingw64_datadir}/qt5/qml/Qt3D/Core/quick3dcoreplugin.dll -%dir %{mingw64_datadir}/qt5/qml/Qt3D/Extras/ -%{mingw64_datadir}/qt5/qml/Qt3D/Extras/plugins.qmltypes -%{mingw64_datadir}/qt5/qml/Qt3D/Extras/qmldir -%{mingw64_datadir}/qt5/qml/Qt3D/Extras/quick3dextrasplugin.dll -%dir %{mingw64_datadir}/qt5/qml/Qt3D/Input/ -%{mingw64_datadir}/qt5/qml/Qt3D/Input/plugins.qmltypes -%{mingw64_datadir}/qt5/qml/Qt3D/Input/qmldir -%{mingw64_datadir}/qt5/qml/Qt3D/Input/quick3dinputplugin.dll -%dir %{mingw64_datadir}/qt5/qml/Qt3D/Logic -%{mingw64_datadir}/qt5/qml/Qt3D/Logic/plugins.qmltypes -%{mingw64_datadir}/qt5/qml/Qt3D/Logic/qmldir -%{mingw64_datadir}/qt5/qml/Qt3D/Logic/quick3dlogicplugin.dll -%dir %{mingw64_datadir}/qt5/qml/Qt3D/Render/ -%{mingw64_datadir}/qt5/qml/Qt3D/Render/plugins.qmltypes -%{mingw64_datadir}/qt5/qml/Qt3D/Render/qmldir -%{mingw64_datadir}/qt5/qml/Qt3D/Render/quick3drenderplugin.dll -%dir %{mingw64_datadir}/qt5/qml/QtQuick/Scene3D/ -%{mingw64_datadir}/qt5/qml/QtQuick/Scene3D/plugins.qmltypes -%{mingw64_datadir}/qt5/qml/QtQuick/Scene3D/qmldir -%{mingw64_datadir}/qt5/qml/QtQuick/Scene3D/qtquickscene3dplugin.dll +%{mingw64_libdir}/qt5/qml/Qt3D/ +%dir %{mingw64_libdir}/qt5/qml/QtQuick/ +%{mingw64_libdir}/qt5/qml/QtQuick/Scene2D/ +%{mingw64_libdir}/qt5/qml/QtQuick/Scene3D/ %files -n mingw64-qt5-%{qt_module}-tools %{_prefix}/%{mingw64_target}/bin/qt5/qgltf %changelog +* Fri Jun 30 2017 Sandro Mani - 5.9.1-1 +- Update to 5.9.1 + +* Wed Jun 28 2017 Sandro Mani - 5.9.0-1 +- Update to 5.9.0 + * Tue May 09 2017 Sandro Mani - 5.8.0-2 - Rebuild for dropped 0022-Allow-usage-of-static-version-with-CMake.patch in qtbase diff --git a/qt3d-fix-lvalue.patch b/qt3d-fix-lvalue.patch deleted file mode 100644 index 9d798f7..0000000 --- a/qt3d-fix-lvalue.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rupN qt3d-opensource-src-5.7.1/src/3rdparty/assimp/code/Bitmap.cpp qt3d-opensource-src-5.7.1-new/src/3rdparty/assimp/code/Bitmap.cpp ---- qt3d-opensource-src-5.7.1/src/3rdparty/assimp/code/Bitmap.cpp 2016-10-14 12:01:26.000000000 +0200 -+++ qt3d-opensource-src-5.7.1-new/src/3rdparty/assimp/code/Bitmap.cpp 2017-02-04 11:52:48.952398300 +0100 -@@ -82,7 +82,12 @@ namespace Assimp { - - template - inline std::size_t Copy(uint8_t* data, T& field) { -- std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(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) { diff --git a/sources b/sources index 6deedb6..1169742 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt3d-opensource-src-5.8.0.tar.xz) = 95018edcda0528ce67733d87f67f471ff80f69ef4a91a1837f9b02dac4de3cd8744c00b237d94addc776b6a39a70afa0f94570ee6b7220d4510cc36d96dd0c3f +SHA512 (qt3d-opensource-src-5.9.1.tar.xz) = 63b647dd2e73420443ed1a4f317d79ab83ba2c101b260ecd8eafdc51b6bf901cffbfb2d645a9f9d740881ca963346c02b26fedb535768f7247aab30362d9bc35