<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0c2d310a4edd60c11dbd5baa6530af1ab6d2a890">https://github.com/macports/macports-ports/commit/0c2d310a4edd60c11dbd5baa6530af1ab6d2a890</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 0c2d310a4ed materialx: update to version 1.37.3
</span>0c2d310a4ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0c2d310a4edd60c11dbd5baa6530af1ab6d2a890
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sat Dec 5 22:50:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> materialx: update to version 1.37.3
</span>---
graphics/materialx/Portfile | 24 +++++---
.../files/patch-use-macports-nanogui.diff | 65 ----------------------
2 files changed, 17 insertions(+), 72 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 b21b9995dd3..00f92a9b427 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.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup materialx MaterialX 1.37.3 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 cfabb6a6428a817476a2199d58f8b725cbff3252 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab2f27b2e2e743eab5eef8912099bc7ec097524cfda75e2eeca7a0d9d4a9e21d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 62620973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9dc2fb73f3e190b7e8b800cfe16adc855ff47275 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1a10b9619a87f624dbbe8d7671b9acaaeec6bb0b9a979a972d7832470b712f09 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 62623430
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,8 @@ if {${os.major} < 16} {
</span> configure.objcxxflags-prepend -isystem ${filespath}/old_appkit_compat
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DMATERIALX_BUILD_TESTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DMATERIALX_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMATERIAL_BUILD_SHARED_LIBS=ON
</span>
post-destroot {
# MaterialX's build files puts files into a ${prefix}/cmake folder
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,12 +72,18 @@ post-destroot {
</span> move ${destroot}${prefix}/$dir $mtlx_share_path
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/CHANGELOG.md]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/CHANGELOG.md $mtlx_share_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/README.md]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/README.md $mtlx_share_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant viewer description {Build the MaterialX viewer} {
depends_lib-append port:nanogui-wjakob
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-use-macports-nanogui.diff
</span> post-patch {
reinplace "/return searchPath/i\\
\\ // Default search path for MacPorts shared directory.\\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +98,10 @@ variant viewer description {Build the MaterialX viewer} {
</span> ${worksrcpath}/source/MaterialXGenShader/Util.cpp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DMATERIALX_BUILD_VIEWER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DMATERIALX_BUILD_VIEWER=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMATERIALX_NANOGUI_EXTERNAL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNANOGUI_EXTRA_LIBS=glfw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNANOGUI_EXTRA_INCS="${prefix}/include\;${prefix}/include/eigen3\;${prefix}/include/nanovg"
</span> }
variant oiio requires viewer \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/materialx/files/patch-use-macports-nanogui.diff b/graphics/materialx/files/patch-use-macports-nanogui.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c38e5a3d395..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/materialx/files/patch-use-macports-nanogui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- source/MaterialXView/CMakeLists.txt.orig 2020-06-04 18:21:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ source/MaterialXView/CMakeLists.txt 2020-09-01 15:07:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,38 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/NanoGUI/ext/glfw/src")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "Building the MaterialX viewer requires the NanoGUI submodule "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "to be present. Update your repository by calling the following:\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "git submodule update --init --recursive")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB materialx_source "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB materialx_headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(NANOGUI_BUILD_EXAMPLE OFF CACHE BOOL " " FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(NANOGUI_BUILD_SHARED OFF CACHE BOOL " " FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(NANOGUI_BUILD_PYTHON OFF CACHE BOOL " " FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(NANOGUI_INSTALL OFF CACHE BOOL " " FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Locally disable additional warnings for NanoGUI and its dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(PREV_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(PREV_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_compile_options(-wd4389 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DEIGEN_DONT_VECTORIZE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_compile_options(-Wno-objc-multiple-method-names -DGL_SILENCE_DEPRECATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif(UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_compile_options(-Wno-format-truncation -Wno-implicit-fallthrough -Wno-int-in-bool-context
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-maybe-uninitialized -Wno-misleading-indentation)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/NanoGUI external/NanoGUI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_property(TARGET nanogui nanogui-obj glfw glfw_objects PROPERTY FOLDER "External")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Restore warnings for MaterialXView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_C_FLAGS ${PREV_CMAKE_C_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_CXX_FLAGS ${PREV_CMAKE_CXX_FLAGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_definitions(${NANOGUI_EXTRA_DEFS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# We remove the CMake code that compiles NanoGUI from source and replace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# it with code that points to the pre-compiled NanoGUI package that is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# available through MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(MACPORTS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(NANOGUI_EXTRA_INCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MACPORTS_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MACPORTS_INCLUDE_DIR}/eigen3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MACPORTS_INCLUDE_DIR}/nanovg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${MACPORTS_INCLUDE_DIR}/GLFW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(MaterialXView ${materialx_source} ${materialx_headers})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,13 +23,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MaterialXGenGlsl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MaterialXRenderGlsl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nanogui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glfw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${NANOGUI_EXTRA_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MaterialXView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRIVATE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CURRENT_SOURCE_DIR}/../
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CURRENT_SOURCE_DIR}/NanoGUI/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${NANOGUI_EXTRA_INCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MATERIALX_BUILD_OIIO AND OPENIMAGEIO_ROOT_DIR)
</span></pre><pre style='margin:0'>
</pre>