<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/7b5a673e0c0c035eda20c4b521b1529fa25a131c">https://github.com/macports/macports-ports/commit/7b5a673e0c0c035eda20c4b521b1529fa25a131c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7b5a673e0c0c035eda20c4b521b1529fa25a131c
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Apr 29 20:59:21 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> openimageio: pin up to macOS 11; fix build on macOS 13
</span>---
graphics/openimageio/Portfile | 10 ++++++++--
graphics/openimageio/files/patch-enforce-clang14.diff | 14 ++++++++++++++
2 files changed, 22 insertions(+), 2 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 9dc2e974714..06e154741ce 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;'>@@ -34,11 +34,13 @@ compiler.thread_local_storage yes
</span>
github.tarball_from archive
<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:#ffe0e0;'>-# pin the used version for macOS before 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pin the used version before macOS 11
</span> # which is forced by used version of opencolorio
# this, it also forces used version of osl
<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:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span> github.setup OpenImageIO oiio 2.1.20.0 v
revision 6
checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +51,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span> patch-libraw-0.21.0.diff
}
<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;'>+ patchfiles-append patch-enforce-clang14.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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;color:#808080;'>diff --git a/graphics/openimageio/files/patch-enforce-clang14.diff b/graphics/openimageio/files/patch-enforce-clang14.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e503aa8fd53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/files/patch-enforce-clang14.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/libtexture/texturesys.cpp src/libtexture/texturesys.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d2d64dbdb..c0d4fc0e4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libtexture/texturesys.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libtexture/texturesys.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2299,9 +2299,7 @@ TextureSystemImpl::sample_bilinear(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tile_st %= tilewh;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OIIO_PRAGMA_WARNING_PUSH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OIIO_CLANG_VERSION >= 140000 || OIIO_INTEL_CLANG_VERSION >= 140000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OIIO_CLANG_PRAGMA(GCC diagnostic ignored "-Wbitwise-instead-of-logical")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool s_onetile = (tile_st[S0] != tilewhmask[S0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ & (sttex[S0] + 1 == sttex[S1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool t_onetile = (tile_st[T0] != tilewhmask[T0])
</span></pre><pre style='margin:0'>
</pre>