commit bcc95a407a01e683a955d37f9b9b7bf188759353
Author: Jan Palus <[email protected]>
Date: Mon Oct 31 11:59:25 2022 +0100
up to 5.2.5
assimp-system-minizip.patch | 20 --------------------
assimp.spec | 9 ++++-----
2 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/assimp.spec b/assimp.spec
index 7d331d4..6dc5314 100644
--- a/assimp.spec
+++ b/assimp.spec
@@ -6,14 +6,13 @@
Summary: Open Asset Import Library
Summary(pl.UTF-8): Asset Import - otwarta biblioteka do importu danych
trójwymiarowych
Name: assimp
-Version: 5.2.1
+Version: 5.2.5
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: 6726425e307b3356a5f121abe436f4f6
-Patch0: %{name}-system-minizip.patch
+# Source0-md5: 0b5a5a2714f1126b9931cdb95f512c91
URL: https://www.assimp.org/
BuildRequires: cmake >= 3.10
BuildRequires: libstdc++-devel >= 6:4.7
@@ -56,13 +55,13 @@ bibliotekę assimp.
%prep
%setup -q
-%patch0 -p1
%build
install -d build
cd build
%cmake .. \
- -DASSIMP_LIB_INSTALL_DIR:PATH=%{_lib}
+ -DASSIMP_LIB_INSTALL_DIR:PATH=%{_lib} \
+ -DASSIMP_BUILD_ASSIMP_TOOLS:BOOL=ON
%{__make}
diff --git a/assimp-system-minizip.patch b/assimp-system-minizip.patch
deleted file mode 100644
index f9bef85..0000000
--- a/assimp-system-minizip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: fix compilation with system provided minizip package
- upstream vendored an a forked version of minizip that has not seen any love
for 6 years...
-Origin: https://github.com/assimp/assimp/issues/4334
-Forwarded: https://github.com/assimp/assimp/issues/4334
-Reviewed-by: IOhannes m zmölnig
-Last-Update: 2022-01-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- assimp.orig/code/Common/ZipArchiveIOSystem.cpp
-+++ assimp/code/Common/ZipArchiveIOSystem.cpp
-@@ -196,7 +196,9 @@
- zlib_filefunc_def mapping;
-
- mapping.zopen_file = (open_file_func)open;
-+#ifdef ZOPENDISK64
- mapping.zopendisk_file = (opendisk_file_func)opendisk;
-+#endif
- mapping.zread_file = (read_file_func)read;
- mapping.zwrite_file = (write_file_func)write;
- mapping.ztell_file = (tell_file_func)tell;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/assimp.git/commitdiff/bcc95a407a01e683a955d37f9b9b7bf188759353
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
