<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/f43b32790e04234c5ebb246476f7423bdc423f1d">https://github.com/macports/macports-ports/commit/f43b32790e04234c5ebb246476f7423bdc423f1d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f43b32790e04234c5ebb246476f7423bdc423f1d
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Dec 3 11:37:09 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> osl: update to 1.12.7.0; default +python311
</span>---
graphics/openimageio/Portfile | 1 +
graphics/osl/Portfile | 71 +++++++++++++++++++++++++++++++++++++------
2 files changed, 62 insertions(+), 10 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 6648aadf4b7..9dc2e974714 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;'>@@ -37,6 +37,7 @@ github.tarball_from archive
</span>
# pin the used version for macOS before 10.13
# which is forced by used version of opencolorio
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# this, it also forces used version of osl
</span> if {${os.platform} eq "darwin" && ${os.major} < 18} {
github.setup OpenImageIO oiio 2.1.20.0 v
revision 6
<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 76178dc4315..40b071d1534 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;'>@@ -7,10 +7,11 @@ PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup legacysupport 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AcademySoftwareFoundation OpenShadingLanguage 1.11.13.0 Release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AcademySoftwareFoundation OpenShadingLanguage 1.12.7.0 v
</span> name osl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,15 +28,35 @@ long_description Open Shading Language is a language developed \
</span> and can be used for describing materials, \
lights, displacement, and pattern generation.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 87b4fc115da9574735671fb56d3ae34a17171084 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ec1e9a460bd22211b14d926287c946d5ffba753d3ee48d08cf6149db2f23e12 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14141564
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e80e2e0543691dfbe5c08f14d0f1527f5da021e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0387104bafe309cac76fbf071d55eabccc3ece1a7108bea9d0649ca0934e8ce8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20249105
</span>
compiler.cxx_standard 2014
# Keep this value synchronized with the
# newest LLVM that is compatible with OSL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and be sure that parito is build by the same compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pin the used version for macOS before 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which is forced by used version of openimageio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup AcademySoftwareFoundation OpenShadingLanguage 1.11.13.0 Release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name osl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 87b4fc115da9574735671fb56d3ae34a17171084 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7ec1e9a460bd22211b14d926287c946d5ffba753d3ee48d08cf6149db2f23e12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14141564
</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;'>+ set llvm_version 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1319
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove when in next release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append fix-test-disable-cmake.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# MacPorts Clang is used "to generate bitcode"
# See variable LLVM_BC_GENERATOR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,10 +74,6 @@ depends_lib-append port:llvm-$llvm_version \
</span> compiler.blacklist-append clang
compiler.fallback macports-clang-${llvm_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1319
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove when in next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append fix-test-disable-cmake.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace {s|llvm-config|llvm-config-mp|g} \
${worksrcpath}/src/cmake/modules/FindLLVM.cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +85,7 @@ configure.args-append -DCMAKE_CXX_STANDARD=14 \
</span> -DLLVM_VERSION=$llvm_version \
-DVERBOSE=ON \
-DUSE_PARTIO=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PYTHON=OFF \
</span> -DOSL_BUILD_TESTS=OFF \
-DINSTALL_DOCS=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,4 +112,37 @@ variant docs description {Build documentation} {
</span>
default_variants +partio +docs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {38 39 310 311}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python${s}
</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;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string range ${s} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build the Python ${v} bindings" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants [boost::depends_portname] ${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_VERSION=${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DUSE_PYTHON=OFF -DUSE_PYTHON=ON
</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;'>+set set_python_default yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set set_python_default 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;'>+# this default version should stay synchronized with python_get_default_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# in the python PortGroup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${set_python_default}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.livecheck.regex {([0-9.]+)}
</pre><pre style='margin:0'>
</pre>