<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6b6de9fae8a8d94503af57b13a0f0357e0a47ca">https://github.com/macports/macports-ports/commit/a6b6de9fae8a8d94503af57b13a0f0357e0a47ca</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 a6b6de9fae8 osl: update to 1.11.13.0
</span>a6b6de9fae8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a6b6de9fae8a8d94503af57b13a0f0357e0a47ca
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Apr 18 22:55:09 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    osl: update to 1.11.13.0
</span>---
 graphics/osl/Portfile                           | 38 ++++++++++++-------------
 graphics/osl/files/fix-test-disable-cmake.patch | 20 +++++++++++++
 2 files changed, 38 insertions(+), 20 deletions(-)

<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 2f6c65f0432..8e4300a1e43 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;'>@@ -6,9 +6,9 @@ PortGroup               qt5 1.0
</span> PortGroup               cmake 1.1
 PortGroup               compiler_blacklist_versions 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            AcademySoftwareFoundation OpenShadingLanguage 1.10.10 Release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            AcademySoftwareFoundation OpenShadingLanguage 1.11.13.0 Release-
</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;'>@@ -25,22 +25,15 @@ 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;'>-# 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  8dd32c03c09bd686ceb46ed0a1590ba490d37b7a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  43073ee6bf53b91839300c1d696ef4685ec5bf55165875576c723c8aba056d79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    13551287
</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:#ffe0e0;'>-compiler.cxx_standard   2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# llvm_ops.s:58:20: error: expected comma after load's type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#  %2 = load float* %1, align 4, !tbaa !1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                   ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 800}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>-set llvm_version 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version        11
</span> 
 # MacPorts Clang is used "to generate bitcode"
 # See variable LLVM_BC_GENERATOR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +46,15 @@ depends_lib-append      port:llvm-$llvm_version \
</span>                         port:pugixml \
                         port:openimageio
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# As MP clang is available at build time, use for consistency and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to avoid potentially a second MP clang being installed unneccessarily.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback macports-clang-${llvm_version}
</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> 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;'>@@ -60,7 +62,8 @@ post-patch {
</span>         ${worksrcpath}/src/liboslcomp/oslcomp.cpp
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   -DLLVM_VERSION=$llvm_version \
</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;'>+                        -DLLVM_VERSION=$llvm_version \
</span>                         -DVERBOSE=ON \
                         -DUSE_PARTIO=OFF \
                         -DOSL_BUILD_TESTS=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,11 +76,6 @@ pre-test {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${destroot}${prefix}/share/OSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    move ${destroot}${prefix}/shaders ${destroot}${prefix}/share/OSL/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant partio description {Enable Partio point cloud support} {
     depends_lib-append      port:partio
     configure.args-replace  -DUSE_PARTIO=OFF -DUSE_PARTIO=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/osl/files/fix-test-disable-cmake.patch b/graphics/osl/files/fix-test-disable-cmake.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..967d1a73564
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/osl/files/fix-test-disable-cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee78c1a1..ad0228e0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,12 +251,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         FILE ${OSL_TARGETS_EXPORT_NAME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         NAMESPACE ${PROJECT_NAME}::)
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-osl_add_all_tests()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    osl_add_all_tests()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     include (packaging)
</span></pre><pre style='margin:0'>

</pre>