Page MenuHomeFreeBSD
Files F152998080

D9489.diff
No OneTemporary
Actions

D9489.diff
View Options

Index: head/multimedia/assimp/Makefile
===================================================================
--- head/multimedia/assimp/Makefile
+++ head/multimedia/assimp/Makefile
@@ -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: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp
===================================================================
--- head/multimedia/assimp/files/patch-code_BlenderDNA.cpp
+++ head/multimedia/assimp/files/patch-code_BlenderDNA.cpp
@@ -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);
+

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 1:26 PM (2 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31773143
Default Alt Text
D9489.diff (1 KB)

Event Timeline