Index: head/graphics/qt5-3d/Makefile =================================================================== --- head/graphics/qt5-3d/Makefile (revision 446389) +++ head/graphics/qt5-3d/Makefile (revision 446390) @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} CATEGORIES= graphics 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 QT_DIST= ${PORTNAME} USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include Index: head/multimedia/assimp/files/patch-code_D3MFImporter.cpp =================================================================== --- head/multimedia/assimp/files/patch-code_D3MFImporter.cpp (revision 446389) +++ head/multimedia/assimp/files/patch-code_D3MFImporter.cpp (nonexistent) @@ -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; - } Property changes on: head/multimedia/assimp/files/patch-code_D3MFImporter.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp =================================================================== --- head/multimedia/assimp/files/patch-code_BlenderDNA.cpp (revision 446389) +++ head/multimedia/assimp/files/patch-code_BlenderDNA.cpp (nonexistent) @@ -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((stream).GetI1()), -+ static_cast((stream).GetI1()), -+ static_cast((stream).GetI1()), -+ static_cast((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(stream.GetI1()), -+ static_cast(stream.GetI1()), -+ static_cast(stream.GetI1()), -+ static_cast(stream.GetI1()) - }; - current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); - Property changes on: head/multimedia/assimp/files/patch-code_BlenderDNA.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/assimp/Makefile =================================================================== --- head/multimedia/assimp/Makefile (revision 446389) +++ head/multimedia/assimp/Makefile (revision 446390) @@ -1,39 +1,31 @@ # Created by: Yuri # $FreeBSD$ PORTNAME= assimp -PORTVERSION= 3.3.1 +PORTVERSION= 4.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= yuri@rawbw.com COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE 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 CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON -DASSIMP_BUILD_TESTS:BOOL=OFF .include .if ${CHOSEN_COMPILER_TYPE} == gcc # GCC C++11 support is broken on FreeBSD (see PR 193528 for details) 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 Index: head/multimedia/assimp/distinfo =================================================================== --- head/multimedia/assimp/distinfo (revision 446389) +++ head/multimedia/assimp/distinfo (revision 446390) @@ -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 Index: head/multimedia/assimp/pkg-plist =================================================================== --- head/multimedia/assimp/pkg-plist (revision 446389) +++ head/multimedia/assimp/pkg-plist (revision 446390) @@ -1,50 +1,53 @@ 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 include/assimp/IOSystem.hpp include/assimp/Importer.hpp 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 include/assimp/cexport.h include/assimp/cfileio.h include/assimp/cimport.h include/assimp/color4.h include/assimp/color4.inl include/assimp/config.h include/assimp/defs.h include/assimp/importerdesc.h include/assimp/light.h include/assimp/material.h include/assimp/material.inl include/assimp/matrix3x3.h include/assimp/matrix3x3.inl include/assimp/matrix4x4.h include/assimp/matrix4x4.inl include/assimp/mesh.h include/assimp/metadata.h include/assimp/postprocess.h include/assimp/quaternion.h include/assimp/quaternion.inl include/assimp/scene.h include/assimp/texture.h include/assimp/types.h include/assimp/vector2.h 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