- updated to 5.2.1

- removed outdated irrxml,pc patches
- added system-minizip from Debian (fix build with system minizip from zlib 1.2.x)

diff --git a/assimp-irrxml.patch b/assimp-irrxml.patch
deleted file mode 100644 (file)
index 2bfa2d0..0000000
--- a/assimp-irrxml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- assimp-5.0.1/cmake-modules/FindIrrXML.cmake.orig   2020-01-12 12:56:40.000000000 +0100
-+++ assimp-5.0.1/cmake-modules/FindIrrXML.cmake        2020-12-25 13:21:58.767549238 +0100
-@@ -7,7 +7,7 @@
- #   IRRXML_LIBRARY        - IrrXML main library
- 
- find_path(IRRXML_INCLUDE_DIR irrXML.h
--    PATH_SUFFIXES include/irrlicht include/irrxml)
-+    PATH_SUFFIXES include/irrxml)
- find_library(IRRXML_LIBRARY IrrXML)
- 
- include(FindPackageHandleStandardArgs)

diff --git a/assimp-pc.patch b/assimp-pc.patch
deleted file mode 100644 (file)
index 3713883..0000000
--- a/assimp-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- assimp-5.0.1/assimp.pc.in.orig     2020-01-12 12:56:40.000000000 +0100
-+++ assimp-5.0.1/assimp.pc.in  2020-12-25 13:23:56.546911173 +0100
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_PREFIX@/
--libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
--includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
-+exec_prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: @CMAKE_PROJECT_NAME@
- Description: Import various well-known 3D model formats in an uniform manner.

diff --git a/assimp.spec b/assimp.spec
index 594aaa299d967e77958d3820bfa77bdf9754844f..7d331d44fbc991bcddb5ae878fcd126fd10af5bf 100644 (file)
--- a/assimp.spec
+++ b/assimp.spec
@@ -1,21 +1,26 @@
+# TODO:
+# - use more system libs:
+#   - utf8cpp, stb_image, libdraco (see patches in Debian)
+#   - pugixml, polyclipping, poly2tri, zip, opendllparser, open3dgc, rapidjson  (see code/CMakeLists.txt, ASSIMP_HUNTER_ENABLED vs plain option)
+# - draco support? (-DASSIMP_ENABLE_DRACO)
 Summary:       Open Asset Import Library
 Summary(pl.UTF-8):     Asset Import - otwarta biblioteka do importu danych trójwymiarowych
 Name:          assimp
-Version:       5.0.1
-Release:       2
+Version:       5.2.1
+Release:       1
 License:       BSD
 Group:         Libraries
+#Source0Download: https://github.com/assimp/assimp/releases
 Source0:       https://github.com/assimp/assimp/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: eb7b7385a5c3194ab46d7f869d7ac6cf
-Patch0:                %{name}-irrxml.patch
-Patch1:                %{name}-pc.patch
+# Source0-md5: 6726425e307b3356a5f121abe436f4f6
+Patch0:                %{name}-system-minizip.patch
 URL:           https://www.assimp.org/
-BuildRequires: cmake >= 3.0
-BuildRequires: irrxml-devel
-BuildRequires: libstdc++-devel
+BuildRequires: cmake >= 3.10
+BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: minizip-devel
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.213
+#BuildRequires:        pugixml-devel
+BuildRequires: rpmbuild(macros) >= 1.605
 BuildRequires: unzip
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,7 +43,7 @@ Summary:      Header files for assimp library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki assimp
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libstdc++-devel
+Requires:      libstdc++-devel >= 6:4.7
 Requires:      zlib-devel
 
 %description devel
@@ -52,14 +57,12 @@ bibliotekę assimp.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
-       -DASSIMP_LIB_INSTALL_DIR:PATH=%{_lib} \
-       -DSYSTEM_IRRXML=ON
+       -DASSIMP_LIB_INSTALL_DIR:PATH=%{_lib}
 
 %{__make}
 
@@ -85,6 +88,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/assimp
 %attr(755,root,root) %{_libdir}/libassimp.so
-%{_libdir}/cmake/assimp-5.0
+%{_libdir}/cmake/assimp-5.2
 %{_includedir}/assimp
 %{_pkgconfigdir}/assimp.pc