diff options
| author | riggs <riggs@FreeBSD.org> | 2016-03-27 15:34:57 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2016-03-27 15:34:57 +0800 |
| commit | 63e0b0cf113770e0869e0569518d1fa8de5f2738 (patch) | |
| tree | 3b6948434b630f1b035989cee01993de2b52e688 /multimedia | |
| parent | ac97a28aba57195eca4fe9b84427c19c022d8a5e (diff) | |
| download | freebsd-ports-gnome-63e0b0cf113770e0869e0569518d1fa8de5f2738.tar.gz freebsd-ports-gnome-63e0b0cf113770e0869e0569518d1fa8de5f2738.tar.zst freebsd-ports-gnome-63e0b0cf113770e0869e0569518d1fa8de5f2738.zip | |
Update multimedia/assimp to upstream version 3.1.1
Details:
- Allow build with clang on FreeBSD >= 10
- Add BOOST option
- Add restrictions for USE_GCC
- Update post-patch and pkg-plist file
- Bump PORTREVISION on dependent ports (possible ABI change)
PR: 207575
Submitted by: lightside@gmx.com
Approved by: maintainer timeout
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/assimp/Makefile | 24 | ||||
| -rw-r--r-- | multimedia/assimp/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/assimp/pkg-plist | 7 |
3 files changed, 23 insertions, 12 deletions
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 4735407849cd..5dc63f27cc56 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= assimp -PORTVERSION= 3.0 -PORTREVISION= 5 +PORTVERSION= 3.1.1 +DISTVERSIONSUFFIX= _no_test_models CATEGORIES= multimedia -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.0 -DISTNAME= ${PORTNAME}--${PORTVERSION}.1270-source-only +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.1 MAINTAINER= yuri@tsoft.com COMMENT= Library to import various 3D model formats in a uniform manner @@ -14,17 +13,28 @@ COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= cmake pkgconfig zip -USE_GCC= yes # GCC 4.2 causes compiler warnings USE_LDCONFIG= yes # CMAKE_ARGS instructs cmake to skip runtime path removal during install CMAKE_ARGS+= "-DCMAKE_SKIP_RPATH=ON" +OPTIONS_DEFINE= BOOST +OPTIONS_DEFAULT= BOOST +BOOST_LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs +BOOST_CMAKE_ON= -DASSIMP_ENABLE_BOOST_WORKAROUND:BOOL=OFF + +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054 +# GCC 4.2 causes compiler warnings +USE_GCC= yes +.endif + post-patch: - @${REINPLACE_CMD} 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ + @${REINPLACE_CMD} 's|$${ASSIMP_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt .include <bsd.port.mk> diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo index b029e49968d8..88126656bd3f 100644 --- a/multimedia/assimp/distinfo +++ b/multimedia/assimp/distinfo @@ -1,2 +1,2 @@ -SHA256 (assimp--3.0.1270-source-only.zip) = ac29beb596db97df57451a5503afaf2d8b4366522842a6914da89644927a1423 -SIZE (assimp--3.0.1270-source-only.zip) = 4042147 +SHA256 (assimp-3.1.1_no_test_models.zip) = da9827876f10a8b447270368753392cfd502e70a2e9d1361554e5dfcb1fede9e +SIZE (assimp-3.1.1_no_test_models.zip) = 6626442 diff --git a/multimedia/assimp/pkg-plist b/multimedia/assimp/pkg-plist index 3f41599d2c00..5bd0c4b5dd89 100644 --- a/multimedia/assimp/pkg-plist +++ b/multimedia/assimp/pkg-plist @@ -30,6 +30,7 @@ include/assimp/matrix3x3.inl include/assimp/matrix4x4.h include/assimp/matrix4x4.inl include/assimp/mesh.h +include/assimp/metadata.h include/assimp/postprocess.h include/assimp/quaternion.h include/assimp/quaternion.inl @@ -41,9 +42,9 @@ include/assimp/vector2.inl include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h -lib/cmake/assimp-3.0/assimp-config-version.cmake -lib/cmake/assimp-3.0/assimp-config.cmake +lib/cmake/assimp-3.1/assimp-config-version.cmake +lib/cmake/assimp-3.1/assimp-config.cmake lib/libassimp.so lib/libassimp.so.3 -lib/libassimp.so.3.0.1264 +lib/libassimp.so.3.1.1 libdata/pkgconfig/assimp.pc |