Date: Thu, 8 Feb 2018 22:09:16 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461274 - in head: games/doomsday games/pioneer graphics/qt5-3d multimedia/assimp multimedia/assimp/files Message-ID: <201802082209.w18M9GbQ089311@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Thu Feb 8 22:09:15 2018 New Revision: 461274 URL: https://svnweb.freebsd.org/changeset/ports/461274 Log: multimedia/assimp: Update to 4.1.0 Change log: https://github.com/assimp/assimp/releases/tag/v4.1.0 Additional port changes: * Removed CMAKE_SKIP_RPATH, the default behavior should suffice * Changed to CMAKE_OFF * Removed the unnecessary .if/gcc clause * Improved PLIST_SUB tokens * Added the patch for #include that is already in the upstream repository now Also tried to add the double-precision option, but it fails in build, so I reported this to the upsream. Bumped PORTREVISION: games/pioneer games/doomsday graphics/qt5-3d Submitted by: myself Reported by: portscout Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D14253 Added: head/multimedia/assimp/files/patch-git_096056 (contents, props changed) Modified: head/games/doomsday/Makefile head/games/pioneer/Makefile head/graphics/qt5-3d/Makefile head/multimedia/assimp/Makefile head/multimedia/assimp/distinfo head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp head/multimedia/assimp/pkg-plist Modified: head/games/doomsday/Makefile ============================================================================== --- head/games/doomsday/Makefile Thu Feb 8 21:59:25 2018 (r461273) +++ head/games/doomsday/Makefile Thu Feb 8 22:09:15 2018 (r461274) @@ -3,6 +3,7 @@ PORTNAME= doomsday PORTVERSION= 2.0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/deng/Doomsday%20Engine/${PORTVERSION} Modified: head/games/pioneer/Makefile ============================================================================== --- head/games/pioneer/Makefile Thu Feb 8 21:59:25 2018 (r461273) +++ head/games/pioneer/Makefile Thu Feb 8 22:09:15 2018 (r461274) @@ -3,6 +3,7 @@ PORTNAME= pioneer PORTVERSION= 0.0.${GH_TAGNAME} +PORTREVISION= 1 CATEGORIES= games MAINTAINER= lightside@gmx.com Modified: head/graphics/qt5-3d/Makefile ============================================================================== --- head/graphics/qt5-3d/Makefile Thu Feb 8 21:59:25 2018 (r461273) +++ head/graphics/qt5-3d/Makefile Thu Feb 8 22:09:15 2018 (r461274) @@ -2,6 +2,7 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- Modified: head/multimedia/assimp/Makefile ============================================================================== --- head/multimedia/assimp/Makefile Thu Feb 8 21:59:25 2018 (r461273) +++ head/multimedia/assimp/Makefile Thu Feb 8 22:09:15 2018 (r461274) @@ -2,7 +2,7 @@ PORTNAME= assimp DISTVERSIONPREFIX= v -DISTVERSION= 4.0.1 +DISTVERSION= 4.1.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -19,16 +19,11 @@ USES= cmake compiler:c++11-lib localbase:ldflags pkgc USE_GITHUB= yes USE_LDCONFIG= yes -# CMAKE_ARGS instructs cmake to skip runtime path removal during install -CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON -DASSIMP_BUILD_TESTS:BOOL=OFF +CMAKE_OFF= ASSIMP_BUILD_TESTS -PLIST_SUB= SHLIB_VER=${DISTVERSION} +PLIST_SUB= SHL3=${DISTVERSION} VER2=${DISTVERSION:R} SHL1=${DISTVERSION:R:R} -.include <bsd.port.pre.mk> +post-install: # rm the third-party lib installed by mistake: https://github.com/assimp/assimp/issues/1650 + @${RM} ${STAGEDIR}${PREFIX}/lib/libIrrXML.a -.if ${CHOSEN_COMPILER_TYPE} == gcc -# GCC C++11 support is broken on FreeBSD (see PR 193528 for details) -CXXFLAGS+= -D_GLIBCXX_USE_C99 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/multimedia/assimp/distinfo ============================================================================== --- head/multimedia/assimp/distinfo Thu Feb 8 21:59:25 2018 (r461273) +++ head/multimedia/assimp/distinfo Thu Feb 8 22:09:15 2018 (r461274) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509810769 -SHA256 (assimp-assimp-v4.0.1_GH0.tar.gz) = 60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e -SIZE (assimp-assimp-v4.0.1_GH0.tar.gz) = 44625148 +TIMESTAMP = 1513844771 +SHA256 (assimp-assimp-v4.1.0_GH0.tar.gz) = 3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 +SIZE (assimp-assimp-v4.1.0_GH0.tar.gz) = 45417293 Modified: head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp ============================================================================== --- head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp Thu Feb 8 21:59:25 2018 (r461273) +++ head/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp Thu Feb 8 22:09:15 2018 (r461274) @@ -1,11 +1,10 @@ ---- code/D3MFOpcPackage.cpp.orig 2017-07-18 17:03:26 UTC +--- code/D3MFOpcPackage.cpp.orig 2017-12-11 13:22:45 UTC +++ code/D3MFOpcPackage.cpp -@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O +@@ -55,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #include <map> #include <algorithm> #include <cassert> - +#include <stdlib.h> -+ #include <contrib/unzip/unzip.h> + #include "3MFXmlTags.h" - namespace Assimp { Added: head/multimedia/assimp/files/patch-git_096056 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/assimp/files/patch-git_096056 Thu Feb 8 22:09:15 2018 (r461274) @@ -0,0 +1,21 @@ +From 096056b899d9c423cdcad527849126e3e3e17a34 Mon Sep 17 00:00:00 2001 +From: Turo Lamminen <turotl@gmail.com> +Date: Sun, 24 Dec 2017 22:17:45 +0200 +Subject: [PATCH] Q3BSP: Fix build with clang libc++ + +--- + code/Q3BSPZipArchive.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git code/Q3BSPZipArchive.cpp code/Q3BSPZipArchive.cpp +index 86c966d8e..1c8b18ad3 100644 +--- code/Q3BSPZipArchive.cpp ++++ code/Q3BSPZipArchive.cpp +@@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include "Q3BSPZipArchive.h" + #include <cassert> ++#include <cstdlib> + #include <assimp/ai_assert.h> + + namespace Assimp { Modified: head/multimedia/assimp/pkg-plist ============================================================================== --- head/multimedia/assimp/pkg-plist Thu Feb 8 21:59:25 2018 (r461273) +++ head/multimedia/assimp/pkg-plist Thu Feb 8 22:09:15 2018 (r461274) @@ -5,6 +5,7 @@ include/assimp/Compiler/pushpack1.h include/assimp/DefaultIOStream.h include/assimp/DefaultIOSystem.h include/assimp/DefaultLogger.hpp +include/assimp/Defines.h include/assimp/Exporter.hpp include/assimp/IOStream.hpp include/assimp/IOSystem.hpp @@ -45,9 +46,9 @@ include/assimp/vector2.inl include/assimp/vector3.h include/assimp/vector3.inl include/assimp/version.h -lib/cmake/assimp-4.0/assimp-config-version.cmake -lib/cmake/assimp-4.0/assimp-config.cmake +lib/cmake/assimp-%%VER2%%/assimp-config-version.cmake +lib/cmake/assimp-%%VER2%%/assimp-config.cmake lib/libassimp.so -lib/libassimp.so.4 -lib/libassimp.so.%%SHLIB_VER%% +lib/libassimp.so.%%SHL1%% +lib/libassimp.so.%%SHL3%% libdata/pkgconfig/assimp.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802082209.w18M9GbQ089311>