diff --git a/qt3d-everywhere-src-5.11.1.tar.xz b/qt3d-everywhere-src-5.15.2.tar.xz similarity index 91% rename from qt3d-everywhere-src-5.11.1.tar.xz rename to qt3d-everywhere-src-5.15.2.tar.xz index e190ecf1735c387fbf30427988ea17c9a4674a4e..9897395aaafb993d286415565039a52b145c8734 100644 Binary files a/qt3d-everywhere-src-5.11.1.tar.xz and b/qt3d-everywhere-src-5.15.2.tar.xz differ diff --git a/qt3dcore-config-multilib_p.h b/qt3dcore-config-multilib_p.h new file mode 100644 index 0000000000000000000000000000000000000000..09affc18a6500bb9266975586fc3970f812c7088 --- /dev/null +++ b/qt3dcore-config-multilib_p.h @@ -0,0 +1,22 @@ +/* qt3dcore-config_p.h */ +/* This file is here to prevent a file conflict on multiarch systems. A + * conflict will occur because qt3dcore-config_p.h has arch-specific definitions. + * + * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ + +#ifndef Q3DCONFIG_MULTILIB_H +#define Q3DCONFIG_MULTILIB_H + +#ifndef __WORDSIZE +#include +#endif + +#if __WORDSIZE == 32 +#include "Qt3DCore/private/qt3dcore-config-32_p.h" +#elif __WORDSIZE == 64 +#include "Qt3DCore/private/qt3dcore-config-64_p.h" +#else +#error "unexpected value for __WORDSIZE macro" +#endif + +#endif diff --git a/qt5-qt3d.spec b/qt5-qt3d.spec index 812d3a53f65e79477555ad52f1fed1370f11676e..5332cad3adb04bc1104b897522d59524e775eaac 100644 --- a/qt5-qt3d.spec +++ b/qt5-qt3d.spec @@ -1,15 +1,19 @@ Name: qt5-qt3d -Version: 5.11.1 -Release: 4 +Version: 5.15.2 +Release: 1 Summary: Qt5 - Qt3D C++ APIs and QML bindings License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io -Source0: https://download.qt.io/new_archive/qt/5.11/%{version}/submodules/qt3d-everywhere-src-%{version}.tar.xz +%global majmin %(echo %{version} | cut -d. -f1-2) +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qt3d-everywhere-src-%{version}.tar.xz +Source1: qt3dcore-config-multilib_p.h +BuildRequires: make BuildRequires: qt5-rpm-macros >= %{version} qt5-qtbase-private-devel qt5-qtdeclarative-devel BuildRequires: qt5-qtimageformats qt5-qtxmlpatterns-devel pkgconfig(assimp) >= 3.3.1 Requires: qt5-qtimageformats >= %{version} %{?_qt5:Requires: %{_qt5} = %{_qt5_version}} +BuildRequires: qt5-qtbase-static >= %{version} %description Qt 3D support for 2D and 3D rendering in both Qt C++ and Qt Quick applications for @@ -29,12 +33,19 @@ Provides development files and programming examples for qt5-qt3d. %autosetup -n qt3d-everywhere-src-%{version} %build +%define _lto_cflags %{nil} + %{qmake_qt5} %make_build %install make install INSTALL_ROOT=%{buildroot} +%ifarch x86_64 + mv %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config-%{__isa_bits}_p.h + install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h +%endif + pushd %{buildroot}%{_qt5_libdir} for prl_file in libQt5*.prl ; do sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} @@ -55,6 +66,7 @@ popd %{_qt5_libdir}/{libQt53D*.so.5*} %{_qt5_qmldir}/{Qt3D/,QtQuick/Scene3D/,QtQuick/Scene2D/} %{_qt5_plugindir}/{sceneparsers/,renderplugins/,geometryloaders/} +%{_qt5_plugindir}/renderers/ %files devel %{_qt5_bindir}/qgltf @@ -73,6 +85,9 @@ popd %endif %changelog +* Wed Oct 13 2021 peijiankang - 5.15.2-1 +- update to upstream version 5.15.2 + * Mon Sep 14 2020 liuweibo - 5.11.1-4 - Fix Source0 diff --git a/qt5-qt3d.yaml b/qt5-qt3d.yaml index 2e3b098a4d3956c6f74d20582eac358ada7d646c..2383b40ebadf75f6b07b60a014d7d38a2f06d70b 100644 --- a/qt5-qt3d.yaml +++ b/qt5-qt3d.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://code.qt.io/cgit/qt/qt3d.git/ -tag_prefix: ^v -seperator: . +tag_prefix: "^v" +separator: "."