Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Jun 2026 19:22:50 +0000
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 01ab3984e646 - main - multimedia/assimp: Improve port
Message-ID:  <6a35970a.35cf0.71810967@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=01ab3984e646468d8bea707bb0d378765fc3be78

commit 01ab3984e646468d8bea707bb0d378765fc3be78
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-06-19 16:34:15 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-06-19 19:22:25 +0000

    multimedia/assimp: Improve port
    
    * Unbundle minizip, rapidjson and utf8cpp
    * Don't extract tests unless requested
      (saves over 120Mbyte of unnecessary data extraction)
    * Update Makefile to follow Porters Handbook more closely
    
    PR:             296154
    Reviewed by:    yuri
---
 multimedia/assimp/Makefile | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index ef769bdd1d94..0ad945fa21f8 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -11,20 +11,40 @@ WWW=		https://www.assimp.org \
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:testing compiler:c++17-lang cpe localbase:ldflags pkgconfig # minizip is disabled for https://github.com/assimp/assimp/issues/4374
+BUILD_DEPENDS=	rapidjson>0:devel/rapidjson \
+		utf8cpp>0:devel/utf8cpp
 
-USE_GITHUB=	yes
+USES=		cmake:testing compiler:c++17-lang cpe localbase:ldflags \
+		pathfix pkgconfig minizip
 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
+USE_GITHUB=	yes
+
+EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/contrib/rapidjson	\
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/contrib/unzip \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/contrib/utf8cpp \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/contrib/zlib \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/test \
+			--no-same-owner --no-same-permissions
+
+CXXFLAGS+=	-I${LOCALBASE}/include/utf8cpp
+
 CMAKE_TESTING_ON=	ASSIMP_BUILD_TESTS
-CMAKE_TESTING_TARGET=	${ALL_TARGET} # hack to avoid target
+CMAKE_TESTING_TARGET=
+
+CMAKE_OFF=		ASSIMP_BUILD_TESTS \
+			ASSIMP_BUILD_MINIZIP \
+			ASSIMP_BUILD_ZLIB \
+			BUILD_STATIC_LIBS
+
+pre-test:
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
+	    -C ${WRKDIR} --include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/test \
+	    --no-same-owner --no-same-permissions
+	@${RLN} ${WRKSRC}/test ${CONFIGURE_WRKSRC}/test
 
 post-test:
 	@cd ${BUILD_WRKSRC} && \
 		${BUILD_WRKSRC}/bin/unit
 
-# tests as of 6.0.1: 584 tests from 114 test suites ran. (2506 ms total)
-
 .include <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a35970a.35cf0.71810967>