Update assimp to 5.2.4. Consumers looking happy and cmake patches are obsolete. I also reorder some VARs in the Makefile.
OK? diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 22a1fdd6788..2792a4a4d34 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,12 +1,11 @@ COMMENT = open asset import library CATEGORIES = multimedia -SHARED_LIBS += assimp 1.0 # 5.0 - GH_ACCOUNT = assimp GH_PROJECT = assimp -GH_TAGNAME = v5.0.0 -REVISION = 1 +GH_TAGNAME = v5.2.4 + +SHARED_LIBS += assimp 1.1 # 5.0 HOMEPAGE = https://www.assimp.org/ MAINTAINER = Brian Callahan <bcal...@openbsd.org> @@ -19,16 +18,13 @@ WANTLIB += ${COMPILER_LIBCXX} c m z # C++11 COMPILER = base-clang ports-gcc -# make sure we dont pickup minizip from ports as its not the same -CONFIGURE_ARGS+=-DASSIMP_BUILD_MINIZIP:bool=true MODULES = devel/cmake BUILD_DEPENDS = devel/boost -NO_TEST = Yes +# make sure we dont pickup minizip from ports as its not the same +CONFIGURE_ARGS+=-DASSIMP_BUILD_MINIZIP=ON -pre-configure: - ${SUBST_CMD} ${WRKSRC}/assimpTargets-release.cmake.in \ - ${WRKSRC}/assimpTargets-debug.cmake.in +NO_TEST = Yes .include <bsd.port.mk> diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo index f89f049aa81..8a4aee8af4e 100644 --- a/multimedia/assimp/distinfo +++ b/multimedia/assimp/distinfo @@ -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.4.tar.gz) = ak/3Xccngh9171Kc6hxPwKe1/C4KCy/y9reZP+bLVLo= +SIZE (assimp-5.2.4.tar.gz) = 49613683 diff --git a/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in b/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in deleted file mode 100644 index bcb5dbbdd30..00000000000 --- a/multimedia/assimp/patches/patch-assimpTargets-debug_cmake_in +++ /dev/null @@ -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}" diff --git a/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in b/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in deleted file mode 100644 index e45dcea0970..00000000000 --- a/multimedia/assimp/patches/patch-assimpTargets-release_cmake_in +++ /dev/null @@ -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}" diff --git a/multimedia/assimp/pkg/PLIST b/multimedia/assimp/pkg/PLIST index 2d01b50a55a..b0215082186 100644 --- a/multimedia/assimp/pkg/PLIST +++ b/multimedia/assimp/pkg/PLIST @@ -1,9 +1,11 @@ @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 +14,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 +27,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 +38,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 +51,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 +62,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 +90,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
