<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/aa7474288e6839b9a69f7adceb89ccb2499fd923">https://github.com/macports/macports-ports/commit/aa7474288e6839b9a69f7adceb89ccb2499fd923</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 aa7474288e6 openexr3: use imath3 See: https://github.com/darktable-org/darktable/pull/12599#issuecomment-1514614338 See: https://trac.macports.org/ticket/65662
</span>aa7474288e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa7474288e6839b9a69f7adceb89ccb2499fd923
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 5 17:49:15 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> openexr3: use imath3
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/darktable-org/darktable/pull/12599#issuecomment-1514614338
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65662
</span>---
graphics/openexr3/Portfile | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openexr3/Portfile b/graphics/openexr3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ce43182fd8..b21fcd4b697 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openexr3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openexr3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,12 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Version should be kept in-sync with 'imath3'
</span> github.setup AcademySoftwareFoundation openexr 3.1.7 v
name openexr3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# also set revision in subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories graphics
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +75,13 @@ depends_build-append \
</span> port:pkgconfig
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:imath3 \
</span> port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set imath3_lib ${prefix}/lib/imath3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.module_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${imath3_lib}/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append NM=${prefix}/bin/nm
# avoid dependency on port:grep
configure.env-append GREP=/usr/bin/grep
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,8 +95,30 @@ compiler.cxx_standard 2014
</span> configure.ldflags-delete \
-L${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# openexr3 3.1.7_0 installs its own public copy of 'imath3' too, which causes a build conflict.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc port_check_conflict {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_conflict_name ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_conflict_ver_min "3.1.7_0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_conflict_ver_max "3.1.7_0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![catch {set port_conflict_ver_info [lindex [registry_active ${port_conflict_name}] 0]}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_conflict_ver [lindex ${port_conflict_ver_info} 1]_[lindex ${port_conflict_ver_info} 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "${port_conflict_name} active version: ${port_conflict_ver}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${port_conflict_ver} ${port_conflict_ver_min}] >= 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [vercmp ${port_conflict_ver} ${port_conflict_ver_max}] <= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "${port_conflict_name} conflicts; declare build conflict"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport}
</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;'>+
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+port_check_conflict
</span>
# Only allow numbers, to avoid pre-release versions
github.livecheck.regex {([0-9.]+)}
</pre><pre style='margin:0'>
</pre>