Date: Thu, 9 Feb 2017 17:41:19 +0000 (UTC) From: Kirill Ponomarew <krion@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433750 - in head/multimedia/assimp: . files Message-ID: <201702091741.v19HfJnX076629@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: krion Date: Thu Feb 9 17:41:19 2017 New Revision: 433750 URL: https://svnweb.freebsd.org/changeset/ports/433750 Log: Unbreak multimedia/assimp on armv6 and aarch64 PR: 216815 Submitted by: mmel@FreeBSD.org Approved by: mag (mentor) Differential Revision: https://reviews.freebsd.org/D9489 Added: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp (contents, props changed) Modified: head/multimedia/assimp/Makefile Modified: head/multimedia/assimp/Makefile ============================================================================== --- head/multimedia/assimp/Makefile Thu Feb 9 17:39:41 2017 (r433749) +++ head/multimedia/assimp/Makefile Thu Feb 9 17:41:19 2017 (r433750) @@ -13,10 +13,7 @@ COMMENT= Library to import various 3D mo 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 Added: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/assimp/files/patch-code_BlenderDNA.cpp Thu Feb 9 17:41:19 2017 (r433750) @@ -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<char>((stream).GetI1()), ++ static_cast<char>((stream).GetI1()), ++ static_cast<char>((stream).GetI1()), ++ static_cast<char>((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<char>(stream.GetI1()), ++ static_cast<char>(stream.GetI1()), ++ static_cast<char>(stream.GetI1()), ++ static_cast<char>(stream.GetI1()) + }; + current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702091741.v19HfJnX076629>