<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1393fcec9ada1be1f7b4216a043092f11e2c804d">https://github.com/macports/macports-ports/commit/1393fcec9ada1be1f7b4216a043092f11e2c804d</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 1393fcec9ad openexr: add patch for macos ver defs; use mp-libcxx for 10.7/10.8 See: https://trac.macports.org/ticket/67590
</span>1393fcec9ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1393fcec9ada1be1f7b4216a043092f11e2c804d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Jun 9 11:47:46 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> openexr: add patch for macos ver defs; use mp-libcxx for 10.7/10.8
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/67590
</span>---
graphics/openexr/Portfile | 13 +++++-
graphics/openexr/files/patch-macos-ver-defs.diff | 56 ++++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr/Portfile b/graphics/openexr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 721236137ac..36dd3f65a15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,18 @@ checksums rmd160 0c98cb5e0f7337dee9e02d789e49d21cc641fee1
</span> size 20540601
# NOTE: legacysupport needed for 'sys/fcntl.h'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also need macports-libcxx for 10.7/10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { (${os.major} >= 11) && (${os.major} <= 12) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.use_mp_libcxx yes
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to fix MAC_OS_X_VERSION_xxx defs; upstream was using those prefixed with '__', which don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# exist for older macOS releases. Already merged by upstream; available in next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/67590
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-macos-ver-defs.diff
</span>
if { (!(${universal_possible} && [variant_isset universal]) && ${configure.build_arch} eq "ppc")
||
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr/files/patch-macos-ver-defs.diff b/graphics/openexr/files/patch-macos-ver-defs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3be86838e5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr/files/patch-macos-ver-defs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From 6773e77bade3b4d8284881e477bee9c1f91c0f8b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Thu, 18 May 2023 07:18:48 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] IlmThread: fix defines for older macOS: do not prefix with __ (#1416)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/macports/macports-ports/pull/18711
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/IlmThread/IlmThreadSemaphore.h b/src/lib/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5746fd92c..1410af536 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ILMTHREAD_THREADING_ENABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if ILMTHREAD_HAVE_POSIX_SEMAPHORES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <semaphore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # elif (defined(_WIN32) || defined(_WIN64))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef NOMINMAX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ class ILMTHREAD_EXPORT_TYPE Semaphore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mutable sem_t _semaphore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mutable dispatch_semaphore_t _semaphore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif (defined(_WIN32) || defined(_WIN64))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp b/src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 45e1cc7f0..d456a1463 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // No libdispatch prior to 10.6, and no support for it on any ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "Iex.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "IlmThreadSemaphore.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp b/src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b919ea186..621b8d408 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ILMTHREAD_THREADING_ENABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if (!(ILMTHREAD_HAVE_POSIX_SEMAPHORES) && !defined(_WIN32) && !defined(_WIN64) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (!defined(__APPLE__) || (defined(__APPLE__) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (__MAC_OS_X_VERSION_MIN_REQUIRED < 1060 || defined(__ppc__)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (MAC_OS_X_VERSION_MIN_REQUIRED < 1060 || defined(__ppc__)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "IlmThreadSemaphore.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>