<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/652a56fc03d39b3d75a0270db27ba29b2e9d4615">https://github.com/macports/macports-ports/commit/652a56fc03d39b3d75a0270db27ba29b2e9d4615</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 652a56fc03d opencolorio: update to 2.3.2
</span>652a56fc03d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 652a56fc03d39b3d75a0270db27ba29b2e9d4615
</span>Author: Mohamed Akram <mohd.akram@outlook.com>
AuthorDate: Sun Apr 7 16:16:04 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> opencolorio: update to 2.3.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove circular dependency on openimageio
</span><span style='display:block; white-space:pre;color:#404040;'> - Use python 3.12 and remove EOL python
</span><span style='display:block; white-space:pre;color:#404040;'> - Fix symlinks
</span>---
graphics/opencolorio/Portfile | 95 +++++++++++++++++++++++++------------------
1 file changed, 56 insertions(+), 39 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 c8c9fcf01c1..df99ef97e0d 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;'>@@ -7,8 +7,8 @@ PortGroup boost 1.0
</span>
boost.depends_type build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AcademySoftwareFoundation OpenColorIO 2.2.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AcademySoftwareFoundation OpenColorIO 2.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name opencolorio
categories graphics
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,9 @@ long_description OpenColorIO (OCIO) is a complete color management solution \
</span> geared towards motion picture production with an emphasis on \
visual effects and computer animation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# please remove "stealth update" workaround on next version update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3f2ab794c6f4df2e8cec24f8d04478f2fe590c73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 646171b8c9d3941da2bf59fcab99f979626f908b6c6fa4d8fe95bda9eec0407b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11314927
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 297c061816895bd4d02a9450c0415d8769e188ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6e437aa8c09f5d870212847af7788d92c3a5c34c739b212a9947a4ef3e8542b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11444813
</span>
# Exclude pre-releases from livecheck
github.livecheck.regex {([0-9.]+)}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +32,13 @@ configure.args-append \
</span>
# pin the used version before macOS 11
# keep in mind that openimageio had the same pin
<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 {${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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!${port_latest}} {
</span> github.setup AcademySoftwareFoundation OpenColorIO 1.1.1 v
revision 4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +46,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span> sha256 b7def3b5383c9b35dc9c0bdd26da74e2199c2b283d52bb84847aa307f70a0bc4 \
size 13830493
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # workaround for stealth update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://github.com/imageworks/OpenColorIO/commit/c43cc918c3e79e324f11ca47e95bfe36e9e0dd15
patchfiles-append patch-upstream.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +62,13 @@ if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span> patchfiles-append patch-CMakeLists.txt.diff
livecheck.type none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/imageworks/OpenColorIO/issues/563
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/67904
</span><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;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=self-assign-field
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# source assumes C++11 compiler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,13 +76,6 @@ compiler.cxx_standard 2011
</span> configure.cxxflags-append \
-std=c++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/imageworks/OpenColorIO/issues/563
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/67904
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=self-assign-field
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # src/core/ExponentOps.cpp: error: 'OpenColorIO::v1::{anonymous}::ExponentOp::~ExponentOp()'
# defined but not used [-Werror=unused-function]
# pyglue/PyAllocationTransform.cpp: error: cast between incompatible function types from 'PyObject* (*)(PyObject*)' \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,20 +114,7 @@ if {${configure.build_arch} in [list ppc ppc64]} {
</span> # OpenColorIO intentially installs Python module in lib
# see https://github.com/imageworks/OpenColorIO/blob/15e96c1f579d3640947a5fcb5ec831383cc3956e/src/pyglue/CMakeLists.txt#L85
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Build the Python 2.7 bindings} conflicts python38 python39 python310 python311 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/python2.7/site-packages/PyOpenColorIO.so \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 description {Build the Python 3.8 bindings} conflicts python27 python39 python310 python311 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description {Build the Python 3.8 bindings} conflicts python39 python310 python311 python312 {
</span> depends_lib-append port:python38
configure.args-append \
-DPYTHON=${prefix}/bin/python3.8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +127,7 @@ variant python38 description {Build the Python 3.8 bindings} conflicts python27
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 description {Build the Python 3.9 bindings} conflicts python27 python38 python310 python311 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 description {Build the Python 3.9 bindings} conflicts python38 python310 python311 python312 {
</span> depends_lib-append port:python39
configure.args-append \
-DPYTHON=${prefix}/bin/python3.9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +140,7 @@ variant python39 description {Build the Python 3.9 bindings} conflicts python27
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 description {Build the Python 3.10 bindings} conflicts python27 python38 python39 python311 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 description {Build the Python 3.10 bindings} conflicts python38 python39 python311 python312 {
</span> depends_lib-append port:python310
configure.args-append \
-DPYTHON=${prefix}/bin/python3.10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,13 +148,13 @@ variant python310 description {Build the Python 3.10 bindings} conflicts python2
</span> xinstall -d -m 0755 \
${destroot}${frameworks_dir}/Python.framework/Versions/3.10/lib/python3.10/site-packages
ln -s \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/python3.9/site-packages/PyOpenColorIO.so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/python3.10/site-packages/PyOpenColorIO.so \
</span> ${destroot}${frameworks_dir}/Python.framework/Versions/3.10/lib/python3.10/site-packages/
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python311 description {Build the Python 3.11 bindings} conflicts python27 python38 python39 python310 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 description {Build the Python 3.11 bindings} conflicts python38 python39 python310 python312 {
</span> depends_lib-append port:python311
configure.args-append \
-DPYTHON=${prefix}/bin/python3.11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,16 +162,29 @@ variant python311 description {Build the Python 3.11 bindings} conflicts python2
</span> xinstall -d -m 0755 \
${destroot}${frameworks_dir}/Python.framework/Versions/3.11/lib/python3.11/site-packages
ln -s \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/python3.9/site-packages/PyOpenColorIO.so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/python3.11/site-packages/PyOpenColorIO.so \
</span> ${destroot}${frameworks_dir}/Python.framework/Versions/3.11/lib/python3.11/site-packages/
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python312 description {Build the Python 3.12 bindings} conflicts python38 python39 python310 python311 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON=${prefix}/bin/python3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/3.12/lib/python3.12/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/python3.12/site-packages/PyOpenColorIO.so \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/3.12/lib/python3.12/site-packages/
</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;'>+if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311] && ![variant_isset python312]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python312
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311] && ![variant_isset python312]} {
</span> configure.args-append \
-DOCIO_BUILD_PYGLUE=OFF
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,9 +192,14 @@ if {![variant_isset python27] && ![variant_isset python38] && ![variant_isset py
</span> # make neither x11 nor quartz default since openimageio depends on opencolorio
variant x11 {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${port_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openexr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openimageio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
port:lcms2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openimageio \
</span> port:mesa \
port:libGLU \
port:freeglut \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,9 +217,14 @@ variant x11 {
</span> }
variant quartz {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${port_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openexr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openimageio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
port:lcms2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openimageio \
</span> port:glew
configure.args-append \
-DGLUT_glut_LIBRARY=/System/Library/Frameworks/GLUT.framework
</pre><pre style='margin:0'>
</pre>