!25 assimp在master进行升级,到5.2.5

From: @json-book 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2023-04-10 08:12:25 +00:00 committed by Gitee
commit be92267e89
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 5 additions and 30 deletions

View File

@ -1,26 +0,0 @@
From 9ed6834c72971998fce2ea3319b76184969ad93c Mon Sep 17 00:00:00 2001
From: Brecht Sanders (@brechtsanders)
Date: Fri, 11 Mar 2022 10:01:15 +0100
Subject: [PATCH] fix usage of incompatible minizip data structure
---
code/Common/ZipArchiveIOSystem.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp
index 9870fa9d0..685cc8b5d 100644
--- a/code/Common/ZipArchiveIOSystem.cpp
+++ b/code/Common/ZipArchiveIOSystem.cpp
@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
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;
--
2.34.1

View File

@ -1,13 +1,12 @@
Name: assimp
Version: 5.2.4
Version: 5.2.5
Release: 1
Summary: Library to load and process various 3D model formats into applications.
License: BSD and MIT and LGPL-2.1 and LGPL-2.0 and GPL-2.0 and LGPL-3.0 and GPL-3.0
URL: http://www.assimp.org/
Source0: https://github.com/assimp/assimp/archive/v%{version}.tar.gz
Patch0001: 0001-Fix-build-with-zlib.patch
BuildRequires: gcc-c++ boost-devel cmake dos2unix irrlicht-devel irrXML-devel
BuildRequires: doxygen poly2tri-devel gtest-devel pkgconfig(zzip-zlib-config)
BuildRequires: doxygen poly2tri-devel gtest-devel pkgconfig(zziplib)
BuildRequires: pkgconfig(zlib) pkgconfig(minizip) gmock-devel make
BuildRequires: pkgconfig(python3) python3-rpm-macros
Provides: bundled(polyclipping) = 4.8.8 bundled(openddl-parser)
@ -66,7 +65,6 @@ install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyass
%files
%doc CREDITS LICENSE
%{_bindir}/assimp
%{_libdir}/*.so.*
%files devel
@ -83,6 +81,9 @@ install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyass
%{python3_sitelib}/pyassimp
%changelog
* Sat Feb 04 2023 wenchaofan <349464272@qq.com> - 5.2.5-1
- Update to 5.2.5 version
* Wed Jun 15 2022 wulei <wulei80@h-partners.com> - 5.2.4-1
- Upgrade to 5.2.4

Binary file not shown.