From owner-svn-ports-all@freebsd.org Tue Jan 17 17:22:22 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 918DFCB4D48; Tue, 17 Jan 2017 17:22:22 +0000 (UTC) (envelope-from jbeich@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 471181DC2; Tue, 17 Jan 2017 17:22:22 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HHMLAd056697; Tue, 17 Jan 2017 17:22:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HHMLBg056695; Tue, 17 Jan 2017 17:22:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701171722.v0HHMLBg056695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 17 Jan 2017 17:22:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431762 - 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: Tue, 17 Jan 2017 17:22:22 -0000 Author: jbeich Date: Tue Jan 17 17:22:21 2017 New Revision: 431762 URL: https://svnweb.freebsd.org/changeset/ports/431762 Log: multimedia/assimp: unbreak build with clang 4.0 code/D3MFImporter.cpp:230:29: error: invalid operands to binary expression ('float (*)(const char *, const char *)' and 'nullptr_t') vertex.z = ai_strtof>(xmlReader->getAttributeValue(D3MF::XmlTag::z.c_str()), nullptr); ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 216160 Approved by: Yuri Victorovich (maintainer) MFH: 2017Q1 (changes behavior) Added: head/multimedia/assimp/files/ head/multimedia/assimp/files/patch-code_D3MFImporter.cpp (contents, props changed) Modified: head/multimedia/assimp/Makefile (contents, props changed) Modified: head/multimedia/assimp/Makefile ============================================================================== --- head/multimedia/assimp/Makefile Tue Jan 17 17:21:16 2017 (r431761) +++ head/multimedia/assimp/Makefile Tue Jan 17 17:22:21 2017 (r431762) @@ -4,6 +4,7 @@ PORTNAME= assimp PORTVERSION= 3.3.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@rawbw.com Added: head/multimedia/assimp/files/patch-code_D3MFImporter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/assimp/files/patch-code_D3MFImporter.cpp Tue Jan 17 17:22:21 2017 (r431762) @@ -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; + }