<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/022876f2fd835bf78397cf9d5bb94b2ca345c3a4">https://github.com/macports/macports-ports/commit/022876f2fd835bf78397cf9d5bb94b2ca345c3a4</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 022876f2fd8 openexr: fix defines in libdispatch-related patch
</span>022876f2fd8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 022876f2fd835bf78397cf9d5bb94b2ca345c3a4
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed May 17 18:14:51 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> openexr: fix defines in libdispatch-related patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See comments to: https://github.com/macports/macports-ports/commit/c1bcfa7090015e6f09e9714e862591c460ef6b39
</span>---
graphics/openexr/Portfile | 2 +-
graphics/openexr/files/patch-darwin-no-libdispatch.diff | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
<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 5549fd65ba9..df0ff990b1a 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;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
github.setup AcademySoftwareFoundation openexr 3.1.7 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories graphics
license BSD
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr/files/patch-darwin-no-libdispatch.diff b/graphics/openexr/files/patch-darwin-no-libdispatch.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b344e542c35..d4f19b813b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr/files/patch-darwin-no-libdispatch.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr/files/patch-darwin-no-libdispatch.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> # if ILMTHREAD_HAVE_POSIX_SEMAPHORES
# include <semaphore.h>
-# elif defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# 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> # include <dispatch/dispatch.h>
# elif (defined (_WIN32) || defined (_WIN64))
# ifdef NOMINMAX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> mutable sem_t _semaphore;
-#elif defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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> +
mutable dispatch_semaphore_t _semaphore;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@
</span> +# include <AvailabilityMacros.h>
+
+// No libdispatch prior to 10.6, and no support for it on any ppc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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>
#include "IlmThreadSemaphore.h"
#include "Iex.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@
</span> -#if ( !(ILMTHREAD_HAVE_POSIX_SEMAPHORES) && !defined (__APPLE__) && !defined (_WIN32) && !defined (_WIN64) )
+# if (!(ILMTHREAD_HAVE_POSIX_SEMAPHORES) && !defined(_WIN32) && !defined(_WIN64) && \
+ (!defined(__APPLE__) || (defined(__APPLE__) && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (__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>
#include "IlmThreadSemaphore.h"
</pre><pre style='margin:0'>
</pre>