svn commit: r431762 - in head/multimedia/assimp: . files

[Jan Beich]

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 <yuri at rawbw.com> (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 at 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;
+     }