deps: upgrade USD 20.05 → 21.02
ClosedPublic
Actions

Authored by Sybren A. Stüvel (sybren) on Feb 9 2021, 11:10 AM.

Details

Reviewers

Sebastián Barschkis (sebbas)
Ray Molenkamp (LazyDodo)
Bastien Montagne (mont29)

Maniphest Tasks

T85365: Libraries Changes for Blender 2.93

Commits

rBa923a34de19c: CMake/Deps: upgrade USD 20.05 → 21.02

Summary

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
testing, 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.

Diff Detail

Repository

rB Blender

Branch

temp-upgrade-2.93-usd

Build Status

Buildable 12750
Build 12750: arc lint + arc unit

Event Timeline

Sybren A. Stüvel (sybren) requested review of this revision.Feb 9 2021, 11:10 AM

Sybren A. Stüvel (sybren) created this revision.

Harbormaster completed remote builds in B12745: Diff 33748.Feb 9 2021, 11:10 AM

Sybren A. Stüvel (sybren) added a task: T85365: Libraries Changes for Blender 2.93.Feb 9 2021, 11:11 AM

Sybren A. Stüvel (sybren) mentioned this in T85365: Libraries Changes for Blender 2.93.

Can you please include updates to install_deps in the same patch/commit? It relies on the same patch for USD lib, so better get everything committed at the same time.

Checked, besides patch application, just updating the version numbers works fine:

index eee8c32f8a5..65f6a15fb2f 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -526,10 +526,10 @@ ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false
 
-USD_VERSION="20.08"
-USD_VERSION_SHORT="20.08"
+USD_VERSION="21.02"
+USD_VERSION_SHORT="21.02"
 USD_VERSION_MIN="20.05"
-USD_VERSION_MAX="21.00"
+USD_VERSION_MAX="22.00"
 USD_FORCE_BUILD=false
 USD_FORCE_REBUILD=false
 USD_SKIP=false

Include install_deps.sh changes as per @Bastien Montagne (mont29)'s request

Harbormaster completed remote builds in B12750: Diff 33757.Feb 9 2021, 12:31 PM

Bastien Montagne (mont29) accepted this revision.Feb 9 2021, 12:40 PM

This revision is now accepted and ready to land.Feb 9 2021, 12:40 PM

Anything particular to watch out for? I am currently getting a build error here: build_darwin/deps/build/usd/src/external_usd/pxr/base/tf/hash.cpp:38:1: error: use of undeclared identifier 'Tf_HashState'

@Sybren A. Stüvel (sybren) Do you know what could be the issue?

That's strange, I didn't get that error myself.
Currently I've queued up all the library upgrades into one branch, so that I can test the USD upgrade with the latest Boost and Python and other things. Maybe I'll run into the error too, and we'll know a bit more.

Ok, can't say what it was but a fresh build (with the new boost and python patches) did the trick.

Closed by commit rBa923a34de19c: CMake/Deps: upgrade USD 20.05 → 21.02 (authored by Sybren A. Stüvel (sybren)). · Explain WhyFeb 15 2021, 12:17 PM

This revision was automatically updated to reflect the committed changes.

Sybren A. Stüvel (sybren) added a commit: rBa923a34de19c: CMake/Deps: upgrade USD 20.05 → 21.02.

Why did you remove the install_deps change from final commit??????

Bastien Montagne (mont29) mentioned this in rB59c1029e2009: install_deps: bump USD version to 21.02..Feb 25 2021, 11:58 AM