<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b7ded617109af71e2f91734928bbe7e3050d8fb">https://github.com/macports/macports-ports/commit/8b7ded617109af71e2f91734928bbe7e3050d8fb</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 8b7ded61710 usd: update to version 20.02
</span>8b7ded61710 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b7ded617109af71e2f91734928bbe7e3050d8fb
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sun Jan 24 23:05:37 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> usd: update to version 20.02
</span>---
graphics/usd/Portfile | 17 +++++++-------
graphics/usd/files/patch-add-blender-mods.diff | 4 ++--
graphics/usd/files/patch-plugins-output-paths.diff | 16 ++++++-------
graphics/usd/files/patch-tests-output-paths.diff | 26 +++++++++++-----------
4 files changed, 31 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/Portfile b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 663f44916b1..0319ddcf8fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,13 +6,13 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup cmake 1.1
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup PixarAnimationStudios USD 19.11 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup PixarAnimationStudios USD 20.02 v
</span> name usd
categories graphics
platforms darwin
license Apache-2
maintainers @jasonliu--
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://www.openusd.org
description universal scene description
long_description Universal Scene Description (USD) is a software \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ long_description Universal Scene Description (USD) is a software \
</span> shading, models, and assets can be organized and \
manipulated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 26c4c38b45e9254395b5e673a15ed95fb9465a44 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 84f3bb123f7950b277aace096d678c8876737add0ed0b6ccb77cabb4f32dbcb0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 37563211
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 342d266a0be0774e22aa5653a9d22fa4e21f8e16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a0eb6eacefbbfa88393021c63a51ca8c528c9607ad56968c177992b27bb45f7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 30156908
</span>
set py_ver 2.7
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,9 +95,9 @@ variant docs description {Build documentation} {
</span> reinplace {/os.mkdir.installPath/s/mkdir/makedirs/} \
${worksrcpath}/cmake/macros/generateDocs.py
reinplace {/PROJECT_NAME.*=/s/$/"Universal Scene Description"/} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/pxr/usd/lib/usd/Doxyfile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pxr/usd/usd/Doxyfile.in
</span> reinplace "/PROJECT_NUMBER.*=/s/$/${version}/" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/pxr/usd/lib/usd/Doxyfile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pxr/usd/usd/Doxyfile.in
</span> }
configure.args-append -DPXR_BUILD_DOCUMENTATION=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,8 +149,7 @@ variant python description {Enable Python-based components} {
</span> -DPXR_ENABLE_PYTHON_SUPPORT=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant viewer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- requires usd_imaging python opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant viewer requires usd_imaging python opengl \
</span> description {Build USD viewer} \
{
depends_lib-append port:py${py_ver_nodot}-pyside \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/files/patch-add-blender-mods.diff b/graphics/usd/files/patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 52fae9d7e2a..cc97a4adde2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/files/patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/files/patch-add-blender-mods.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pxr/base/lib/plug/initConfig.cpp.orig 2019-10-24 22:39:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pxr/base/lib/plug/initConfig.cpp 2019-12-11 11:00:37.643323127 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pxr/base/plug/initConfig.cpp.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pxr/base/plug/initConfig.cpp 2021-01-24 12:38:52.000000000 -0500
</span> @@ -69,8 +69,38 @@
ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/files/patch-plugins-output-paths.diff b/graphics/usd/files/patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 25860522633..e11b15894f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/files/patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/files/patch-plugins-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/macros/Private.cmake.orig 2019-10-24 16:39:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/macros/Private.cmake 2020-10-07 21:57:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Private.cmake.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Private.cmake 2021-01-24 12:32:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@
</span> _get_resources_dir_name(PLUG_INFO_RESOURCE_PATH)
set(PLUG_INFO_ROOT "..")
set(PLUG_INFO_PLUGIN_NAME "pxr.${libTarget}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
configure_file(
${plugInfoPath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1139,10 +1139,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1144,10 +1144,10 @@
</span> _get_install_dir("include/${PXR_PREFIX}/${NAME}" headerInstallPrefix)
_get_install_dir("lib" libInstallPrefix)
if(isPlugin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span> endif()
if(NOT isObject)
# A plugin embedded in the monolithic library is found in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1233,7 +1233,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1239,7 +1239,7 @@
</span> MFB_ALT_PACKAGE_NAME=${PXR_PACKAGE}
MFB_PACKAGE_MODULE=${pythonModuleName}
PXR_BUILD_LOCATION=usd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@
</span> ${pxrInstallLocation}
${pythonModulesEnabled}
${apiPrivate}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/macros/Public.cmake.orig 2020-10-01 10:37:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/macros/Public.cmake 2020-10-03 18:11:35.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -766,7 +766,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Public.cmake.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Public.cmake 2021-01-24 12:32:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -756,7 +756,7 @@
</span> "${plugInfoContents}")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/usd_plugInfo.json"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/files/patch-tests-output-paths.diff b/graphics/usd/files/patch-tests-output-paths.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ecd573807ab..1f3408fbeec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/files/patch-tests-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/files/patch-tests-output-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/macros/Public.cmake.orig 2019-10-24 16:39:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/macros/Public.cmake 2020-10-01 10:37:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/macros/Public.cmake.orig 2020-01-24 14:25:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/macros/Public.cmake 2021-01-24 12:36:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,7 +381,7 @@
</span> RENAME
__init__.py
DESTINATION
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> )
endif()
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${plugInfoFile}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -401,7 +401,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,7 +391,7 @@
</span> RENAME
plugInfo.json
DESTINATION
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> )
endif()
endfunction() # pxr_create_test_module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -422,7 +422,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -412,7 +412,7 @@
</span> _pxr_target_link_libraries(${LIBRARY_NAME}
${bt_LIBRARIES}
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> set_target_properties(${LIBRARY_NAME}
PROPERTIES
FOLDER "${folder}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -430,7 +430,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -420,7 +420,7 @@
</span>
# Find libraries under the install prefix, which has the core USD
# libraries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
_pxr_install_rpath(rpath ${LIBRARY_NAME})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -444,14 +444,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,14 +434,14 @@
</span> set(TEST_PLUG_INFO_ROOT "..")
set(LIBRARY_FILE "${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@
</span>
configure_file("${testPlugInfoSrcPath}" "${testPlugInfoPath}")
# XXX -- We shouldn't have to install to run tests.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,9 +474,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -464,9 +464,9 @@
</span> # XXX -- We shouldn't have to install to run tests.
install(
TARGETS ${LIBRARY_NAME}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@
</span> )
endif()
endfunction() # pxr_build_test_shared_lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -495,7 +495,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -485,7 +485,7 @@
</span>
# Turn PIC ON otherwise ArchGetAddressInfo() on Linux may yield
# unexpected results.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@
</span> set_target_properties(${TEST_NAME}
PROPERTIES
FOLDER "${folder}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -510,13 +510,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -500,13 +500,13 @@
</span>
# Find libraries under the install prefix, which has the core USD
# libraries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,7 @@
</span> )
endif()
endfunction() # pxr_build_test
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,7 +536,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -526,7 +526,7 @@
</span> # XXX -- We shouldn't have to install to run tests.
install(
PROGRAMS ${file}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@
</span> RENAME ${destFile}
)
endforeach()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -554,7 +554,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -544,7 +544,7 @@
</span> # XXX -- We shouldn't have to install to run tests.
install(
DIRECTORY ${bt_SRC}/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@
</span> )
endif()
endfunction() # pxr_install_test_dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -625,9 +625,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -615,9 +615,9 @@
</span> # assume the testenv has the same name as the test but allow it to be
# overridden by specifying TESTENV.
if (bt_TESTENV)
</pre><pre style='margin:0'>
</pre>