<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4adad9cbfe6559e9a1bab709650911aa2072a82d">https://github.com/macports/macports-ports/commit/4adad9cbfe6559e9a1bab709650911aa2072a82d</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 4adad9c ptex: fix build on older systems
</span>4adad9c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4adad9cbfe6559e9a1bab709650911aa2072a82d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 2 10:16:49 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ptex: fix build on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57495
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all
</span>---
graphics/ptex/Portfile | 6 ++++++
graphics/ptex/files/patch-lock.diff | 30 ++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ptex/Portfile b/graphics/ptex/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 62cde12..24166ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ptex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ptex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,4 +16,10 @@ checksums rmd160 9a39e73d41812ec66d14d78dcbd378eda9867e92 \
</span> sha256 a2ab01ec376bc199cb8c84f66322607a046015a95322d5684cbe80f57d58575f \
size 306514
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# revert https://github.com/wdas/ptex/commit/1818ffc24c3049a9c26f796daf298bb9c1883839 on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57495
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-lock.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:zlib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ptex/files/patch-lock.diff b/graphics/ptex/files/patch-lock.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bc5a9a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ptex/files/patch-lock.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ptex/PtexPlatform.h.orig 2018-04-10 15:47:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ptex/PtexPlatform.h 2018-11-02 09:28:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <os/lock.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libkern/OSAtomic.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,13 +136,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class SpinLock {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SpinLock() { _spinlock = OS_UNFAIR_LOCK_INIT; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SpinLock() { _spinlock = 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~SpinLock() { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void lock() { os_unfair_lock_lock(&_spinlock); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool trylock() { return os_unfair_lock_trylock(&_spinlock); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void unlock() { os_unfair_lock_unlock(&_spinlock); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void lock() { OSSpinLockLock(&_spinlock); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool trylock() { return OSSpinLockTry(&_spinlock); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void unlock() { OSSpinLockUnlock(&_spinlock); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os_unfair_lock _spinlock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSSpinLock _spinlock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class SpinLock {
</span></pre><pre style='margin:0'>
</pre>