<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/23ed8e9352a3e0f560d070436e794840dc1087c8">https://github.com/macports/macports-ports/commit/23ed8e9352a3e0f560d070436e794840dc1087c8</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 23ed8e9352a openexr: update to 3.1.9, drop patches merged to upstream
</span>23ed8e9352a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 23ed8e9352a3e0f560d070436e794840dc1087c8
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Jul 4 17:18:20 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> openexr: update to 3.1.9, drop patches merged to upstream
</span>---
graphics/openexr/Portfile | 25 +++--------
graphics/openexr/files/patch-isnan.diff | 20 ---------
graphics/openexr/files/patch-macos-ver-defs.diff | 56 ------------------------
3 files changed, 6 insertions(+), 95 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 1b42c713998..2225cd3aba8 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;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AcademySoftwareFoundation openexr 3.1.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AcademySoftwareFoundation openexr 3.1.9 v
</span> revision 0
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ homepage https://www.openexr.com
</span>
github.tarball_from tarball
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0c98cb5e0f7337dee9e02d789e49d21cc641fee1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c4a5f5c7cc4d40effba9323fc42ac81988a2e5969ec2f94e7a0b361fcb47db48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20540601
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ae1fcc23410f0065c2e5722b3d7d3a866c3dd16a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18ae17ac09c5b03dedaf1d4e6da97cd247c012541a87e5f062c75ebeaaf5d326 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20540364
</span>
# NOTE: legacysupport needed for 'sys/fcntl.h'
legacysupport.newest_darwin_requires_legacy 12
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,19 +33,11 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-# exist for older macOS releases. Already merged by upstream; available in next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/67590
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-macos-ver-defs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix references to std::isnan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://github.com/AcademySoftwareFoundation/openexr/commit/729f42648d5a522bba0d8f52061c0368a5d31bbb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-isnan.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if { (!(${universal_possible} && [variant_isset universal]) && ${configure.build_arch} eq "ppc")
||
((${universal_possible} && [variant_isset universal]) && "ppc" in ${configure.universal_archs}) } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see description in patch file; bug in GCC 7?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see description in patch file; bug in GCC, fixed in current branches, but not backported yet:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110044
</span> patchfiles-append patch-ensure_pack.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,11 +47,6 @@ depends_lib-append port:imath \
</span>
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/67403
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 && ${cxx_stdlib} eq "libstdc++" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -D__STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.target test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr/files/patch-isnan.diff b/graphics/openexr/files/patch-isnan.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 56f6a9968c3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr/files/patch-isnan.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From 729f42648d5a522bba0d8f52061c0368a5d31bbb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Thu, 8 Jun 2023 17:35:20 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] compression.cpp: fix isnan (#1448)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixes: https://github.com/AcademySoftwareFoundation/openexr/issues/1412
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/test/OpenEXRCoreTest/compression.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/test/OpenEXRCoreTest/compression.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,7 +159,7 @@ inline bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- withinDWAErrorBounds (const uint16_t a, const uint16_t b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float a1 = imath_half_to_float (a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!isnan (a1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!std::isnan (a1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float a2 = imath_half_to_float (b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float denominator =
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3be86838e5e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr/files/patch-macos-ver-defs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From 6773e77bade3b4d8284881e477bee9c1f91c0f8b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Thu, 18 May 2023 07:18:48 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] IlmThread: fix defines for older macOS: do not prefix with __ (#1416)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://github.com/macports/macports-ports/pull/18711
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/IlmThread/IlmThreadSemaphore.h b/src/lib/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5746fd92c..1410af536 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/IlmThread/IlmThreadSemaphore.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if ILMTHREAD_THREADING_ENABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if ILMTHREAD_HAVE_POSIX_SEMAPHORES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <semaphore.h>
</span><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:#ffe0e0;'>-+# elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # elif (defined(_WIN32) || defined(_WIN64))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifdef NOMINMAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,7 +57,7 @@ class ILMTHREAD_EXPORT_TYPE Semaphore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mutable sem_t _semaphore;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mutable dispatch_semaphore_t _semaphore;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined(_WIN32) || defined(_WIN64))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp b/src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 45e1cc7f0..d456a1463 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/IlmThread/IlmThreadSemaphoreOSX.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // No libdispatch prior to 10.6, and no support for it on any ppc.
</span><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:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED > 1050 && !defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "Iex.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "IlmThreadSemaphore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp b/src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b919ea186..621b8d408 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/IlmThread/IlmThreadSemaphorePosixCompat.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if ILMTHREAD_THREADING_ENABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if (!(ILMTHREAD_HAVE_POSIX_SEMAPHORES) && !defined(_WIN32) && !defined(_WIN64) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (!defined(__APPLE__) || (defined(__APPLE__) && \
</span><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:#ffe0e0;'>-+ (MAC_OS_X_VERSION_MIN_REQUIRED < 1060 || defined(__ppc__)))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "IlmThreadSemaphore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>