Attachment 179668 Details for Bug 216815 – Fix build on armv6 and aarch64

[patch] Fix build on armv6 and aarch64

assimp.diff (text/plain), 2.26 KB, created by Michal Meloun on 2017-02-06 07:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Meloun

Created: 2017-02-06 07:32:13 UTC

Size: 2.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433472)
>+++ Makefile	(working copy)
>@@ -13,10 +13,7 @@
> 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
>Index: files/patch-code_BlenderDNA.cpp
>===================================================================
>--- files/patch-code_BlenderDNA.cpp	(nonexistent)
>+++ files/patch-code_BlenderDNA.cpp	(working copy)
>@@ -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);
>+ 
>
>Property changes on: files/patch-code_BlenderDNA.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216815: 179630 | 179631 | 179668