<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/88cf6eeadab5c82de31e23b7b95dc8b3946f18d4">https://github.com/macports/macports-ports/commit/88cf6eeadab5c82de31e23b7b95dc8b3946f18d4</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 88cf6eeadab opencolorio, openimageio, osl: Fix version pinning
</span>88cf6eeadab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88cf6eeadab5c82de31e23b7b95dc8b3946f18d4
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 11 16:17:36 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> opencolorio, openimageio, osl: Fix version pinning
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the same condition for pinning the version on older macOS versions
</span><span style='display:block; white-space:pre;color:#404040;'> and allow non-macOS operating systems to see the latest version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix some typos in comments.
</span>---
graphics/opencolorio/Portfile | 11 +++--------
graphics/openimageio/Portfile | 9 ++-------
graphics/osl/Portfile | 11 ++++++-----
3 files changed, 11 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencolorio/Portfile b/graphics/opencolorio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df99ef97e0d..e89045bfc23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencolorio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencolorio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,13 +30,8 @@ github.livecheck.regex {([0-9.]+)}
</span> configure.args-append \
-DCMAKE_CONFIGURATION_TYPES=MacPorts
<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;'>-# keep in mind that openimageio had the same pin
</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:#ffe0e0;'>- set port_latest yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_latest no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Keep this condition the same in the opencolorio, openimageio, and osl ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_latest [expr {${os.platform} ne "darwin" || ${os.major} >= 20}]
</span>
if {!${port_latest}} {
github.setup AcademySoftwareFoundation OpenColorIO 1.1.1 v
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +106,7 @@ if {${configure.build_arch} in [list ppc ppc64]} {
</span> -DOCIO_USE_SSE=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenColorIO intentially installs Python module in lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OpenColorIO intentionally installs Python module in lib
</span> # see https://github.com/imageworks/OpenColorIO/blob/15e96c1f579d3640947a5fcb5ec831383cc3956e/src/pyglue/CMakeLists.txt#L85
variant python38 description {Build the Python 3.8 bindings} conflicts python39 python310 python311 python312 {
<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 27189a92a44..be52316bafd 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;'>@@ -16,13 +16,8 @@ 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;'>-# Pin the used version before macOS 11, which is required by pinned versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# of opencolorio and 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:#ffe0e0;'>- set port_latest yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_latest no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Keep this condition the same in the opencolorio, openimageio, and osl ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_latest [expr {${os.platform} ne "darwin" || ${os.major} >= 20}]
</span>
if {${port_latest}} {
github.setup OpenImageIO oiio 2.4.5.0 v
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/osl/Portfile b/graphics/osl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6925e2b8fe7..3a0fa428d1a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/osl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/osl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,13 @@ compiler.cxx_standard 2014
</span>
# Keep this value synchronized with the
# newest LLVM that is compatible with OSL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# and be sure that parito is build by the same compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and be sure that partio is built by the same compiler
</span> set llvm_version 14
<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 openimageio
</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;'>+# Keep this condition the same in the opencolorio, openimageio, and osl ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_latest [expr {${os.platform} ne "darwin" || ${os.major} >= 20}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!${port_latest}} {
</span> github.setup AcademySoftwareFoundation OpenShadingLanguage 1.11.13.0 Release-
name osl
revision 3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +71,7 @@ depends_lib-append port:llvm-$llvm_version \
</span> port:openimageio
# As MP clang is available at build time, use for consistency and
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# to avoid potentially a second MP clang being installed unneccessarily.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to avoid potentially a second MP clang being installed unnecessarily.
</span> compiler.blacklist-append clang
compiler.fallback macports-clang-${llvm_version}
</pre><pre style='margin:0'>
</pre>