Use system assimp

This commit is contained in:
Jan Grulich 2024-01-16 16:46:31 +01:00
parent d25d6dc0e9
commit 1cb239eca8

View File

@ -9,7 +9,7 @@
Summary: Qt6 - Qt3D QML bindings and C++ APIs Summary: Qt6 - Qt3D QML bindings and C++ APIs
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.6.1 Version: 6.6.1
Release: 1%{?dist} Release: 2%{?dist}
%global examples 1 %global examples 1
@ -38,9 +38,9 @@ BuildRequires: qt6-qtdeclarative-devel
BuildRequires: qt6-qtshadertools-devel BuildRequires: qt6-qtshadertools-devel
BuildRequires: qt6-qtimageformats BuildRequires: qt6-qtimageformats
# FIXME: enable with newer assimp # FIXME: enable with newer assimp
# if 0{?fedora} %if 0%{?fedora}
# BuildRequires: pkgconfig(assimp) >= 3.3.1 BuildRequires: pkgconfig(assimp) >= 3.3.1
# endif %endif
Requires: qt6-qtimageformats%{?_isa} >= %{version} Requires: qt6-qtimageformats%{?_isa} >= %{version}
%description %description
@ -75,7 +75,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%cmake_qt6 \ %cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_FEATURE_qt3d_system_assimp=OFF -DQT_FEATURE_qt3d_system_assimp=ON
%cmake_build %cmake_build
@ -202,6 +202,9 @@ popd
%changelog %changelog
* Tue Jan 16 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-2
- Use system assimp
* Mon Nov 27 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.1-1 * Mon Nov 27 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.1-1
- 6.6.1 - 6.6.1