<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90aafa3ae8de938d78e8b98ecf91c702523ac87d">https://github.com/macports/macports-ports/commit/90aafa3ae8de938d78e8b98ecf91c702523ac87d</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 90aafa3ae8d assimp: try to fix 10.14 and 10.15 builds
</span>90aafa3ae8d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90aafa3ae8de938d78e8b98ecf91c702523ac87d
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Sun Sep 25 14:55:54 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> assimp: try to fix 10.14 and 10.15 builds
</span>---
graphics/assimp/Portfile | 3 ++-
.../assimp/files/patch-include-assimp-Hash.h.diff | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
<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 e14ed0aa321..459a297c4f8 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;'>@@ -44,7 +44,8 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-code-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-code-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-include-assimp-Hash.h.diff
</span>
compiler.cxx_standard 2017
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/assimp/files/patch-include-assimp-Hash.h.diff b/graphics/assimp/files/patch-include-assimp-Hash.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e6d38b1b6fc
</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-include-assimp-Hash.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/assimp/Hash.h.orig 2022-09-08 13:13:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/assimp/Hash.h 2022-09-25 11:46:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,6 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Hashing function taken from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline uint32_t SuperFastHash (const char * data, uint32_t len = 0, uint32_t hash = 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t tmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!data) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!len)len = (uint32_t)::strlen(data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>