<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b7899e386136d77da921ceae86a848fe340674fd">https://github.com/macports/macports-ports/commit/b7899e386136d77da921ceae86a848fe340674fd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b7899e386136d77da921ceae86a848fe340674fd
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Dec 16 12:02:32 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> openexr2: backport fix for missing libdispatch from 3.x
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67655
</span>---
graphics/openexr2/Portfile | 3 +
...macOS-use-libdispatch-only-where-available.diff | 83 ++++++++++++++++++++++
2 files changed, 86 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr2/Portfile b/graphics/openexr2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14720a8fe16..b12532ebb15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,9 @@ checksums rmd160 5b623bebf0a456db656f8e9fc91d6109386fa61b
</span> sha256 38443be87db1b0eaa53747104246943120c3812cc54cfbbec1846c8917e74884 \
size 27540352
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# backport of https://github.com/AcademySoftwareFoundation/openexr/commit/155f1bf174e2b87a4de721e936f8b6ab141079fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-macOS-use-libdispatch-only-where-available.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport ${name} {
cmake.source_dir ${worksrcpath}/OpenEXR
cmake.install_prefix ${prefix}/libexec/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr2/files/patch-macOS-use-libdispatch-only-where-available.diff b/graphics/openexr2/files/patch-macOS-use-libdispatch-only-where-available.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..205f224b89a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr2/files/patch-macOS-use-libdispatch-only-where-available.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d13d644f0a062e6992db5f30a2551703a6a7badf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 16 Dec 2023 11:39:36 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macOS: use libdispatch only where available
</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;'>+ IlmBase/IlmThread/IlmThreadSemaphore.h | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 18 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/IlmBase/IlmThread/IlmThreadSemaphore.h b/IlmBase/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0810af22..c89e5c9a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- IlmBase/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ IlmBase/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "IlmThreadExport.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "IlmThreadNamespace.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if 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;'>+ # undef NOMINMAX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef 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__)
</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;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef ILMBASE_FORCE_CXX03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +98,7 @@ class ILMTHREAD_EXPORT 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__)
</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;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp b/IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3ad88f28..305d0727 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ IlmBase/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>++#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 "IlmThreadSemaphore.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Iex.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,3 +100,5 @@ Semaphore::value () const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ILMTHREAD_INTERNAL_NAMESPACE_SOURCE_EXIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp b/IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f46ba618..bb55e261 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ IlmBase/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "IlmBaseConfig.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "IlmThreadSemaphore.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined (HAVE_POSIX_SEMAPHORES) && !defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined (HAVE_POSIX_SEMAPHORES) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (!defined(__APPLE__) || (defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060 || defined(__ppc__))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (!defined (_WIN32) && !defined (_WIN64)) || defined (__MINGW64_VERSION_MAJOR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Iex.h"
</span></pre><pre style='margin:0'>
</pre>