<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fe18521bb0e7c4db3b349b9a6d6a4572dc1d8b54">https://github.com/macports/macports-ports/commit/fe18521bb0e7c4db3b349b9a6d6a4572dc1d8b54</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fe18521bb0e assimp: update to 5.1.5
</span>fe18521bb0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fe18521bb0e7c4db3b349b9a6d6a4572dc1d8b54
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jan 7 15:15:55 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> assimp: update to 5.1.5
</span>---
graphics/assimp/Portfile | 18 ++++++++----------
graphics/assimp/files/patch-CMakeLists.txt.diff | 11 -----------
graphics/assimp/files/patch-assimp.pc.in.diff | 11 -----------
.../patch-code-AssetLib-glTF2-glTF2Asset.inl.diff | 11 +++++++++++
graphics/assimp/files/patch-code-CMakeLists.txt.diff | 11 +++++++++++
graphics/assimp/files/patch-code-STEPFile.h.diff | 18 ------------------
6 files changed, 30 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/Portfile b/graphics/assimp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5d0e2219b4..4cdcc05b850 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/assimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/assimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,12 @@ PortGroup legacysupport 1.0
</span> # strnlen
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup assimp assimp 5.0.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup assimp assimp 5.1.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 adf21a78900d6bab170898c1536fdec94195e319 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fea5953ac509fd0687e80cc19c7a35c0d5d4d8c654efd003a6112372d4edfda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48978688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> conflicts assimp2
categories graphics
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,18 +27,12 @@ homepage http://www.assimp.org
</span> platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7d7da8769f284fe1b2d229d986663380eef4c69f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 226d4039d92915eb24e677203be518d2825f0821c41bd5a46d002945c6adfb72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 46605606
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:pkgconfig
depends_lib port:zlib port:minizip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix the pkg-config file variable "includedir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove at next release, which uses a totally different .pc file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/assimp/assimp/commit/1e828cb8bb18218735a8a5fa00f18ba2c544f7bd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-assimp.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-code-AssetLib-glTF2-glTF2Asset.inl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-code-CMakeLists.txt.diff
</span>
compiler.cxx_standard 2011
configure.args-append -DASSIMP_BUILD_ASSIMP_TOOLS:BOOL=OFF -DASSIMP_BUILD_TESTS:BOOL=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/files/patch-CMakeLists.txt.diff b/graphics/assimp/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 19debbc5c20..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/assimp/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2012-07-07 18:15:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2012-07-16 11:09:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (ASSIMP_SV_REVISION 1264)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (ASSIMP_VERSION_MAJOR 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (ASSIMP_VERSION_MINOR 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set (ASSIMP_VERSION_PATCH ${ASSIMP_SV_REVISION}) # subversion revision?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set (ASSIMP_VERSION_PATCH 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VERSION_PATCH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (ASSIMP_SOVERSION 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET ( PROJECT_VERSION "${ASSIMP_VERSION}" )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/files/patch-assimp.pc.in.diff b/graphics/assimp/files/patch-assimp.pc.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ded84d77bea..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/assimp/files/patch-assimp.pc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- assimp.pc.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ assimp.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=@CMAKE_INSTALL_PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec_prefix=@CMAKE_INSTALL_PREFIX@/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+includedir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_INCLUDE_INSTALL_DIR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Name: @CMAKE_PROJECT_NAME@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Import various well-known 3D model formats in an uniform manner.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/files/patch-code-AssetLib-glTF2-glTF2Asset.inl.diff b/graphics/assimp/files/patch-code-AssetLib-glTF2-glTF2Asset.inl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..58c1e156ff1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/assimp/files/patch-code-AssetLib-glTF2-glTF2Asset.inl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- code/AssetLib/glTF2/glTF2Asset.inl.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ code/AssetLib/glTF2/glTF2Asset.inl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assimp/StringUtils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assimp/DefaultLogger.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/stringbuffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // clang-format off
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ASSIMP_ENABLE_DRACO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/files/patch-code-CMakeLists.txt.diff b/graphics/assimp/files/patch-code-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bfcf99aa444
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/assimp/files/patch-code-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- code/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ code/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1201,7 +1201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(assimp PUBLIC ${draco_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} pugixml)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ASSIMP_BUILD_DRACO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(assimp ${draco_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/files/patch-code-STEPFile.h.diff b/graphics/assimp/files/patch-code-STEPFile.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 22f9f0acf8e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/assimp/files/patch-code-STEPFile.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- code/STEPFile.h.orig 2012-07-31 15:16:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ code/STEPFile.h 2012-07-31 15:16:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -195,13 +195,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // conversion support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const T& ResolveSelect(const DB& db) const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->To<T>();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->template To<T>();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const T* ResolveSelectPtr(const DB& db) const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const EXPRESS::ENTITY* e = ToPtr<EXPRESS::ENTITY>();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return e?Couple<T>(db).MustGetObject(*e)->ToPtr<T>():(const T*)0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return e?Couple<T>(db).MustGetObject(*e)->template ToPtr<T>():(const T*)0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span></pre><pre style='margin:0'>
</pre>