diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index a99338a1512e..cf245a3dca95 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,29 +1,28 @@ PORTNAME= assimp DISTVERSIONPREFIX= v DISTVERSION= 5.4.3 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Library to import various 3D model formats in a uniform manner -WWW= https://www.assimp.org/ +WWW= https://www.assimp.org \ + https://github.com/assimp/assimp LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_armv6= field within 'Assimp::MDL::Vertex_MDL7' is less aligned than 'Assimp::MDL::Vertex_MDL7::..., see https://github.com/assimp/assimp/issues/4640 - USES= cmake:testing compiler:c++17-lang cpe localbase:ldflags pkgconfig # minizip is disabled for https://github.com/assimp/assimp/issues/4374 USE_GITHUB= yes USE_LDCONFIG= yes CMAKE_OFF= ASSIMP_BUILD_TESTS ASSIMP_BUILD_ZLIB BUILD_STATIC_LIBS CMAKE_ON= ASSIMP_BUILD_MINIZIP # workaround for https://github.com/assimp/assimp/issues/4374 CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack to avoid target post-test: # 1 test fails, see https://github.com/assimp/assimp/issues/4751 @cd ${BUILD_WRKSRC} && \ ${BUILD_WRKSRC}/bin/unit .include diff --git a/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h b/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h index 334f12063fbd..bbd40c65b773 100644 --- a/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h +++ b/multimedia/assimp/files/patch-code_AssetLib_MDL_MDLFileData.h @@ -1,11 +1,13 @@ +- https://github.com/assimp/assimp/issues/4640 + --- code/AssetLib/MDL/MDLFileData.h.orig 2023-10-16 03:31:18 UTC +++ code/AssetLib/MDL/MDLFileData.h @@ -603,7 +603,7 @@ struct Vertex_MDL7 union { uint8_t norm162index; float norm[3]; - }; + } PACK_STRUCT; } PACK_STRUCT; // -------------------------------------------------------------------------------------