<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/340cefc12efd6723b18597854924821d61735719">https://github.com/macports/macports-ports/commit/340cefc12efd6723b18597854924821d61735719</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 340cefc12ef materialx: update to version 1.38.0
</span>340cefc12ef is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 340cefc12efd6723b18597854924821d61735719
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Fri Apr 16 12:24:59 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    materialx: update to version 1.38.0
</span>---
 graphics/materialx/Portfile                        | 40 +++++++++++---
 .../files/patch-MaterialXTest-reference_impl.diff  | 63 +++++++++++++++-------
 2 files changed, 75 insertions(+), 28 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/materialx/Portfile b/graphics/materialx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 976b9e76f41..e984273bd4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/materialx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/materialx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 PortGroup           cmake 1.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        materialx MaterialX 1.37.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        materialx MaterialX 1.38.0 v
</span> name                materialx
 categories          graphics
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ long_description    MaterialX is an open standard specification and \
</span>                     and texturing, complex nested materials, and \
                     geometric assignments.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  d7b816731f6f20d810ca30e67227be889995a02c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  995fb67eed08af79e77b13593d8934d520b7b66cf3b634a9c4c298f425ddd840 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    62621904
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  632ebee77420da5e59c8a141588e0d0724e9575e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  2ac172560cda021e4aa4b2f65c6f151d35a81f7175bee7f6eb10d2ce64dc0ddf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    62177975
</span> 
 compiler.cxx_standard 2011
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +79,12 @@ post-destroot {
</span>     if {[file exists ${destroot}${prefix}/README.md]} {
         move ${destroot}${prefix}/README.md $mtlx_share_path
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    fs-traverse f $mtlx_share_path/resources {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[file isfile $f] && [file tail $f] eq "CMakeLists.txt"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            delete $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 livecheck.regex     releases/tag/v(\\d+\\.\\d+\\.\\d+)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,21 +95,26 @@ variant viewer description {Build the MaterialX viewer} {
</span>     post-patch {
         reinplace "/return searchPath/i\\
 \\    // Default search path for MacPorts shared directory.\\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\\    FilePath macportsSharePath = FilePath(\"${prefix}/share/MaterialX\");\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\    mx::FilePath macportsSharePath = mx::FilePath(\"${prefix}/share/MaterialX\");\\
</span> \\    if (macportsSharePath.exists())\\
 \\    {\\
 \\        searchPath.append(macportsSharePath);\\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\\        searchPath.append(macportsSharePath / \"libraries\");\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\        searchPath.append(macportsSharePath / \"resources\");\\
</span> \\    }\\
 \\
 " \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/source/MaterialXGenShader/Util.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/source/MaterialXView/Main.cpp
</span>     }
 
     configure.args-append   -DMATERIALX_BUILD_VIEWER=ON \
                             -DMATERIALX_NANOGUI_EXTERNAL=ON \
                             -DNANOGUI_EXTRA_LIBS=glfw \
                             -DNANOGUI_EXTRA_INCS="${prefix}/include\;${prefix}/include/eigen3\;${prefix}/include/nanovg"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    notes-append    "To view the examples, you can launch the viewer\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    by running `MaterialXView` in a terminal window,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    and then loading the files located in\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${prefix}/share/MaterialX/resources."
</span> }
 
 variant oiio requires viewer \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,6 +188,13 @@ variant tests description {Build unit tests} {
</span>     configure.args-append   -DMATERIALX_OSLC_EXECUTABLE=${prefix}/bin/oslc \
                             -DMATERIALX_TESTRENDER_EXECUTABLE=${prefix}/bin/testrender \
                             -DMATERIALX_OSL_INCLUDE_PATH=${prefix}/share/OSL/shaders
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set mdl ${destroot}${prefix}/mdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[file exists $mdl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            move $mdl ${destroot}${prefix}/share/MaterialX/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 default_variants    +viewer +oiio +docs +tests
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +202,7 @@ default_variants    +viewer +oiio +docs +tests
</span> ### The following code was adapted from the portfiles
 ### of ports such as openvdb and openimageio
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes    {36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes    {36 37 38 39}
</span> 
 set pythons_ports       {}
 foreach s ${pythons_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,7 +223,13 @@ foreach s ${pythons_suffixes} {
</span>         set selected_v          ${v}
         depends_lib-append      port:${p} \
                                 port:pybind11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         patchfiles-append       patch-python-paths.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace {/pybind11Tools/s/^/#/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/source/PyMaterialX/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-append   -DMATERIALX_BUILD_PYTHON=ON \
                                 -DMATERIALX_PYTHON_VERSION=$selected_v \
                                 -DPYTHON_INSTALL_PREFIX=${destroot}${frameworks_dir}/Python.framework/Versions/$selected_v/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/materialx/files/patch-MaterialXTest-reference_impl.diff b/graphics/materialx/files/patch-MaterialXTest-reference_impl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fd7deb49060..27644ecfd32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/materialx/files/patch-MaterialXTest-reference_impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/materialx/files/patch-MaterialXTest-reference_impl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,47 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/MaterialXTest/CMakeLists.txt.orig       2020-09-21 15:07:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/MaterialXTest/CMakeLists.txt    2020-09-21 15:09:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,15 +69,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Only do this stuff when it's relevant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/MaterialXTest/CMakeLists.txt.orig       2021-03-02 12:41:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/MaterialXTest/CMakeLists.txt    2021-04-14 23:27:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,23 +81,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span>  
 +# Hoist the generation of the reference OSL implementation into the
 +# pre-link portion of the CMake build, instead of waiting until after
 +# the build completes by using the install() commands (see comment
 +# below).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_custom_command(TARGET MaterialXTest PRE_LINK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  COMMAND ${CMAKE_COMMAND} -E make_directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_custom_command(TARGET MaterialXTest PRE_LINK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  COMMAND ${CMAKE_COMMAND} -E copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/osl/*.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(MATERIALX_BUILD_GEN_OSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    add_custom_command(TARGET MaterialXTest PRE_LINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          COMMAND ${CMAKE_COMMAND} -E make_directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    add_custom_command(TARGET MaterialXTest PRE_LINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          COMMAND ${CMAKE_COMMAND} -E copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/osl/*.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/reference/osl)
</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(MATERIALX_BUILD_GEN_MDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    add_custom_command(TARGET MaterialXTest PRE_LINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          COMMAND ${CMAKE_COMMAND} -E copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        "${CMAKE_CURRENT_SOURCE_DIR}/../../source/MaterialXGenMdl/mdl/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ${CMAKE_CURRENT_BINARY_DIR}/${MATERIALX_INSTALL_MDL_MODULE_PATH}/mdl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span> +
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Only do this stuff when it's relevant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span>  add_custom_command(TARGET MaterialXTest POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy_directory
        ${CMAKE_CURRENT_SOURCE_DIR}/../../libraries ${CMAKE_CURRENT_BINARY_DIR}/libraries)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>--install(DIRECTORY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(MATERIALX_BUILD_GEN_OSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    install(DIRECTORY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/osl/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        FILES_MATCHING PATTERN "*.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span> -
<span style='display:block; white-space:pre;background:#ffe0e0;'>--install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/osl/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    FILES_MATCHING PATTERN "*.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(MATERIALX_BUILD_GEN_MDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../source/MaterialXGenMdl/mdl/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${MATERIALX_INSTALL_MDL_MODULE_PATH}/mdl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span> +# These lines have been removed because they occur way too late. During
 +# the MacPorts build process, they get added/copied after the build/
 +# directory has already been deleted by the MacPorts build system (which
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +49,17 @@
</span> +# them to get generated in a build/ directory inside the destroot tree,
 +# which results in the files getting placed into
 +# ${destroot}${worksrcpath}/build/libraries, which is not what we want.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#install(DIRECTORY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if(MATERIALX_BUILD_GEN_OSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#    install(DIRECTORY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/osl/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#        FILES_MATCHING PATTERN "*.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif()
</span> +#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/stdlib/osl/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/libraries/stdlib/reference/osl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#    FILES_MATCHING PATTERN "*.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if(MATERIALX_BUILD_GEN_MDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../source/MaterialXGenMdl/mdl/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${MATERIALX_INSTALL_MDL_MODULE_PATH}/mdl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif()
</span>  
  add_custom_command(TARGET MaterialXTest POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy_directory
</pre><pre style='margin:0'>

</pre>