Simple update assimp-5.2.5. Tested with Qt on amd64. OK? Cheers Rafael
Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/assimp/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile 11 Mar 2022 19:39:15 -0000 1.8 +++ Makefile 29 Aug 2023 06:19:27 -0000 @@ -1,20 +1,20 @@ COMMENT = open asset import library CATEGORIES = multimedia -SHARED_LIBS += assimp 1.0 # 5.0 +SHARED_LIBS += assimp 2.0 # 5.0 GH_ACCOUNT = assimp GH_PROJECT = assimp -GH_TAGNAME = v5.0.0 -REVISION = 1 +GH_TAGNAME = v5.2.5 HOMEPAGE = https://www.assimp.org/ + MAINTAINER = Brian Callahan <bcal...@openbsd.org> # BSD PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} c m z +WANTLIB += ${COMPILER_LIBCXX} m z # C++11 COMPILER = base-clang ports-gcc @@ -26,9 +26,5 @@ MODULES = devel/cmake BUILD_DEPENDS = devel/boost NO_TEST = Yes - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/assimpTargets-release.cmake.in \ - ${WRKSRC}/assimpTargets-debug.cmake.in .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/assimp/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 24 Nov 2019 19:48:08 -0000 1.3 +++ distinfo 29 Aug 2023 06:19:27 -0000 @@ -1,2 +1,2 @@ -SHA256 (assimp-5.0.0.tar.gz) = sBEKkWUNa7QADj1cIYW/d7D/Ci56KEvCxK+BszmItjw= -SIZE (assimp-5.0.0.tar.gz) = 46604597 +SHA256 (assimp-5.2.5.tar.gz) = tSGeY64x2JXWDZgAHuW7gJ+yx7LeHn94zutgAGNkHho= +SIZE (assimp-5.2.5.tar.gz) = 49543936 Index: patches/patch-assimpTargets-debug_cmake_in =================================================================== RCS file: patches/patch-assimpTargets-debug_cmake_in diff -N patches/patch-assimpTargets-debug_cmake_in --- patches/patch-assimpTargets-debug_cmake_in 11 Mar 2022 19:39:16 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: assimpTargets-debug.cmake.in ---- assimpTargets-debug.cmake.in.orig -+++ assimpTargets-debug.cmake.in -@@ -63,7 +63,7 @@ if(MSVC) - else() - set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the assimp libraries" ) - if(ASSIMP_BUILD_SHARED_LIBS) -- set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") -+ set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.${LIBassimp_VERSION}") - set_target_properties(assimp::assimp PROPERTIES - IMPORTED_SONAME_DEBUG "${sharedLibraryName}" - IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" Index: patches/patch-assimpTargets-release_cmake_in =================================================================== RCS file: patches/patch-assimpTargets-release_cmake_in diff -N patches/patch-assimpTargets-release_cmake_in --- patches/patch-assimpTargets-release_cmake_in 11 Mar 2022 19:39:16 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -Index: assimpTargets-release.cmake.in ---- assimpTargets-release.cmake.in.orig -+++ assimpTargets-release.cmake.in -@@ -63,7 +63,7 @@ if(MSVC) - else() - set(ASSIMP_LIBRARY_SUFFIX "@ASSIMP_LIBRARY_SUFFIX@" CACHE STRING "the suffix for the assimp libraries" ) - if(ASSIMP_BUILD_SHARED_LIBS) -- set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") -+ set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.${LIBassimp_VERSION}") - set_target_properties(assimp::assimp PROPERTIES - IMPORTED_SONAME_RELEASE "${sharedLibraryName}" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/multimedia/assimp/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 11 Mar 2022 19:39:16 -0000 1.4 +++ pkg/PLIST 29 Aug 2023 06:19:27 -0000 @@ -1,9 +1,10 @@ -@bin bin/assimp include/assimp/ +include/assimp/Base64.hpp include/assimp/BaseImporter.h include/assimp/Bitmap.h include/assimp/BlobIOSystem.h include/assimp/ByteSwapper.h +include/assimp/ColladaMetaData.h include/assimp/Compiler/ include/assimp/Compiler/poppack1.h include/assimp/Compiler/pstdint.h @@ -12,10 +13,10 @@ include/assimp/CreateAnimMesh.h include/assimp/DefaultIOStream.h include/assimp/DefaultIOSystem.h include/assimp/DefaultLogger.hpp -include/assimp/Defines.h include/assimp/Exceptional.h include/assimp/Exporter.hpp include/assimp/GenericProperty.h +include/assimp/GltfMaterial.h include/assimp/Hash.h include/assimp/IOStream.hpp include/assimp/IOStreamBuffer.h @@ -25,10 +26,10 @@ include/assimp/LineSplitter.h include/assimp/LogAux.h include/assimp/LogStream.hpp include/assimp/Logger.hpp -include/assimp/Macros.h include/assimp/MathFunctions.h include/assimp/MemoryIOWrapper.h include/assimp/NullLogger.hpp +include/assimp/ObjMaterial.h include/assimp/ParsingUtils.h include/assimp/Profiler.h include/assimp/ProgressHandler.hpp @@ -36,6 +37,7 @@ include/assimp/RemoveComments.h include/assimp/SGSpatialSort.h include/assimp/SceneCombiner.h include/assimp/SkeletonMeshBuilder.h +include/assimp/SmallVector.h include/assimp/SmoothingGroups.h include/assimp/SmoothingGroups.inl include/assimp/SpatialSort.h @@ -48,6 +50,7 @@ include/assimp/Subdivision.h include/assimp/TinyFormatter.h include/assimp/Vertex.h include/assimp/XMLTools.h +include/assimp/XmlParser.h include/assimp/ZipArchiveIOSystem.h include/assimp/aabb.h include/assimp/ai_assert.h @@ -58,11 +61,11 @@ include/assimp/cfileio.h include/assimp/cimport.h include/assimp/color4.h include/assimp/color4.inl +include/assimp/commonMetaData.h include/assimp/config.h include/assimp/defs.h include/assimp/fast_atof.h include/assimp/importerdesc.h -include/assimp/irrXMLWrapper.h include/assimp/light.h include/assimp/material.h include/assimp/material.inl @@ -86,11 +89,10 @@ include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h lib/cmake/ -lib/cmake/assimp-5.0/ -lib/cmake/assimp-5.0/assimp-config-version.cmake -lib/cmake/assimp-5.0/assimp-config.cmake -lib/cmake/assimp-5.0/assimpTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/assimp-5.0/assimpTargets.cmake -@static-lib lib/libIrrXML.a +lib/cmake/assimp-5.2/ +lib/cmake/assimp-5.2/assimpConfig.cmake +lib/cmake/assimp-5.2/assimpConfigVersion.cmake +lib/cmake/assimp-5.2/assimpTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/assimp-5.2/assimpTargets.cmake @lib lib/libassimp.so.${LIBassimp_VERSION} lib/pkgconfig/assimp.pc
