Attachment 178990 Details for Bug 216160 – typo fix

[patch] typo fix

assimp.clang40.diff (text/plain), 1.95 KB, created by Jan Beich on 2017-01-17 11:05:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-01-17 11:05:11 UTC

Size: 1.95 KB

patch

obsolete

>From de83e974572402ae90dcb6c11ead924f1ccf8e74 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Tue, 17 Jan 2017 10:58:40 +0000
>Subject: 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@rawbw.com> (maintainer)
>MFH:		2017Q1
>---
> multimedia/assimp/Makefile                          |  1 +
> multimedia/assimp/files/patch-code_D3MFImporter.cpp | 11 +++++++++++
> 2 files changed, 12 insertions(+)
> create mode 100644 multimedia/assimp/files/patch-code_D3MFImporter.cpp
>
>diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
>index fe19ca982b9e..88bf19c590a7 100644
>--- a/multimedia/assimp/Makefile
>+++ b/multimedia/assimp/Makefile
>@@ -4,6 +4,7 @@
> PORTNAME=	assimp
> PORTVERSION=	3.3.1
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	yuri@rawbw.com
>diff --git a/multimedia/assimp/files/patch-code_D3MFImporter.cpp b/multimedia/assimp/files/patch-code_D3MFImporter.cpp
>new file mode 100644
>index 000000000000..bb6fe04953d5
>--- /dev/null
>+++ b/multimedia/assimp/files/patch-code_D3MFImporter.cpp
>@@ -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;
>+     }

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 216160: 178990