From owner-svn-ports-all@freebsd.org Thu Feb 9 17:41:20 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEB79CD7C98; Thu, 9 Feb 2017 17:41:20 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D47212B0; Thu, 9 Feb 2017 17:41:20 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v19HfJns076808; Thu, 9 Feb 2017 17:41:19 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v19HfJnX076629; Thu, 9 Feb 2017 17:41:19 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201702091741.v19HfJnX076629@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarew Date: Thu, 9 Feb 2017 17:41:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433750 - in head/multimedia/assimp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Feb 2017 17:41:21 -0000 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((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); +