From b482c84654a9f2dec2fae029c8c1bbd8a46317fa Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 15 Mar 2025 21:24:29 -0400 Subject: [PATCH 1/3] Update to release 5.4.3 Resolves: #2274012 --- .gitignore | 1 + assimp.spec | 14 +++++++++----- assimp_generate_tarball.sh | 2 +- sources | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index dd475f8..a08b038 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /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 diff --git a/assimp.spec b/assimp.spec index 958a2a1..e016569 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ %define soversion 5 Name: assimp -Version: 5.3.1 +Version: 5.4.3 Release: 1%{?dist} Summary: Library to import various 3D model formats into applications @@ -22,15 +22,15 @@ Source0: %{name}-%{version}-free.tar.xz Source1: assimp_generate_tarball.sh # Un-bundle libraries that are provided by the distribution. -Patch0: %{name}-5.3.1-unbundle.patch +Patch0: %{name}-5.4.3-unbundle.patch # Add /usr/lib64 to library lookup paths for python modules Patch1: %{name}-5.1.0-pythonpath.patch # Prevent export of bundled zlibstatic library -Patch2: %{name}-5.2.5-nozlib.patch +Patch2: %{name}-5.4.3-nozlib.patch # Exclude the build directory from the doxygen-generated documentation Patch3: %{name}-5.1.0-doxyfile.patch -# Enable ctest and correct the project version -Patch4: %{name}-5.3.1-tests.patch +# Enable ctest +Patch4: %{name}-5.4.3-tests.patch BuildRequires: boost-devel BuildRequires: cmake @@ -198,6 +198,10 @@ rm -f %{buildroot}%{_libdir}/libzlibstatic.a %endif %changelog +* Sat Mar 15 2025 Rich Mattes - 5.4.3-1 +- Update to release 5.4.3 +- Resolves: #2274012 + * Sun Mar 31 2024 Rich Mattes - 5.3.1-1 - Update to release 5.3.1 - Resolves: rhbz#2256587 diff --git a/assimp_generate_tarball.sh b/assimp_generate_tarball.sh index 2542a8d..28f5c60 100755 --- a/assimp_generate_tarball.sh +++ b/assimp_generate_tarball.sh @@ -1,5 +1,5 @@ #!/bin/bash -RELEASE=5.3.1 +RELEASE=5.4.3 if [ ! -f assimp-$RELEASE.tar.gz ]; then wget https://github.com/assimp/assimp/archive/v$RELEASE/assimp-$RELEASE.tar.gz diff --git a/sources b/sources index be1a1ca..ff02f8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (assimp-5.3.1-free.tar.xz) = 480ef268a811bf575fe20e6514666dd854c23923a841f8caac4edde1338eda774de84d0425ba1e41897f613d16ca2fb0b7d625c51c1777d2b21a090306b6db9c +SHA512 (assimp-5.4.3-free.tar.xz) = 7843cb6687060a7a15b04a1383418ce5956f04c1d4f635d744cdbb0f7fcaa637e51c380c5fd24386e60b6a458b021f8a2fe11e4f4fd9d0400f5a97bdb2608c49 From 17e597d73017474d5f7270dc8dd2cf6b88bf2287 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 15 Mar 2025 21:26:01 -0400 Subject: [PATCH 2/3] Add new patches --- assimp-5.2.5-nozlib.patch | 12 -- assimp-5.3.1-tests.patch | 49 -------- assimp-5.4.3-nozlib.patch | 12 ++ assimp-5.4.3-tests.patch | 29 +++++ ...undle.patch => assimp-5.4.3-unbundle.patch | 111 ++++-------------- 5 files changed, 67 insertions(+), 146 deletions(-) delete mode 100644 assimp-5.2.5-nozlib.patch delete mode 100644 assimp-5.3.1-tests.patch create mode 100644 assimp-5.4.3-nozlib.patch create mode 100644 assimp-5.4.3-tests.patch rename assimp-5.3.1-unbundle.patch => assimp-5.4.3-unbundle.patch (63%) diff --git a/assimp-5.2.5-nozlib.patch b/assimp-5.2.5-nozlib.patch deleted file mode 100644 index 8238036..0000000 --- a/assimp-5.2.5-nozlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt ---- a/contrib/zlib/CMakeLists.txt 2022-09-08 11:13:43.000000000 -0700 -+++ b/contrib/zlib/CMakeLists.txt 2023-01-17 15:29:47.187803181 -0800 -@@ -196,7 +196,7 @@ - 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}) - - INSTALL( TARGETS zlibstatic - EXPORT "${TARGETS_EXPORT_NAME}" diff --git a/assimp-5.3.1-tests.patch b/assimp-5.3.1-tests.patch deleted file mode 100644 index 0be1e8f..0000000 --- a/assimp-5.3.1-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up ./CMakeLists.txt.tests ./CMakeLists.txt ---- ./CMakeLists.txt.tests 2023-09-25 10:46:51.000000000 -0400 -+++ ./CMakeLists.txt 2024-03-31 20:49:21.960500757 -0400 -@@ -55,7 +55,7 @@ IF(ASSIMP_HUNTER_ENABLED) - add_definitions(-DASSIMP_USE_HUNTER) - ENDIF() - --PROJECT(Assimp VERSION 5.3.0) -+PROJECT(Assimp VERSION 5.3.1) - - # All supported options ############################################### - -@@ -725,6 +725,7 @@ IF ( ASSIMP_BUILD_SAMPLES ) - ENDIF () - - IF ( ASSIMP_BUILD_TESTS ) -+ ENABLE_TESTING() - ADD_SUBDIRECTORY( test/ ) - ENDIF () - -diff -up ./test/CMakeLists.txt.tests ./test/CMakeLists.txt ---- ./test/CMakeLists.txt.tests 2023-09-25 10:46:51.000000000 -0400 -+++ ./test/CMakeLists.txt 2024-03-31 20:48:33.624049363 -0400 -@@ -36,6 +36,7 @@ - # - #---------------------------------------------------------------------- - cmake_minimum_required( VERSION 3.10 ) -+include(GoogleTest) - - INCLUDE_DIRECTORIES( - ${Assimp_SOURCE_DIR}/test/unit -@@ -281,4 +282,4 @@ target_link_libraries( unit assimp ${pla - - add_subdirectory(headercheck) - --add_test( unittests unit ) -+gtest_discover_tests(unit) -diff -up ./test/unit/utVersion.cpp.tests ./test/unit/utVersion.cpp ---- ./test/unit/utVersion.cpp.tests 2024-03-31 20:48:33.624049363 -0400 -+++ ./test/unit/utVersion.cpp 2024-03-31 20:50:08.025156444 -0400 -@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest - } - - TEST_F( utVersion, aiGetVersionPatchTest ) { -- EXPECT_EQ(aiGetVersionPatch(), 0U ); -+ EXPECT_EQ(aiGetVersionPatch(), 1U ); - } - - TEST_F( utVersion, aiGetCompileFlagsTest ) { diff --git a/assimp-5.4.3-nozlib.patch b/assimp-5.4.3-nozlib.patch new file mode 100644 index 0000000..db914bb --- /dev/null +++ b/assimp-5.4.3-nozlib.patch @@ -0,0 +1,12 @@ +diff -up ./contrib/zlib/CMakeLists.txt.nozlib ./contrib/zlib/CMakeLists.txt +--- ./contrib/zlib/CMakeLists.txt.nozlib 2025-03-15 21:15:34.401498688 -0400 ++++ ./contrib/zlib/CMakeLists.txt 2025-03-15 21:16:59.423133391 -0400 +@@ -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 diff --git a/assimp-5.4.3-tests.patch b/assimp-5.4.3-tests.patch new file mode 100644 index 0000000..c7e5125 --- /dev/null +++ b/assimp-5.4.3-tests.patch @@ -0,0 +1,29 @@ +diff -up ./CMakeLists.txt.tests ./CMakeLists.txt +--- ./CMakeLists.txt.tests 2024-08-30 14:35:01.000000000 -0400 ++++ ./CMakeLists.txt 2025-03-15 21:17:37.690633353 -0400 +@@ -774,6 +774,7 @@ IF ( ASSIMP_BUILD_SAMPLES ) + ENDIF () + + IF ( ASSIMP_BUILD_TESTS ) ++ ENABLE_TESTING() + ADD_SUBDIRECTORY( test/ ) + ENDIF () + +diff -up ./test/CMakeLists.txt.tests ./test/CMakeLists.txt +--- ./test/CMakeLists.txt.tests 2024-08-30 14:35:01.000000000 -0400 ++++ ./test/CMakeLists.txt 2025-03-15 21:17:37.690940621 -0400 +@@ -36,6 +36,7 @@ + # + #---------------------------------------------------------------------- + cmake_minimum_required( VERSION 3.10 ) ++include(GoogleTest) + + INCLUDE_DIRECTORIES( + ${Assimp_SOURCE_DIR}/test/unit +@@ -283,4 +284,4 @@ target_link_libraries( unit assimp ${pla + + add_subdirectory(headercheck) + +-add_test( unittests unit ) ++gtest_discover_tests(unit) +diff -up ./test/unit/utVersion.cpp.tests ./test/unit/utVersion.cpp diff --git a/assimp-5.3.1-unbundle.patch b/assimp-5.4.3-unbundle.patch similarity index 63% rename from assimp-5.3.1-unbundle.patch rename to assimp-5.4.3-unbundle.patch index 27e6853..538be8a 100644 --- a/assimp-5.3.1-unbundle.patch +++ b/assimp-5.4.3-unbundle.patch @@ -1,6 +1,6 @@ diff -up ./code/AssetLib/Blender/BlenderTessellator.h.unbundle ./code/AssetLib/Blender/BlenderTessellator.h ---- ./code/AssetLib/Blender/BlenderTessellator.h.unbundle 2024-03-31 20:36:05.293864981 -0400 -+++ ./code/AssetLib/Blender/BlenderTessellator.h 2024-03-31 20:38:26.958995165 -0400 +--- ./code/AssetLib/Blender/BlenderTessellator.h.unbundle 2024-08-30 14:35:01.000000000 -0400 ++++ ./code/AssetLib/Blender/BlenderTessellator.h 2025-03-15 21:12:11.625781244 -0400 @@ -143,7 +143,7 @@ namespace Assimp #if ASSIMP_BLEND_WITH_POLY_2_TRI @@ -10,10 +10,9 @@ diff -up ./code/AssetLib/Blender/BlenderTessellator.h.unbundle ./code/AssetLib/B namespace Assimp { -diff -up ./code/AssetLib/glTF2/glTF2Asset.inl.unbundle ./code/AssetLib/glTF2/glTF2Asset.inl diff -up ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle ./code/AssetLib/IFC/IFCGeometry.cpp ---- ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle 2024-03-31 20:36:05.294864983 -0400 -+++ ./code/AssetLib/IFC/IFCGeometry.cpp 2024-03-31 20:37:34.819951544 -0400 +--- ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 ++++ ./code/AssetLib/IFC/IFCGeometry.cpp 2025-03-15 21:12:11.625971442 -0400 @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE #include "IFCUtil.h" #include "Common/PolyTools.h" @@ -24,8 +23,8 @@ diff -up ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle ./code/AssetLib/IFC/IFCGeo #include diff -up ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle ./code/AssetLib/IFC/IFCOpenings.cpp ---- ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle 2024-03-31 20:36:05.295864985 -0400 -+++ ./code/AssetLib/IFC/IFCOpenings.cpp 2024-03-31 20:38:37.290002919 -0400 +--- ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 ++++ ./code/AssetLib/IFC/IFCOpenings.cpp 2025-03-15 21:12:11.626145199 -0400 @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE #include "IFCUtil.h" #include "Common/PolyTools.h" @@ -36,56 +35,12 @@ diff -up ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle ./code/AssetLib/IFC/IFCOpe #include diff -up ./code/AssetLib/MMD/MMDPmxParser.cpp.unbundle ./code/AssetLib/MMD/MMDPmxParser.cpp ---- ./code/AssetLib/MMD/MMDPmxParser.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./code/AssetLib/MMD/MMDPmxParser.cpp 2024-03-31 20:36:05.295864985 -0400 -@@ -42,11 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE - #include - #include "MMDPmxParser.h" - #include --#ifdef ASSIMP_USE_HUNTER --# include --#else --# include "../contrib/utf8cpp/source/utf8.h" --#endif -+#include - #include - - namespace pmx diff -up ./code/AssetLib/SIB/SIBImporter.cpp.unbundle ./code/AssetLib/SIB/SIBImporter.cpp ---- ./code/AssetLib/SIB/SIBImporter.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./code/AssetLib/SIB/SIBImporter.cpp 2024-03-31 20:36:05.296864986 -0400 -@@ -56,11 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE - #include - #include - #include --#ifdef ASSIMP_USE_HUNTER - #include --#else --#include "../contrib/utf8cpp/source/utf8.h" --#endif - #include - #include - #include diff -up ./code/AssetLib/STEPParser/STEPFileEncoding.cpp.unbundle ./code/AssetLib/STEPParser/STEPFileEncoding.cpp ---- ./code/AssetLib/STEPParser/STEPFileEncoding.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./code/AssetLib/STEPParser/STEPFileEncoding.cpp 2024-03-31 20:36:05.295864985 -0400 -@@ -45,11 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE - */ - #include "STEPFileEncoding.h" - #include --#ifdef ASSIMP_USE_HUNTER --# include --#else --# include --#endif -+#include - - #include - diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ---- ./code/CMakeLists.txt.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./code/CMakeLists.txt 2024-03-31 20:41:45.135187104 -0400 -@@ -910,12 +910,7 @@ IF(ASSIMP_HUNTER_ENABLED) +--- ./code/CMakeLists.txt.unbundle 2024-08-30 14:35:01.000000000 -0400 ++++ ./code/CMakeLists.txt 2025-03-15 21:14:28.763995892 -0400 +@@ -1054,12 +1054,7 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(pugixml) find_package(pugixml CONFIG REQUIRED) ELSE() @@ -99,16 +54,16 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ENDIF() # utf8 -@@ -923,7 +918,7 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1067,7 +1062,7 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(utf8) find_package(utf8cpp CONFIG REQUIRED) ELSE() -- # utf8 is header-only, so Assimp doesn't need to do anything. -+ find_package(utf8cpp) +- INCLUDE_DIRECTORIES("../contrib/utf8cpp/source") ++ find_package(utf8cpp CONFIG REQUIRED) ENDIF() # polyclipping -@@ -939,10 +934,10 @@ ENDIF() +@@ -1083,10 +1078,10 @@ ENDIF() #ENDIF() # poly2tri @@ -123,7 +78,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt SET( Poly2Tri_SRCS ../contrib/poly2tri/poly2tri/common/shapes.cc ../contrib/poly2tri/poly2tri/common/shapes.h -@@ -957,13 +952,13 @@ ENDIF() +@@ -1101,13 +1096,13 @@ ENDIF() ../contrib/poly2tri/poly2tri/sweep/sweep_context.h ) SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) @@ -142,7 +97,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt SET( unzip_SRCS ../contrib/unzip/crypt.h ../contrib/unzip/ioapi.c -@@ -972,7 +967,7 @@ ELSE() +@@ -1116,7 +1111,7 @@ ELSE() ../contrib/unzip/unzip.h ) SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) @@ -151,7 +106,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt # zip (https://github.com/kuba--/zip) separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) -@@ -1068,6 +1063,7 @@ ENDIF () +@@ -1212,6 +1207,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 ) @@ -159,7 +114,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ELSE () SET (open3dgc_SRCS "") MESSAGE (INFO " Hunter enabled or RT-extension not found. glTF import/export will be built without Open3DGC-compression.") -@@ -1079,7 +1075,8 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1223,7 +1219,8 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(RapidJSON) find_package(RapidJSON CONFIG REQUIRED) ELSE() @@ -169,7 +124,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt 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) -@@ -1092,11 +1089,6 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1236,11 +1233,6 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(stb) find_package(stb CONFIG REQUIRED) ELSE() @@ -181,7 +136,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ENDIF() # VC2010 fixes -@@ -1269,8 +1261,7 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1419,8 +1411,7 @@ IF(ASSIMP_HUNTER_ENABLED) PUBLIC #polyclipping::polyclipping openddlparser::openddl_parser @@ -191,7 +146,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ZLIB::zlib RapidJSON::rapidjson utf8cpp -@@ -1289,6 +1280,16 @@ ELSE() +@@ -1439,6 +1430,16 @@ ELSE() if (ASSIMP_BUILD_DRACO) target_link_libraries(assimp ${draco_LIBRARIES}) endif() @@ -209,24 +164,10 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt if(ASSIMP_ANDROID_JNIIOSYSTEM) diff -up ./code/Common/BaseImporter.cpp.unbundle ./code/Common/BaseImporter.cpp ---- ./code/Common/BaseImporter.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./code/Common/BaseImporter.cpp 2024-03-31 20:36:05.294864983 -0400 -@@ -357,11 +357,7 @@ std::string BaseImporter::GetExtension(c - return false; - } - --#ifdef ASSIMP_USE_HUNTER - #include --#else --#include "../contrib/utf8cpp/source/utf8.h" --#endif - - // ------------------------------------------------------------------------------------------------ - // Convert to UTF8 data diff -up ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp.unbundle ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp ---- ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp 2024-03-31 20:36:05.297864988 -0400 -@@ -23,7 +23,7 @@ +--- ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 ++++ ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp 2025-03-15 21:12:11.627116368 -0400 +@@ -24,7 +24,7 @@ #endif // _MSC_VER #define STB_IMAGE_IMPLEMENTATION @@ -236,9 +177,9 @@ diff -up ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.c #ifdef _MSC_VER #pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter' diff -up ./test/unit/utglTF2ImportExport.cpp.unbundle ./test/unit/utglTF2ImportExport.cpp ---- ./test/unit/utglTF2ImportExport.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 -+++ ./test/unit/utglTF2ImportExport.cpp 2024-03-31 20:36:05.297864988 -0400 -@@ -805,7 +805,7 @@ namespace { +--- ./test/unit/utglTF2ImportExport.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 ++++ ./test/unit/utglTF2ImportExport.cpp 2025-03-15 21:12:11.627354486 -0400 +@@ -943,7 +943,7 @@ namespace { rapidjson::Document schemaDoc; schemaDoc.Parse(R"==({"properties":{"scene" : { "type" : "integer" }}, "required": [ "scene" ]})=="); EXPECT_FALSE(schemaDoc.HasParseError()); From d17c813bf375496a73bbe5acad64c942c8aa10de Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 15 Mar 2025 21:28:45 -0400 Subject: [PATCH 3/3] Revert mistaken update commits --- .gitignore | 1 - assimp-5.2.5-nozlib.patch | 12 ++ assimp-5.3.1-tests.patch | 49 ++++++++ ...undle.patch => assimp-5.3.1-unbundle.patch | 111 ++++++++++++++---- assimp-5.4.3-nozlib.patch | 12 -- assimp-5.4.3-tests.patch | 29 ----- assimp.spec | 14 +-- assimp_generate_tarball.sh | 2 +- sources | 2 +- 9 files changed, 153 insertions(+), 79 deletions(-) create mode 100644 assimp-5.2.5-nozlib.patch create mode 100644 assimp-5.3.1-tests.patch rename assimp-5.4.3-unbundle.patch => assimp-5.3.1-unbundle.patch (63%) delete mode 100644 assimp-5.4.3-nozlib.patch delete mode 100644 assimp-5.4.3-tests.patch diff --git a/.gitignore b/.gitignore index a08b038..dd475f8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ /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 diff --git a/assimp-5.2.5-nozlib.patch b/assimp-5.2.5-nozlib.patch new file mode 100644 index 0000000..8238036 --- /dev/null +++ b/assimp-5.2.5-nozlib.patch @@ -0,0 +1,12 @@ +diff -uNr a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt +--- a/contrib/zlib/CMakeLists.txt 2022-09-08 11:13:43.000000000 -0700 ++++ b/contrib/zlib/CMakeLists.txt 2023-01-17 15:29:47.187803181 -0800 +@@ -196,7 +196,7 @@ + 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}) + + INSTALL( TARGETS zlibstatic + EXPORT "${TARGETS_EXPORT_NAME}" diff --git a/assimp-5.3.1-tests.patch b/assimp-5.3.1-tests.patch new file mode 100644 index 0000000..0be1e8f --- /dev/null +++ b/assimp-5.3.1-tests.patch @@ -0,0 +1,49 @@ +diff -up ./CMakeLists.txt.tests ./CMakeLists.txt +--- ./CMakeLists.txt.tests 2023-09-25 10:46:51.000000000 -0400 ++++ ./CMakeLists.txt 2024-03-31 20:49:21.960500757 -0400 +@@ -55,7 +55,7 @@ IF(ASSIMP_HUNTER_ENABLED) + add_definitions(-DASSIMP_USE_HUNTER) + ENDIF() + +-PROJECT(Assimp VERSION 5.3.0) ++PROJECT(Assimp VERSION 5.3.1) + + # All supported options ############################################### + +@@ -725,6 +725,7 @@ IF ( ASSIMP_BUILD_SAMPLES ) + ENDIF () + + IF ( ASSIMP_BUILD_TESTS ) ++ ENABLE_TESTING() + ADD_SUBDIRECTORY( test/ ) + ENDIF () + +diff -up ./test/CMakeLists.txt.tests ./test/CMakeLists.txt +--- ./test/CMakeLists.txt.tests 2023-09-25 10:46:51.000000000 -0400 ++++ ./test/CMakeLists.txt 2024-03-31 20:48:33.624049363 -0400 +@@ -36,6 +36,7 @@ + # + #---------------------------------------------------------------------- + cmake_minimum_required( VERSION 3.10 ) ++include(GoogleTest) + + INCLUDE_DIRECTORIES( + ${Assimp_SOURCE_DIR}/test/unit +@@ -281,4 +282,4 @@ target_link_libraries( unit assimp ${pla + + add_subdirectory(headercheck) + +-add_test( unittests unit ) ++gtest_discover_tests(unit) +diff -up ./test/unit/utVersion.cpp.tests ./test/unit/utVersion.cpp +--- ./test/unit/utVersion.cpp.tests 2024-03-31 20:48:33.624049363 -0400 ++++ ./test/unit/utVersion.cpp 2024-03-31 20:50:08.025156444 -0400 +@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest + } + + TEST_F( utVersion, aiGetVersionPatchTest ) { +- EXPECT_EQ(aiGetVersionPatch(), 0U ); ++ EXPECT_EQ(aiGetVersionPatch(), 1U ); + } + + TEST_F( utVersion, aiGetCompileFlagsTest ) { diff --git a/assimp-5.4.3-unbundle.patch b/assimp-5.3.1-unbundle.patch similarity index 63% rename from assimp-5.4.3-unbundle.patch rename to assimp-5.3.1-unbundle.patch index 538be8a..27e6853 100644 --- a/assimp-5.4.3-unbundle.patch +++ b/assimp-5.3.1-unbundle.patch @@ -1,6 +1,6 @@ diff -up ./code/AssetLib/Blender/BlenderTessellator.h.unbundle ./code/AssetLib/Blender/BlenderTessellator.h ---- ./code/AssetLib/Blender/BlenderTessellator.h.unbundle 2024-08-30 14:35:01.000000000 -0400 -+++ ./code/AssetLib/Blender/BlenderTessellator.h 2025-03-15 21:12:11.625781244 -0400 +--- ./code/AssetLib/Blender/BlenderTessellator.h.unbundle 2024-03-31 20:36:05.293864981 -0400 ++++ ./code/AssetLib/Blender/BlenderTessellator.h 2024-03-31 20:38:26.958995165 -0400 @@ -143,7 +143,7 @@ namespace Assimp #if ASSIMP_BLEND_WITH_POLY_2_TRI @@ -10,9 +10,10 @@ diff -up ./code/AssetLib/Blender/BlenderTessellator.h.unbundle ./code/AssetLib/B namespace Assimp { +diff -up ./code/AssetLib/glTF2/glTF2Asset.inl.unbundle ./code/AssetLib/glTF2/glTF2Asset.inl diff -up ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle ./code/AssetLib/IFC/IFCGeometry.cpp ---- ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 -+++ ./code/AssetLib/IFC/IFCGeometry.cpp 2025-03-15 21:12:11.625971442 -0400 +--- ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle 2024-03-31 20:36:05.294864983 -0400 ++++ ./code/AssetLib/IFC/IFCGeometry.cpp 2024-03-31 20:37:34.819951544 -0400 @@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE #include "IFCUtil.h" #include "Common/PolyTools.h" @@ -23,8 +24,8 @@ diff -up ./code/AssetLib/IFC/IFCGeometry.cpp.unbundle ./code/AssetLib/IFC/IFCGeo #include diff -up ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle ./code/AssetLib/IFC/IFCOpenings.cpp ---- ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 -+++ ./code/AssetLib/IFC/IFCOpenings.cpp 2025-03-15 21:12:11.626145199 -0400 +--- ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle 2024-03-31 20:36:05.295864985 -0400 ++++ ./code/AssetLib/IFC/IFCOpenings.cpp 2024-03-31 20:38:37.290002919 -0400 @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE #include "IFCUtil.h" #include "Common/PolyTools.h" @@ -35,12 +36,56 @@ diff -up ./code/AssetLib/IFC/IFCOpenings.cpp.unbundle ./code/AssetLib/IFC/IFCOpe #include diff -up ./code/AssetLib/MMD/MMDPmxParser.cpp.unbundle ./code/AssetLib/MMD/MMDPmxParser.cpp +--- ./code/AssetLib/MMD/MMDPmxParser.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./code/AssetLib/MMD/MMDPmxParser.cpp 2024-03-31 20:36:05.295864985 -0400 +@@ -42,11 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #include + #include "MMDPmxParser.h" + #include +-#ifdef ASSIMP_USE_HUNTER +-# include +-#else +-# include "../contrib/utf8cpp/source/utf8.h" +-#endif ++#include + #include + + namespace pmx diff -up ./code/AssetLib/SIB/SIBImporter.cpp.unbundle ./code/AssetLib/SIB/SIBImporter.cpp +--- ./code/AssetLib/SIB/SIBImporter.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./code/AssetLib/SIB/SIBImporter.cpp 2024-03-31 20:36:05.296864986 -0400 +@@ -56,11 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #include + #include + #include +-#ifdef ASSIMP_USE_HUNTER + #include +-#else +-#include "../contrib/utf8cpp/source/utf8.h" +-#endif + #include + #include + #include diff -up ./code/AssetLib/STEPParser/STEPFileEncoding.cpp.unbundle ./code/AssetLib/STEPParser/STEPFileEncoding.cpp +--- ./code/AssetLib/STEPParser/STEPFileEncoding.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./code/AssetLib/STEPParser/STEPFileEncoding.cpp 2024-03-31 20:36:05.295864985 -0400 +@@ -45,11 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + */ + #include "STEPFileEncoding.h" + #include +-#ifdef ASSIMP_USE_HUNTER +-# include +-#else +-# include +-#endif ++#include + + #include + diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ---- ./code/CMakeLists.txt.unbundle 2024-08-30 14:35:01.000000000 -0400 -+++ ./code/CMakeLists.txt 2025-03-15 21:14:28.763995892 -0400 -@@ -1054,12 +1054,7 @@ IF(ASSIMP_HUNTER_ENABLED) +--- ./code/CMakeLists.txt.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./code/CMakeLists.txt 2024-03-31 20:41:45.135187104 -0400 +@@ -910,12 +910,7 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(pugixml) find_package(pugixml CONFIG REQUIRED) ELSE() @@ -54,16 +99,16 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ENDIF() # utf8 -@@ -1067,7 +1062,7 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -923,7 +918,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) +- # utf8 is header-only, so Assimp doesn't need to do anything. ++ find_package(utf8cpp) ENDIF() # polyclipping -@@ -1083,10 +1078,10 @@ ENDIF() +@@ -939,10 +934,10 @@ ENDIF() #ENDIF() # poly2tri @@ -78,7 +123,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt SET( Poly2Tri_SRCS ../contrib/poly2tri/poly2tri/common/shapes.cc ../contrib/poly2tri/poly2tri/common/shapes.h -@@ -1101,13 +1096,13 @@ ENDIF() +@@ -957,13 +952,13 @@ ENDIF() ../contrib/poly2tri/poly2tri/sweep/sweep_context.h ) SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) @@ -97,7 +142,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt SET( unzip_SRCS ../contrib/unzip/crypt.h ../contrib/unzip/ioapi.c -@@ -1116,7 +1111,7 @@ ELSE() +@@ -972,7 +967,7 @@ ELSE() ../contrib/unzip/unzip.h ) SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) @@ -106,7 +151,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt # zip (https://github.com/kuba--/zip) separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) -@@ -1212,6 +1207,7 @@ ENDIF () +@@ -1068,6 +1063,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 ) @@ -114,7 +159,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ELSE () SET (open3dgc_SRCS "") MESSAGE (INFO " Hunter enabled or RT-extension not found. glTF import/export will be built without Open3DGC-compression.") -@@ -1223,7 +1219,8 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1079,7 +1075,8 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(RapidJSON) find_package(RapidJSON CONFIG REQUIRED) ELSE() @@ -124,7 +169,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt 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) -@@ -1236,11 +1233,6 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1092,11 +1089,6 @@ IF(ASSIMP_HUNTER_ENABLED) hunter_add_package(stb) find_package(stb CONFIG REQUIRED) ELSE() @@ -136,7 +181,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ENDIF() # VC2010 fixes -@@ -1419,8 +1411,7 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -1269,8 +1261,7 @@ IF(ASSIMP_HUNTER_ENABLED) PUBLIC #polyclipping::polyclipping openddlparser::openddl_parser @@ -146,7 +191,7 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt ZLIB::zlib RapidJSON::rapidjson utf8cpp -@@ -1439,6 +1430,16 @@ ELSE() +@@ -1289,6 +1280,16 @@ ELSE() if (ASSIMP_BUILD_DRACO) target_link_libraries(assimp ${draco_LIBRARIES}) endif() @@ -164,10 +209,24 @@ diff -up ./code/CMakeLists.txt.unbundle ./code/CMakeLists.txt if(ASSIMP_ANDROID_JNIIOSYSTEM) diff -up ./code/Common/BaseImporter.cpp.unbundle ./code/Common/BaseImporter.cpp +--- ./code/Common/BaseImporter.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./code/Common/BaseImporter.cpp 2024-03-31 20:36:05.294864983 -0400 +@@ -357,11 +357,7 @@ std::string BaseImporter::GetExtension(c + return false; + } + +-#ifdef ASSIMP_USE_HUNTER + #include +-#else +-#include "../contrib/utf8cpp/source/utf8.h" +-#endif + + // ------------------------------------------------------------------------------------------------ + // Convert to UTF8 data diff -up ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp.unbundle ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp ---- ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 -+++ ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp 2025-03-15 21:12:11.627116368 -0400 -@@ -24,7 +24,7 @@ +--- ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp 2024-03-31 20:36:05.297864988 -0400 +@@ -23,7 +23,7 @@ #endif // _MSC_VER #define STB_IMAGE_IMPLEMENTATION @@ -177,9 +236,9 @@ diff -up ./samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.c #ifdef _MSC_VER #pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter' diff -up ./test/unit/utglTF2ImportExport.cpp.unbundle ./test/unit/utglTF2ImportExport.cpp ---- ./test/unit/utglTF2ImportExport.cpp.unbundle 2024-08-30 14:35:01.000000000 -0400 -+++ ./test/unit/utglTF2ImportExport.cpp 2025-03-15 21:12:11.627354486 -0400 -@@ -943,7 +943,7 @@ namespace { +--- ./test/unit/utglTF2ImportExport.cpp.unbundle 2023-09-25 10:46:51.000000000 -0400 ++++ ./test/unit/utglTF2ImportExport.cpp 2024-03-31 20:36:05.297864988 -0400 +@@ -805,7 +805,7 @@ namespace { rapidjson::Document schemaDoc; schemaDoc.Parse(R"==({"properties":{"scene" : { "type" : "integer" }}, "required": [ "scene" ]})=="); EXPECT_FALSE(schemaDoc.HasParseError()); diff --git a/assimp-5.4.3-nozlib.patch b/assimp-5.4.3-nozlib.patch deleted file mode 100644 index db914bb..0000000 --- a/assimp-5.4.3-nozlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./contrib/zlib/CMakeLists.txt.nozlib ./contrib/zlib/CMakeLists.txt ---- ./contrib/zlib/CMakeLists.txt.nozlib 2025-03-15 21:15:34.401498688 -0400 -+++ ./contrib/zlib/CMakeLists.txt 2025-03-15 21:16:59.423133391 -0400 -@@ -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 diff --git a/assimp-5.4.3-tests.patch b/assimp-5.4.3-tests.patch deleted file mode 100644 index c7e5125..0000000 --- a/assimp-5.4.3-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up ./CMakeLists.txt.tests ./CMakeLists.txt ---- ./CMakeLists.txt.tests 2024-08-30 14:35:01.000000000 -0400 -+++ ./CMakeLists.txt 2025-03-15 21:17:37.690633353 -0400 -@@ -774,6 +774,7 @@ IF ( ASSIMP_BUILD_SAMPLES ) - ENDIF () - - IF ( ASSIMP_BUILD_TESTS ) -+ ENABLE_TESTING() - ADD_SUBDIRECTORY( test/ ) - ENDIF () - -diff -up ./test/CMakeLists.txt.tests ./test/CMakeLists.txt ---- ./test/CMakeLists.txt.tests 2024-08-30 14:35:01.000000000 -0400 -+++ ./test/CMakeLists.txt 2025-03-15 21:17:37.690940621 -0400 -@@ -36,6 +36,7 @@ - # - #---------------------------------------------------------------------- - cmake_minimum_required( VERSION 3.10 ) -+include(GoogleTest) - - INCLUDE_DIRECTORIES( - ${Assimp_SOURCE_DIR}/test/unit -@@ -283,4 +284,4 @@ target_link_libraries( unit assimp ${pla - - add_subdirectory(headercheck) - --add_test( unittests unit ) -+gtest_discover_tests(unit) -diff -up ./test/unit/utVersion.cpp.tests ./test/unit/utVersion.cpp diff --git a/assimp.spec b/assimp.spec index e016569..958a2a1 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,7 +1,7 @@ %define soversion 5 Name: assimp -Version: 5.4.3 +Version: 5.3.1 Release: 1%{?dist} Summary: Library to import various 3D model formats into applications @@ -22,15 +22,15 @@ Source0: %{name}-%{version}-free.tar.xz Source1: assimp_generate_tarball.sh # Un-bundle libraries that are provided by the distribution. -Patch0: %{name}-5.4.3-unbundle.patch +Patch0: %{name}-5.3.1-unbundle.patch # Add /usr/lib64 to library lookup paths for python modules Patch1: %{name}-5.1.0-pythonpath.patch # Prevent export of bundled zlibstatic library -Patch2: %{name}-5.4.3-nozlib.patch +Patch2: %{name}-5.2.5-nozlib.patch # Exclude the build directory from the doxygen-generated documentation Patch3: %{name}-5.1.0-doxyfile.patch -# Enable ctest -Patch4: %{name}-5.4.3-tests.patch +# Enable ctest and correct the project version +Patch4: %{name}-5.3.1-tests.patch BuildRequires: boost-devel BuildRequires: cmake @@ -198,10 +198,6 @@ rm -f %{buildroot}%{_libdir}/libzlibstatic.a %endif %changelog -* Sat Mar 15 2025 Rich Mattes - 5.4.3-1 -- Update to release 5.4.3 -- Resolves: #2274012 - * Sun Mar 31 2024 Rich Mattes - 5.3.1-1 - Update to release 5.3.1 - Resolves: rhbz#2256587 diff --git a/assimp_generate_tarball.sh b/assimp_generate_tarball.sh index 28f5c60..2542a8d 100755 --- a/assimp_generate_tarball.sh +++ b/assimp_generate_tarball.sh @@ -1,5 +1,5 @@ #!/bin/bash -RELEASE=5.4.3 +RELEASE=5.3.1 if [ ! -f assimp-$RELEASE.tar.gz ]; then wget https://github.com/assimp/assimp/archive/v$RELEASE/assimp-$RELEASE.tar.gz diff --git a/sources b/sources index ff02f8f..be1a1ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (assimp-5.4.3-free.tar.xz) = 7843cb6687060a7a15b04a1383418ce5956f04c1d4f635d744cdbb0f7fcaa637e51c380c5fd24386e60b6a458b021f8a2fe11e4f4fd9d0400f5a97bdb2608c49 +SHA512 (assimp-5.3.1-free.tar.xz) = 480ef268a811bf575fe20e6514666dd854c23923a841f8caac4edde1338eda774de84d0425ba1e41897f613d16ca2fb0b7d625c51c1777d2b21a090306b6db9c