[Midnightbsd-cvs] mports [24711] trunk/multimedia/assimp: update assimp to 4.1.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Nov 26 11:26:42 EST 2018
Revision: 24711
http://svnweb.midnightbsd.org/mports/?rev=24711
Author: laffer1
Date: 2018-11-26 11:26:41 -0500 (Mon, 26 Nov 2018)
Log Message:
-----------
update assimp to 4.1.0
Modified Paths:
--------------
trunk/multimedia/assimp/Makefile
trunk/multimedia/assimp/distinfo
trunk/multimedia/assimp/pkg-plist
Added Paths:
-----------
trunk/multimedia/assimp/files/
trunk/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp
trunk/multimedia/assimp/files/patch-git_096056
Modified: trunk/multimedia/assimp/Makefile
===================================================================
--- trunk/multimedia/assimp/Makefile 2018-11-26 16:20:46 UTC (rev 24710)
+++ trunk/multimedia/assimp/Makefile 2018-11-26 16:26:41 UTC (rev 24711)
@@ -1,8 +1,9 @@
# $MidnightBSD$
PORTNAME= assimp
-PORTVERSION= 3.3.1
DISTVERSIONPREFIX= v
+DISTVERSION= 4.1.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= ports at MidnightBSD.org
@@ -11,25 +12,19 @@
LICENSE= bsd3
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cmake compiler:c++11-lib pkgconfig
-USE_GITHUB= yes
+LIB_DEPENDS= libminizip.so:archivers/minizip
+
+USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig
+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
-.include <bsd.port.pre.mk>
+PLIST_SUB= SHL3=${DISTVERSION} VER2=${DISTVERSION:R} SHL1=${DISTVERSION:R:R}
-.if ${COMPILER_TYPE} == gcc
-# GCC C++11 support is broken on FreeBSD (see PR 193528 for details)
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
+post-install: # rm the third-party lib installed by mistake: https://github.com/assimp/assimp/issues/1650
+ @${RM} ${STAGEDIR}${PREFIX}/lib/libIrrXML.a
+ ${MKDIR} ${PREFIX}/libdata/pkgconfig
+ ${CP} ${PREFIX}/lib/pkgconfig/*.pc ${PREFIX}/libdata/pkgconfig/
-post-patch: .SILENT
- ${REINPLACE_CMD} -e '/zzip-zlib-config/d' \
- ${WRKSRC}/cmake-modules/FindZLIB.cmake
- ${REINPLACE_CMD} -e '/working branch$$/,/^)/d ; /minizip/d ; \
- s|$${ASSIMP_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
- ${WRKSRC}/CMakeLists.txt
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/multimedia/assimp/distinfo
===================================================================
--- trunk/multimedia/assimp/distinfo 2018-11-26 16:20:46 UTC (rev 24710)
+++ trunk/multimedia/assimp/distinfo 2018-11-26 16:26:41 UTC (rev 24711)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525982120
-SHA256 (assimp-v3.3.1_GH0.tar.gz) = d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf
-SIZE (assimp-v3.3.1_GH0.tar.gz) = 36428380
+TIMESTAMP = 1543249372
+SHA256 (assimp-v4.1.0_GH0.tar.gz) = 3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71
+SIZE (assimp-v4.1.0_GH0.tar.gz) = 45417293
Added: trunk/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp
===================================================================
--- trunk/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp (rev 0)
+++ trunk/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp 2018-11-26 16:26:41 UTC (rev 24711)
@@ -0,0 +1,10 @@
+--- code/D3MFOpcPackage.cpp.orig 2017-12-11 13:22:45 UTC
++++ code/D3MFOpcPackage.cpp
+@@ -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"
+
Property changes on: trunk/multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/assimp/files/patch-git_096056
===================================================================
--- trunk/multimedia/assimp/files/patch-git_096056 (rev 0)
+++ trunk/multimedia/assimp/files/patch-git_096056 2018-11-26 16:26:41 UTC (rev 24711)
@@ -0,0 +1,21 @@
+From 096056b899d9c423cdcad527849126e3e3e17a34 Mon Sep 17 00:00:00 2001
+From: Turo Lamminen <turotl at 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 {
Property changes on: trunk/multimedia/assimp/files/patch-git_096056
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/assimp/pkg-plist
===================================================================
--- trunk/multimedia/assimp/pkg-plist 2018-11-26 16:20:46 UTC (rev 24710)
+++ trunk/multimedia/assimp/pkg-plist 2018-11-26 16:26:41 UTC (rev 24711)
@@ -2,7 +2,10 @@
include/assimp/Compiler/poppack1.h
include/assimp/Compiler/pstdint.h
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
@@ -11,6 +14,7 @@
include/assimp/Logger.hpp
include/assimp/NullLogger.hpp
include/assimp/ProgressHandler.hpp
+include/assimp/SceneCombiner.h
include/assimp/ai_assert.h
include/assimp/anim.h
include/assimp/camera.h
@@ -42,9 +46,9 @@
include/assimp/vector3.h
include/assimp/vector3.inl
include/assimp/version.h
-lib/cmake/assimp-3.3/assimp-config-version.cmake
-lib/cmake/assimp-3.3/assimp-config.cmake
+lib/cmake/assimp-%%VER2%%/assimp-config-version.cmake
+lib/cmake/assimp-%%VER2%%/assimp-config.cmake
lib/libassimp.so
-lib/libassimp.so.3
-lib/libassimp.so.3.3.1
+lib/libassimp.so.%%SHL1%%
+lib/libassimp.so.%%SHL3%%
libdata/pkgconfig/assimp.pc
More information about the Midnightbsd-cvs
mailing list