Compare commits

...
Sign in to create a new pull request.

39 commits

Author SHA1 Message Date
Fedora Release Engineering
9f9f1c36f2 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 04:03:06 +00:00
Sandro Mani
d70b66d8fe PyAssimp: Re-add 'aiProcess_Triangulate' (#2423174) 2025-12-27 19:11:41 +01:00
Sandro Mani
5cacab3fd7 Backport fix for CVE-2025-11277 2025-12-14 20:03:32 +01:00
Python Maint
3a13f18407 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 12:09:52 +02:00
Sandro Mani
068be93c1c Fix pugixml::pugixml dependency ending up in link interface of assimp::assimp 2025-08-18 20:33:28 +02:00
Sandro Mani
4469c3c65b Update to 6.0.2 2025-08-18 11:06:53 +02:00
Python Maint
c9a5f7310c Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 12:38:44 +02:00
Fedora Release Engineering
4aa7296a0a Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:21:27 +00:00
Python Maint
e99d3401b5 Rebuilt for Python 3.14 2025-06-03 14:28:26 +02:00
Rich Mattes
12cc8a4445 Add new patches 2025-03-15 21:27:34 -04:00
Rich Mattes
80fe326abc Update to release 5.4.3
Resolves: #2274012
2025-03-15 21:27:27 -04:00
Fedora Release Engineering
3a42df86a2 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 11:48:12 +00:00
Miroslav Suchý
b3fa9c1d57 convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-08-28 08:01:17 +02:00
Fedora Release Engineering
49901f8079 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 17:39:51 +00:00
Python Maint
8cd41a5618 Rebuilt for Python 3.13 2024-06-09 01:38:30 +02:00
Rich Mattes
5ef27d009c Update to release 5.3.1 2024-03-31 21:08:11 -04:00
Fedora Release Engineering
e5e96945e2 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 23:40:56 +00:00
Fedora Release Engineering
a47b41f26d Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 13:45:25 +00:00
Scott K Logan
98ede03e7c Add pugixml and poly2tri devel dependencies to assimp-devel 2024-01-03 13:00:49 -06:00
Rich Mattes
41c8bc20b9 Update changelog for latest changes 2023-11-24 10:45:53 -05:00
Rich Mattes
c6758b2144 Fix versions
Fix library version and filter installed libraries by package version
and soversion.
2023-11-23 23:55:31 -05:00
Rich Mattes
814f62525c Enable unit tests
Enable unit tests and exclude unit tests that rely on non-free models.

Disable -Werror during build.

Incorporate stb_image minimum versions.
2023-11-23 23:43:10 -05:00
Scott K Logan
1170228628 Update to release 5.2.5 2023-07-28 15:00:08 -05:00
Fedora Release Engineering
1ac0cb353d Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 13:58:22 +00:00
Python Maint
30ad66683b Rebuilt for Python 3.12 2023-06-13 23:27:02 +02:00
Fedora Release Engineering
760d443dae Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 22:19:14 +00:00
Fedora Release Engineering
a119cb971f Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 21:24:24 +00:00
Python Maint
0b9c80100d Rebuilt for Python 3.11 2022-06-13 19:53:07 +02:00
Benjamin A. Beasley
603f5dbba8 Drop BR on pkgconfig(zzip-zlib-config)
Dropped upstream in zziplib, and no longer available in F37+.

https://github.com/gdraheim/zziplib/issues/86#issuecomment-612961815
2022-04-23 13:43:38 -04:00
Benjamin A. Beasley
2fbf9e06a9 Security fix for CVE-2022-28041 2022-04-23 13:27:09 -04:00
Fedora Release Engineering
b25065f086 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 21:48:10 +00:00
Rich Mattes
20482f2b12 Correct Unlicense shortname (rhbz#2036000) 2021-12-29 23:16:18 -05:00
Benjamin A. Beasley
33f0991ae3 Add -static BR’s for header-only libraries utf8cpp and rapidjson 2021-09-11 12:49:37 -04:00
Benjamin A. Beasley
b9d3cbace5 Unbundle stb_image 2021-09-11 12:37:12 -04:00
Benjamin A. Beasley
ef89f0abc0 Fix “error: changelog not in descending chronological order” 2021-09-11 12:37:12 -04:00
Rich Mattes
ea12704921 Merge branch 'epel8' into rawhide 2021-07-31 21:42:01 -04:00
Fedora Release Engineering
066ef04fce - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 18:05:19 +00:00
Fedora Release Engineering
11d75200c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 13:09:21 +00:00
Python Maint
cb2670101d Rebuilt for Python 3.10 2021-06-04 19:59:35 +02:00
17 changed files with 569 additions and 584 deletions

4
.gitignore vendored
View file

@ -5,3 +5,7 @@
/assimp-3.1.1_no_test_models.zip
/assimp-c318d648ff73aa2e32b783709d69740ac3e8c072-free.tar.bz2
/assimp-5.0.1-free.tar.xz
/assimp-5.2.5-free.tar.xz
/assimp-5.3.1-free.tar.xz
/assimp-5.4.3-free.tar.xz
/assimp-6.0.2-free.tar.xz

View file

@ -0,0 +1,24 @@
diff -rupN --no-dereference assimp-6.0.2/code/AssetLib/Q3D/Q3DLoader.cpp assimp-6.0.2-new/code/AssetLib/Q3D/Q3DLoader.cpp
--- assimp-6.0.2/code/AssetLib/Q3D/Q3DLoader.cpp 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/code/AssetLib/Q3D/Q3DLoader.cpp 2025-12-14 20:02:55.733930684 +0100
@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <assimp/DefaultLogger.hpp>
#include <assimp/IOSystem.hpp>
+#include <limits>
+
namespace Assimp {
static constexpr aiImporterDesc desc = {
@@ -309,6 +311,11 @@ void Q3DImporter::InternReadFile(const s
throw DeadlyImportError("Quick3D: Invalid texture. Width or height is zero");
}
+ const unsigned int uint_max = std::numeric_limits<unsigned int>::max();
+ if (tex->mWidth > (uint_max / tex->mHeight)) {
+ throw DeadlyImportError("Quick3D: Texture dimensions are too large, resulting in overflow.");
+ }
+
unsigned int mul = tex->mWidth * tex->mHeight;
aiTexel *begin = tex->pcData = new aiTexel[mul];
aiTexel *const end = &begin[mul - 1] + 1;

View file

@ -1,12 +0,0 @@
diff -up ./CMakeLists.txt.assimpversion ./CMakeLists.txt
--- ./CMakeLists.txt.assimpversion 2020-06-23 20:40:43.160107355 -0400
+++ ./CMakeLists.txt 2020-06-23 20:41:03.435259223 -0400
@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED)
add_definitions(-DASSIMP_USE_HUNTER)
ENDIF(HUNTER_ENABLED)
-PROJECT( Assimp VERSION 5.0.0 )
+PROJECT( Assimp VERSION 5.0.1 )
# All supported options ###############################################

View file

@ -1,21 +0,0 @@
diff -up ./doc/Doxyfile.in.doxyfile ./doc/Doxyfile.in
--- ./doc/Doxyfile.in.doxyfile 2020-01-12 06:56:40.000000000 -0500
+++ ./doc/Doxyfile.in 2021-02-27 18:12:22.953572564 -0500
@@ -664,7 +664,6 @@ WARN_LOGFILE =
INPUT = @doxy_main_page@ \
@PROJECT_SOURCE_DIR@ \
- @PROJECT_BINARY_DIR@ \
@PROJECT_SOURCE_DIR@/include/ \
@PROJECT_SOURCE_DIR@/doc/dox.h \
@PROJECT_SOURCE_DIR@/code/BaseImporter.h
@@ -725,7 +724,8 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE = irrXML.h
+EXCLUDE = irrXML.h \
+ @PROJECT_BINARY_DIR@
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded

View file

@ -1,46 +0,0 @@
diff -up ./code/X3D/FIReader.cpp.irrxml ./code/X3D/FIReader.cpp
--- ./code/X3D/FIReader.cpp.irrxml 2020-01-12 06:56:40.000000000 -0500
+++ ./code/X3D/FIReader.cpp 2021-03-07 20:38:31.402545036 -0500
@@ -60,11 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <assimp/types.h>
#include <assimp/MemoryIOWrapper.h>
#include <assimp/irrXMLWrapper.h>
-#ifdef ASSIMP_USE_HUNTER
-# include <utf8/utf8.h>
-#else
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
+#include <utf8.h>
#include <assimp/fast_atof.h>
#include <stack>
#include <map>
@@ -654,7 +650,7 @@ public:
return currentNodeType;
}
- virtual int getAttributeCount() const /*override*/ {
+ virtual unsigned int getAttributeCount() const /*override*/ {
return static_cast<int>(attributes.size());
}
@@ -1733,7 +1729,7 @@ public:
return reader->getNodeType();
}
- virtual int getAttributeCount() const /*override*/ {
+ virtual unsigned int getAttributeCount() const /*override*/ {
return reader->getAttributeCount();
}
diff -up ./include/assimp/irrXMLWrapper.h.irrxml ./include/assimp/irrXMLWrapper.h
--- ./include/assimp/irrXMLWrapper.h.irrxml 2020-01-12 06:56:40.000000000 -0500
+++ ./include/assimp/irrXMLWrapper.h 2021-03-07 20:38:15.760525926 -0500
@@ -133,7 +133,7 @@ public:
// ----------------------------------------------------------------------------------
//! Returns size of file in bytes
- virtual int getSize() {
+ virtual long getSize() const {
return (int)data.size();
}

View file

@ -1,134 +0,0 @@
diff -uNr a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
--- a/assimpTargets-debug.cmake.in 2020-01-12 03:56:40.000000000 -0800
+++ b/assimpTargets-debug.cmake.in 2021-03-23 12:45:13.392725131 -0700
@@ -7,6 +7,14 @@
set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+
+if ("${LIB64}" STREQUAL "TRUE")
+ set(LIBSUFFIX 64)
+else()
+ set(LIBSUFFIX "")
+endif()
+
if(MSVC)
if(MSVC_TOOLSET_VERSION)
set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
@@ -42,11 +50,11 @@
# Import target "assimp::assimp" for configuration "Debug"
set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
+ IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}"
IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}")
list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
else()
set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
@@ -54,10 +62,10 @@
# Import target "assimp::assimp" for configuration "Debug"
set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
+ IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}")
endif()
else()
@@ -66,17 +74,17 @@
set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
set_target_properties(assimp::assimp PROPERTIES
IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
+ IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" )
else()
set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
+ IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" )
endif()
endif()
diff -uNr a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
--- a/assimpTargets-release.cmake.in 2020-01-12 03:56:40.000000000 -0800
+++ b/assimpTargets-release.cmake.in 2021-03-23 12:45:40.323586653 -0700
@@ -7,6 +7,14 @@
set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+
+if ("${LIB64}" STREQUAL "TRUE")
+ set(LIBSUFFIX 64)
+else()
+ set(LIBSUFFIX "")
+endif()
+
if(MSVC)
if(MSVC_TOOLSET_VERSION)
set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
@@ -42,11 +50,11 @@
# Import target "assimp::assimp" for configuration "Release"
set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
+ IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}"
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}")
list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
else()
set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
@@ -54,10 +62,10 @@
# Import target "assimp::assimp" for configuration "Release"
set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}")
endif()
else()
@@ -70,17 +78,17 @@
endif()
set_target_properties(assimp::assimp PROPERTIES
IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" )
else()
set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
set_target_properties(assimp::assimp PROPERTIES
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}"
)
list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" )
endif()
endif()

View file

@ -1,14 +0,0 @@
diff -up ./assimp.pc.in.pkgconfig ./assimp.pc.in
--- ./assimp.pc.in.pkgconfig 2021-02-27 18:08:34.032990798 -0500
+++ ./assimp.pc.in 2021-02-27 18:09:21.019110197 -0500
@@ -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=@ASSIMP_BIN_INSTALL_DIR@
+libdir=@ASSIMP_LIB_INSTALL_DIR@
+includedir=@ASSIMP_INCLUDE_INSTALL_DIR@/assimp
Name: @CMAKE_PROJECT_NAME@
Description: Import various well-known 3D model formats in an uniform manner.

View file

@ -1,281 +0,0 @@
diff -up ./CMakeLists.txt.unbundle ./CMakeLists.txt
--- ./CMakeLists.txt.unbundle 2020-01-12 06:56:40.000000000 -0500
+++ ./CMakeLists.txt 2021-02-27 15:46:23.408557445 -0500
@@ -485,6 +485,27 @@ IF ( ASSIMP_NO_EXPORT )
MESSAGE( STATUS "Build an import-only version of Assimp." )
ENDIF( ASSIMP_NO_EXPORT )
+# Search for poly2tri
+FIND_LIBRARY(POLY2TRI_LIB poly2tri HINTS ${POLY2TRI_LIB_PATH})
+FIND_FILE(POLY2TRI_H poly2tri.h PATHS ${POLY2TRI_INCLUDE_PATH})
+IF (POLY2TRI_LIB AND POLY2TRI_H)
+ message(status "Found External poly2tri")
+ SET(HAVE_POLY2TRI true)
+ELSE(POLY2TRI_LIB AND POLY2TRI_H)
+ SET(HAVE_POLY2TRI false)
+ENDIF(POLY2TRI_LIB AND POLY2TRI_H)
+
+# Search for clipper
+FIND_LIBRARY(CLIPPER_LIB polyclipping HINTS ${CLIPPER_LIB_PATH})
+FIND_FILE(CLIPPER_H clipper.hpp PATHS ${CLIPPER_INCLUDE_PATH})
+IF (CLIPPER_LIB AND CLIPPER_H)
+ message(status "Found External clipper")
+ SET(HAVE_CLIPPER true)
+ELSE(CLIPPER_LIB AND CLIPPER_H)
+ SET(HAVE_CLIPPER false)
+ENDIF(CLIPPER_LIB AND CLIPPER_H)
+
+
SET ( ASSIMP_BUILD_ARCHITECTURE "" CACHE STRING
"describe the current architecture."
)
diff -up ./code/Blender/BlenderTessellator.h.unbundle ./code/Blender/BlenderTessellator.h
--- ./code/Blender/BlenderTessellator.h.unbundle 2020-01-12 06:56:40.000000000 -0500
+++ ./code/Blender/BlenderTessellator.h 2021-02-27 15:46:23.408557445 -0500
@@ -144,11 +144,7 @@ namespace Assimp
#if ASSIMP_BLEND_WITH_POLY_2_TRI
-#ifdef ASSIMP_USE_HUNTER
# include <poly2tri/poly2tri.h>
-#else
-# include "../contrib/poly2tri/poly2tri/poly2tri.h"
-#endif
namespace Assimp
{
diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt
--- ./code/CMakeLists.txt.unbundle 2020-01-12 06:56:40.000000000 -0500
+++ ./code/CMakeLists.txt 2021-02-27 15:46:23.408557445 -0500
@@ -874,7 +874,7 @@ IF(HUNTER_ENABLED)
hunter_add_package(utf8)
find_package(utf8 CONFIG REQUIRED)
ELSE(HUNTER_ENABLED)
- # utf8 is header-only, so Assimp doesn't need to do anything.
+ find_package(utf8cpp)
ENDIF(HUNTER_ENABLED)
# polyclipping
@@ -882,11 +882,11 @@ IF(HUNTER_ENABLED)
hunter_add_package(polyclipping)
find_package(polyclipping CONFIG REQUIRED)
ELSE(HUNTER_ENABLED)
- SET( Clipper_SRCS
- ../contrib/clipper/clipper.hpp
- ../contrib/clipper/clipper.cpp
- )
- SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS})
+ SET( Clipper_SRCS
+ ../contrib/clipper/clipper.hpp
+ ../contrib/clipper/clipper.cpp
+ )
+ SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS})
ENDIF(HUNTER_ENABLED)
# poly2tri
@@ -894,20 +894,25 @@ IF(HUNTER_ENABLED)
hunter_add_package(poly2tri)
find_package(poly2tri CONFIG REQUIRED)
ELSE(HUNTER_ENABLED)
- SET( Poly2Tri_SRCS
- ../contrib/poly2tri/poly2tri/common/shapes.cc
- ../contrib/poly2tri/poly2tri/common/shapes.h
- ../contrib/poly2tri/poly2tri/common/utils.h
- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h
- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc
- ../contrib/poly2tri/poly2tri/sweep/cdt.cc
- ../contrib/poly2tri/poly2tri/sweep/cdt.h
- ../contrib/poly2tri/poly2tri/sweep/sweep.cc
- ../contrib/poly2tri/poly2tri/sweep/sweep.h
- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc
- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h
- )
- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS})
+ if (HAVE_POLY2TRI)
+ include_directories(${POLY2TRI_INCLUDE_PATH})
+ set(Poly2Tri_SRCS "")
+ elseif(HAVE_POLY2TRI)
+ SET( Poly2Tri_SRCS
+ ../contrib/poly2tri/poly2tri/common/shapes.cc
+ ../contrib/poly2tri/poly2tri/common/shapes.h
+ ../contrib/poly2tri/poly2tri/common/utils.h
+ ../contrib/poly2tri/poly2tri/sweep/advancing_front.h
+ ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc
+ ../contrib/poly2tri/poly2tri/sweep/cdt.cc
+ ../contrib/poly2tri/poly2tri/sweep/cdt.h
+ ../contrib/poly2tri/poly2tri/sweep/sweep.cc
+ ../contrib/poly2tri/poly2tri/sweep/sweep.h
+ ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc
+ ../contrib/poly2tri/poly2tri/sweep/sweep_context.h
+ )
+ SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS})
+ endif(HAVE_POLY2TRI)
ENDIF(HUNTER_ENABLED)
# minizip/unzip
@@ -915,14 +920,19 @@ IF(HUNTER_ENABLED)
hunter_add_package(minizip)
find_package(minizip CONFIG REQUIRED)
ELSE(HUNTER_ENABLED)
- SET( unzip_SRCS
- ../contrib/unzip/crypt.h
- ../contrib/unzip/ioapi.c
- ../contrib/unzip/ioapi.h
- ../contrib/unzip/unzip.c
- ../contrib/unzip/unzip.h
- )
- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS})
+ #if (MINIZIP_FOUND)
+ # SET( unzip_SRCS "")
+ # INCLUDE_DIRECTORIES(${MINIZIP_INCLUDE_DIRS})
+ #elseif(MINIZIP_FOUND)
+ SET( unzip_SRCS
+ ../contrib/unzip/crypt.h
+ ../contrib/unzip/ioapi.c
+ ../contrib/unzip/ioapi.h
+ ../contrib/unzip/unzip.c
+ ../contrib/unzip/unzip.h
+ )
+ SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS})
+ #endif(HAVE_MINIZIP)
ENDIF(HUNTER_ENABLED)
# zip (https://github.com/kuba--/zip)
@@ -1025,8 +1035,9 @@ IF(HUNTER_ENABLED)
hunter_add_package(RapidJSON)
find_package(RapidJSON CONFIG REQUIRED)
ELSE(HUNTER_ENABLED)
- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" )
- INCLUDE_DIRECTORIES( "../contrib" )
+ find_package(RapidJSON REQUIRED)
+ include_directories(${RapidJSON_INCLUDE_DIRS})
+ include_directories("../contrib")
ENDIF(HUNTER_ENABLED)
# VC2010 fixes
@@ -1118,7 +1129,7 @@ IF(HUNTER_ENABLED)
irrXML::irrXML
openddlparser::openddl_parser
poly2tri::poly2tri
- minizip::minizip
+ #minizip::minizip
ZLIB::zlib
RapidJSON::rapidjson
utf8::utf8
@@ -1126,6 +1137,13 @@ IF(HUNTER_ENABLED)
)
ELSE(HUNTER_ENABLED)
TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} )
+ IF (HAVE_POLY2TRI)
+ TARGET_LINK_LIBRARIES(assimp ${POLY2TRI_LIB})
+ ENDIF(HAVE_POLY2TRI)
+
+ IF (HAVE_CLIPPER)
+ TARGET_LINK_LIBRARIES(assimp ${CLIPPER_LIB})
+ ENDIF (HAVE_CLIPPER)
ENDIF(HUNTER_ENABLED)
if(ASSIMP_ANDROID_JNIIOSYSTEM)
diff -up ./code/Common/BaseImporter.cpp.unbundle ./code/Common/BaseImporter.cpp
--- ./code/Common/BaseImporter.cpp.unbundle 2021-02-27 15:47:27.432812387 -0500
+++ ./code/Common/BaseImporter.cpp 2021-02-27 15:47:58.526936201 -0500
@@ -341,11 +341,7 @@ std::string BaseImporter::GetExtension(
return false;
}
-#ifdef ASSIMP_USE_HUNTER
-# include <utf8/utf8.h>
-#else
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
+# include <utf8.h>
// ------------------------------------------------------------------------------------------------
// Convert to UTF8 data
diff -up ./code/Importer/IFC/IFCGeometry.cpp.unbundle ./code/Importer/IFC/IFCGeometry.cpp
--- ./code/Importer/IFC/IFCGeometry.cpp.unbundle 2020-01-12 06:56:40.000000000 -0500
+++ ./code/Importer/IFC/IFCGeometry.cpp 2021-02-27 15:46:23.408557445 -0500
@@ -49,13 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "Common/PolyTools.h"
#include "PostProcessing/ProcessHelper.h"
-#ifdef ASSIMP_USE_HUNTER
-# include <poly2tri/poly2tri.h>
-# include <polyclipping/clipper.hpp>
-#else
-# include "../contrib/poly2tri/poly2tri/poly2tri.h"
-# include "../contrib/clipper/clipper.hpp"
-#endif
+#include <poly2tri/poly2tri.h>
+#include <../contrib/clipper/clipper.hpp>
#include <memory>
#include <iterator>
diff -up ./code/Importer/IFC/IFCOpenings.cpp.unbundle ./code/Importer/IFC/IFCOpenings.cpp
--- ./code/Importer/IFC/IFCOpenings.cpp.unbundle 2020-01-12 06:56:40.000000000 -0500
+++ ./code/Importer/IFC/IFCOpenings.cpp 2021-02-27 15:46:23.409557449 -0500
@@ -49,13 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "Common/PolyTools.h"
#include "PostProcessing/ProcessHelper.h"
-#ifdef ASSIMP_USE_HUNTER
-# include <poly2tri/poly2tri.h>
-# include <polyclipping/clipper.hpp>
-#else
-# include "../contrib/poly2tri/poly2tri/poly2tri.h"
-# include "../contrib/clipper/clipper.hpp"
-#endif
+#include <poly2tri/poly2tri.h>
+#include <../contrib/clipper/clipper.hpp>
#include <iterator>
diff -up ./code/Importer/STEPParser/STEPFileEncoding.cpp.unbundle ./code/Importer/STEPParser/STEPFileEncoding.cpp
--- ./code/Importer/STEPParser/STEPFileEncoding.cpp.unbundle 2021-02-27 15:48:15.993005751 -0500
+++ ./code/Importer/STEPParser/STEPFileEncoding.cpp 2021-02-27 15:48:37.161090042 -0500
@@ -45,11 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
*/
#include "STEPFileEncoding.h"
#include <assimp/fast_atof.h>
-#ifdef ASSIMP_USE_HUNTER
-# include <utf8/utf8.h>
-#else
-# include <contrib/utf8cpp/source/utf8.h>
-#endif
+#include <utf8.h>
#include <memory>
diff -up ./code/MMD/MMDPmxParser.cpp.unbundle ./code/MMD/MMDPmxParser.cpp
--- ./code/MMD/MMDPmxParser.cpp.unbundle 2021-02-27 15:50:16.110484046 -0500
+++ ./code/MMD/MMDPmxParser.cpp 2021-02-27 15:50:57.573649134 -0500
@@ -42,11 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <utility>
#include "MMDPmxParser.h"
#include <assimp/StringUtils.h>
-#ifdef ASSIMP_USE_HUNTER
-# include <utf8/utf8.h>
-#else
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
+#include <utf8.h>
#include <assimp/Exceptional.h>
namespace pmx
diff -up ./code/SIB/SIBImporter.cpp.unbundle ./code/SIB/SIBImporter.cpp
--- ./code/SIB/SIBImporter.cpp.unbundle 2021-02-27 15:48:54.037157241 -0500
+++ ./code/SIB/SIBImporter.cpp 2021-02-27 15:49:24.194277325 -0500
@@ -59,12 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <assimp/ByteSwapper.h>
#include <assimp/StreamReader.h>
#include <assimp/TinyFormatter.h>
-#ifdef ASSIMP_USE_HUNTER
-# include <utf8/utf8.h>
-#else
-//# include "../contrib/ConvertUTF/ConvertUTF.h"
-# include "../contrib/utf8cpp/source/utf8.h"
-#endif
+#include <utf8.h>
#include <assimp/IOSystem.hpp>
#include <assimp/DefaultLogger.hpp>
#include <assimp/scene.h>

37
assimp-docs.patch Normal file
View file

@ -0,0 +1,37 @@
diff -rupN --no-dereference assimp-6.0.2/doc/CMakeLists.txt assimp-6.0.2-new/doc/CMakeLists.txt
--- assimp-6.0.2/doc/CMakeLists.txt 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/doc/CMakeLists.txt 2025-08-17 10:36:53.475374100 +0200
@@ -33,9 +33,9 @@ if( DEFINED CMAKE_INSTALL_DOCDIR )
DESTINATION ${CMAKE_INSTALL_DOCDIR}
)
install(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.png
- ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.svg
- ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/dragonsplash.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/architecture/AnimationOverview.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/architecture/AnimationOverview.svg
+ ${CMAKE_CURRENT_SOURCE_DIR}/images/dragonsplash.png
DESTINATION ${CMAKE_INSTALL_DOCDIR}/${HTML_OUTPUT}
)
endif()
diff -rupN --no-dereference assimp-6.0.2/doc/Doxyfile.in assimp-6.0.2-new/doc/Doxyfile.in
--- assimp-6.0.2/doc/Doxyfile.in 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/doc/Doxyfile.in 2025-08-17 10:36:53.474954432 +0200
@@ -952,7 +952,7 @@ RECURSIVE = NO
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE =
+EXCLUDE = @PROJECT_BINARY_DIR@
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -1221,7 +1221,7 @@ GENERATE_HTML = YES
# The default directory is: html.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_OUTPUT = html
+HTML_OUTPUT = AssimpDoc_Html
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
# generated HTML page (for example: .htm, .php, .asp).

12
assimp-nozlib.patch Normal file
View file

@ -0,0 +1,12 @@
diff -rupN --no-dereference assimp-6.0.2/contrib/zlib/CMakeLists.txt assimp-6.0.2-new/contrib/zlib/CMakeLists.txt
--- assimp-6.0.2/contrib/zlib/CMakeLists.txt 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/contrib/zlib/CMakeLists.txt 2025-08-17 10:36:53.187611066 +0200
@@ -196,7 +196,7 @@ if(MINGW)
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif(MINGW)
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic OBJECT ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
IF(ASSIMP_INSTALL)
INSTALL( TARGETS zlibstatic

View file

@ -1,15 +1,15 @@
diff -up ./port/PyAssimp/pyassimp/helper.py.pythonpath ./port/PyAssimp/pyassimp/helper.py
--- ./port/PyAssimp/pyassimp/helper.py.pythonpath 2021-02-27 18:03:01.858146645 -0500
+++ ./port/PyAssimp/pyassimp/helper.py 2021-02-27 18:04:18.595341644 -0500
@@ -25,6 +25,7 @@ additional_dirs, ext_whitelist = [],[]
diff -rupN --no-dereference assimp-6.0.2/port/PyAssimp/pyassimp/helper.py assimp-6.0.2-new/port/PyAssimp/pyassimp/helper.py
--- assimp-6.0.2/port/PyAssimp/pyassimp/helper.py 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/port/PyAssimp/pyassimp/helper.py 2025-08-17 10:36:52.891631207 +0200
@@ -29,6 +29,7 @@ additional_dirs, ext_whitelist = [],[]
# depending on the platform we're running on.
if os.name=='posix':
additional_dirs.append('./')
+ additional_dirs.append('/usr/lib64/')
additional_dirs.append('/usr/lib/')
additional_dirs.append('/usr/lib/x86_64-linux-gnu/')
additional_dirs.append('/usr/local/lib/')
@@ -44,6 +45,7 @@ if os.name=='posix':
additional_dirs.append('/usr/lib/aarch64-linux-gnu/')
@@ -54,6 +55,7 @@ if os.name=='posix':
# currently there's always a symlink called
# libassimp.so in /usr/local/lib.
ext_whitelist.append('.so')

28
assimp-tests.patch Normal file
View file

@ -0,0 +1,28 @@
diff -rupN --no-dereference assimp-6.0.2/CMakeLists.txt assimp-6.0.2-new/CMakeLists.txt
--- assimp-6.0.2/CMakeLists.txt 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/CMakeLists.txt 2025-08-17 10:36:53.765126531 +0200
@@ -813,6 +813,7 @@ IF ( ASSIMP_BUILD_SAMPLES )
ENDIF ()
IF ( ASSIMP_BUILD_TESTS )
+ ENABLE_TESTING()
ADD_SUBDIRECTORY( test/ )
ENDIF ()
diff -rupN --no-dereference assimp-6.0.2/test/CMakeLists.txt assimp-6.0.2-new/test/CMakeLists.txt
--- assimp-6.0.2/test/CMakeLists.txt 2025-08-17 10:36:52.887323815 +0200
+++ assimp-6.0.2-new/test/CMakeLists.txt 2025-08-17 10:36:53.765489323 +0200
@@ -36,6 +36,7 @@
#
#----------------------------------------------------------------------
cmake_minimum_required( VERSION 3.10 )
+include(GoogleTest)
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/test/unit
@@ -267,4 +268,4 @@ target_link_libraries( unit assimp ${pla
add_subdirectory(headercheck)
-add_test( unittests unit )
+gtest_discover_tests(unit)

248
assimp-unbundle.patch Normal file
View file

@ -0,0 +1,248 @@
diff -rupN --no-dereference assimp-6.0.2/code/AssetLib/Blender/BlenderTessellator.h assimp-6.0.2-new/code/AssetLib/Blender/BlenderTessellator.h
--- assimp-6.0.2/code/AssetLib/Blender/BlenderTessellator.h 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/code/AssetLib/Blender/BlenderTessellator.h 2025-08-18 20:15:00.250159883 +0200
@@ -143,7 +143,7 @@ namespace Assimp
#if ASSIMP_BLEND_WITH_POLY_2_TRI
-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+#include <poly2tri/poly2tri.h>
namespace Assimp
{
diff -rupN --no-dereference assimp-6.0.2/code/AssetLib/IFC/IFCGeometry.cpp assimp-6.0.2-new/code/AssetLib/IFC/IFCGeometry.cpp
--- assimp-6.0.2/code/AssetLib/IFC/IFCGeometry.cpp 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/code/AssetLib/IFC/IFCGeometry.cpp 2025-08-18 20:15:00.250503229 +0200
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "IFCUtil.h"
#include "Common/PolyTools.h"
#include "PostProcessing/ProcessHelper.h"
-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+#include <poly2tri/poly2tri.h>
#include "contrib/clipper/clipper.hpp"
#include <iterator>
diff -rupN --no-dereference assimp-6.0.2/code/AssetLib/IFC/IFCOpenings.cpp assimp-6.0.2-new/code/AssetLib/IFC/IFCOpenings.cpp
--- assimp-6.0.2/code/AssetLib/IFC/IFCOpenings.cpp 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/code/AssetLib/IFC/IFCOpenings.cpp 2025-08-18 20:15:00.250876754 +0200
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "IFCUtil.h"
#include "Common/PolyTools.h"
#include "PostProcessing/ProcessHelper.h"
-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+#include <poly2tri/poly2tri.h>
#include "contrib/clipper/clipper.hpp"
#include <deque>
diff -rupN --no-dereference assimp-6.0.2/code/CMakeLists.txt assimp-6.0.2-new/code/CMakeLists.txt
--- assimp-6.0.2/code/CMakeLists.txt 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/code/CMakeLists.txt 2025-08-18 20:15:00.254124936 +0200
@@ -1120,13 +1120,7 @@ IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(pugixml)
find_package(pugixml CONFIG REQUIRED)
ELSEIF(NOT TARGET pugixml::pugixml)
- SET( Pugixml_SRCS
- ../contrib/pugixml/src/pugiconfig.hpp
- ../contrib/pugixml/src/pugixml.cpp
- ../contrib/pugixml/src/pugixml.hpp
- )
- INCLUDE_DIRECTORIES("../contrib/pugixml/src")
- SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
+ find_package(pugixml REQUIRED)
ENDIF()
# utf8
@@ -1134,7 +1128,7 @@ IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(utf8)
find_package(utf8cpp CONFIG REQUIRED)
ELSE()
- INCLUDE_DIRECTORIES("../contrib/utf8cpp/source")
+ find_package(utf8cpp CONFIG REQUIRED)
ENDIF()
# polyclipping
@@ -1150,10 +1144,10 @@ ENDIF()
#ENDIF()
# poly2tri
-#IF(ASSIMP_HUNTER_ENABLED)
-# hunter_add_package(poly2tri)
-# find_package(poly2tri CONFIG REQUIRED)
-#ELSE()
+IF(HAVE_POLY2TRI)
+ include_directories(${POLY2TRI_INCLUDE_PATH})
+ set(Poly2Tri_SRCS "")
+ELSE()
SET( Poly2Tri_SRCS
../contrib/poly2tri/poly2tri/common/shapes.cc
../contrib/poly2tri/poly2tri/common/shapes.h
@@ -1168,13 +1162,13 @@ ENDIF()
../contrib/poly2tri/poly2tri/sweep/sweep_context.h
)
SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS})
-#ENDIF()
+ENDIF()
# minizip/unzip
-IF(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(minizip)
- find_package(minizip CONFIG REQUIRED)
-ELSE()
+#IF(ASSIMP_HUNTER_ENABLED)
+# hunter_add_package(minizip)
+# find_package(minizip CONFIG REQUIRED)
+#ELSE()
SET( unzip_SRCS
../contrib/unzip/crypt.h
../contrib/unzip/ioapi.c
@@ -1183,7 +1177,7 @@ ELSE()
../contrib/unzip/unzip.h
)
SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS})
-ENDIF()
+#ENDIF()
# zip (https://github.com/kuba--/zip)
separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED})
@@ -1279,6 +1273,7 @@ ENDIF ()
IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR WIN32))
SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 )
ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 )
+ INCLUDE_DIRECTORIES( "../contrib" )
ELSE ()
SET (open3dgc_SRCS "")
MESSAGE (INFO " Hunter enabled or RT-extension not found. glTF import/export will be built without Open3DGC-compression.")
@@ -1290,7 +1285,8 @@ IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(RapidJSON)
find_package(RapidJSON CONFIG REQUIRED)
ELSE()
- INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
+ find_package(RapidJSON REQUIRED)
+ include_directories(${RapidJSON_INCLUDE_DIRS})
ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
@@ -1303,11 +1299,6 @@ IF(ASSIMP_HUNTER_ENABLED)
hunter_add_package(stb)
find_package(stb CONFIG REQUIRED)
ELSE()
- SET( stb_SRCS
- ../contrib/stb/stb_image.h
- )
- INCLUDE_DIRECTORIES("../contrib")
- SOURCE_GROUP( Contrib\\stb FILES ${stb_SRCS})
ENDIF()
# VC2010 fixes
@@ -1489,7 +1480,6 @@ IF(ASSIMP_HUNTER_ENABLED)
TARGET_LINK_LIBRARIES(assimp
PUBLIC
openddlparser::openddl_parser
- minizip::minizip
ZLIB::zlib
RapidJSON::rapidjson
utf8cpp
@@ -1508,9 +1498,16 @@ ELSE()
if (ASSIMP_BUILD_DRACO)
target_link_libraries(assimp ${draco_LIBRARIES})
endif()
- if(TARGET pugixml::pugixml)
- target_link_libraries(assimp pugixml::pugixml)
- endif()
+
+ TARGET_LINK_LIBRARIES(assimp pugixml)
+
+ IF (HAVE_POLY2TRI)
+ TARGET_LINK_LIBRARIES(assimp ${POLY2TRI_LIB})
+ ENDIF()
+
+ IF (HAVE_CLIPPER)
+ TARGET_LINK_LIBRARIES(assimp ${CLIPPER_LIB})
+ ENDIF()
ENDIF()
if(ASSIMP_ANDROID_JNIIOSYSTEM)
diff -rupN --no-dereference assimp-6.0.2/code/PostProcessing/TriangulateProcess.cpp assimp-6.0.2-new/code/PostProcessing/TriangulateProcess.cpp
--- assimp-6.0.2/code/PostProcessing/TriangulateProcess.cpp 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/code/PostProcessing/TriangulateProcess.cpp 2025-08-18 20:15:00.251686318 +0200
@@ -62,7 +62,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "PostProcessing/TriangulateProcess.h"
#include "PostProcessing/ProcessHelper.h"
#include "Common/PolyTools.h"
-#include "contrib/earcut-hpp/earcut.hpp"
+#include <mapbox/earcut.hpp>
#include <memory>
#include <cstdint>
diff -rupN --no-dereference assimp-6.0.2/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp assimp-6.0.2-new/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
--- assimp-6.0.2/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp 2025-08-18 20:15:00.252020642 +0200
@@ -24,7 +24,7 @@
#endif // _MSC_VER
#define STB_IMAGE_IMPLEMENTATION
-#include "contrib/stb/stb_image.h"
+#include "stb_image.h"
#ifdef _MSC_VER
#pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter'
diff -rupN --no-dereference assimp-6.0.2/test/CMakeLists.txt assimp-6.0.2-new/test/CMakeLists.txt
--- assimp-6.0.2/test/CMakeLists.txt 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/test/CMakeLists.txt 2025-08-18 20:15:00.253409037 +0200
@@ -43,14 +43,6 @@ INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/code
)
-if(NOT ASSIMP_HUNTER_ENABLED)
- INCLUDE_DIRECTORIES(
- ${Assimp_SOURCE_DIR}/contrib/googletest/googletest/include
- ${Assimp_SOURCE_DIR}/contrib/googletest/googletest/
- ${Assimp_SOURCE_DIR}/contrib/pugixml/src
- )
-endif()
-
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
endif()
@@ -234,26 +226,11 @@ add_executable( unit
${POST_PROCESSES}
)
-if(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(GTest)
- find_package(GTest CONFIG REQUIRED)
- target_link_libraries(unit GTest::gtest_main GTest::gmock)
-else()
- target_sources(unit PUBLIC ${Assimp_SOURCE_DIR}/contrib/googletest/googletest/src/gtest-all.cc)
-endif()
+find_package(GTest CONFIG REQUIRED)
+target_link_libraries(unit GTest::gtest_main GTest::gmock)
# RapidJSON
-IF(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(RapidJSON)
- find_package(RapidJSON CONFIG REQUIRED)
-ELSE()
- INCLUDE_DIRECTORIES("../contrib/rapidjson/include")
- ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1)
- option( ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR "Suppress rapidjson warning on MSVC (NOTE: breaks android build)" ON )
- if(ASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR)
- ADD_DEFINITIONS( -DRAPIDJSON_NOMEMBERITERATORCLASS )
- endif()
-ENDIF()
+find_package(RapidJSON CONFIG REQUIRED)
IF (ASSIMP_BUILD_DRACO)
ADD_DEFINITIONS( -DASSIMP_ENABLE_DRACO )
diff -rupN --no-dereference assimp-6.0.2/test/unit/utglTF2ImportExport.cpp assimp-6.0.2-new/test/unit/utglTF2ImportExport.cpp
--- assimp-6.0.2/test/unit/utglTF2ImportExport.cpp 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/test/unit/utglTF2ImportExport.cpp 2025-08-18 20:15:00.253778700 +0200
@@ -986,7 +986,7 @@ namespace {
rapidjson::Document schemaDoc;
schemaDoc.Parse(R"==({"properties":{"scene" : { "type" : "integer" }}, "required": [ "scene" ]})==");
EXPECT_FALSE(schemaDoc.HasParseError());
- m_schema.reset(new rapidjson::SchemaDocument(schemaDoc, m_schemaName.c_str(), static_cast<rapidjson::SizeType>(m_schemaName.size()), this));
+ m_schema.reset(new rapidjson::SchemaDocument(schemaDoc, 0, 0, this));
}
const rapidjson::SchemaDocument* GetRemoteDocument(const char* uri, rapidjson::SizeType) override {

View file

@ -1,18 +1,19 @@
%undefine __cmake_in_source_build
%define soversion 6
Name: assimp
Version: 5.0.1
Release: 3%{?dist}
Version: 6.0.2
Release: 6%{?dist}
Summary: Library to import various 3D model formats into applications
# Assimp is BSD
# Bundled contrib/clipper is Boost
# Bundled contrib/Open3DGC is MIT
# Bundled contrib/openddlparser is MIT
# Bundled contrib/stb_image is MIT
# Bundled contrib/stb is MIT
# Bundled contrib/unzip is zlib
# Bundled contrib/zip is unlicense
# Bundled contrib/zlib is zlib
License: BSD and MIT and Boost and unlicense and zlib
License: BSD-3-Clause AND MIT AND BSL-1.0 AND Unlicense AND Zlib
URL: https://github.com/assimp/assimp
# Github releases include nonfree models, source tarball must be re-generated
@ -20,47 +21,53 @@ URL: https://github.com/assimp/assimp
Source0: %{name}-%{version}-free.tar.xz
Source1: assimp_generate_tarball.sh
# Un-bundle libraries that are provided by the distribution.
Patch0: %{name}-5.0.1-unbundle.patch
# Un-bundle poly2tri, pugixml, utf8cpp, RapidJSON, clipper
Patch0: %{name}-unbundle.patch
# Add /usr/lib64 to library lookup paths for python modules
Patch1: %{name}-5.0.1-pythonpath.patch
# Correct the paths in the installed pkgconfig file
Patch2: %{name}-5.0.1-pkgconfig.patch
Patch1: %{name}-pythonpath.patch
# Prevent export of bundled zlibstatic library
Patch2: %{name}-nozlib.patch
# Exclude the build directory from the doxygen-generated documentation
Patch3: %{name}-5.0.1-doxyfile.patch
# Updates for changes in irrxml's API
Patch4: %{name}-5.0.1-irrxml.patch
# Correct the CMake version to match the tarball version.
Patch5: %{name}-5.0.1-assimpversion.patch
# Correct the library installation location
Patch6: %{name}-5.0.1-lib-dir.patch
# Fix HTML_OUTPUT dir in doxyfile
# Fix installing images from doc/architecture
Patch3: %{name}-docs.patch
# Enable ctest
Patch4: %{name}-tests.patch
# Backport fix for CVE-2025-11277
Patch5: https://github.com/assimp/assimp/commit/0978918f7148fbcd3d05cc6573dae7859975a895.patch
# PyAssimp: Re-add 'aiProcess_Triangulate' (#2423174)
Patch6: https://github.com/assimp/assimp/commit/dd98d4aea3d9d2b3544540ea44eeb15c3616dbb7.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: doxygen
BuildRequires: irrlicht-devel
BuildRequires: irrXML-devel
BuildRequires: earcut-hpp-devel
BuildRequires: gcc-c++
BuildRequires: gtest-devel
BuildRequires: make
BuildRequires: pkgconfig(zzip-zlib-config)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(python3)
BuildRequires: poly2tri-devel
BuildRequires: pugixml-devel
BuildRequires: python3-devel
BuildRequires: zlib-devel
# Need to BR -static packages for header-only libraries for tracking, per
# guidelines
BuildRequires: rapidjson-devel
BuildRequires: rapidjson-static
BuildRequires: stb_image-devel
BuildRequires: stb_image-static
BuildRequires: utf8cpp-devel
BuildRequires: utf8cpp-static
# Incompatible - https://github.com/assimp/assimp/issues/788
#BuildRequires: pkgconfig(polyclipping)
Provides: bundled(polyclipping) = 4.8.8
Provides: bundled(open3dgc)
Provides: bundled(openddl-parser)
Provides: bundled(stb_image)
Provides: bundled(unzip)
Provides: bundled(minzip)
Provides: bundled(zlib)
%description
Assimp, the Open Asset Import Library, is a free library to import
@ -69,27 +76,27 @@ to provide a full asset conversion pipeline for use in game
engines and real-time rendering systems, but is not limited
to these applications.
%package devel
Summary: Header files and libraries for assimp
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: poly2tri-devel
Requires: pugixml-devel
%description devel
This package contains the header files and libraries
for assimp. If you would like to develop programs using assimp,
you will need to install assimp-devel.
%if 0%{?fedora} || 0%{?rhel} > 7
%package -n python3-%{name}
Summary: Python 3 bindings for assimp
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: python3
Provides: %{name}-python3 = %{version}-%{release}
Obsoletes: %{name}-python3 < 3.1.1
%description -n python3-%{name}
This package contains the PyAssimp3 python bindings
%endif
%package doc
Summary: Assimp documentation
@ -98,79 +105,177 @@ BuildArch: noarch
%description doc
%{summary}.
%prep
%setup -q
# Get rid of bundled libs so we can't accidently build against them
rm -r contrib/android-cmake
rm -r contrib/irrXML
rm -r contrib/poly2tri
rm -r contrib/rapidjson
rm -r contrib/utf8cpp
%patch0 -p1 -b .unbundle
%patch1 -p1 -b .pythonpath
%patch2 -p1 -b .pkgconfig
%patch3 -p1 -b .doxyfile
%patch4 -p1 -b .irrxml
%patch5 -p1 -b .assimpversion
%patch6 -p1 -b .libdir
%prep
%autosetup -p1 -n %{name}-%{version}
# Get rid of bundled libs so we can't accidently build against them, except:
# - clipper: Unpackaged
# - Open3DGC: Unpackaged
# - openddlparser: Unpackaged
# - tinyusdz: Unpackaged
# - unzip: Modified minizip
# - zip: Modified minizip
find contrib/ -maxdepth 1 -mindepth 1 \
| grep -Ev '(clipper|Open3DGC|openddlparser|tinyusdz|unzip|zip)' \
| xargs rm -r
mv contrib/openddlparser/LICENSE contrib/openddlparser/LICENSE.openddlparser
%build
%cmake \
-DCMAKE_BUILD_TYPE=None \
-DASSIMP_LIB_INSTALL_DIR=%{_lib} \
%ifarch s390x ppc64
-DAI_BUILD_BIG_ENDIAN=TRUE \
%endif
-DBUILD_DOCS=OFF \
-DHTML_OUTPUT=%{name}-%{version} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir} \
-DASSIMP_WARNINGS_AS_ERRORS=OFF \
-DASSIMP_BUILD_ASSIMP_TOOLS=ON \
-DASSIMP_BUILD_DOCS=ON \
-DASSIMP_IGNORE_GIT_HASH=ON \
-DHAVE_POLY2TRI=ON \
-DPOLY2TRI_INCLUDE_PATH=%{_includedir}/poly2tri \
-DSYSTEM_IRRXML=ON \
-DASSIMP_BUILD_ZLIB=ON
-DPOLY2TRI_LIB=poly2tri \
-DCMAKE_INSTALL_DOCDIR=%{_defaultdocdir}/%{name}
# To use system polyclipping if assimp ever becomes compatible:
# -DCLIPPER_INCLUDE_PATH=%{_includedir}/polyclipping
%cmake_build
# Fix file encoding
dos2unix README LICENSE CREDITS port/PyAssimp/README.md
iconv -f iso8859-1 -t utf-8 CREDITS > CREDITS.conv && mv -f CREDITS.conv CREDITS
%install
%cmake_install
mkdir -p %{buildroot}%{python3_sitelib}/pyassimp/
install -m0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyassimp/
rm -f %{buildroot}%{_libdir}/libzlibstatic.a
%ldconfig_scriptlets
%check
# Exclude tests that rely on nonbsd models
%ctest --exclude-regex "utMD5Importer.importBoarMan|utMD5Importer.importBob|utMD2Importer.importDolphin|utMD2Importer.importFlag|utMD2Importer.importHorse|utQ3BSPImportExport.importerTest|utBlenderImporter.importBob|utBlenderImporter.importFleurOptonl|utPMXImporter.importTest|utXImporter.importDwarf" || :
%files
%license LICENSE
%license contrib/clipper/License.txt
%license contrib/openddlparser/LICENSE
%license contrib/openddlparser/LICENSE.openddlparser
%license contrib/zip/UNLICENSE
%doc Readme.md CREDITS
%{_bindir}/assimp
%{_libdir}/*.so.*
%{_libdir}/libassimp.so.%{version}
%{_libdir}/libassimp.so.%{soversion}
%files devel
%{_includedir}/assimp
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_libdir}/cmake/*
%{_includedir}/assimp/
%{_libdir}/libassimp.so
%{_libdir}/pkgconfig/assimp.pc
%{_libdir}/cmake/assimp-*/
%files doc
%{_docdir}/*
%if 0%{?fedora} || 0%{?rhel} > 7
%files -n python3-%{name}
%doc port/PyAssimp/README.md
%{python3_sitelib}/pyassimp
%endif
%{python3_sitelib}/pyassimp/
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Sat Dec 27 2025 Sandro Mani <manisandro@gmail.com> - 6.0.2-5
- PyAssimp: Re-add 'aiProcess_Triangulate' (#2423174)
* Sun Dec 14 2025 Sandro Mani <manisandro@gmail.com> - 6.0.2-4
- Backport fix for CVE-2025-11277
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 6.0.2-3
- Rebuilt for Python 3.14.0rc3 bytecode
* Mon Aug 18 2025 Sandro Mani <manisandro@gmail.com> - 6.0.2-2
- Fix pugixml::pugixml dependency ending up in link interface of assimp::assimp
* Fri Aug 15 2025 Sandro Mani <manisandro@gmail.com> - 6.0.2-1
- Update to 6.0.2
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 5.4.3-4
- Rebuilt for Python 3.14.0rc2 bytecode
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 5.4.3-2
- Rebuilt for Python 3.14
* Sat Mar 15 2025 Rich Mattes <richmattes@gmail.com> - 5.4.3-1
- Update to release 5.4.3
- Resolves: #2274012
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 5.3.1-4
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 5.3.1-2
- Rebuilt for Python 3.13
* Sun Mar 31 2024 Rich Mattes <richmattes@gmail.com> - 5.3.1-1
- Update to release 5.3.1
- Resolves: rhbz#2256587
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Scott K Logan <logans@cottsay.net> - 5.2.5-2
- Add pugixml and poly2tri devel dependencies to assimp-devel
* Fri Nov 24 2023 Rich Mattes <richmattes@gmail.com> - 5.2.5-1
- Add check section and fix ctest configuration
* Thu Oct 26 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 5.2.5-1
- Ensure stb_image contains the latest CVE patches
* Fri Jul 28 2023 Scott K Logan <logans@cottsay.net> - 5.2.5-1
- Update to release 5.2.5
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 5.0.1-11
- Rebuilt for Python 3.12
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.0.1-8
- Rebuilt for Python 3.11
* Sat Apr 23 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 5.0.1-7
- Security fix for CVE-2022-28041
- Drop dependency on pkgconfig(zzip-zlib-config), no longer available in
zziplib; use zlib directly instead
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 30 2021 Rich Mattes <richmattes@gmail.com> - 5.0.1-5
- Correct Unlicense shortname (rhbz#2036000)
* Sat Sep 11 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 5.0.1-4
- Unbundle stb_image
- Add -static BRs for header-only libraries utf8cpp and rapidjson
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.3.1-29
- Rebuilt for Python 3.10
* Mon Mar 29 2021 Rich Mattes <richmattes@gmail.com> - 5.0.1-3
- Fix library install dir specification (rhbz#1943862)
- Remove un-needed build dependency on ILUT

View file

@ -1,5 +1,10 @@
#!/bin/bash
RELEASE=5.0.1
if [ $# -lt 1 ]; then
echo "Usage: $0 version"
exit 1
fi
RELEASE=$1
if [ ! -f assimp-$RELEASE.tar.gz ]; then
wget https://github.com/assimp/assimp/archive/v$RELEASE/assimp-$RELEASE.tar.gz
@ -15,4 +20,4 @@ find ./ -name "*.dll" -exec git rm -r {} \;
rm -r test/models-nonbsd
cd ..
tar czf assimp-5.0.1-free.tar.xz assimp-$RELEASE
tar czf assimp-$RELEASE-free.tar.xz assimp-$RELEASE

View file

@ -0,0 +1,30 @@
diff -rupN --no-dereference assimp-6.0.2/port/PyAssimp/pyassimp/postprocess.py assimp-6.0.2-new/port/PyAssimp/pyassimp/postprocess.py
--- assimp-6.0.2/port/PyAssimp/pyassimp/postprocess.py 2025-06-08 21:50:39.000000000 +0200
+++ assimp-6.0.2-new/port/PyAssimp/pyassimp/postprocess.py 2025-12-27 19:11:08.846657557 +0100
@@ -36,13 +36,21 @@ aiProcess_JoinIdenticalVertices = 0x2
#
aiProcess_MakeLeftHanded = 0x4
-## <hr>Triangulates all faces of all meshes.
+## <hr>Triangulates all faces of all meshes.
#
# By default the imported mesh data might contain faces with more than 3
-# indices. For rendering you'll usually want all faces to be triangles.
-# This post processing stepaiProcess_ForceGenNormals
-## <hr>Removes some parts of the data structure (animations, materials,
-# light sources, cameras, textures, vertex components).
+# indices. For rendering you'll usually want all faces to be triangles.
+# This post processing step splits up faces with more than 3 indices into
+# triangles. Line and point primitives are *not* modified! If you want
+# 'triangles only' with no other kinds of primitives, try the following
+# solution:
+# - Specify both #aiProcess_Triangulate and #aiProcess_SortByPType
+# - Ignore all point and line meshes when you process assimp's output
+#
+aiProcess_Triangulate = 0x8
+
+# <hr>Removes some parts of the data structure (animations, materials,
+# light sources, cameras, textures, vertex components).
#
# The components to be removed are specified in a separate
# configuration option, <tt>#AI_CONFIG_PP_RVC_FLAGS<tt>. This is quite useful

View file

@ -1 +1 @@
SHA512 (assimp-5.0.1-free.tar.xz) = bbdcb26fb826f44789850c139981f0a9c4000cf44e4cfb48671aa05b7fa1eaef164aa973dbba2f21ee16295236b3a775a4fa987bb211cfd552bd92c0522816da
SHA512 (assimp-6.0.2-free.tar.xz) = c2895d1185d13fdbd25499e6d916d960f124892de7363e9e91db3ed1daef554ebea462e37cbfafbe5be548e5a962f18fc9f213f836579d97e725c17aae58149b