diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-02-09 12:38:41 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-02-15 14:17:08 +0300 |
| commit | a923a34de19cc83a9a687995de7203e64a4a5b95 (patch) | |
| tree | 25c32298f730cabc3e5736a3c1fdf7f8e683fbc2 /build_files/build_environment/cmake | |
| parent | ebdf68a0bb37f4f3765521fcc78646c250cd9269 (diff) | |
CMake/Deps: upgrade USD 20.05 → 21.02
USD version 21.02 includes two of the changes Blender used to patch in,
which have now been removed from `usd.diff`. Unfortunately 21.02
introduces another issue where LZ4 symbols are accidentally exported,
causing linker errors. Fortunately these symbols are only used for
resting, so I added a patch hunk that simply removes their `extern "C"`
declaration.
The LZ4 linker issue has been reported upstream at
https://github.com/PixarAnimationStudios/USD/issues/1447.
Reviewed By: sebbas, mont29
Differential Revision: https://developer.blender.org/D10367
Diffstat (limited to 'build_files/build_environment/cmake')
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 8eff4c3180d..4a879c793a1 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -297,9 +297,9 @@ set(EMBREE_VERSION 3.10.0) set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip) set(EMBREE_HASH 4bbe29e7eaa46417efc75fc5f1e8eb87) -set(USD_VERSION 20.05) +set(USD_VERSION 21.02) set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz) -set(USD_HASH 6d679e739e7f65725d9c029e37dda9fc) +set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a) set(OIDN_VERSION 1.3.0) set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz) |