<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5380e5f1e1643894e81579ca67e3afb608debacc">https://github.com/macports/macports-ports/commit/5380e5f1e1643894e81579ca67e3afb608debacc</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 5380e5f1e16 openimageio: fix the build for < 20
</span>5380e5f1e16 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5380e5f1e1643894e81579ca67e3afb608debacc
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Apr 28 13:30:43 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> openimageio: fix the build for < 20
</span>---
graphics/openimageio/Portfile | 46 ++++++++++++++++++++++++++++++++-----------
1 file changed, 34 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/Portfile b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 737e2ee1634..25f8888c2ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span> PortGroup cmake 1.1
PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +26,7 @@ if {${port_latest}} {
</span> size 52061055
} else {
github.setup AcademySoftwareFoundation OpenImageIO 2.1.20.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 15
</span> checksums rmd160 7f241baddcc6e731a29fb37090e4582953560f38 \
sha256 0ad46bda55d6357a3c474b8c8ccbb41d9732313247cffaf4a65fc50e6aad9e78 \
size 29116032
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +39,7 @@ github.tarball_from archive
</span> if {${port_latest}} {
depends_lib-append port:imath \
port:openexr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openvdb \
</span> port:onetbb
#configure.args-append -DUSE_TBB=OFF
configure.args-append -DTBB_ROOT=${prefix}/libexec/onetbb
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,10 @@ if {${port_latest}} {
</span>
configure.pkg_config_path-prepend \
${prefix}/libexec/openexr2/lib/pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/69842
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DUSE_OPENVDB=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #configure.args-append -DUSE_TBB=OFF
configure.args-append -DTBB_ROOT=${prefix}/libexec/tbb
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,9 +86,14 @@ compiler.thread_local_storage yes
</span>
configure.cxxflags-append \
-Wno-deprecated-declarations \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=unknown-warning-option \
</span> -Wno-unknown-warning-option
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is a clang-specific flag:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=unknown-warning-option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # NOTE: Ensure we prepend 'libfmt9', to include it before 'openexr2'
set port_libfmt libfmt9
cmake.module_path-prepend \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,9 +121,21 @@ depends_lib-append port:robin-map \
</span>
# optional components
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append -DUSE_OPENGL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -DUSE_QT=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.min_version 5.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_QT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.args-append -DUSE_OPENGL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.6
</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;'>+if {[string match *gcc* ${configure.compiler}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ${configure.build_arch} in [list i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args-append -DUSE_PYTHON=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,11 +186,15 @@ configure.args-append -DOpenJpeg_ROOT=${prefix}
</span> #configure.args-append -DUSE_OCIO=OFF
depends_lib-append port:opencolorio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append -DUSE_OPENCV=OFF
</span> set opencv_ver 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/opencv${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DOpenCV_INCLUDE_DIR=${prefix}/include/opencv${opencv_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # opencv4 does not build on 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DUSE_OPENCV=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/opencv${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOpenCV_INCLUDE_DIR=${prefix}/include/opencv${opencv_ver} \
</span> -DOpenCV_ROOT=${prefix}/lib/opencv${opencv_ver}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
#configure.args-append -DUSE_FREETYPE=OFF
depends_lib-append port:freetype
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,9 +211,6 @@ depends_lib-append port:ptex
</span> #configure.args-append -DUSE_LIBRAW=OFF
depends_lib-append port:libraw
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append -DUSE_OPENVDB=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:openvdb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # not in MacPorts
configure.args-append -DUSE_NUKE=OFF
</pre><pre style='margin:0'>
</pre>