[usd] update to 26.08 (#53548)

This commit is contained in:
JacksonSun-adsk 2026-08-28 17:00:40 -04:00 committed by GitHub
parent 1d8862cfcb
commit 6c409c8aea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 29 deletions

View File

@ -1,23 +0,0 @@
diff --git a/pxr/base/work/workTBB/dispatcher_impl.h b/pxr/base/work/workTBB/dispatcher_impl.h
index 9cecf4a4d..6785dcec6 100644
--- a/pxr/base/work/workTBB/dispatcher_impl.h
+++ b/pxr/base/work/workTBB/dispatcher_impl.h
@@ -10,6 +10,18 @@
#include "pxr/pxr.h"
#include "pxr/base/work/api.h"
+// The TBB version macro is located in different headers in legacy TBB
+// (tbb/tbb_stddef.h) and oneTBB (tbb/version.h)
+#if __has_include(<tbb/tbb_stddef.h>)
+#include <tbb/tbb_stddef.h>
+#elif __has_include(<tbb/version.h>)
+#include <tbb/version.h>
+#endif
+
+#ifndef TBB_INTERFACE_VERSION_MAJOR
+#error "TBB version macro TBB_INTERFACE_VERSION_MAJOR not found"
+#endif
+
// Blocked range is not used in this file, but this header happens to pull in
// the TBB version header in a way that works in all TBB versions.
#include <tbb/blocked_range.h>

View File

@ -20,7 +20,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PixarAnimationStudios/OpenUSD
REF "v${USD_VERSION}"
SHA512 d10222a457d71470a26ad6dc812685f257bf5c90a64a11d90e543ef7eaba803aa4e2593c358ebd430ba55856e987f7a6f50597b1ad6d2da737c239ad4f18ad6a
SHA512 82f7bb4f77b295be79cd36f591f242276d36c0d589b0fca383344c27e70daf7e29151bf587528bb2fc2b2a8b974387a253993ace3caf5f79ae70f9ebbc71cf1a
HEAD_REF release
PATCHES
003-fix-dep.patch
@ -29,7 +29,6 @@ vcpkg_from_github(
008-fix_clang8_compiler_error.patch
009-vcpkg_install_folder_conventions.patch
010-cmake_export_plugin_as_modules.patch
011-fix-tbb2023-task-api.patch
)
# Changes accompanying 003-fix-dep.patch

View File

@ -1,7 +1,6 @@
{
"name": "usd",
"version": "26.5",
"port-version": 1,
"version": "26.8",
"description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.",
"homepage": "https://github.com/PixarAnimationStudios/OpenUSD",
"license": null,

View File

@ -10553,8 +10553,8 @@
"port-version": 1
},
"usd": {
"baseline": "26.5",
"port-version": 1
"baseline": "26.8",
"port-version": 0
},
"usearch": {
"baseline": "2.25.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "598f853d37335f04e8912a47d45d97503cd6b067",
"version": "26.8",
"port-version": 0
},
{
"git-tree": "0292e6ee6d054866a39a60a931bc94e5f3dc238e",
"version": "26.5",