FreeBSD Bugzilla – Attachment 184555 Details for
Bug 220889
multimedia/assimp: Update to 4.0.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
assimp.patch (text/plain), 7.43 KB, created by
Yuri Victorovich
on 2017-07-20 19:03:53 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Yuri Victorovich
Created:
2017-07-20 19:03:53 UTC
Size:
7.43 KB
patch
obsolete
>Index: multimedia/assimp/Makefile >=================================================================== >--- multimedia/assimp/Makefile (revision 446285) >+++ multimedia/assimp/Makefile (working copy) >@@ -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 @@ > 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 @@ > 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> >Index: multimedia/assimp/distinfo >=================================================================== >--- multimedia/assimp/distinfo (revision 446285) >+++ multimedia/assimp/distinfo (working copy) >@@ -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: multimedia/assimp/files/patch-code_BlenderDNA.cpp >=================================================================== >--- multimedia/assimp/files/patch-code_BlenderDNA.cpp (revision 446285) >+++ 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<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: 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: multimedia/assimp/files/patch-code_D3MFImporter.cpp >=================================================================== >--- multimedia/assimp/files/patch-code_D3MFImporter.cpp (revision 446285) >+++ 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: 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: multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp >=================================================================== >--- multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp (nonexistent) >+++ multimedia/assimp/files/patch-code_D3MFOpcPackage.cpp (working copy) >@@ -0,0 +1,11 @@ >+--- code/D3MFOpcPackage.cpp.orig 2017-07-20 18:51:33 UTC >++++ code/D3MFOpcPackage.cpp >+@@ -55,6 +55,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE >+ #include <algorithm> >+ #include <cassert> >+ >++#include <stdlib.h> >++ >+ #include <contrib/unzip/unzip.h> >+ >+ namespace Assimp { > >Property changes on: multimedia/assimp/files/patch-code_D3MFOpcPackage.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 >Index: multimedia/assimp/files/patch-code_MMDPmdParser.h >=================================================================== >--- multimedia/assimp/files/patch-code_MMDPmdParser.h (nonexistent) >+++ multimedia/assimp/files/patch-code_MMDPmdParser.h (working copy) >@@ -0,0 +1,11 @@ >+--- code/MMDPmdParser.h.orig 2017-07-18 17:03:26 UTC >++++ code/MMDPmdParser.h >+@@ -158,7 +158,7 @@ namespace pmd >+ sphere_filename.clear(); >+ } >+ else { >+- *pstar = (char)NULL; >++ *pstar = 0; >+ texture_filename = std::string(buffer); >+ sphere_filename = std::string(pstar+1); >+ } > >Property changes on: multimedia/assimp/files/patch-code_MMDPmdParser.h >___________________________________________________________________ >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 >Index: multimedia/assimp/pkg-plist >=================================================================== >--- multimedia/assimp/pkg-plist (revision 446285) >+++ multimedia/assimp/pkg-plist (working copy) >@@ -2,6 +2,8 @@ > 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/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/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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
yuri
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 220889
: 184555 |
184602
|
184604
|
184685
|
184686