diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-04-21 16:32:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-04-21 16:35:12 +0300 |
| commit | 75a9830d84f68c8f1e1d4d132def28ef25b5cabd (patch) | |
| tree | 4050b09a09bc78a0fde550af544786507b1ebdca /build_files | |
| parent | c196ca37407d4dacb832d4c888ac87e66d7094c5 (diff) | |
install_deps: Update USD to 22.03.
Add back a patch wrongly removed by rBb9c37608a9e9, and add another fix,
for gcc11 build support.
Re {T95206}.
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 6 | ||||
| -rw-r--r-- | build_files/build_environment/patches/usd.diff | 26 |
2 files changed, 29 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index ecf5d215333..58702f69609 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -539,10 +539,10 @@ ALEMBIC_FORCE_BUILD=false ALEMBIC_FORCE_REBUILD=false ALEMBIC_SKIP=false -USD_VERSION="21.02" -USD_VERSION_SHORT="21.02" +USD_VERSION="22.03" +USD_VERSION_SHORT="22.03" USD_VERSION_MIN="20.05" -USD_VERSION_MEX="22.00" +USD_VERSION_MEX="23.00" USD_FORCE_BUILD=false USD_FORCE_REBUILD=false USD_SKIP=false diff --git a/build_files/build_environment/patches/usd.diff b/build_files/build_environment/patches/usd.diff index 5c0d2ba0b67..eb5905109a7 100644 --- a/build_files/build_environment/patches/usd.diff +++ b/build_files/build_environment/patches/usd.diff @@ -25,3 +25,29 @@ diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/default set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP") set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-") +diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h +--- a/pxr/base/work/singularTask.h ++++ b/pxr/base/work/singularTask.h +@@ -120,7 +120,7 @@ + // case we go again to ensure the task can do whatever it + // was awakened to do. Once we successfully take the count + // to zero, we stop. +- size_t old = count; ++ std::size_t old = count; + do { _fn(); } while ( + !count.compare_exchange_strong(old, 0)); + }); + +diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHelpers.h +--- a/pxr/usd/sdr/shaderMetadataHelpers.h ++++ b/pxr/usd/sdr/shaderMetadataHelpers.h +@@ -32,6 +32,8 @@ + #include "pxr/base/tf/token.h" + #include "pxr/usd/sdr/declare.h" + ++#include <limits> ++ + PXR_NAMESPACE_OPEN_SCOPE + + /// \namespace ShaderMetadataHelpers + |