Index: head/multimedia/assimp/Makefile =================================================================== --- head/multimedia/assimp/Makefile (revision 433749) +++ head/multimedia/assimp/Makefile (revision 433750) @@ -1,42 +1,39 @@ # 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 Index: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp =================================================================== --- head/multimedia/assimp/files/patch-code_BlenderDNA.cpp (nonexistent) +++ head/multimedia/assimp/files/patch-code_BlenderDNA.cpp (revision 433750) @@ -0,0 +1,32 @@ +--- code/BlenderDNA.cpp.orig 2017-02-05 09:22:26 UTC ++++ code/BlenderDNA.cpp +@@ -55,10 +55,10 @@ using namespace Assimp::Formatter; + + bool match4(StreamReaderAny& stream, const char* string) { + char tmp[] = { +- (stream).GetI1(), +- (stream).GetI1(), +- (stream).GetI1(), +- (stream).GetI1() ++ static_cast((stream).GetI1()), ++ static_cast((stream).GetI1()), ++ static_cast((stream).GetI1()), ++ static_cast((stream).GetI1()) + }; + return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); + } +@@ -345,10 +345,10 @@ void SectionParser :: Next() + stream.SetCurrentPos(current.start + current.size); + + const char tmp[] = { +- stream.GetI1(), +- stream.GetI1(), +- stream.GetI1(), +- stream.GetI1() ++ static_cast(stream.GetI1()), ++ static_cast(stream.GetI1()), ++ static_cast(stream.GetI1()), ++ static_cast(stream.GetI1()) + }; + current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); + Property changes on: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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