Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Mar 2016 07:34:57 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411981 - in head: games/doomsday games/pioneer multimedia/assimp
Message-ID:  <201603270734.u2R7YvTr030651@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sun Mar 27 07:34:57 2016
New Revision: 411981
URL: https://svnweb.freebsd.org/changeset/ports/411981

Log:
  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

Modified:
  head/games/doomsday/Makefile
  head/games/pioneer/Makefile
  head/multimedia/assimp/Makefile
  head/multimedia/assimp/distinfo
  head/multimedia/assimp/pkg-plist

Modified: head/games/doomsday/Makefile
==============================================================================
--- head/games/doomsday/Makefile	Sun Mar 27 07:32:33 2016	(r411980)
+++ head/games/doomsday/Makefile	Sun Mar 27 07:34:57 2016	(r411981)
@@ -3,7 +3,7 @@
 
 PORTNAME=	doomsday
 PORTVERSION=	1.15.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/deng/Doomsday%20Engine/${PORTVERSION}
 DISTNAME=	${PORTNAME}-stable-${PORTVERSION}

Modified: head/games/pioneer/Makefile
==============================================================================
--- head/games/pioneer/Makefile	Sun Mar 27 07:32:33 2016	(r411980)
+++ head/games/pioneer/Makefile	Sun Mar 27 07:34:57 2016	(r411981)
@@ -3,6 +3,7 @@
 
 PORTNAME=	pioneer
 PORTVERSION=	0.0.${GH_TAGNAME}
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	lightside@gmx.com

Modified: head/multimedia/assimp/Makefile
==============================================================================
--- head/multimedia/assimp/Makefile	Sun Mar 27 07:32:33 2016	(r411980)
+++ head/multimedia/assimp/Makefile	Sun Mar 27 07:34:57 2016	(r411981)
@@ -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 mo
 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>

Modified: head/multimedia/assimp/distinfo
==============================================================================
--- head/multimedia/assimp/distinfo	Sun Mar 27 07:32:33 2016	(r411980)
+++ head/multimedia/assimp/distinfo	Sun Mar 27 07:34:57 2016	(r411981)
@@ -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

Modified: head/multimedia/assimp/pkg-plist
==============================================================================
--- head/multimedia/assimp/pkg-plist	Sun Mar 27 07:32:33 2016	(r411980)
+++ head/multimedia/assimp/pkg-plist	Sun Mar 27 07:34:57 2016	(r411981)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603270734.u2R7YvTr030651>