multimedia/assimp: update to 4.0.0

Changes:	https://github.com/assimp/assimp/releases/tag/v4.0.0
PR:		220889
Submitted by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)

6 files changed, 13 insertions, 61 deletions

diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
index e539ae9..7fa5560 100644
--- a/graphics/qt5-3d/Makefile
+++ b/graphics/qt5-3d/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt3D module
 
-LIB_DEPENDS=	libassimp.so.3:multimedia/assimp
+LIB_DEPENDS=	libassimp.so:multimedia/assimp
 
 USES=		pkgconfig qmake
 USE_QT5=	concurrent core gui qml quick buildtools_build
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 92642ed..e04c712 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	assimp
-PORTVERSION=	3.3.1
+PORTVERSION=	4.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@rawbw.com
@@ -16,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_powerpc64=	Does not build: error: ByteSwap has not been declared
 
 USES=		cmake compiler:c++11-lib pkgconfig
-USE_GITHUB=		yes
+USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 # CMAKE_ARGS instructs cmake to skip runtime path removal during install
@@ -29,11 +28,4 @@ CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON -DASSIMP_BUILD_TESTS:BOOL=OFF
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
-post-patch: .SILENT
-	${REINPLACE_CMD} -e '/zzip-zlib-config/d' \
-		${WRKSRC}/cmake-modules/FindZLIB.cmake
-	${REINPLACE_CMD} -e '/working branch$$/,/^)/d ; /minizip/d ; \
-		s|$${ASSIMP_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
-		${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/assimp/distinfo b/multimedia/assimp/distinfo
index 244d650..8c0f295 100644
--- a/multimedia/assimp/distinfo
+++ b/multimedia/assimp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467998991
-SHA256 (assimp-assimp-v3.3.1_GH0.tar.gz) = d385c3f90876241343f09e45f4e5033a6a05861b971c63d1f6d512371ffdc7bf
-SIZE (assimp-assimp-v3.3.1_GH0.tar.gz) = 36428380
+TIMESTAMP = 1500479195
+SHA256 (assimp-assimp-v4.0.0_GH0.tar.gz) = 9025d7fdd2a1d1d23261cbbcb1155b267f2a277f7e86103e5e16f1cdea407fb9
+SIZE (assimp-assimp-v4.0.0_GH0.tar.gz) = 44618473
diff --git a/multimedia/assimp/files/patch-code_BlenderDNA.cpp b/multimedia/assimp/files/patch-code_BlenderDNA.cpp
deleted file mode 100644
index f70bf32..0000000
--- a/multimedia/assimp/files/patch-code_BlenderDNA.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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);
- 
diff --git a/multimedia/assimp/files/patch-code_D3MFImporter.cpp b/multimedia/assimp/files/patch-code_D3MFImporter.cpp
deleted file mode 100644
index bb6fe04..0000000
--- a/multimedia/assimp/files/patch-code_D3MFImporter.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
-     }
diff --git a/multimedia/assimp/pkg-plist b/multimedia/assimp/pkg-plist
index fd0c4ad..b2f92384 100644
--- a/multimedia/assimp/pkg-plist
+++ b/multimedia/assimp/pkg-plist
@@ -2,6 +2,8 @@ bin/assimp
 include/assimp/Compiler/poppack1.h
 include/assimp/Compiler/pstdint.h
 include/assimp/Compiler/pushpack1.h
+include/assimp/DefaultIOStream.h
+include/assimp/DefaultIOSystem.h
 include/assimp/DefaultLogger.hpp
 include/assimp/Exporter.hpp
 include/assimp/IOStream.hpp
@@ -11,6 +13,7 @@ include/assimp/LogStream.hpp
 include/assimp/Logger.hpp
 include/assimp/NullLogger.hpp
 include/assimp/ProgressHandler.hpp
+include/assimp/SceneCombiner.h
 include/assimp/ai_assert.h
 include/assimp/anim.h
 include/assimp/camera.h
@@ -42,9 +45,9 @@ include/assimp/vector2.inl
 include/assimp/vector3.h
 include/assimp/vector3.inl
 include/assimp/version.h
-lib/cmake/assimp-3.3/assimp-config-version.cmake
-lib/cmake/assimp-3.3/assimp-config.cmake
+lib/cmake/assimp-4.0/assimp-config-version.cmake
+lib/cmake/assimp-4.0/assimp-config.cmake
 lib/libassimp.so
-lib/libassimp.so.3
-lib/libassimp.so.3.3.1
+lib/libassimp.so.4
+lib/libassimp.so.4.0.0
 libdata/pkgconfig/assimp.pc