rpm/libqt5-qt3d
SHA256
1
0
Fork 0
forked from pool/libqt5-qt3d
Code Pull Requests Activity

Accepting request 1189211 from KDE:Qt:5.15

Browse Source 
boo#1228199 / boo#1228204 (forwarded request 1189032 from krop)

OBS-URL: https://build.opensuse.org/request/show/1189211
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qt3d?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2024-07-24 13:31:32 +00:00 committed by Git OBS Bridge
commit 8b98ce6261
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libqt5-qt3d.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 22 12:07:08 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Use system assimp unconditionally (boo#1228204)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 29 06:24:45 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de> Wed May 29 06:24:45 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

17
libqt5-qt3d.spec
View File

@ -24,7 +24,6 @@
%define real_version 5.15.14 %define real_version 5.15.14
%define so_version 5.15.14 %define so_version 5.15.14
%define tar_version qt3d-everywhere-src-%{version} %define tar_version qt3d-everywhere-src-%{version}
%global enable_assimp (0%{?suse_version} >= 1550)
Name: libqt5-qt3d Name: libqt5-qt3d
Version: 5.15.14+kde0 Version: 5.15.14+kde0
Release: 0 Release: 0
@ -48,9 +47,7 @@ BuildRequires: perl
%endif %endif
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xz BuildRequires: xz
%if %{enable_assimp}
BuildRequires: pkgconfig(assimp) > 3.3.1 BuildRequires: pkgconfig(assimp) > 3.3.1
%endif
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%description %description
@ -62,6 +59,8 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica
%prep %prep
%autosetup -p1 -n %{tar_version} %autosetup -p1 -n %{tar_version}
rm -r src/3rdparty/assimp/{src,unzip}
%package -n %{libname} %package -n %{libname}
Summary: Qt 5 3D Addon Summary: Qt 5 3D Addon
Group: System/Libraries Group: System/Libraries
@ -401,11 +400,7 @@ the exact Qt version.
mkdir .git mkdir .git
%endif %endif
%qmake5 -- \ %qmake5 -- \
%if %{enable_assimp} -system-assimp
-system-assimp \
%else
-no-assimp \
%endif
%make_jobs %make_jobs
@ -415,7 +410,6 @@ mkdir .git
# kill .la files # kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
%if %{enable_assimp}
# put all the binaries to %%_bindir and symlink them back to %%_qt5_bindir # put all the binaries to %%_bindir and symlink them back to %%_qt5_bindir
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_libqt5_bindir} pushd %{buildroot}%{_libqt5_bindir}
@ -424,7 +418,6 @@ for i in * ; do
ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i} ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
done done
popd popd
%endif
%fdupes %{buildroot} %fdupes %{buildroot}
@ -455,9 +448,7 @@ popd
%dir %{_libqt5_libdir}/qt5/plugins/sceneparsers %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so
%if %{enable_assimp}
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so
%endif
%dir %{_libqt5_libdir}/qt5/plugins/geometryloaders %dir %{_libqt5_libdir}/qt5/plugins/geometryloaders
%{_libqt5_libdir}/qt5/plugins/geometryloaders/libdefaultgeometryloader.so %{_libqt5_libdir}/qt5/plugins/geometryloaders/libdefaultgeometryloader.so
%{_libqt5_libdir}/qt5/plugins/geometryloaders/libgltfgeometryloader.so %{_libqt5_libdir}/qt5/plugins/geometryloaders/libgltfgeometryloader.so
@ -504,11 +495,9 @@ popd
%files tools %files tools
%defattr(-,root,root,755) %defattr(-,root,root,755)
%license LICENSE.* %license LICENSE.*
%if %{enable_assimp}
%{_bindir}/qgltf %{_bindir}/qgltf
%{_bindir}/qgltf-qt5 %{_bindir}/qgltf-qt5
%{_libqt5_bindir}/qgltf %{_libqt5_bindir}/qgltf
%endif
%files examples %files examples
%defattr(-,root,root,755) %defattr(-,root,root,755)