diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index fe19ca982b9e..88bf19c590a7 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -1,41 +1,42 @@ # Created by: Yuri # $FreeBSD$ PORTNAME= assimp PORTVERSION= 3.3.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@rawbw.com COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= Does not compile: error: non-constant-expression cannot be narrowed from type int8_t to char BROKEN_armv6= Does not compile: error: non-constant-expression cannot be narrowed from type int8_t to char BROKEN_powerpc64= Does not build BROKEN_armv6= Does not compile: error: ByteSwap has not been declared USES= cmake compiler:c++11-lib 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 .include .if ${CHOSEN_COMPILER_TYPE} == gcc # GCC C++11 support is broken on FreeBSD (see PR 193528 for details) CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif 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 diff --git a/multimedia/assimp/files/patch-code_D3MFImporter.cpp b/multimedia/assimp/files/patch-code_D3MFImporter.cpp new file mode 100644 index 000000000000..bb6fe04953d5 --- /dev/null +++ b/multimedia/assimp/files/patch-code_D3MFImporter.cpp @@ -0,0 +1,11 @@ +--- code/D3MFImporter.cpp.orig 2016-07-08 17:29:51 UTC ++++ code/D3MFImporter.cpp +@@ -227,7 +227,7 @@ private: + aiVector3D vertex; + vertex.x = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::x.c_str()), nullptr); + vertex.y = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::y.c_str()), nullptr); +- vertex.z = ai_strtof>(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); ++ vertex.z = ai_strtof(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); + + return vertex; + }