<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/90990745712d508db2235b78440cb72d32b53d0c">https://github.com/macports/macports-ports/commit/90990745712d508db2235b78440cb72d32b53d0c</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 90990745712 openimageio: use openexr2 for fallback version
</span>90990745712 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90990745712d508db2235b78440cb72d32b53d0c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon May 15 17:27:16 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> openimageio: use openexr2 for fallback version
</span>---
graphics/openimageio/Portfile | 81 +++++++++++++-----------
graphics/openimageio/files/patch-manual-tbb.diff | 14 ----
2 files changed, 44 insertions(+), 51 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 20197e55ca2..a6e52b1d15d 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;'>@@ -8,12 +8,6 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OpenImageIO oiio 2.4.5.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 31938357
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name openimageio
categories graphics
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,44 +16,63 @@ description a library for reading and writing images
</span> long_description OpenImageIO is a library for reading and writing images, and a bunch of \
related classes, utilities, and applications.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: multiple overloads of 'address' instantiate to the same signature 'const_pointer (const_reference) const noexcept'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://lists.llvm.org/pipermail/llvm-bugs/2013-November/031552.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Seen on OSX 10.9 and older.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 700}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenVDB header files use C++14 features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_CXX_STANDARD=14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Pin the used version before macOS 11, which is required by pinned versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# of opencolorio and osl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_latest yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_latest no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# pin the used version before macOS 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# which is forced by used version of opencolorio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this, it also forces used version of osl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${port_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup OpenImageIO oiio 2.4.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 31938357
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> github.setup OpenImageIO oiio 2.1.20.0 v
revision 9
checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
size 29115990
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-FindOpenJpeg.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libraw-0.21.0.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.args-append -DUSE_FIELD3D=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:field3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} > 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${port_latest}} {
</span> patchfiles-append patch-enforce-clang14.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:imath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-FindOpenJpeg.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libraw-0.21.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:field3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/libexec/openexr2/lib/pkgconfig
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: multiple overloads of 'address' instantiate to the same signature 'const_pointer (const_reference) const noexcept'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://lists.llvm.org/pipermail/llvm-bugs/2013-November/031552.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Seen on OSX 10.9 and older.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 700}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OpenVDB header files use C++14 features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_CXX_STANDARD=14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-deprecated-declarations \
</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;'>+ -Wno-unknown-warning-option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set port_libfmt libfmt9
cmake.module_path-append \
${prefix}/lib/${port_libfmt}/cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +91,6 @@ depends_lib-append port:robin-map \
</span> port:bzip2 \
port:libpng \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:imath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr \
</span> port:squish \
port:${port_libfmt}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,10 +178,6 @@ depends_lib-append port:libraw
</span> depends_lib-append port:tbb \
port:openvdb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE it may picks OneTBB via CMake config, disable it until port is migrated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {!(${os.platform} eq "darwin" && ${os.major} < 18)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-manual-tbb.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.args-append -DTBB_ROOT=${prefix}/libexec/tbb
# not in MacPorts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/files/patch-manual-tbb.diff b/graphics/openimageio/files/patch-manual-tbb.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4da0941303f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/files/patch-manual-tbb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3ca046b2..daf1d17e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cmake/externalpackages.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cmake/externalpackages.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,8 +187,7 @@ checked_find_package (OpenCV 3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Intel TBB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (TBB_USE_DEBUG_BUILD OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checked_find_package (TBB 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SETVARIABLES OIIO_TBB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PREFER_CONFIG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SETVARIABLES OIIO_TBB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checked_find_package (FFmpeg VERSION_MIN 3.0)
</span></pre><pre style='margin:0'>
</pre>