From f989edeca9fe6c3721ac37a90449a3a957d31ba8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2019 22:28:42 +0000 Subject: import qt5-qt3d-5.9.7-1.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5dd4be3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/qt3d-opensource-src-5.9.7.tar.xz diff --git a/.qt5-qt3d.metadata b/.qt5-qt3d.metadata new file mode 100644 index 0000000..fcef068 --- /dev/null +++ b/.qt5-qt3d.metadata @@ -0,0 +1 @@ +69cb1ed06389ee6a012eb93c61f7f763536977d0 SOURCES/qt3d-opensource-src-5.9.7.tar.xz 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 new file mode 100644 index 0000000..8258636 --- /dev/null +++ b/SPECS/qt5-qt3d.spec @@ -0,0 +1,278 @@ +%global qt_module qt3d + +%define docs 1 + +#define prerelease + +Summary: Qt5 - Qt3D QML bindings and C++ APIs +Name: qt5-%{qt_module} +Version: 5.9.7 +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.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz + +# 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: qt5-qtdeclarative-devel +BuildRequires: qt5-qtimageformats +BuildRequires: qt5-qtxmlpatterns-devel + +Requires: qt5-qtimageformats%{?_isa} >= %{version} + +%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} + +%description +Qt 3D provides functionality for near-realtime simulation systems with +support for 2D and 3D rendering in both Qt C++ and Qt Quick applications). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?docs} +%package doc +Summary: API documentation for %{name} +License: GFDL +Requires: %{name} = %{version}-%{release} +BuildRequires: qt5-qdoc +BuildRequires: qt5-qhelpgenerator +BuildArch: noarch +%description doc +%{summary}. +%endif + +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + + +%prep +%setup -q -n %{qt_module}-opensource-src-%{version} + +%patch0 -p1 -b .namespace-big-endian +%patch1 -p1 -b .fix-build-on-secondary-arches + +%build +%{qmake_qt5} + +make %{?_smp_mflags} + +%if 0%{?docs} +# HACK to avoid multilib conflicts in noarch content +# see also https://bugreports.qt-project.org/browse/QTBUG-42071 +QT_HASH_SEED=0; export QT_HASH_SEED +make %{?_smp_mflags} docs +%endif + +%install +make install INSTALL_ROOT=%{buildroot} + +%if 0%{?docs} +make install_docs INSTALL_ROOT=%{buildroot} +%endif + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt5_libdir} +for prl_file in libQt5*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%license LICENSE.GPL* LICENSE.LGPL* +%{_qt5_libdir}/libQt53DQuick.so.5* +%{_qt5_libdir}/libQt53DInput.so.5* +%{_qt5_libdir}/libQt53DQuickRender.so.5* +%{_qt5_libdir}/libQt53DRender.so.5* +%{_qt5_libdir}/libQt53DCore.so.5* +%{_qt5_libdir}/libQt53DLogic.so.5* +%{_qt5_libdir}/libQt53DQuickInput.so.5* +%{_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_includedir}/Qt3DQuick +%{_qt5_libdir}/pkgconfig/Qt53DQuick.pc +%{_qt5_libdir}/libQt53DInput.so +%{_qt5_libdir}/libQt53DInput.prl +%{_qt5_libdir}/cmake/Qt53DInput +%{_qt5_includedir}/Qt3DInput/ +%{_qt5_libdir}/pkgconfig/Qt53DInput.pc +%{_qt5_libdir}/libQt53DCore.so +%{_qt5_libdir}/libQt53DCore.prl +%{_qt5_libdir}/cmake/Qt53DCore/ +%{_qt5_includedir}/Qt3DCore/ +%{_qt5_libdir}/pkgconfig/Qt53DCore.pc +%{_qt5_libdir}/libQt53DQuickRender.so +%{_qt5_libdir}/libQt53DQuickRender.prl +%{_qt5_libdir}/cmake/Qt53DQuickRender/ +%{_qt5_includedir}/Qt3DQuickRender/ +%{_qt5_libdir}/pkgconfig/Qt53DQuickRender.pc +%{_qt5_libdir}/libQt53DRender.so +%{_qt5_libdir}/libQt53DRender.prl +%{_qt5_libdir}/cmake/Qt53DRender/ +%{_qt5_includedir}/Qt3DRender/ +%{_qt5_libdir}/pkgconfig/Qt53DRender.pc +%{_qt5_archdatadir}/mkspecs/modules/*.pri +%{_qt5_libdir}/libQt53DLogic.so +%{_qt5_libdir}/libQt53DLogic.prl +%{_qt5_includedir}/Qt3DLogic/ +%{_qt5_libdir}/cmake/Qt53DLogic +%{_qt5_libdir}/pkgconfig/Qt53DLogic.pc +%{_qt5_libdir}/libQt53DQuickInput.so +%{_qt5_libdir}/libQt53DQuickInput.prl +%{_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 +%{_qt5_docdir}/* +%endif + +%if 0%{?_qt5_examplesdir:1} +%files examples +%{_qt5_examplesdir}/ +%endif + + +%changelog +* Thu Feb 07 2019 Jan Grulich - 5.9.7-1 +- Update to 5.9.7 + Resolves: bz#1564024 + +* 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 + +* Tue Aug 30 2016 Jan Grulich - 5.6.1-10 +- Increase build version to have newer version than in EPEL + Resolves: bz#1324732 + +* Wed Jun 08 2016 Jan Grulich - 5.6.1-1 +- Update to 5.6.1 + Resolves: bz#1324732 + +* Thu Apr 07 2016 Jan Grulich - 5.6.0-3 +- Initial version for RHEL + Resolves: bz#1324732 + +* Tue Mar 22 2016 Rex Dieter - 5.6.0-2 +- rebuild + +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.9.rc +- Update to final RC + +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.8 +- Update RC release + +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.7.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.6.beta +- use %%license, update Source URL, BR: cmake + +* Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.5 +- Update to final beta release + +* Fri Dec 11 2015 Rex Dieter 5.6.0-0.4 +- -doc: BR: qt5-qdoc qt5-qhelpgenerator + +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.3 +- Official beta release + +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + +* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 +- Update to final release 5.5.1 + +* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 +- Update to Qt 5.5.1 RC1 + +* Wed Jul 1 2015 Helio Chissini de Castro 5.5.0-1 +- New final upstream release Qt 5.5.0 + +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Wed Jun 17 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt 5.5.0 RC1 (initial version) +