From c8eae5d8a64704e331425dc4a1c3bf9c33c60264 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Oct 2025 18:52:19 +0000 Subject: [PATCH 01/29] Rebuilt for opensubdiv 3.7.0~RC1 (fix RHBZ#2406597) From 734e75b372c6868ab5cbe569061d385a627dd32e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Oct 2025 21:14:39 +0000 Subject: [PATCH 02/29] Add direct build dependency on OpenCL as a workaround --- usd.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usd.spec b/usd.spec index c1c00a2..26e7309 100644 --- a/usd.spec +++ b/usd.spec @@ -167,6 +167,11 @@ BuildRequires: pkgconfig(dri) BuildRequires: hdf5-devel BuildRequires: cmake(OpenSubdiv) BuildRequires: pkgconfig(tbb) +# This seems to be an indirect dependency, probably through OpenSubdiv. +# Ideally, everything would take care of its own dependencies, and we wouldn’t +# have to specify it directly, but we haven’t studied the problem closely +# enough to propose a fix. +BuildRequires: pkgconfig(OpenCL) # Unbundled: BuildRequires: cmake(double-conversion) BuildRequires: pkgconfig(liblz4) From 6172607253b60fcacff4678ace28648ef72cdf4f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 26 Oct 2025 05:12:37 +0000 Subject: [PATCH 03/29] Update to 25.11 (close RHBZ#2406284) --- .gitignore | 1 + ...ownstream-only-add-an-SONAME-version.patch | 36 +- ...use-Valgrind-macro-instead-of-inline.patch | 8 +- ...use-the-system-double-conversion-lib.patch | 8 +- ...ream-only-use-the-system-lz4-library.patch | 8 +- ...-only-use-the-system-pugixml-library.patch | 4 +- ...nly-use-the-system-rapidjson-library.patch | 15 +- ...tream-only-use-the-system-libdeflate.patch | 24 +- ...wnstream-only-use-the-system-libavif.patch | 6 +- 2313.patch | 510 ------------------ sources | 2 +- usd.spec | 24 +- 12 files changed, 74 insertions(+), 572 deletions(-) delete mode 100644 2313.patch diff --git a/.gitignore b/.gitignore index d0e0d07..a6f122a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /OpenUSD-25.05.tar.gz /OpenUSD-25.05.01.tar.gz /OpenUSD-25.08.tar.gz +/OpenUSD-25.11.tar.gz diff --git a/0001-Downstream-only-add-an-SONAME-version.patch b/0001-Downstream-only-add-an-SONAME-version.patch index 250eae0..aeb48ad 100644 --- a/0001-Downstream-only-add-an-SONAME-version.patch +++ b/0001-Downstream-only-add-an-SONAME-version.patch @@ -1,4 +1,4 @@ -From 483ce5b8e320e89016fff7b3480216ba94c032ff Mon Sep 17 00:00:00 2001 +From 2f2ebd688c7e6804014ea183163954f48e7622af Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 27 Oct 2023 12:56:58 -0400 Subject: [PATCH] Downstream-only: add an SONAME version @@ -33,15 +33,15 @@ built with -DPXR_BUILD_EXAMPLES=OFF, but it is.) --- cmake/defaults/Version.cmake | 6 ++++++ cmake/macros/Private.cmake | 1 + - cmake/macros/Public.cmake | 1 + - 3 files changed, 8 insertions(+) + cmake/macros/Public.cmake | 2 ++ + 3 files changed, 9 insertions(+) diff --git a/cmake/defaults/Version.cmake b/cmake/defaults/Version.cmake -index 447c74e4d..a990f071b 100644 +index 20e70edb2..c3e072e1a 100644 --- a/cmake/defaults/Version.cmake +++ b/cmake/defaults/Version.cmake @@ -10,3 +10,9 @@ set(PXR_MINOR_VERSION "25") - set(PXR_PATCH_VERSION "8") # NOTE: Must not have leading 0 for single digits + set(PXR_PATCH_VERSION "11") # NOTE: Must not have leading 0 for single digits math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}") + @@ -51,29 +51,37 @@ index 447c74e4d..a990f071b 100644 + "Downstream shared object version" +) diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake -index 6fe1134c1..06aecd083 100644 +index b90b743de..7af8b89c2 100644 --- a/cmake/macros/Private.cmake +++ b/cmake/macros/Private.cmake -@@ -1372,6 +1372,7 @@ function(_pxr_library NAME) +@@ -1304,6 +1304,7 @@ function(_pxr_library NAME) + FOLDER "${folder}" + POSITION_INDEPENDENT_CODE ON IMPORT_PREFIX "${args_PREFIX}" ++ SOVERSION ${PXR_DOWNSTREAM_SOVERSION} PREFIX "${args_PREFIX}" SUFFIX "${args_SUFFIX}" -+ SOVERSION ${PXR_DOWNSTREAM_SOVERSION} ) - - target_compile_definitions(${NAME} diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake -index 807cf7d83..7225af783 100644 +index b8e588bf3..cf64607c8 100644 --- a/cmake/macros/Public.cmake +++ b/cmake/macros/Public.cmake -@@ -1121,6 +1121,7 @@ function(pxr_toplevel_prologue) - FOLDER "${folder}" +@@ -414,6 +414,7 @@ function(pxr_library NAME) + TYPE "${args_TYPE}" + PREFIX "${prefix}" + SUFFIX "${suffix}" ++ SOVERSION ${PXR_DOWNSTREAM_SOVERSION} + SUBDIR "${subdir}" + CPPFILES "${args_CPPFILES};${${NAME}_CPPFILES}" + PUBLIC_HEADERS "${args_PUBLIC_HEADERS};${${NAME}_PUBLIC_HEADERS}" +@@ -1152,6 +1153,7 @@ function(pxr_toplevel_prologue) PREFIX "${libPrefix}" IMPORT_PREFIX "${libPrefix}" + OUTPUT_NAME ${libName} + SOVERSION ${PXR_DOWNSTREAM_SOVERSION} ) _get_install_dir("lib" libInstallPrefix) install( -- -2.50.1 +2.51.0 diff --git a/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch b/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch index 62f0370..4ca709f 100644 --- a/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch +++ b/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch @@ -1,4 +1,4 @@ -From 75d4451fa64e086edd9d621af681df13cebde5eb Mon Sep 17 00:00:00 2001 +From bb5d6070945c671d3192e2c6c939b941f50991fc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 1 Aug 2025 08:47:41 -0400 Subject: [PATCH] Downstream-only: use Valgrind macro instead of inline @@ -13,7 +13,7 @@ on aarch64. 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pxr/exec/vdf/executorDataVector.cpp b/pxr/exec/vdf/executorDataVector.cpp -index 12f9e517e..7e5625678 100644 +index 96dacca06..7e5625678 100644 --- a/pxr/exec/vdf/executorDataVector.cpp +++ b/pxr/exec/vdf/executorDataVector.cpp @@ -11,40 +11,18 @@ @@ -35,7 +35,7 @@ index 12f9e517e..7e5625678 100644 static inline void Vdf_ExecutorDataVector_ValgrindMakeDefined(void *ptr, size_t size) { --#if defined(ARCH_OS_LINUX) +-#if defined(ARCH_OS_LINUX) && defined(ARCH_CPU_INTEL) - // Pass a result and a pointer to some arguments via registers - volatile unsigned long long int result; - volatile unsigned long long int args[6] = { @@ -61,5 +61,5 @@ index 12f9e517e..7e5625678 100644 Vdf_ExecutorDataVector::~Vdf_ExecutorDataVector() -- -2.50.1 +2.51.0 diff --git a/0001-Downstream-only-use-the-system-double-conversion-lib.patch b/0001-Downstream-only-use-the-system-double-conversion-lib.patch index 1d2a648..3b8f6e5 100644 --- a/0001-Downstream-only-use-the-system-double-conversion-lib.patch +++ b/0001-Downstream-only-use-the-system-double-conversion-lib.patch @@ -1,4 +1,4 @@ -From 23bda0e3337d7a27696a000a47eaf36840650c69 Mon Sep 17 00:00:00 2001 +From 70ca2a5a93b263c1f42502e6b800f46fe1f0d91f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Aug 2024 10:42:48 -0400 Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library @@ -8,7 +8,7 @@ Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index fade8d559..5d9272087 100644 +index 1b1aa9dbe..f2d58fd15 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt @@ -110,11 +110,14 @@ function(add_py_dll_link_test) @@ -26,7 +26,7 @@ index fade8d559..5d9272087 100644 PUBLIC_CLASSES anyUniquePtr -@@ -278,14 +281,6 @@ pxr_library(tf +@@ -277,14 +280,6 @@ pxr_library(tf CPPFILES initConfig.cpp @@ -42,5 +42,5 @@ index fade8d559..5d9272087 100644 PYMODULE_CPPFILES -- -2.50.1 +2.51.0 diff --git a/0002-Downstream-only-use-the-system-lz4-library.patch b/0002-Downstream-only-use-the-system-lz4-library.patch index c72d25a..26affbf 100644 --- a/0002-Downstream-only-use-the-system-lz4-library.patch +++ b/0002-Downstream-only-use-the-system-lz4-library.patch @@ -1,4 +1,4 @@ -From 3492a9fb0fccfe52ed5258e943381d48d28be3e5 Mon Sep 17 00:00:00 2001 +From 64a603b9c6278f3287cd2769f0fb5ebd9356ae74 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Aug 2024 13:30:18 -0400 Subject: [PATCH 2/6] Downstream-only: use the system lz4 library @@ -8,7 +8,7 @@ Subject: [PATCH 2/6] Downstream-only: use the system lz4 library 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index 5d9272087..c4130882c 100644 +index f2d58fd15..7433f0591 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt @@ -111,6 +111,8 @@ function(add_py_dll_link_test) @@ -31,7 +31,7 @@ index 5d9272087..c4130882c 100644 PUBLIC_CLASSES anyUniquePtr -@@ -281,7 +287,6 @@ pxr_library(tf +@@ -280,7 +286,6 @@ pxr_library(tf CPPFILES initConfig.cpp @@ -40,5 +40,5 @@ index 5d9272087..c4130882c 100644 PYMODULE_CPPFILES module.cpp -- -2.50.1 +2.51.0 diff --git a/0003-Downstream-only-use-the-system-pugixml-library.patch b/0003-Downstream-only-use-the-system-pugixml-library.patch index 2bab595..1051ecd 100644 --- a/0003-Downstream-only-use-the-system-pugixml-library.patch +++ b/0003-Downstream-only-use-the-system-pugixml-library.patch @@ -1,4 +1,4 @@ -From 98f62852495fb2c86047eff532a3af2a5b88792b Mon Sep 17 00:00:00 2001 +From 48a4ad95bbe1e5675922da4eaf863bd208c0167b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 30 Aug 2024 09:32:08 -0400 Subject: [PATCH 3/6] Downstream-only: use the system pugixml library @@ -35,5 +35,5 @@ index 244f27aa8..1e00413c4 100644 PRIVATE_HEADERS api.h -- -2.50.1 +2.51.0 diff --git a/0004-Downstream-only-use-the-system-rapidjson-library.patch b/0004-Downstream-only-use-the-system-rapidjson-library.patch index 8d1c7e6..cd90d76 100644 --- a/0004-Downstream-only-use-the-system-rapidjson-library.patch +++ b/0004-Downstream-only-use-the-system-rapidjson-library.patch @@ -1,22 +1,23 @@ -From aa1063129297e469ddd709c7ee4d0406f9bae08f Mon Sep 17 00:00:00 2001 +From 48c8a77ae5ba717b8651585302939a36126d286c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 31 Aug 2024 11:08:18 -0400 Subject: [PATCH 4/6] Downstream-only: use the system rapidjson library --- - pxr/base/js/CMakeLists.txt | 37 ------------------------------------- - 1 file changed, 37 deletions(-) + pxr/base/js/CMakeLists.txt | 40 -------------------------------------- + 1 file changed, 40 deletions(-) diff --git a/pxr/base/js/CMakeLists.txt b/pxr/base/js/CMakeLists.txt -index d59dc1f6d..086d1bc48 100644 +index 632c061e5..62696a341 100644 --- a/pxr/base/js/CMakeLists.txt +++ b/pxr/base/js/CMakeLists.txt -@@ -15,43 +15,6 @@ pxr_library(js +@@ -15,46 +15,6 @@ pxr_library(js converter.h types.h - PRIVATE_HEADERS - rapidjson/allocators.h +- rapidjson/cursorstreamwrapper.h - rapidjson/document.h - rapidjson/encodedstream.h - rapidjson/encodings.h @@ -26,6 +27,7 @@ index d59dc1f6d..086d1bc48 100644 - rapidjson/filewritestream.h - rapidjson/fwd.h - rapidjson/internal/biginteger.h +- rapidjson/internal/clzll.h - rapidjson/internal/diyfp.h - rapidjson/internal/dtoa.h - rapidjson/internal/ieee754.h @@ -50,11 +52,12 @@ index d59dc1f6d..086d1bc48 100644 - rapidjson/schema.h - rapidjson/stream.h - rapidjson/stringbuffer.h +- rapidjson/uri.h - rapidjson/writer.h - DOXYGEN_FILES overview.dox ) -- -2.50.1 +2.51.0 diff --git a/0005-Downstream-only-use-the-system-libdeflate.patch b/0005-Downstream-only-use-the-system-libdeflate.patch index e76eeb6..5549f98 100644 --- a/0005-Downstream-only-use-the-system-libdeflate.patch +++ b/0005-Downstream-only-use-the-system-libdeflate.patch @@ -1,16 +1,16 @@ -From 4b1c527468f9c43e04a1ff773cec6a9f9ca0b5ae Mon Sep 17 00:00:00 2001 +From 614a6a01271cfaaa2421f58289cc1267685c75a9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 1 Sep 2024 21:30:11 -0400 Subject: [PATCH 5/6] Downstream-only: use the system libdeflate --- - pxr/imaging/hio/CMakeLists.txt | 7 +++++++ - pxr/imaging/hio/OpenEXR/OpenEXRCore/compression.c | 3 +-- - pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h | 12 ------------ + pxr/imaging/hio/CMakeLists.txt | 7 +++++++ + .../hioOpenEXR/OpenEXR/OpenEXRCore/compression.c | 3 +-- + .../plugin/hioOpenEXR/OpenEXR/OpenEXRCoreUnity.h | 12 ------------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pxr/imaging/hio/CMakeLists.txt b/pxr/imaging/hio/CMakeLists.txt -index 75e1e6298..09264c600 100644 +index e61fc7c54..7cfbe9d70 100644 --- a/pxr/imaging/hio/CMakeLists.txt +++ b/pxr/imaging/hio/CMakeLists.txt @@ -1,6 +1,9 @@ @@ -34,10 +34,10 @@ index 75e1e6298..09264c600 100644 PUBLIC_CLASSES fieldTextureData -diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCore/compression.c b/pxr/imaging/hio/OpenEXR/OpenEXRCore/compression.c +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/compression.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/compression.c index a672e833b..1d2eaea56 100644 ---- a/pxr/imaging/hio/OpenEXR/OpenEXRCore/compression.c -+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCore/compression.c +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/compression.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/compression.c @@ -8,8 +8,7 @@ #include "internal_memory.h" #include "internal_structs.h" @@ -48,10 +48,10 @@ index a672e833b..1d2eaea56 100644 #if ( \ LIBDEFLATE_VERSION_MAJOR > 1 || \ -diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h b/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCoreUnity.h b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCoreUnity.h index 7481a346e..71bdde9cc 100644 ---- a/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h -+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCoreUnity.h ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCoreUnity.h @@ -8,18 +8,6 @@ #include "OpenEXRCore/openexr_config.h" @@ -72,5 +72,5 @@ index 7481a346e..71bdde9cc 100644 #include "OpenEXRCore/attributes.c" -- -2.50.1 +2.51.0 diff --git a/0006-Downstream-only-use-the-system-libavif.patch b/0006-Downstream-only-use-the-system-libavif.patch index fe06223..e1a6178 100644 --- a/0006-Downstream-only-use-the-system-libavif.patch +++ b/0006-Downstream-only-use-the-system-libavif.patch @@ -1,4 +1,4 @@ -From 8ebd20bf9e0e945457215dba1d56a25408f860a6 Mon Sep 17 00:00:00 2001 +From a7e7a94bed76d6b24bfbf9a2c4aa1cf9d57564ab Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 4 Sep 2024 11:09:47 -0400 Subject: [PATCH 6/6] Downstream-only: use the system libavif @@ -22,7 +22,7 @@ index 81549fb54..d2dfb1bcd 100644 #if defined(PXR_STATIC) # define HIOAVIF_API diff --git a/pxr/imaging/plugin/hioAvif/CMakeLists.txt b/pxr/imaging/plugin/hioAvif/CMakeLists.txt -index f4eaeea15..7f1680eaf 100644 +index 1a81d50b1..fd89502a7 100644 --- a/pxr/imaging/plugin/hioAvif/CMakeLists.txt +++ b/pxr/imaging/plugin/hioAvif/CMakeLists.txt @@ -1,6 +1,9 @@ @@ -237,5 +237,5 @@ index f4eaeea15..7f1680eaf 100644 RESOURCE_FILES -- -2.50.1 +2.51.0 diff --git a/2313.patch b/2313.patch deleted file mode 100644 index 74383c0..0000000 --- a/2313.patch +++ /dev/null @@ -1,510 +0,0 @@ -From 97de29467ef3ee2e9f9952b7158f9cbad51dac2a Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Thu, 23 Feb 2023 14:17:02 -0700 -Subject: [PATCH 1/7] build_usd.py: wrap the TBB_ROOT parameter value in double - quotes when building Embree - -This ensures that slash characters are properly escaped on Windows. ---- - build_scripts/build_usd.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py -index 40f6c3296c..ec1a268d78 100644 ---- a/build_scripts/build_usd.py -+++ b/build_scripts/build_usd.py -@@ -1587,7 +1587,7 @@ def InstallMaterialX(context, force, buildArgs): - def InstallEmbree(context, force, buildArgs): - with CurrentWorkingDirectory(DownloadURL(EMBREE_URL, context, force)): - extraArgs = [ -- '-DTBB_ROOT={instDir}'.format(instDir=context.instDir), -+ '-DTBB_ROOT="{instDir}"'.format(instDir=context.instDir), - '-DEMBREE_TUTORIALS=OFF', - '-DEMBREE_ISPC_SUPPORT=OFF' - ] - -From 2679ca564baca476ff7beee448b6d6a85b91a339 Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Thu, 23 Feb 2023 12:20:39 -0700 -Subject: [PATCH 2/7] FindEmbree.cmake: add support for finding Embree versions - 3 or 4 - ---- - cmake/modules/FindEmbree.cmake | 41 +++++++++++++++++++++------------- - 1 file changed, 26 insertions(+), 15 deletions(-) - -diff --git a/cmake/modules/FindEmbree.cmake b/cmake/modules/FindEmbree.cmake -index cd52f6b7f5..4c4ff1cdb2 100644 ---- a/cmake/modules/FindEmbree.cmake -+++ b/cmake/modules/FindEmbree.cmake -@@ -19,12 +19,30 @@ - # - #============================================================================= - -+find_path(EMBREE_INCLUDE_DIR -+ embree4/rtcore.h -+ embree3/rtcore.h -+HINTS -+ "${EMBREE_LOCATION}/include" -+ "$ENV{EMBREE_LOCATION}/include" -+DOC -+ "Embree headers path" -+) -+ -+if (EMBREE_INCLUDE_DIR AND EXISTS "${EMBREE_INCLUDE_DIR}/embree4/rtcore.h") -+ set(EMBREE_VERSIONED_LIBRARY_NAME "embree4") -+ set(EMBREE_VERSION_HEADER_FILE_NAME "rtcore_config.h") -+else() -+ set(EMBREE_VERSIONED_LIBRARY_NAME "embree3") -+ set(EMBREE_VERSION_HEADER_FILE_NAME "rtcore_version.h") -+endif() -+ - if (APPLE) -- set (EMBREE_LIB_NAME libembree3.dylib) -+ set (EMBREE_LIB_NAME "lib${EMBREE_VERSIONED_LIBRARY_NAME}.dylib") - elseif (UNIX) -- set (EMBREE_LIB_NAME libembree3.so) -+ set (EMBREE_LIB_NAME "lib${EMBREE_VERSIONED_LIBRARY_NAME}.so") - elseif (WIN32) -- set (EMBREE_LIB_NAME embree3.lib) -+ set (EMBREE_LIB_NAME "${EMBREE_VERSIONED_LIBRARY_NAME}.lib") - endif() - - find_library(EMBREE_LIBRARY -@@ -38,21 +56,14 @@ find_library(EMBREE_LIBRARY - "Embree library path" - ) - --find_path(EMBREE_INCLUDE_DIR -- embree3/rtcore.h --HINTS -- "${EMBREE_LOCATION}/include" -- "$ENV{EMBREE_LOCATION}/include" --DOC -- "Embree headers path" --) -+set(EMBREE_VERSION_HEADER_FILE_PATH "${EMBREE_INCLUDE_DIR}/${EMBREE_VERSIONED_LIBRARY_NAME}/${EMBREE_VERSION_HEADER_FILE_NAME}") - --if (EMBREE_INCLUDE_DIR AND EXISTS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" ) -- file(STRINGS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" TMP REGEX "^#define RTC_VERSION_MAJOR.*$") -+if (EMBREE_INCLUDE_DIR AND EXISTS "${EMBREE_VERSION_HEADER_FILE_PATH}") -+ file(STRINGS "${EMBREE_VERSION_HEADER_FILE_PATH}" TMP REGEX "^#define RTC_VERSION_MAJOR.*$") - string(REGEX MATCHALL "[0-9]+" MAJOR ${TMP}) -- file(STRINGS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" TMP REGEX "^#define RTC_VERSION_MINOR.*$") -+ file(STRINGS "${EMBREE_VERSION_HEADER_FILE_PATH}" TMP REGEX "^#define RTC_VERSION_MINOR.*$") - string(REGEX MATCHALL "[0-9]+" MINOR ${TMP}) -- file(STRINGS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" TMP REGEX "^#define RTC_VERSION_PATCH.*$") -+ file(STRINGS "${EMBREE_VERSION_HEADER_FILE_PATH}" TMP REGEX "^#define RTC_VERSION_PATCH.*$") - string(REGEX MATCHALL "[0-9]+" PATCH ${TMP}) - - set (EMBREE_VERSION ${MAJOR}.${MINOR}.${PATCH}) - -From c3db8a5d3c7040433f845a99b5c1ff57e5003f31 Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Thu, 16 Feb 2023 16:37:11 -0700 -Subject: [PATCH 3/7] hdEmbree: add support for building against Embree - versions 3 or 4 - -This supports upgrading Embree to a major version 4 release, so it includes -handling for the change in file paths between "embree3" and "embree4" and also -accounts for a small change in API in version 4. RTCIntersectContext was -renamed to RTCRayQueryContext, but it was also made part of the optional -RTCIntersectArguments parameter to rtcIntersect and rtcOccluded functions. -Since the context is not used by hdEmbree, it no longer needs to be provided. ---- - pxr/imaging/plugin/hdEmbree/CMakeLists.txt | 6 ++++++ - pxr/imaging/plugin/hdEmbree/context.h | 6 +++++- - pxr/imaging/plugin/hdEmbree/mesh.h | 9 +++++++-- - pxr/imaging/plugin/hdEmbree/meshSamplers.h | 9 +++++++-- - pxr/imaging/plugin/hdEmbree/pch.h | 6 ++++++ - pxr/imaging/plugin/hdEmbree/renderDelegate.h | 7 ++++++- - pxr/imaging/plugin/hdEmbree/renderParam.h | 6 +++++- - pxr/imaging/plugin/hdEmbree/renderer.cpp | 8 ++++++++ - pxr/imaging/plugin/hdEmbree/renderer.h | 9 +++++++-- - pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp | 7 ++++++- - 10 files changed, 63 insertions(+), 10 deletions(-) - -diff --git a/pxr/imaging/plugin/hdEmbree/CMakeLists.txt b/pxr/imaging/plugin/hdEmbree/CMakeLists.txt -index 96ac989d6c..d843804a15 100644 ---- a/pxr/imaging/plugin/hdEmbree/CMakeLists.txt -+++ b/pxr/imaging/plugin/hdEmbree/CMakeLists.txt -@@ -11,6 +11,12 @@ if (NOT ${PXR_BUILD_GPU_SUPPORT}) - return() - endif() - -+if (EMBREE_VERSION VERSION_GREATER_EQUAL 4.0.0) -+ add_definitions(-DPXR_EMBREE_MAJOR_VERSION=4) -+else() -+ add_definitions(-DPXR_EMBREE_MAJOR_VERSION=3) -+endif() -+ - pxr_plugin(hdEmbree - LIBRARIES - plug -diff --git a/pxr/imaging/plugin/hdEmbree/context.h b/pxr/imaging/plugin/hdEmbree/context.h -index 4165adb1e6..7e5c099b74 100644 ---- a/pxr/imaging/plugin/hdEmbree/context.h -+++ b/pxr/imaging/plugin/hdEmbree/context.h -@@ -14,7 +14,11 @@ - #include "pxr/base/gf/matrix4f.h" - #include "pxr/base/vt/array.h" - --#include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+#else -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - - PXR_NAMESPACE_OPEN_SCOPE - -diff --git a/pxr/imaging/plugin/hdEmbree/mesh.h b/pxr/imaging/plugin/hdEmbree/mesh.h -index bbb006302f..a6f71f110f 100644 ---- a/pxr/imaging/plugin/hdEmbree/mesh.h -+++ b/pxr/imaging/plugin/hdEmbree/mesh.h -@@ -15,8 +15,13 @@ - - #include "pxr/imaging/plugin/hdEmbree/meshSamplers.h" - --#include --#include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+ #include -+#else -+ #include -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - - PXR_NAMESPACE_OPEN_SCOPE - -diff --git a/pxr/imaging/plugin/hdEmbree/meshSamplers.h b/pxr/imaging/plugin/hdEmbree/meshSamplers.h -index c32c35fffa..51459a2ed4 100644 ---- a/pxr/imaging/plugin/hdEmbree/meshSamplers.h -+++ b/pxr/imaging/plugin/hdEmbree/meshSamplers.h -@@ -12,8 +12,13 @@ - #include "pxr/imaging/hd/meshUtil.h" - #include "pxr/base/vt/types.h" - --#include --#include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+ #include -+#else -+ #include -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - - #include - -diff --git a/pxr/imaging/plugin/hdEmbree/pch.h b/pxr/imaging/plugin/hdEmbree/pch.h -index 4e16a844d7..901e93859f 100644 ---- a/pxr/imaging/plugin/hdEmbree/pch.h -+++ b/pxr/imaging/plugin/hdEmbree/pch.h -@@ -76,9 +76,15 @@ - #include - #include - #include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+#include -+#include -+#include -+#else - #include - #include - #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - #ifdef PXR_PYTHON_SUPPORT_ENABLED - #include "pxr/base/tf/pySafePython.h" - #endif // PXR_PYTHON_SUPPORT_ENABLED -diff --git a/pxr/imaging/plugin/hdEmbree/renderDelegate.h b/pxr/imaging/plugin/hdEmbree/renderDelegate.h -index 1d8694daa6..826d020e04 100644 ---- a/pxr/imaging/plugin/hdEmbree/renderDelegate.h -+++ b/pxr/imaging/plugin/hdEmbree/renderDelegate.h -@@ -13,8 +13,13 @@ - #include "pxr/imaging/plugin/hdEmbree/renderer.h" - #include "pxr/base/tf/staticTokens.h" - -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+#else -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ - #include --#include - - PXR_NAMESPACE_OPEN_SCOPE - -diff --git a/pxr/imaging/plugin/hdEmbree/renderParam.h b/pxr/imaging/plugin/hdEmbree/renderParam.h -index 206a7458bc..af94ef10a4 100644 ---- a/pxr/imaging/plugin/hdEmbree/renderParam.h -+++ b/pxr/imaging/plugin/hdEmbree/renderParam.h -@@ -11,7 +11,11 @@ - #include "pxr/imaging/hd/renderDelegate.h" - #include "pxr/imaging/hd/renderThread.h" - --#include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+#else -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - - PXR_NAMESPACE_OPEN_SCOPE - -diff --git a/pxr/imaging/plugin/hdEmbree/renderer.cpp b/pxr/imaging/plugin/hdEmbree/renderer.cpp -index cc8ddb0270..8cbf8d4959 100644 ---- a/pxr/imaging/plugin/hdEmbree/renderer.cpp -+++ b/pxr/imaging/plugin/hdEmbree/renderer.cpp -@@ -709,9 +709,13 @@ HdEmbreeRenderer::_TraceRay(unsigned int x, unsigned int y, - rayHit.ray.flags = 0; - _PopulateRayHit(&rayHit, origin, dir, 0.0f); - { -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ rtcIntersect1(_scene, &rayHit); -+#else - RTCIntersectContext context; - rtcInitIntersectContext(&context); - rtcIntersect1(_scene, &context, &rayHit); -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - // - // there is something odd about how this is used in Embree. Is it reversed - // here and then when it it used in -@@ -1047,9 +1051,13 @@ HdEmbreeRenderer::_ComputeAmbientOcclusion(GfVec3f const& position, - shadow.flags = 0; - _PopulateRay(&shadow, position, shadowDir, 0.001f); - { -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ rtcOccluded1(_scene, &shadow); -+#else - RTCIntersectContext context; - rtcInitIntersectContext(&context); - rtcOccluded1(_scene,&context,&shadow); -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - } - - // Record this AO ray's contribution to the occlusion factor: a -diff --git a/pxr/imaging/plugin/hdEmbree/renderer.h b/pxr/imaging/plugin/hdEmbree/renderer.h -index 2da9880848..913b83eccc 100644 ---- a/pxr/imaging/plugin/hdEmbree/renderer.h -+++ b/pxr/imaging/plugin/hdEmbree/renderer.h -@@ -15,8 +15,13 @@ - #include "pxr/base/gf/matrix4d.h" - #include "pxr/base/gf/rect2i.h" - --#include --#include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+ #include -+#else -+ #include -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 - - #include - #include -diff --git a/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp b/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp -index 02c2ca69f8..45370dfed0 100644 ---- a/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp -+++ b/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp -@@ -23,7 +23,12 @@ - - #include "pxr/base/tf/errorMark.h" - --#include -+#if defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ #include -+#else -+ #include -+#endif // defined(PXR_EMBREE_MAJOR_VERSION) && PXR_EMBREE_MAJOR_VERSION >= 4 -+ - #include - - PXR_NAMESPACE_USING_DIRECTIVE - -From 9c67986d0a7e76babead0d1fdf5190f264c1a8b9 Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Wed, 24 Jul 2024 10:07:44 -0400 -Subject: [PATCH 4/7] build_usd.py: update Embree URLs to reflect new home in - the RenderKit GitHub organization - ---- - build_scripts/build_usd.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py -index ec1a268d78..afa4763c8d 100644 ---- a/build_scripts/build_usd.py -+++ b/build_scripts/build_usd.py -@@ -1580,9 +1580,9 @@ def InstallMaterialX(context, force, buildArgs): - # For MacOS we use version 3.13.3 to include a fix from Intel - # to build on Apple Silicon. - if MacOS(): -- EMBREE_URL = "https://github.com/embree/embree/archive/v3.13.3.zip" -+ EMBREE_URL = "https://github.com/RenderKit/embree/archive/v3.13.3.zip" - else: -- EMBREE_URL = "https://github.com/embree/embree/archive/v3.2.2.zip" -+ EMBREE_URL = "https://github.com/RenderKit/embree/archive/v3.2.2.zip" - - def InstallEmbree(context, force, buildArgs): - with CurrentWorkingDirectory(DownloadURL(EMBREE_URL, context, force)): - -From 0e3f0e8b595e74312c7fbd1b378a96d3b5e85723 Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Thu, 23 Feb 2023 12:25:24 -0700 -Subject: [PATCH 5/7] build_usd.py: add an option to choose Embree 3 or Embree - 4 - -The new --embree-major-version option can be given to build_usd.py to select -between Embree 3 or Embree 4. By default, Embree 3 is still used, preserving -the existing behavior. ---- - build_scripts/build_usd.py | 31 ++++++++++++++++++++++++------- - 1 file changed, 24 insertions(+), 7 deletions(-) - -diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py -index afa4763c8d..f932c85b5d 100644 ---- a/build_scripts/build_usd.py -+++ b/build_scripts/build_usd.py -@@ -1577,14 +1577,19 @@ def InstallMaterialX(context, force, buildArgs): - - ############################################################ - # Embree --# For MacOS we use version 3.13.3 to include a fix from Intel --# to build on Apple Silicon. --if MacOS(): -- EMBREE_URL = "https://github.com/RenderKit/embree/archive/v3.13.3.zip" --else: -- EMBREE_URL = "https://github.com/RenderKit/embree/archive/v3.2.2.zip" -+ -+EMBREE_DEFAULT_MAJOR_VERSION = 3 - - def InstallEmbree(context, force, buildArgs): -+ if context.embreeMajorVersion >= 4: -+ EMBREE_URL = "https://github.com/RenderKit/embree/archive/refs/tags/v4.4.0.zip" -+ elif MacOS(): -+ # For MacOS we use version 3.13.3 to include a fix from Intel -+ # to build on Apple Silicon. -+ EMBREE_URL = "https://github.com/RenderKit/embree/archive/refs/tags/v3.13.3.zip" -+ else: -+ EMBREE_URL = "https://github.com/RenderKit/embree/archive/refs/tags/v3.2.2.zip" -+ - with CurrentWorkingDirectory(DownloadURL(EMBREE_URL, context, force)): - extraArgs = [ - '-DTBB_ROOT="{instDir}"'.format(instDir=context.instDir), -@@ -1601,7 +1606,9 @@ def InstallEmbree(context, force, buildArgs): - - RunCMake(context, force, extraArgs) - --EMBREE = Dependency("Embree", InstallEmbree, "include/embree3/rtcore.h") -+EMBREE = Dependency("Embree", InstallEmbree, -+ "include/embree3/rtcore.h", -+ "include/embree4/rtcore.h") - - ############################################################ - # AnimX -@@ -2121,6 +2128,12 @@ def InstallUSD(context, force, buildArgs): - help="Build Embree sample imaging plugin") - subgroup.add_argument("--no-embree", dest="build_embree", action="store_false", - help="Do not build Embree sample imaging plugin (default)") -+group.add_argument("--embree-major-version", -+ default=EMBREE_DEFAULT_MAJOR_VERSION, type=int, -+ choices=[3, 4], -+ help=( -+ "The major version of Embree to build " -+ "(default: {})").format(EMBREE_DEFAULT_MAJOR_VERSION)) - subgroup = group.add_mutually_exclusive_group() - subgroup.add_argument("--prman", dest="build_prman", action="store_true", - default=False, -@@ -2342,6 +2355,7 @@ def __init__(self, args): - - # - Imaging plugins - self.buildEmbree = self.buildImaging and args.build_embree -+ self.embreeMajorVersion = args.embree_major_version - self.buildPrman = self.buildImaging and args.build_prman - self.prmanLocation = (os.path.abspath(args.prman_location) - if args.prman_location else None) -@@ -2656,6 +2670,7 @@ def _JoinVersion(v): - OpenImageIO support: {buildOIIO} - OpenColorIO support: {buildOCIO} - Embree support: {buildEmbree} -+ Embree major version: {embreeMajorVersion} - PRMan support: {buildPrman} - Vulkan support: {enableVulkan} - UsdImaging {buildUsdImaging} -@@ -2738,6 +2753,8 @@ def FormatBuildArguments(buildArgs): - buildOIIO=("On" if context.buildOIIO else "Off"), - buildOCIO=("On" if context.buildOCIO else "Off"), - buildEmbree=("On" if context.buildEmbree else "Off"), -+ embreeMajorVersion=(context.embreeMajorVersion if context.buildEmbree -+ else "N/A"), - buildPrman=("On" if context.buildPrman else "Off"), - buildUsdImaging=("On" if context.buildUsdImaging else "Off"), - buildUsdview=("On" if context.buildUsdview else "Off"), - -From c96c972bc116e46bef477493b86b535f9b115545 Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Thu, 12 Jun 2025 17:46:43 -0400 -Subject: [PATCH 6/7] hdEmbree: use a header common between TBB and oneTBB in - limits workaround - -The TBB header that provides version definitions moved between TBB -(tbb_stddef.h) and oneTBB (version.h), so we use the lowest level -header that is available at the same path in both and let it bring in -the definitions. This allows the hdEmbree plugin to be built with -oneTBB when used in combination with Embree 4. ---- - pxr/imaging/plugin/hdEmbree/renderer.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pxr/imaging/plugin/hdEmbree/renderer.cpp b/pxr/imaging/plugin/hdEmbree/renderer.cpp -index 8cbf8d4959..381bed73e5 100644 ---- a/pxr/imaging/plugin/hdEmbree/renderer.cpp -+++ b/pxr/imaging/plugin/hdEmbree/renderer.cpp -@@ -28,8 +28,13 @@ - // oneTBB as a min spec. This applies the "Work" thread limit to the - // render thread if "Work" is using old TBB, but won't affect other "Work" - // implementations. Note that it may affect Embree TBB usage as well. -+// -+// The header that provides version definitions moved between TBB -+// (tbb_stddef.h) and oneTBB (version.h), so we use the lowest level header -+// that is available at the same path in both and let it bring in the -+// definitions. - // ------------------------------------------------------------------------- --#include -+#include - - #if TBB_INTERFACE_VERSION_MAJOR < 12 - - -From a464dc5dcc9a26f552a3ece42dab949ae03d35df Mon Sep 17 00:00:00 2001 -From: Matt Johnson -Date: Wed, 24 Jul 2024 10:17:27 -0400 -Subject: [PATCH 7/7] build_usd.py: allow oneTBB and Embree to be used together - when Embree 4.x or later is selected - ---- - build_scripts/build_usd.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py -index f932c85b5d..949acadb42 100644 ---- a/build_scripts/build_usd.py -+++ b/build_scripts/build_usd.py -@@ -2473,9 +2473,10 @@ def ForceBuildDependency(self, dep): - PrintError("Draco plugin can not be enabled for monolithic build on Windows") - sys.exit(1) - --# The versions of Embree we currently support do not support oneTBB. --if context.buildOneTBB and context.buildEmbree: -- PrintError("Embree support cannot be enabled when building against oneTBB") -+# When building with both oneTBB and Embree, a 4.x version of Embree must be -+# used. -+if context.buildOneTBB and (context.buildEmbree and context.embreeMajorVersion < 4): -+ PrintError("Embree 4.x or later must be selected when building against oneTBB") - sys.exit(1) - - # Windows ARM64 requires oneTBB. Since oneTBB is a non-standard option for the diff --git a/sources b/sources index 2a65832..8ea47ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenUSD-25.08.tar.gz) = fbe1e632473883e47f4bfeb16cab314bbbe8a7b404a5c071ca613bbf288526e505edd7a5edfdd9f85dd16da6d0d91fa0d4f8c783882094d3691f77685817fea6 +SHA512 (OpenUSD-25.11.tar.gz) = 7b78109055773e44af771e99b64ff6a1fcdc5c4984d6d62708491d14ab576344d432dac2377363cae89e47c1a1e55d016bcc7bde2c5c49d5b26550db5ac46304 diff --git a/usd.spec b/usd.spec index 26e7309..e7e7531 100644 --- a/usd.spec +++ b/usd.spec @@ -2,7 +2,7 @@ # package version, as a reminder of the need to rebuild dependent packages on # every update. See additional notes near the downstream ABI versioning patch. # It should be 0.MAJOR.MINOR without leading zeros, e.g. 22.03 → 0.22.3. -%global downstream_so_version 0.25.8 +%global downstream_so_version 0.25.11 %bcond alembic 1 %bcond draco 1 @@ -27,7 +27,7 @@ %bcond test 0 Name: usd -Version: 25.08 +Version: 25.11 Release: %autorelease Summary: 3D VFX pipeline interchange file format @@ -40,7 +40,7 @@ Summary: 3D VFX pipeline interchange file format # - pxr/base/js/rapidjson/msinttypes/ (removed in %%prep) # - pxr/base/tf/pxrCLI11/ (removed in %%prep) # - pxr/base/tf/pxrDoubleConversion/ (removed in %%prep) -# - pxr/imaging/hio/OpenEXR/OpenEXRCore/ +# - pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/ # - pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/ # BSD-2-Clause: # - pxr/base/tf/pxrLZ4/ (removed in %%prep) @@ -58,14 +58,16 @@ Summary: 3D VFX pipeline interchange file format # - pxr/base/tf/pxrTslRobinMap/ # - pxr/imaging/garch/khrplatform.h # - pxr/imaging/hgiVulkan/vk_mem_alloc.h -# - pxr/imaging/hio/OpenEXR/deflate/ (removed in %%prep) +# - pxr/imaging/plugin/hioOpenEXR/OpenEXR/deflate/ (removed in %%prep) # - third_party/renderman-26/plugin/rmanArgsParser/pugixml/ (removed in %%prep) +# - third_party/renderman-27/plugin/rmanArgsParser/pugixml/ (removed in %%prep) # MIT OR Unlicense: # - pxr/imaging/hio/stb/ # Pixar AND GPL-3.0-or-later WITH Bison-exception-2.2: # - pxr/usd/sdf/path.tab.{cpp,h} # - pxr/usd/sdf/textFileFormat.tab.{cpp,h} # - third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.{cpp,h} +# - third_party/renderman-27/plugin/hdPrman/virtualStructConditionalGrammar.tab.{cpp,h} # # Additionally, the following would be listed above but are removed in %%prep: # @@ -126,10 +128,6 @@ Source1: org.openusd.usdview.desktop # built with -DPXR_BUILD_EXAMPLES=OFF, but it is.) Patch: 0001-Downstream-only-add-an-SONAME-version.patch -# hdEmbree: add support for building against embree4 -# https://github.com/PixarAnimationStudios/USD/pull/2313 -Patch: %{forgeurl}/pull/2313.patch - # Downstream-only: use Valgrind macro instead of inline assembly # # Upstream already has a plan to make this change, but is waiting to be @@ -285,8 +283,9 @@ Provides: bundled(ilmbase) = 2.5.3 # Currently, Fedora’s PEGTL is too old: # https://bugzilla.redhat.com/show_bug.cgi?id=1902427 Provides: bundled(PEGTL) = 3.2.7 -# Version from pxr/imaging/hio/OpenEXR/OpenEXRCore/openexr_version.h -# From pxr/imaging/hio/OpenEXR/README.md: +# Version from +# pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/openexr_version.h +# From pxr/imaging/plugin/hioOpenEXR/OpenEXR/README.md: # A few changes are still in progress to upstreamed to the OpenEXR project, # but these are minor, and otherwise, almost all differences between the # interred OpenEXRCore and the official OpenEXR repo are consolidated to the @@ -328,6 +327,7 @@ Provides: bundled(boost) = 1.85.0 # Provides: bundled(cli11) = 2.3.1 # Version from: # third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugiconfig.hpp +# third_party/renderman-27/plugin/rmanArgsParser/pugixml/pugiconfig.hpp # (header comment) # Provides: bundled(pugixml) = 1.9 # Version from: pxr/base/js/rapidjson/rapidjson.h @@ -336,7 +336,7 @@ Provides: bundled(boost) = 1.85.0 # Version from: pxr/base/tf/pxrTslRobinMap/robin_growth_policy.h # (PXR_TSL_RH_VERSION_{MAJOR,MINOR,PATCH}) # Provides: bundled(robin-map) = 1.3.0 -# Version from pxr/imaging/hio/OpenEXR/deflate/libdeflate.h +# Version from pxr/imaging/plugin/hioOpenEXR/OpenEXR/deflate/libdeflate.h # Provides: bundled(libdeflate) = 1.18 # Version from pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h # We actually have a post-release snapshot of libavif, because @@ -491,7 +491,7 @@ namespace pxr_tsl = tsl; EOF done # Remove the bundled copy of libdeflate. -rm -rv pxr/imaging/hio/OpenEXR/deflate/ +rm -rv pxr/imaging/plugin/hioOpenEXR/OpenEXR/deflate/ # Remove the bundled copies of libavif, along with the associated libaom and # the libyuv that is in the libavif sources. rm -rv pxr/imaging/plugin/hioAvif/aom/ \ From 1fef8f6c7649efcc72e52204bf37784cf90b23c2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 23 Nov 2025 06:57:09 +0000 Subject: [PATCH 04/29] Rebuilt for OpenVDB 13.0.0 From b804423325927568bd1d3968ba984579c0c3b3e5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 25 Nov 2025 10:58:20 +0000 Subject: [PATCH 05/29] Use macros for supported architectures [skip changelog] --- usd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usd.spec b/usd.spec index e7e7531..e26f915 100644 --- a/usd.spec +++ b/usd.spec @@ -253,7 +253,7 @@ Requires: python3-usd%{?_isa} = %{version}-%{release} # # Note that pxr/base/arch/assumptions.cpp explicitly tests the machine is not # big-endian, and pxr/base/arch/defines.h explicitly enforces x86_64 or ARM64. -ExclusiveArch: aarch64 x86_64 +ExclusiveArch: %{arm64} %{x86_64} %description Universal Scene Description (USD) is a time-sampled scene From 201f8d224f28cae55370d42b5e51d89cddb199d7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 25 Nov 2025 10:57:29 +0000 Subject: [PATCH 06/29] Rebuilt with stb_image patched for two new security bugs --- usd.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usd.spec b/usd.spec index e26f915..60884b5 100644 --- a/usd.spec +++ b/usd.spec @@ -237,12 +237,11 @@ BuildRequires: pkgconfig(ptex) # CVE-2023-45664 # CVE-2023-45666 # CVE-2023-45667 -BuildRequires: stb_image-devel >= 2.28^20231011gitbeebb24-12 -BuildRequires: stb_image-static -BuildRequires: stb_image_write-devel >= 1.16 -BuildRequires: stb_image_write-static -BuildRequires: stb_image_resize-devel >= 0.97 -BuildRequires: stb_image_resize-static +# https://github.com/nothings/stb/issues/1860 +# https://github.com/nothings/stb/issues/1861 +BuildRequires: stb_image-static >= 2.30^20251025gitf1c79c0-1 +BuildRequires: stb_image_write-static >= 1.16 +BuildRequires: stb_image_resize-static >= 0.97 Requires: usd-libs%{?_isa} = %{version}-%{release} Requires: python3-usd%{?_isa} = %{version}-%{release} From 97117864dd441dd12986e531fa28838c0fe39a96 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 25 Nov 2025 14:32:01 +0000 Subject: [PATCH 07/29] Correct minimum NVR for stb_image --- usd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usd.spec b/usd.spec index 60884b5..7832201 100644 --- a/usd.spec +++ b/usd.spec @@ -239,7 +239,7 @@ BuildRequires: pkgconfig(ptex) # CVE-2023-45667 # https://github.com/nothings/stb/issues/1860 # https://github.com/nothings/stb/issues/1861 -BuildRequires: stb_image-static >= 2.30^20251025gitf1c79c0-1 +BuildRequires: stb_image-static >= 2.30^20251025gitf1c79c0-2 BuildRequires: stb_image_write-static >= 1.16 BuildRequires: stb_image_resize-static >= 0.97 From d4a03cc10dfb30612957d06a00be41456f916f8d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 2 Dec 2025 15:42:52 +0100 Subject: [PATCH 08/29] Rebuild (python-pyside6) From ff3482cdbea609f1a35b9e32239d09cc7ad2cc23 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 2 Dec 2025 14:53:34 +0000 Subject: [PATCH 09/29] Backport fixes for CVE-2025-64181 etc. in OpenEXRCore --- 3903.patch | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ usd.spec | 4 +++ 2 files changed, 87 insertions(+) create mode 100644 3903.patch diff --git a/3903.patch b/3903.patch new file mode 100644 index 0000000..d8fa15b --- /dev/null +++ b/3903.patch @@ -0,0 +1,83 @@ +From 3e51fb244dd264b09179999d29dc7c5afd7e71e3 Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Tue, 2 Dec 2025 10:43:31 +0000 +Subject: [PATCH] Backport fixes for CVE-2025-64181 etc. in OpenEXRCore + +--- + .../hioOpenEXR/OpenEXR/OpenEXRCore/chunk.c | 20 ++++++++++++++++--- + .../OpenEXR/OpenEXRCore/internal_util.h | 4 ++-- + .../OpenEXR/OpenEXRCore/parse_header.c | 4 +++- + 3 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/chunk.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/chunk.c +index cfe80b4cd68..e11209fe660 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/chunk.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/chunk.c +@@ -1292,6 +1292,16 @@ exr_read_tile_chunk_info ( + return pctxt->report_error ( + pctxt, EXR_ERR_INVALID_ARGUMENT, "Invalid packed size of 0"); + ++ if (part->comp_type == EXR_COMPRESSION_NONE && ++ cinfo->packed_size != cinfo->unpacked_size) ++ { ++ return pctxt->print_error ( ++ pctxt, ++ EXR_ERR_BAD_CHUNK_LEADER, ++ "Mismatch between unpacked and packed size with uncompressed data: packed is %" PRIu64 "; unpacked is %" PRIu64, ++ cinfo->packed_size, cinfo->unpacked_size); ++ } ++ + return EXR_ERR_SUCCESS; + } + +@@ -1350,11 +1360,15 @@ exr_read_chunk ( + rv = pctxt->do_read ( + pctxt, packed_data, toread, &dataoffset, &nread, rmode); + +- if (rmode == EXR_ALLOW_SHORT_READ && nread < (int64_t) toread) ++ if (rmode == EXR_ALLOW_SHORT_READ && ++ nread >= 0 && ++ nread < (int64_t) toread) ++ { + memset ( + ((uint8_t*) packed_data) + nread, +- 0, +- toread - (uint64_t) (nread)); ++ 0, ++ (size_t)(toread - (uint64_t)nread)); ++ } + } + else + rv = EXR_ERR_SUCCESS; +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_util.h b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_util.h +index 3c6f02786cc..e0fa3933d92 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_util.h ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_util.h +@@ -31,10 +31,10 @@ compute_sampled_height (int height, int y_sampling, int start_y) + else + start = start_y; + end = start_y + height - 1; +- end -= (end < 0) ? (-end % y_sampling) : (end % y_sampling); ++ end -= (end < 0 ? -end : end) % y_sampling; + + if (start > end) +- nlines = 0; ++ nlines = start == start_y ? 1 : 0; + else + nlines = (end - start) / y_sampling + 1; + } +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/parse_header.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/parse_header.c +index d7230392693..8b6cf78cc59 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/parse_header.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/parse_header.c +@@ -2293,7 +2293,9 @@ internal_exr_compute_chunk_offset_size (struct _internal_exr_part* curpart) + + w = (uint64_t) (((int64_t) dw.max.x) - ((int64_t) dw.min.x) + 1); + +- if (curpart->tiles) ++ if (curpart->storage_mode != EXR_STORAGE_SCANLINE && ++ curpart->storage_mode != EXR_STORAGE_DEEP_SCANLINE && ++ curpart->tiles) + { + const exr_attr_tiledesc_t* tiledesc = curpart->tiles->tiledesc; + int64_t tilecount = 0; diff --git a/usd.spec b/usd.spec index 7832201..e363506 100644 --- a/usd.spec +++ b/usd.spec @@ -149,6 +149,10 @@ Patch: 0005-Downstream-only-use-the-system-libdeflate.patch # Downstream-only: use the system libavif library Patch: 0006-Downstream-only-use-the-system-libavif.patch +# Backport fixes for CVE-2025-64181 etc. in OpenEXRCore +# https://github.com/PixarAnimationStudios/OpenUSD/pull/3903 +Patch: %{forgeurl}/pull/3903.patch + # Base BuildRequires: gcc-c++ From 1fe1ef6bbd2d59dc27573bd48ca5059c89688699 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 7 Dec 2025 14:15:28 -0600 Subject: [PATCH 10/29] Rebuild for OpenImageIO 3.1. From b5e913b0f3de0ea8d2ea2f7b0ab470952c9c78e4 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 7 Jan 2026 18:38:55 -0800 Subject: [PATCH 11/29] Remove unused MaterialX support This commit removed the unusued materialx support dropped by upstream. --- usd.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/usd.spec b/usd.spec index e363506..ebbd7f2 100644 --- a/usd.spec +++ b/usd.spec @@ -8,9 +8,6 @@ %bcond draco 1 %bcond embree 1 %bcond jemalloc 0 -# Not yet packaged: https://github.com/AcademySoftwareFoundation/MaterialX -# https://bugzilla.redhat.com/show_bug.cgi?id=2262694 -%bcond materialx 0 # Default "UNIX Makefiles" backend for CMake would also work fine; ninja is a # bit faster. We conditionalize it just in case there are backend-specific # issues in the future. @@ -575,7 +572,6 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" -DPXR_BUILD_ALEMBIC_PLUGIN=%{expr:%{with alembic}?"ON":"OFF"} \ -DPXR_BUILD_DRACO_PLUGIN=%{expr:%{with draco}?"ON":"OFF"} \ -DPXR_BUILD_EMBREE_PLUGIN=%{expr:%{with embree}?"ON":"OFF"} \ - -DPXR_BUILD_MATERIALX_PLUGIN=%{expr:%{with materialx}?"ON":"OFF"} \ -DPXR_BUILD_OPENCOLORIO_PLUGIN=%{expr:%{with ocio}?"ON":"OFF"} \ -DPXR_BUILD_OPENIMAGEIO_PLUGIN=%{expr:%{with oiio}?"ON":"OFF"} \ -DPXR_BUILD_PRMAN_PLUGIN=OFF \ From d7483c1c0d0f8b6b7fd6a221bb189203a900b779 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 7 Jan 2026 23:09:08 -0800 Subject: [PATCH 12/29] Revert "Remove unused MaterialX support" This reverts commit b5e913b0f3de0ea8d2ea2f7b0ab470952c9c78e4. --- usd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usd.spec b/usd.spec index ebbd7f2..e363506 100644 --- a/usd.spec +++ b/usd.spec @@ -8,6 +8,9 @@ %bcond draco 1 %bcond embree 1 %bcond jemalloc 0 +# Not yet packaged: https://github.com/AcademySoftwareFoundation/MaterialX +# https://bugzilla.redhat.com/show_bug.cgi?id=2262694 +%bcond materialx 0 # Default "UNIX Makefiles" backend for CMake would also work fine; ninja is a # bit faster. We conditionalize it just in case there are backend-specific # issues in the future. @@ -572,6 +575,7 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" -DPXR_BUILD_ALEMBIC_PLUGIN=%{expr:%{with alembic}?"ON":"OFF"} \ -DPXR_BUILD_DRACO_PLUGIN=%{expr:%{with draco}?"ON":"OFF"} \ -DPXR_BUILD_EMBREE_PLUGIN=%{expr:%{with embree}?"ON":"OFF"} \ + -DPXR_BUILD_MATERIALX_PLUGIN=%{expr:%{with materialx}?"ON":"OFF"} \ -DPXR_BUILD_OPENCOLORIO_PLUGIN=%{expr:%{with ocio}?"ON":"OFF"} \ -DPXR_BUILD_OPENIMAGEIO_PLUGIN=%{expr:%{with oiio}?"ON":"OFF"} \ -DPXR_BUILD_PRMAN_PLUGIN=OFF \ From fb80c784afbe9d32bb7c4fb025fbc5199b1ea135 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 8 Jan 2026 08:01:05 -0800 Subject: [PATCH 13/29] Enable materialx support --- usd.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usd.spec b/usd.spec index e363506..8c7647a 100644 --- a/usd.spec +++ b/usd.spec @@ -8,9 +8,7 @@ %bcond draco 1 %bcond embree 1 %bcond jemalloc 0 -# Not yet packaged: https://github.com/AcademySoftwareFoundation/MaterialX -# https://bugzilla.redhat.com/show_bug.cgi?id=2262694 -%bcond materialx 0 +%bcond materialx 1 # Default "UNIX Makefiles" backend for CMake would also work fine; ninja is a # bit faster. We conditionalize it just in case there are backend-specific # issues in the future. @@ -206,6 +204,13 @@ BuildRequires: embree-devel BuildRequires: pkgconfig(jemalloc) %endif +%if %{with materialx} +BuildRequires: cmake(materialx) +BuildRequires: materialx-data +BuildRequires: pkgconfig(xt) +BuildRequires: python3-materialx +%endif + %if %{with ocio} BuildRequires: cmake(OpenColorIO) %endif @@ -575,7 +580,6 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" -DPXR_BUILD_ALEMBIC_PLUGIN=%{expr:%{with alembic}?"ON":"OFF"} \ -DPXR_BUILD_DRACO_PLUGIN=%{expr:%{with draco}?"ON":"OFF"} \ -DPXR_BUILD_EMBREE_PLUGIN=%{expr:%{with embree}?"ON":"OFF"} \ - -DPXR_BUILD_MATERIALX_PLUGIN=%{expr:%{with materialx}?"ON":"OFF"} \ -DPXR_BUILD_OPENCOLORIO_PLUGIN=%{expr:%{with ocio}?"ON":"OFF"} \ -DPXR_BUILD_OPENIMAGEIO_PLUGIN=%{expr:%{with oiio}?"ON":"OFF"} \ -DPXR_BUILD_PRMAN_PLUGIN=OFF \ @@ -585,6 +589,7 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" -DPXR_ENABLE_PTEX_SUPPORT=%{expr:%{with ptex}?"ON":"OFF"} \ -DPXR_ENABLE_OSL_SUPPORT=%{expr:%{with openshading}?"ON":"OFF"} \ -DPXR_ENABLE_MALLOCHOOK_SUPPORT=OFF \ + -DPXR_ENABLE_MATERIALX_SUPPORT=%{expr:%{with materialx}?"ON":"OFF"} \ -DPXR_ENABLE_PYTHON_SUPPORT=ON \ \ -DPXR_INSTALL_LOCATION="%{_libdir}/usd/plugin" \ @@ -650,6 +655,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d %{_bindir}/hdGenSchema %{_bindir}/sdfdump %{_bindir}/sdffilter +%if %{with materialx} +%{_bindir}/usdBakeMaterialX +%endif %{_bindir}/usdGenSchema %{_bindir}/usdInitSchema %{_bindir}/usdcat @@ -678,6 +686,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d %{_mandir}/man1/hdGenSchema.1* %{_mandir}/man1/sdfdump.1* %{_mandir}/man1/sdffilter.1* +%if %{with materialx} +%{_bindir}/usdBakeMaterialX.1* +%endif %{_mandir}/man1/usdGenSchema.1* %{_mandir}/man1/usdInitSchema.1* %{_mandir}/man1/usdcat.1* From 099daf1d9a32fff0aa4cd812a42dd78014a6ed38 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 8 Jan 2026 09:09:41 -0800 Subject: [PATCH 14/29] Fix manpage line --- usd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usd.spec b/usd.spec index 8c7647a..3e9b41c 100644 --- a/usd.spec +++ b/usd.spec @@ -687,7 +687,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d %{_mandir}/man1/sdfdump.1* %{_mandir}/man1/sdffilter.1* %if %{with materialx} -%{_bindir}/usdBakeMaterialX.1* +%{_mandir}/usdBakeMaterialX.1* %endif %{_mandir}/man1/usdGenSchema.1* %{_mandir}/man1/usdInitSchema.1* From f764fa904f84c5fe42ceb49f3a6d0eb1867ecd09 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 8 Jan 2026 15:16:34 -0800 Subject: [PATCH 15/29] Fix path for manterialx manual --- usd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usd.spec b/usd.spec index 3e9b41c..2b4a8f5 100644 --- a/usd.spec +++ b/usd.spec @@ -687,7 +687,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d %{_mandir}/man1/sdfdump.1* %{_mandir}/man1/sdffilter.1* %if %{with materialx} -%{_mandir}/usdBakeMaterialX.1* +%{_mandir}/man1/usdBakeMaterialX.1* %endif %{_mandir}/man1/usdGenSchema.1* %{_mandir}/man1/usdInitSchema.1* From a93ed447d6ef737862161716720397669bb80689 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:42:31 +0000 Subject: [PATCH 16/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From ba33ab88f9cbaeceb883011fdf5a1922df95a211 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 2 Feb 2026 00:57:36 -0800 Subject: [PATCH 17/29] Rebuild for ptex 2.5.1 From d4e3de7a803ccda03b061d27058cc73a74fb9899 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 Feb 2026 14:13:58 +0000 Subject: [PATCH 18/29] Rebuilt for ptex 2.5.1 (close RHBZ#2435890) From f168f46d3aa3b150d49a39b04ba421ae9e415ca6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 21 Feb 2026 12:24:33 -0700 Subject: [PATCH 19/29] Make devel require cmake(OpenSubdiv) and cmake(materialx) --- usd.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usd.spec b/usd.spec index 2b4a8f5..fc83039 100644 --- a/usd.spec +++ b/usd.spec @@ -375,6 +375,11 @@ Requires: usd-libs%{?_isa} = %{version}-%{release} # Unbundled, and exposed in the API: Requires: cli11-devel cli11-static Requires: robin-map-devel robin-map-static +# Needed by cmake config +Requires: cmake(OpenSubdiv) +%if %{with materialx} +Requires: cmake(materialx) +%endif %description devel This package contains the C++ header files and symbolic links to the shared From 0a6b2117ffe0103efd029a6a119614718c8bae75 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 26 Feb 2026 12:07:15 +0000 Subject: [PATCH 20/29] Update to 26.03 (close RHBZ#2442563) --- .gitignore | 1 + ...ownstream-only-add-an-SONAME-version.patch | 18 +++--- ...use-Valgrind-macro-instead-of-inline.patch | 4 +- ...use-the-system-double-conversion-lib.patch | 10 ++-- ...ream-only-use-the-system-lz4-library.patch | 12 ++-- ...-only-use-the-system-pugixml-library.patch | 12 ++-- ...nly-use-the-system-rapidjson-library.patch | 6 +- ...tream-only-use-the-system-libdeflate.patch | 4 +- ...wnstream-only-use-the-system-libavif.patch | 12 ++-- sources | 2 +- usd.spec | 57 +++++++++++++++---- 11 files changed, 86 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index a6f122a..f00caa1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /OpenUSD-25.05.01.tar.gz /OpenUSD-25.08.tar.gz /OpenUSD-25.11.tar.gz +/OpenUSD-26.03.tar.gz diff --git a/0001-Downstream-only-add-an-SONAME-version.patch b/0001-Downstream-only-add-an-SONAME-version.patch index aeb48ad..7a55eca 100644 --- a/0001-Downstream-only-add-an-SONAME-version.patch +++ b/0001-Downstream-only-add-an-SONAME-version.patch @@ -1,4 +1,4 @@ -From 2f2ebd688c7e6804014ea183163954f48e7622af Mon Sep 17 00:00:00 2001 +From 949707d0bd8ac077fac9763b3b590a016ff4eb6f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 27 Oct 2023 12:56:58 -0400 Subject: [PATCH] Downstream-only: add an SONAME version @@ -37,11 +37,11 @@ built with -DPXR_BUILD_EXAMPLES=OFF, but it is.) 3 files changed, 9 insertions(+) diff --git a/cmake/defaults/Version.cmake b/cmake/defaults/Version.cmake -index 20e70edb2..c3e072e1a 100644 +index 1cc7fa64a..ebe531ec4 100644 --- a/cmake/defaults/Version.cmake +++ b/cmake/defaults/Version.cmake -@@ -10,3 +10,9 @@ set(PXR_MINOR_VERSION "25") - set(PXR_PATCH_VERSION "11") # NOTE: Must not have leading 0 for single digits +@@ -10,3 +10,9 @@ set(PXR_MINOR_VERSION "26") + set(PXR_PATCH_VERSION "3") # NOTE: Must not have leading 0 for single digits math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}") + @@ -51,10 +51,10 @@ index 20e70edb2..c3e072e1a 100644 + "Downstream shared object version" +) diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake -index b90b743de..7af8b89c2 100644 +index e2dccb075..5f6913e22 100644 --- a/cmake/macros/Private.cmake +++ b/cmake/macros/Private.cmake -@@ -1304,6 +1304,7 @@ function(_pxr_library NAME) +@@ -1346,6 +1346,7 @@ function(_pxr_library NAME) FOLDER "${folder}" POSITION_INDEPENDENT_CODE ON IMPORT_PREFIX "${args_PREFIX}" @@ -63,7 +63,7 @@ index b90b743de..7af8b89c2 100644 SUFFIX "${args_SUFFIX}" ) diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake -index b8e588bf3..cf64607c8 100644 +index b51789f4a..af2f2a805 100644 --- a/cmake/macros/Public.cmake +++ b/cmake/macros/Public.cmake @@ -414,6 +414,7 @@ function(pxr_library NAME) @@ -74,7 +74,7 @@ index b8e588bf3..cf64607c8 100644 SUBDIR "${subdir}" CPPFILES "${args_CPPFILES};${${NAME}_CPPFILES}" PUBLIC_HEADERS "${args_PUBLIC_HEADERS};${${NAME}_PUBLIC_HEADERS}" -@@ -1152,6 +1153,7 @@ function(pxr_toplevel_prologue) +@@ -1195,6 +1196,7 @@ function(pxr_toplevel_prologue) PREFIX "${libPrefix}" IMPORT_PREFIX "${libPrefix}" OUTPUT_NAME ${libName} @@ -83,5 +83,5 @@ index b8e588bf3..cf64607c8 100644 _get_install_dir("lib" libInstallPrefix) install( -- -2.51.0 +2.53.0 diff --git a/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch b/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch index 4ca709f..876f0e1 100644 --- a/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch +++ b/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch @@ -1,4 +1,4 @@ -From bb5d6070945c671d3192e2c6c939b941f50991fc Mon Sep 17 00:00:00 2001 +From 15ea3b68bb15fd6338cbe76ec94eac055dc28c4e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 1 Aug 2025 08:47:41 -0400 Subject: [PATCH] Downstream-only: use Valgrind macro instead of inline @@ -61,5 +61,5 @@ index 96dacca06..7e5625678 100644 Vdf_ExecutorDataVector::~Vdf_ExecutorDataVector() -- -2.51.0 +2.53.0 diff --git a/0001-Downstream-only-use-the-system-double-conversion-lib.patch b/0001-Downstream-only-use-the-system-double-conversion-lib.patch index 3b8f6e5..30a54ef 100644 --- a/0001-Downstream-only-use-the-system-double-conversion-lib.patch +++ b/0001-Downstream-only-use-the-system-double-conversion-lib.patch @@ -1,4 +1,4 @@ -From 70ca2a5a93b263c1f42502e6b800f46fe1f0d91f Mon Sep 17 00:00:00 2001 +From 5bc91bdebc42bb3a441c87b706288cea05fcd345 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Aug 2024 10:42:48 -0400 Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library @@ -8,10 +8,10 @@ Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index 1b1aa9dbe..f2d58fd15 100644 +index 6fc9c680e..551b5a3eb 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt -@@ -110,11 +110,14 @@ function(add_py_dll_link_test) +@@ -105,11 +105,14 @@ function(add_py_dll_link_test) endfunction() @@ -26,7 +26,7 @@ index 1b1aa9dbe..f2d58fd15 100644 PUBLIC_CLASSES anyUniquePtr -@@ -277,14 +280,6 @@ pxr_library(tf +@@ -272,14 +275,6 @@ pxr_library(tf CPPFILES initConfig.cpp @@ -42,5 +42,5 @@ index 1b1aa9dbe..f2d58fd15 100644 PYMODULE_CPPFILES -- -2.51.0 +2.53.0 diff --git a/0002-Downstream-only-use-the-system-lz4-library.patch b/0002-Downstream-only-use-the-system-lz4-library.patch index 26affbf..910d576 100644 --- a/0002-Downstream-only-use-the-system-lz4-library.patch +++ b/0002-Downstream-only-use-the-system-lz4-library.patch @@ -1,4 +1,4 @@ -From 64a603b9c6278f3287cd2769f0fb5ebd9356ae74 Mon Sep 17 00:00:00 2001 +From 0caa009abce9d66d441cd548f45ca8fef8d4846d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Aug 2024 13:30:18 -0400 Subject: [PATCH 2/6] Downstream-only: use the system lz4 library @@ -8,10 +8,10 @@ Subject: [PATCH 2/6] Downstream-only: use the system lz4 library 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index f2d58fd15..7433f0591 100644 +index 551b5a3eb..772524a19 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt -@@ -111,6 +111,8 @@ function(add_py_dll_link_test) +@@ -106,6 +106,8 @@ function(add_py_dll_link_test) endfunction() find_library(double-conversion_LIBRARY NAMES double-conversion REQUIRED) @@ -20,7 +20,7 @@ index f2d58fd15..7433f0591 100644 pxr_library(tf LIBRARIES -@@ -118,6 +120,10 @@ pxr_library(tf +@@ -113,6 +115,10 @@ pxr_library(tf ${WINLIBS} TBB::tbb ${double-conversion_LIBRARY} @@ -31,7 +31,7 @@ index f2d58fd15..7433f0591 100644 PUBLIC_CLASSES anyUniquePtr -@@ -280,7 +286,6 @@ pxr_library(tf +@@ -275,7 +281,6 @@ pxr_library(tf CPPFILES initConfig.cpp @@ -40,5 +40,5 @@ index f2d58fd15..7433f0591 100644 PYMODULE_CPPFILES module.cpp -- -2.51.0 +2.53.0 diff --git a/0003-Downstream-only-use-the-system-pugixml-library.patch b/0003-Downstream-only-use-the-system-pugixml-library.patch index 1051ecd..974ff6f 100644 --- a/0003-Downstream-only-use-the-system-pugixml-library.patch +++ b/0003-Downstream-only-use-the-system-pugixml-library.patch @@ -1,16 +1,16 @@ -From 48a4ad95bbe1e5675922da4eaf863bd208c0167b Mon Sep 17 00:00:00 2001 +From d1e032128f9c41a763d9e0535c408ffa6642ae03 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 30 Aug 2024 09:32:08 -0400 Subject: [PATCH 3/6] Downstream-only: use the system pugixml library --- - .../renderman-26/plugin/rmanArgsParser/CMakeLists.txt | 6 +++--- + third_party/renderman/plugin/rmanArgsParser/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt b/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt +diff --git a/third_party/renderman/plugin/rmanArgsParser/CMakeLists.txt b/third_party/renderman/plugin/rmanArgsParser/CMakeLists.txt index 244f27aa8..1e00413c4 100644 ---- a/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt -+++ b/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt +--- a/third_party/renderman/plugin/rmanArgsParser/CMakeLists.txt ++++ b/third_party/renderman/plugin/rmanArgsParser/CMakeLists.txt @@ -1,6 +1,8 @@ set(PXR_PREFIX "") set(PXR_PACKAGE rmanArgsParser) @@ -35,5 +35,5 @@ index 244f27aa8..1e00413c4 100644 PRIVATE_HEADERS api.h -- -2.51.0 +2.53.0 diff --git a/0004-Downstream-only-use-the-system-rapidjson-library.patch b/0004-Downstream-only-use-the-system-rapidjson-library.patch index cd90d76..090b753 100644 --- a/0004-Downstream-only-use-the-system-rapidjson-library.patch +++ b/0004-Downstream-only-use-the-system-rapidjson-library.patch @@ -1,4 +1,4 @@ -From 48c8a77ae5ba717b8651585302939a36126d286c Mon Sep 17 00:00:00 2001 +From 8fc7363878d1917d5b3f3513b16d54293463c297 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 31 Aug 2024 11:08:18 -0400 Subject: [PATCH 4/6] Downstream-only: use the system rapidjson library @@ -8,7 +8,7 @@ Subject: [PATCH 4/6] Downstream-only: use the system rapidjson library 1 file changed, 40 deletions(-) diff --git a/pxr/base/js/CMakeLists.txt b/pxr/base/js/CMakeLists.txt -index 632c061e5..62696a341 100644 +index 8cbda8c52..ec8f3c249 100644 --- a/pxr/base/js/CMakeLists.txt +++ b/pxr/base/js/CMakeLists.txt @@ -15,46 +15,6 @@ pxr_library(js @@ -59,5 +59,5 @@ index 632c061e5..62696a341 100644 overview.dox ) -- -2.51.0 +2.53.0 diff --git a/0005-Downstream-only-use-the-system-libdeflate.patch b/0005-Downstream-only-use-the-system-libdeflate.patch index 5549f98..cc5de7a 100644 --- a/0005-Downstream-only-use-the-system-libdeflate.patch +++ b/0005-Downstream-only-use-the-system-libdeflate.patch @@ -1,4 +1,4 @@ -From 614a6a01271cfaaa2421f58289cc1267685c75a9 Mon Sep 17 00:00:00 2001 +From 30b0460635b46ce71f22586273afb370075d7db8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 1 Sep 2024 21:30:11 -0400 Subject: [PATCH 5/6] Downstream-only: use the system libdeflate @@ -72,5 +72,5 @@ index 7481a346e..71bdde9cc 100644 #include "OpenEXRCore/attributes.c" -- -2.51.0 +2.53.0 diff --git a/0006-Downstream-only-use-the-system-libavif.patch b/0006-Downstream-only-use-the-system-libavif.patch index e1a6178..cac8a41 100644 --- a/0006-Downstream-only-use-the-system-libavif.patch +++ b/0006-Downstream-only-use-the-system-libavif.patch @@ -1,4 +1,4 @@ -From a7e7a94bed76d6b24bfbf9a2c4aa1cf9d57564ab Mon Sep 17 00:00:00 2001 +From c6639b8f1a8c57b02071426400daa349eed14501 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 4 Sep 2024 11:09:47 -0400 Subject: [PATCH 6/6] Downstream-only: use the system libavif @@ -9,7 +9,7 @@ Subject: [PATCH 6/6] Downstream-only: use the system libavif 2 files changed, 7 insertions(+), 189 deletions(-) diff --git a/pxr/imaging/plugin/hioAvif/AVIFImage.cpp b/pxr/imaging/plugin/hioAvif/AVIFImage.cpp -index 81549fb54..d2dfb1bcd 100644 +index b56369ee5..c6fcb4a6c 100644 --- a/pxr/imaging/plugin/hioAvif/AVIFImage.cpp +++ b/pxr/imaging/plugin/hioAvif/AVIFImage.cpp @@ -30,7 +30,7 @@ ARCH_PRAGMA_UNUSED_FUNCTION @@ -19,10 +19,10 @@ index 81549fb54..d2dfb1bcd 100644 -#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h" +#include - #if defined(PXR_STATIC) - # define HIOAVIF_API + PXR_NAMESPACE_OPEN_SCOPE + diff --git a/pxr/imaging/plugin/hioAvif/CMakeLists.txt b/pxr/imaging/plugin/hioAvif/CMakeLists.txt -index 1a81d50b1..fd89502a7 100644 +index 1ac2683f6..7d583c137 100644 --- a/pxr/imaging/plugin/hioAvif/CMakeLists.txt +++ b/pxr/imaging/plugin/hioAvif/CMakeLists.txt @@ -1,6 +1,9 @@ @@ -237,5 +237,5 @@ index 1a81d50b1..fd89502a7 100644 RESOURCE_FILES -- -2.51.0 +2.53.0 diff --git a/sources b/sources index 8ea47ed..d2dbf60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenUSD-25.11.tar.gz) = 7b78109055773e44af771e99b64ff6a1fcdc5c4984d6d62708491d14ab576344d432dac2377363cae89e47c1a1e55d016bcc7bde2c5c49d5b26550db5ac46304 +SHA512 (OpenUSD-26.03.tar.gz) = 3d5dae46c7ae096501dc51b373ba05c8603a1cf16e5054728d41d0c2970b59ce3ee5ec83e1c575b92482bc8cf2c59643df093a9e7aa82bcdd53dada05292720d diff --git a/usd.spec b/usd.spec index fc83039..898ff05 100644 --- a/usd.spec +++ b/usd.spec @@ -2,7 +2,7 @@ # package version, as a reminder of the need to rebuild dependent packages on # every update. See additional notes near the downstream ABI versioning patch. # It should be 0.MAJOR.MINOR without leading zeros, e.g. 22.03 → 0.22.3. -%global downstream_so_version 0.25.11 +%global downstream_so_version 0.26.3 %bcond alembic 1 %bcond draco 1 @@ -25,7 +25,7 @@ %bcond test 0 Name: usd -Version: 25.11 +Version: 26.03 Release: %autorelease Summary: 3D VFX pipeline interchange file format @@ -33,6 +33,9 @@ Summary: 3D VFX pipeline interchange file format # # Apache-2.0: # - pxr/imaging/hgiVulkan/spirv_reflect.{cpp,h} +# - pxr/imaging/plugin/hdEmbree/pxrPbrt/pbrtUtils.h +# - pxr/imaging/plugin/hdEmbree/pxrIES/pxr-IES.patch +# - pxr/imaging/plugin/hdEmbree/pxrIES/ies.{cpp,h} # BSD-3-Clause: # - pxr/base/gf/ilmbase_* # - pxr/base/js/rapidjson/msinttypes/ (removed in %%prep) @@ -57,15 +60,13 @@ Summary: 3D VFX pipeline interchange file format # - pxr/imaging/garch/khrplatform.h # - pxr/imaging/hgiVulkan/vk_mem_alloc.h # - pxr/imaging/plugin/hioOpenEXR/OpenEXR/deflate/ (removed in %%prep) -# - third_party/renderman-26/plugin/rmanArgsParser/pugixml/ (removed in %%prep) -# - third_party/renderman-27/plugin/rmanArgsParser/pugixml/ (removed in %%prep) +# - third_party/renderman/plugin/rmanArgsParser/pugixml/ (removed in %%prep) # MIT OR Unlicense: # - pxr/imaging/hio/stb/ # Pixar AND GPL-3.0-or-later WITH Bison-exception-2.2: # - pxr/usd/sdf/path.tab.{cpp,h} # - pxr/usd/sdf/textFileFormat.tab.{cpp,h} -# - third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.{cpp,h} -# - third_party/renderman-27/plugin/hdPrman/virtualStructConditionalGrammar.tab.{cpp,h} +# - third_party/renderman/plugin/hdPrman/virtualStructConditionalGrammar.tab.{cpp,h} # # Additionally, the following would be listed above but are removed in %%prep: # @@ -322,6 +323,39 @@ Provides: bundled(openexr) = 3.2.0 # effort to remove the Boost dependency. While pxr_boost::python is derived # from boost::python, it is not intended to remain compatible with it. Provides: bundled(boost) = 1.85.0 +# From LICENSE.txt: +# =========================================================== +# PBRT (Sampling functions) +# ============================================================ +# USD includes code derived from the pbrt-v4 library, retrieved from +# https://github.com/mmp/pbrt-v4/tree/8c19f304558fd7681e2fef2c395a689d0106fb05, which was +# provided subject to the unmodified Apache 2.0 license. For details, see +# https://github.com/mmp/pbrt-v4/blob/8c19f304558fd7681e2fef2c395a689d0106fb05/LICENSE.txt +# +# The bundled routines in pxr/imaging/plugin/hdEmbree/pxrPbrt/pbrtUtils.h are +# just a handful of small internal utility functions. It would not be +# reasonable to add a dependency on the full pbrt ray tracer even if these were +# exposed in a public API. +Provides: bundled(pbrt-v4) = 4~20251208.8c19f30 +# From LICENSE.txt: +# ============================================================ +# Cycles (IES reader) +# ============================================================ +# USD includes classes from the Blender Foundation's Cycles project, retrieved from +# https://projects.blender.org/blender/cycles/src/commit/0be21d452506ec90259b9063c28b5a6fc1cac6a1, +# which was provided subject to the unmodified Apache 2.0 license. For details, see +# https://projects.blender.org/blender/cycles/src/commit/0be21d452506ec90259b9063c28b5a6fc1cac6a1/LICENSE +# +# These are not a candidate for unbundling because they are internal utility +# functions not available in the public API. There are also some minor +# modifications for OpenUSD, documented in +# pxr/imaging/plugin/hdEmbree/pxrIES/pxr-IES.patch. +# +# Is this commit a post-release snapshot of 4.5.0, or a pre-release snapshot of +# 5.0.0? How can we tell? There doesn’t seem to be a project version number +# embedded in the source tree. Since this commit hash is only two commits ahead +# of the v4.5.0 tag, we consider it a 4.5.0 post-release. +Provides: bundled(cycles) = 4.5.0^20251210.0be21d4 # We are currently able to unbundle these and use system libraries, but we # retain the virtual Provides, commented out, as documentation and in case we @@ -334,8 +368,7 @@ Provides: bundled(boost) = 1.85.0 # Version from: pxr/base/tf/pxrCLI11/README.md # Provides: bundled(cli11) = 2.3.1 # Version from: -# third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugiconfig.hpp -# third_party/renderman-27/plugin/rmanArgsParser/pugixml/pugiconfig.hpp +# third_party/renderman/plugin/rmanArgsParser/pugixml/pugiconfig.hpp # (header comment) # Provides: bundled(pugixml) = 1.9 # Version from: pxr/base/js/rapidjson/rapidjson.h @@ -359,8 +392,8 @@ Provides: bundled(boost) = 1.85.0 # https://chromium.googlesource.com/libyuv/libyuv and find the commit hash that # corresponds to a particular serial number. # LIBYUV_VERSION 1895 = commit a97746349b244efd54ab1eb0c0a7366717b33f39 -# Provides: bundled(libyuv) = 0^20240812gita977463 -# Version from pxr/imaging/plugin/hioAvif/aom/config/aom_version.h +# Provides: bundled(libyuv) = 0^20240812.a977463 +# Version from pxr/imaging/plugin/hioAvif/config/aom_version.h # Provides: bundled(aom) = 3.0.0 %description libs @@ -479,9 +512,9 @@ cat > pxr/base/tf/pxrCLI11/CLI11.h <<'EOF' namespace pxr_CLI = CLI; EOF # Remove the bundled copy of pugixml. -find third_party/renderman-*/plugin/rmanArgsParser/pugixml/ \ +find third_party/renderman/plugin/rmanArgsParser/pugixml/ \ -type f ! -name '*.hpp' -print -delete -for hdr in third_party/renderman-*/plugin/rmanArgsParser/pugixml/*.hpp +for hdr in third_party/renderman/plugin/rmanArgsParser/pugixml/*.hpp do cat > "${hdr}" < From 1165f5708e79ce58d50c347a0b68fdbd40d4cfc0 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 6 Apr 2026 13:07:00 +0100 Subject: [PATCH 21/29] Backport fix for CVE-2026-34544 in OpenEXRCore - Fixes RHBZ#2454226 --- 4028.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ usd.spec | 3 +++ 2 files changed, 74 insertions(+) create mode 100644 4028.patch diff --git a/4028.patch b/4028.patch new file mode 100644 index 0000000..9fd2598 --- /dev/null +++ b/4028.patch @@ -0,0 +1,71 @@ +From 83c6cdfa63ad61accec35575f503b629f94dc4af Mon Sep 17 00:00:00 2001 +From: Cary Phillips +Date: Thu, 19 Mar 2026 14:22:40 -0700 +Subject: [PATCH] Fix B44/B44A integer overflow: use uint64_t for row offset + (#2312) + +The B44 and B44A decoder and encoder use channel width (`nx`) and +height (`ny`) in row pointer math. `nx` and `ny` are `int`; the +scratch buffer is correctly sized with `(uint64_t)ny * (uint64_t)nx * +bytes_per_element`, but row bases were computed as: + +``` + row0 = (uint16_t*)scratch; + row0 += y * nx; // int * int -> signed overflow when y*nx > INT_MAX +``` + +For large `nx` (e.g. 268435456), `y*nx` overflows, so `row0`/`row1`/`row2`/`row3` +point before the scratch buffer. + +Fix: compute the row offset in `uint64_t` before pointer arithmetic in both +`uncompress_b44_impl` (decoder) and `compress_b44_impl` (encoder). + +Analysis and solution with the help of Curor / Claude Opus 4.5 + +Signed-off-by: Cary Phillips +--- + .../OpenEXR/OpenEXRCore/internal_b44.c | 23 ++++++++++--------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c +index 8d0c257e658..93279ff2ed5 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c +@@ -390,13 +390,13 @@ compress_b44_impl (exr_encode_pipeline_t* encode, int flat_field) + // rightmost column and the bottom row. + // + uint16_t *row0, *row1, *row2, *row3; ++ /* row offset in elements: use uint64_t so y*nx cannot overflow int */ ++ uint64_t row_off = (uint64_t) (y) * (uint64_t) (nx); + +- row0 = (uint16_t*) scratch; +- row0 += y * nx; +- +- row1 = row0 + nx; +- row2 = row1 + nx; +- row3 = row2 + nx; ++ row0 = (uint16_t*) scratch + row_off; ++ row1 = row0 + (uint64_t) nx; ++ row2 = row1 + (uint64_t) nx; ++ row3 = row2 + (uint64_t) nx; + + if (y + 3 >= ny) + { +@@ -512,11 +512,12 @@ uncompress_b44_impl ( + + for (int y = 0; y < ny; y += 4) + { +- row0 = (uint16_t*) scratch; +- row0 += y * nx; +- row1 = row0 + nx; +- row2 = row1 + nx; +- row3 = row2 + nx; ++ /* row offset in elements: use uint64_t so y*nx cannot overflow int */ ++ uint64_t row_off = (uint64_t) (y) * (uint64_t) (nx); ++ row0 = (uint16_t*) scratch + row_off; ++ row1 = row0 + (uint64_t) nx; ++ row2 = row1 + (uint64_t) nx; ++ row3 = row2 + (uint64_t) nx; + for (int x = 0; x < nx; x += 4) + { + if (bIn + 3 > comp_buf_size) return EXR_ERR_OUT_OF_MEMORY; diff --git a/usd.spec b/usd.spec index 898ff05..f1b273f 100644 --- a/usd.spec +++ b/usd.spec @@ -151,6 +151,9 @@ Patch: 0006-Downstream-only-use-the-system-libavif.patch # Backport fixes for CVE-2025-64181 etc. in OpenEXRCore # https://github.com/PixarAnimationStudios/OpenUSD/pull/3903 Patch: %{forgeurl}/pull/3903.patch +# Backport fix for CVE-2026-34544 in OpenEXRCore +# https://github.com/PixarAnimationStudios/OpenUSD/pull/4028 +Patch: %{forgeurl}/pull/4028.patch # Base BuildRequires: gcc-c++ From 099d5a046b76634d20599150d231fc2f3182ac19 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 8 Apr 2026 11:58:16 +0100 Subject: [PATCH 22/29] Backport several OpenEXRCore security fixes - Fixes CVE-2026-34378 / GHSA-v76p-4qvv-vh4g; closes RHBZ#2455493 - Fixes CVE-2026-34380 / GHSA-q3v8-hw4m-59w5; closes RHBZ#2455534 - Fixes CVE-2026-34588 / GHSA-588r-cr5c-w6hf; closes RHBZ#2455505 - Fixes CVE-2026-34589 / GHSA-p8xc-w3q4-h64x; closes RHBZ#2455501 - Fixes CVE-2026-34379 / GHSA-w88v-vqhq-5p24; closes RHBZ#2455497 --- 4030.patch | 612 +++++++++++++++++++++++++++++++++++++++++++++++++++++ usd.spec | 9 + 2 files changed, 621 insertions(+) create mode 100644 4030.patch diff --git a/4030.patch b/4030.patch new file mode 100644 index 0000000..896f2e3 --- /dev/null +++ b/4030.patch @@ -0,0 +1,612 @@ +From 4f03fb0f488d8f528bdc0f9ecac07eea8f7b63ac Mon Sep 17 00:00:00 2001 +From: Christoph Gohlke +Date: Tue, 17 Mar 2026 20:56:39 -0700 +Subject: [PATCH 1/6] Fix comparison operator for buffer size check (#2307) + +Signed-off-by: Christoph Gohlke +--- + .../plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c +index 628438c5c01..56df6a49c2f 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c +@@ -367,7 +367,7 @@ apply_zip_impl (exr_encode_pipeline_t* encode) + + if (rv == EXR_ERR_SUCCESS) + { +- if (compbufsz > encode->packed_bytes) ++ if (compbufsz >= encode->packed_bytes) + { + memcpy ( + encode->compressed_buffer, + +From 0512b6c41b95e5c0ac9e01b2f87b56acd437d8e9 Mon Sep 17 00:00:00 2001 +From: Cary Phillips +Date: Thu, 26 Mar 2026 16:35:49 -0700 +Subject: [PATCH 2/6] Fix integer overflow in `srcbuffer` pointer arithmetic in + `unpack_*` (#2321) + +Pointer arithmetic involving `srcbuffer` in the `unpack_*` functions +can overflow for very wide images. + +Multiplying `int w` by a bytes-per-element constant (2, 4, 6, or 8) in +`srcbuffer +=` expressions causes signed integer overflow when the +image width is large. + +Promote the leading operand to `int64_t` at every affected multiplication +so pointer arithmetic is performed in 64-bit signed arithmetic throughout, +eliminating the undefined behavior without imposing any image size limit. + +Affected sites: `generic_unpack`, `unpack_16bit`, `unpack_32bit`, and +all 3- and 4-channel interleave/planar specializations. + +Made-with: Cursor + +Signed-off-by: Cary Phillips +--- + .../hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c | 38 +++++++++---------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c +index 1324508c5b4..8765bfa50d6 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c +@@ -229,7 +229,7 @@ unpack_16bit_3chan_interleave (exr_decode_pipeline_t* decode) + in1 = in0 + w; + in2 = in1 + w; + +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + out[0] = one_to_native16 (in0[x]); +@@ -269,7 +269,7 @@ unpack_16bit_3chan_interleave_rev (exr_decode_pipeline_t* decode) + in1 = in0 + w; // G + in2 = in1 + w; // R + +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + out[0] = one_to_native16 (in2[x]); +@@ -309,7 +309,7 @@ unpack_half_to_float_3chan_interleave (exr_decode_pipeline_t* decode) + in1 = in0 + w; + in2 = in1 + w; + +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + out[0] = half_to_float (one_to_native16 (in0[x])); +@@ -349,7 +349,7 @@ unpack_half_to_float_3chan_interleave_rev (exr_decode_pipeline_t* decode) + in1 = in0 + w; + in2 = in1 + w; + +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + out[0] = half_to_float (one_to_native16 (in2[x])); +@@ -390,7 +390,7 @@ unpack_16bit_3chan_planar (exr_decode_pipeline_t* decode) + in0 = (const uint16_t*) srcbuffer; + in1 = in0 + w; + in2 = in1 + w; +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + /* specialise to memcpy if we can */ + #if EXR_HOST_IS_NOT_LITTLE_ENDIAN + for (int x = 0; x < w; ++x) +@@ -440,7 +440,7 @@ unpack_half_to_float_3chan_planar (exr_decode_pipeline_t* decode) + in0 = (const uint16_t*) srcbuffer; + in1 = in0 + w; + in2 = in1 + w; +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + /* specialise to memcpy if we can */ + half_to_float_buffer ((float*) out0, in0, w); + half_to_float_buffer ((float*) out1, in1, w); +@@ -485,7 +485,7 @@ unpack_16bit_3chan (exr_decode_pipeline_t* decode) + in0 = (const uint16_t*) srcbuffer; + in1 = in0 + w; + in2 = in1 + w; +- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + *((uint16_t*) (out0 + x * inc0)) = one_to_native16 (in0[x]); + for (int x = 0; x < w; ++x) +@@ -539,7 +539,7 @@ unpack_16bit_4chan_interleave (exr_decode_pipeline_t* decode) + in2 = in1 + w; + in3 = in2 + w; + +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + combined.a = one_to_native16 (in0[x]); +@@ -592,7 +592,7 @@ unpack_16bit_4chan_interleave_rev (exr_decode_pipeline_t* decode) + in2 = in1 + w; + in3 = in2 + w; + +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + combined.a = one_to_native16 (in0[x]); +@@ -633,7 +633,7 @@ unpack_half_to_float_4chan_interleave (exr_decode_pipeline_t* decode) + in2 = in1 + w; + in3 = in2 + w; + +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + out[0] = half_to_float (one_to_native16 (in3[x])); +@@ -674,7 +674,7 @@ unpack_half_to_float_4chan_interleave_rev (exr_decode_pipeline_t* decode) + in2 = in1 + w; + in3 = in2 + w; + +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + { + out[0] = half_to_float (one_to_native16 (in0[x])); +@@ -719,7 +719,7 @@ unpack_16bit_4chan_planar (exr_decode_pipeline_t* decode) + in1 = in0 + w; + in2 = in1 + w; + in3 = in2 + w; +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + /* specialize to memcpy if we can */ + #if EXR_HOST_IS_NOT_LITTLE_ENDIAN + for (int x = 0; x < w; ++x) +@@ -775,7 +775,7 @@ unpack_half_to_float_4chan_planar (exr_decode_pipeline_t* decode) + in1 = in0 + w; + in2 = in1 + w; + in3 = in2 + w; +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + + half_to_float_buffer ((float*) out0, in0, w); + half_to_float_buffer ((float*) out1, in1, w); +@@ -825,7 +825,7 @@ unpack_16bit_4chan (exr_decode_pipeline_t* decode) + in1 = in0 + w; + in2 = in1 + w; + in3 = in2 + w; +- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion ++ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion + for (int x = 0; x < w; ++x) + *((uint16_t*) (out0 + x * inc0)) = one_to_native16 (in0[x]); + for (int x = 0; x < w; ++x) +@@ -898,7 +898,7 @@ unpack_16bit (exr_decode_pipeline_t* decode) + } + } + #endif +- srcbuffer += w * 2; ++ srcbuffer += (int64_t) w * 2; + } + } + return EXR_ERR_SUCCESS; +@@ -963,7 +963,7 @@ unpack_32bit (exr_decode_pipeline_t* decode) + } + } + #endif +- srcbuffer += w * 4; ++ srcbuffer += (int64_t) w * 4; + } + } + return EXR_ERR_SUCCESS; +@@ -1118,7 +1118,7 @@ generic_unpack (exr_decode_pipeline_t* decode) + (uint64_t) decc->user_line_stride); + else + { +- srcbuffer += w * bpc; ++ srcbuffer += (int64_t) w * bpc; + continue; + } + } +@@ -1128,12 +1128,12 @@ generic_unpack (exr_decode_pipeline_t* decode) + } + else + { +- srcbuffer += w * bpc; ++ srcbuffer += (int64_t) w * bpc; + continue; + } + + UNPACK_SAMPLES (w) +- srcbuffer += w * bpc; ++ srcbuffer += (int64_t) w * bpc; + } + } + return EXR_ERR_SUCCESS; + +From f5f7f32d5761b8d28d61e391e9daf68bd62bc9e5 Mon Sep 17 00:00:00 2001 +From: Cary Phillips +Date: Sun, 29 Mar 2026 19:19:12 -0700 +Subject: [PATCH 3/6] Security: fix signed integer overflow in + `undo_pxr24_impl()` (PXR24 decoder) (#2323) + +In the `EXR_PIXEL_FLOAT` branch of `undo_pxr24_impl()`, the expressions + + (uint64_t)(w * 3) + +compute the signed 32-bit product `w * 3` before the cast to `uint64_t`. +When `w` is large this is undefined behavior under the C standard; on +two's-complement builds without sanitizers the result wraps to a small +positive value, which can cause the bounds check + + if (nDec + (uint64_t)(w * 3) > outSize) + +to pass incorrectly. If the check is bypassed the decode loop proceeds +to write `4*w` bytes through `dout`, potentially far beyond the allocated +output buffer. + +Fix: cast `w` to `uint64_t` before multiplying so that both the bounds +check and the counter update are performed entirely in 64-bit unsigned +arithmetic: + + (uint64_t)w * 3 (cast before multiply, not after) + +The `EXR_PIXEL_UINT` and `EXR_PIXEL_HALF` decode branches are unaffected: +they reuse the pre-computed `nBytes` variable, which is already formed as +`(uint64_t)(w) * (uint64_t)(bytes_per_element)`. + +Also fix the symmetric issue in `apply_pxr24_impl()` (the encoder): + lastIn += w * 4 +advances a pointer by a signed 32-bit product; corrected to + lastIn += (uint64_t)w * 4 + +Made-with: Cursor + +Signed-off-by: Cary Phillips +--- + .../plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c +index 43e52c982cf..30f71f4f846 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c +@@ -182,7 +182,7 @@ apply_pxr24_impl (exr_encode_pipeline_t* encode) + if (nOut + nBytes > encode->scratch_alloc_size_1) + return EXR_ERR_OUT_OF_MEMORY; + nOut += nBytes; +- lastIn += w * 4; ++ lastIn += (uint64_t) w * 4; + + ptr[0] = out; + out += w; +@@ -371,7 +371,7 @@ undo_pxr24_impl ( + ptr[2] = lastIn; + lastIn += w; + +- if (nDec + (uint64_t) (w * 3) > outSize) ++ if (nDec + (uint64_t) w * 3 > outSize) + return EXR_ERR_CORRUPT_CHUNK; + + for (int x = 0; x < w; ++x) +@@ -384,7 +384,7 @@ undo_pxr24_impl ( + unaligned_store32 (dout, pixel); + ++dout; + } +- nDec += (uint64_t) (w * 3); ++ nDec += (uint64_t) w * 3; + break; + } + default: return EXR_ERR_INVALID_ARGUMENT; + +From d578381a503add330b3b96b30cf6a49461989f08 Mon Sep 17 00:00:00 2001 +From: Cary Phillips +Date: Sun, 29 Mar 2026 19:19:49 -0700 +Subject: [PATCH 4/6] fix integer overflow in PIZ wavelet buffer arithmetic + (#2328) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Three classes of signed integer overflow in the PIZ codec path, all +reachable from corrupt `dataWindow` dimensions in the EXR file header. + +**`wav_2D_encode` / `wav_2D_decode` — wavelet loop pointer arithmetic** + +`oy` is passed as `int` (value `wcount * nx`, at most ~INT32_MAX after +the guard below). Inside the hierarchical wavelet loop the expressions + + ey = in + oy * (ny - p2) // pointer end-of-row sentinel + oy1 = oy * p // row stride at level p + oy2 = oy * p2 // row stride at level p2 + +multiply two values that can each approach INT32_MAX, producing a +signed 32-bit product that wraps to a small or negative value. The +wrapped value is used as a pointer offset, causing reads and writes +through `px` / `py` to land outside the allocated wavelet buffer. + +Fix: widen by introducing `int64_t oy64 = oy` and using it for all +three expressions; `oy1` and `oy2` are also declared `int64_t`. + +**`wavbuf += nx * ny * wcount` — per-channel buffer advance** + +`nx`, `ny`, and `wcount` are all `int`. Their triple product overflows +int32 for moderately large images, causing subsequent channels to be +processed at an incorrect (too-small) offset into the wavelet buffer, +corrupting both encode and decode output. + +Fix: cast to `(uint64_t)` before multiplying. + +**`wcount * nx` — call-site argument overflow** + +The fifth argument to `wav_2D_encode` / `wav_2D_decode` is `wcount * nx` +(`oy` = y-stride = elements per row). `wcount` is 1 or 2 +(`bytes_per_element / 2`); for `wcount = 2` the product overflows int32 +when `nx > INT32_MAX / 2`. + +Fix: add an early bounds check `if (wcount > 0 && nx > INT_MAX / wcount)` +that rejects such input as `EXR_ERR_CORRUPT_CHUNK` before any arithmetic +is performed. This also keeps `wcount * nx` within int32 range at the +call site, ensuring `oy` arrives in the wavelet functions with a valid +non-overflowed value. + +Made-with: Cursor + +Signed-off-by: Cary Phillips +--- + .../OpenEXR/OpenEXRCore/internal_piz.c | 39 +++++++++++-------- + 1 file changed, 23 insertions(+), 16 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c +index 6c2750b166f..787d2752c61 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c +@@ -10,6 +10,7 @@ + #include "internal_huf.h" + #include "internal_xdr.h" + ++#include + #include + + /**************************************/ +@@ -171,10 +172,11 @@ wdec16 (uint16_t l, uint16_t h, uint16_t* a, uint16_t* b) + static void + wav_2D_encode (uint16_t* in, int nx, int ox, int ny, int oy, uint16_t mx) + { +- int w14 = (mx < (1 << 14)) ? 1 : 0; +- int n = (nx > ny) ? ny : nx; +- int p = 1; // == 1 << level +- int p2 = 2; // == 1 << (level+1) ++ int w14 = (mx < (1 << 14)) ? 1 : 0; ++ int n = (nx > ny) ? ny : nx; ++ int p = 1; // == 1 << level ++ int p2 = 2; // == 1 << (level+1) ++ int64_t oy64 = oy; + + // + // Hierarchical loop on smaller dimension n +@@ -183,9 +185,9 @@ wav_2D_encode (uint16_t* in, int nx, int ox, int ny, int oy, uint16_t mx) + while (p2 <= n) + { + uint16_t* py = in; +- uint16_t* ey = in + oy * (ny - p2); +- int oy1 = oy * p; +- int oy2 = oy * p2; ++ uint16_t* ey = in + oy64 * (ny - p2); ++ int64_t oy1 = oy64 * p; ++ int64_t oy2 = oy64 * p2; + int ox1 = ox * p; + int ox2 = ox * p2; + uint16_t i00, i01, i10, i11; +@@ -284,10 +286,11 @@ wav_2D_decode ( + int oy, // i : y offset + uint16_t mx) // i : maximum in[x][y] value + { +- int w14 = (mx < (1 << 14)) ? 1 : 0; +- int n = (nx > ny) ? ny : nx; +- int p = 1; +- int p2; ++ int w14 = (mx < (1 << 14)) ? 1 : 0; ++ int n = (nx > ny) ? ny : nx; ++ int p = 1; ++ int p2; ++ int64_t oy64 = oy; + + // + // Search max level +@@ -307,9 +310,9 @@ wav_2D_decode ( + while (p >= 1) + { + uint16_t* py = in; +- uint16_t* ey = in + oy * (ny - p2); +- int oy1 = oy * p; +- int oy2 = oy * p2; ++ uint16_t* ey = in + oy64 * (ny - p2); ++ int64_t oy1 = oy64 * p; ++ int64_t oy2 = oy64 * p2; + int ox1 = ox * p; + int ox2 = ox * p2; + uint16_t i00, i01, i10, i11; +@@ -502,11 +505,13 @@ internal_exr_apply_piz (exr_encode_pipeline_t* encode) + nx = curc->width; + ny = curc->height; + wcount = (int) (curc->bytes_per_element / 2); ++ if (wcount > 0 && nx > INT_MAX / wcount) ++ return EXR_ERR_CORRUPT_CHUNK; + for (int j = 0; j < wcount; ++j) + { + wav_2D_encode (wavbuf + j, nx, wcount, ny, wcount * nx, maxValue); + } +- wavbuf += nx * ny * wcount; ++ wavbuf += (uint64_t) nx * ny * wcount; + } + + nBytes = 0; +@@ -655,11 +660,13 @@ internal_exr_undo_piz ( + nx = curc->width; + ny = curc->height; + wcount = (int) (curc->bytes_per_element / 2); ++ if (wcount > 0 && nx > INT_MAX / wcount) ++ return EXR_ERR_CORRUPT_CHUNK; + for (int j = 0; j < wcount; ++j) + { + wav_2D_decode (wavbuf + j, nx, wcount, ny, wcount * nx, maxValue); + } +- wavbuf += nx * ny * wcount; ++ wavbuf += (uint64_t) nx * ny * wcount; + } + + // + +From a76474285ddc24e9956b5e12fab658b908912ed4 Mon Sep 17 00:00:00 2001 +From: Cary Phillips +Date: Sun, 29 Mar 2026 19:20:52 -0700 +Subject: [PATCH 5/6] Fix signed integer overflow in + `LossyDctDecoder_execute()` pointer arithmetic (#2329) + +`numBlocksX` and `numBlocksY` are declared as `int`. Two pointer-offset +expressions in `LossyDctDecoder_execute()` multiplied them as signed +32-bit integers before using the result as a pointer offset: + + rowBlock[comp] = rowBlock[comp - 1] + numBlocksX * 64; + currDcComp[comp] = currDcComp[comp - 1] + numBlocksX * numBlocksY; + +`dataWindow.max.x` is a signed 32-bit value in the EXR file format, so +`numBlocksX` can reach `(INT32_MAX + 7) / 8 = 268,435,456`. At that +point `numBlocksX * 64 = 17,179,869,184` overflows `int32`, and +`numBlocksX * numBlocksY` overflows even sooner. The wraparound +produces a small or negative pointer offset, causing `rowBlock[comp]` +and `currDcComp[comp]` to point into already-used or pre-buffer memory +rather than the intended component stride. + +Fix: cast `numBlocksX` to `size_t` before multiplying so the +arithmetic is performed in pointer-sized unsigned arithmetic: + + rowBlock[comp] = rowBlock[comp - 1] + (size_t) numBlocksX * 64; + currDcComp[comp] = currDcComp[comp - 1] + (size_t) numBlocksX * numBlocksY; + +This is consistent with the allocation on the line above, which already +uses `(size_t) numComp * (size_t) numBlocksX * 64 * sizeof(uint16_t)`, +and with the packed-DC count check, which uses explicit `uint64_t` casts. + +Made-with: Cursor + +Signed-off-by: Cary Phillips +--- + .../hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h +index bcdebd985f9..e289b064dac 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h +@@ -265,7 +265,7 @@ LossyDctDecoder_execute ( + } + + for (int comp = 1; comp < numComp; ++comp) +- rowBlock[comp] = rowBlock[comp - 1] + numBlocksX * 64; ++ rowBlock[comp] = rowBlock[comp - 1] + (size_t) numBlocksX * 64; + + // + // Pack DC components together by common plane, so we can get +@@ -275,7 +275,7 @@ LossyDctDecoder_execute ( + + currDcComp[0] = (uint16_t*) d->_packedDc; + for (int comp = 1; comp < numComp; ++comp) +- currDcComp[comp] = currDcComp[comp - 1] + numBlocksX * numBlocksY; ++ currDcComp[comp] = currDcComp[comp - 1] + (size_t) numBlocksX * numBlocksY; + + for (int blocky = 0; blocky < numBlocksY; ++blocky) + { + +From 219a0870506f80c7353016800e467ad0de923424 Mon Sep 17 00:00:00 2001 +From: Cary Phillips +Date: Tue, 31 Mar 2026 07:49:09 -0700 +Subject: [PATCH 6/6] =?UTF-8?q?Fix=20misaligned=20memory=20access=20in=20`?= + =?UTF-8?q?LossyDctDecoder=5Fexecute`=20HALF=E2=86=92FLOAT=20expansion=20(?= + =?UTF-8?q?#2324)?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* Fix misaligned memory access in `LossyDctDecoder_execute` HALF→FLOAT expansion + +After DCT decoding, `LossyDctDecoder_execute()` expands FLOAT-type channels +from their intermediate HALF (16-bit) XDR representation back to FLOAT (32-bit) +XDR in place. The expansion was done by casting `_rows[y]` (a `uint8_t *`) +directly to `float *` and `uint16_t *`, then reading and writing through those +typed pointers. + +Because row buffers are assigned by advancing a byte pointer with no alignment +padding (`outBufferEnd += chan->width * chan->bytes_per_element` in +`internal_dwa_compressor.h`), a FLOAT channel that follows a HALF channel of +odd width receives a `_rows[y]` pointer that is 2-byte aligned but not 4-byte +aligned. Dereferencing a `float *` cast from such a pointer is undefined +behavior under the C standard: + +- On ARM, RISC-V, and MIPS (strict alignment) this crashes immediately. +- On x86 it is silently tolerated at the hardware level but remains UB: + auto-vectorizing compilers (SSE/AVX) may assume aligned access and generate + incorrect code. +- UBSan reports: `store to misaligned address ... for type 'float', which + requires 4 byte alignment` at `internal_dwa_decoder.h:749`. + +Fix: replace the cast-and-dereference pattern with the `unaligned_load16` / +`memcpy` / `unaligned_store32` helpers already used throughout the rest of +OpenEXRCore (`internal_xdr.h`, `unpack.c`, `pack.c`, `internal_pxr24.c`). +These helpers use `memcpy` internally, which the C standard guarantees is safe +for unaligned addresses and which compilers compile to a single load/store +instruction on architectures that support it. + +The byte-order handling is preserved correctly: +- `unaligned_load16` reads 2 bytes via `memcpy` and applies `one_to_native16` + (XDR → native), returning a native-endian HALF value. +- `half_to_float` converts native HALF → native float. +- `memcpy(&bits, &f, 4)` reinterprets the float's bit pattern as `uint32_t` + without numeric conversion (the correct type-pun idiom in C). +- `unaligned_store32` applies `one_from_native32` (native → XDR) and writes + 4 bytes via `memcpy`, storing the result in XDR float format. + +Made-with: Cursor +Signed-off-by: Cary Phillips + +* add TODO comment + +Signed-off-by: Cary Phillips + +--------- + +Signed-off-by: Cary Phillips +--- + .../OpenEXR/OpenEXRCore/internal_dwa_decoder.h | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h +index e289b064dac..046615ec5b8 100644 +--- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h ++++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h +@@ -651,13 +651,22 @@ LossyDctDecoder_execute ( + /* process in place in reverse to avoid temporary buffer */ + for (int y = 0; y < d->_height; ++y) + { +- float* floatXdrPtr = (float*) chanData[chan]->_rows[y]; +- uint16_t* halfXdr = (uint16_t*) floatXdrPtr; ++ uint8_t* rowBytes = chanData[chan]->_rows[y]; + + for (int x = d->_width - 1; x >= 0; --x) + { +- floatXdrPtr[x] = one_from_native_float ( +- half_to_float (one_to_native16 (halfXdr[x]))); ++ // TODO: make an unaligned_store32f that takes the float and ++ // packages up a one_from_native_float and calls memcpy ++ // instead of the two memcpy. We should look at the metrics ++ // for dwa and see if there's a performance difference to do ++ // so at some point. See: ++ // https://github.com/AcademySoftwareFoundation/openexr/pull/2324 ++ ++ uint16_t h = unaligned_load16 (rowBytes + x * sizeof (uint16_t)); ++ float f = half_to_float (h); ++ uint32_t bits; ++ memcpy (&bits, &f, sizeof (bits)); ++ unaligned_store32 (rowBytes + x * sizeof (float), bits); + } + } + } diff --git a/usd.spec b/usd.spec index f1b273f..e2186c4 100644 --- a/usd.spec +++ b/usd.spec @@ -154,6 +154,15 @@ Patch: %{forgeurl}/pull/3903.patch # Backport fix for CVE-2026-34544 in OpenEXRCore # https://github.com/PixarAnimationStudios/OpenUSD/pull/4028 Patch: %{forgeurl}/pull/4028.patch +# Backport several OpenEXRCore security fixes +# https://github.com/PixarAnimationStudios/OpenUSD/pull/4030 +# Fixes: +# - CVE-2026-34378 / GHSA-v76p-4qvv-vh4g / RHBZ#2455493 +# - CVE-2026-34380 / GHSA-q3v8-hw4m-59w5 / RHBZ#2455534 +# - CVE-2026-34588 / GHSA-588r-cr5c-w6hf / RHBZ#2455505 +# - CVE-2026-34589 / GHSA-p8xc-w3q4-h64x / RHBZ#2455501 +# - CVE-2026-34379 / GHSA-w88v-vqhq-5p24 / RHBZ#2455497 +Patch: %{forgeurl}/pull/4030.patch # Base BuildRequires: gcc-c++ From d7db70a14df648ce58955e0982c55f3418473233 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Apr 2026 19:30:30 -0600 Subject: [PATCH 23/29] Rebuild for hdf5 2.1 From b8ae07c43dfa649205413bf5f376d0b78af430be Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 27 Apr 2026 11:43:09 +0100 Subject: [PATCH 24/29] Update to 26.05 (close RHBZ#2461650) --- .gitignore | 1 + ...ownstream-only-add-an-SONAME-version.patch | 6 +- ...use-the-system-double-conversion-lib.patch | 6 +- ...ream-only-use-the-system-lz4-library.patch | 6 +- ...-only-use-the-system-pugixml-library.patch | 2 +- ...nly-use-the-system-rapidjson-library.patch | 2 +- ...tream-only-use-the-system-libdeflate.patch | 2 +- ...wnstream-only-use-the-system-libavif.patch | 2 +- 4028.patch | 71 -- 4030.patch | 612 ------------------ sources | 2 +- usd.spec | 18 +- 12 files changed, 18 insertions(+), 712 deletions(-) delete mode 100644 4028.patch delete mode 100644 4030.patch diff --git a/.gitignore b/.gitignore index f00caa1..cf961b4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /OpenUSD-25.08.tar.gz /OpenUSD-25.11.tar.gz /OpenUSD-26.03.tar.gz +/OpenUSD-26.05.tar.gz diff --git a/0001-Downstream-only-add-an-SONAME-version.patch b/0001-Downstream-only-add-an-SONAME-version.patch index 7a55eca..c86bdb4 100644 --- a/0001-Downstream-only-add-an-SONAME-version.patch +++ b/0001-Downstream-only-add-an-SONAME-version.patch @@ -1,4 +1,4 @@ -From 949707d0bd8ac077fac9763b3b590a016ff4eb6f Mon Sep 17 00:00:00 2001 +From 330d176f208baadd2db58f8797bc492f2d81c03f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 27 Oct 2023 12:56:58 -0400 Subject: [PATCH] Downstream-only: add an SONAME version @@ -37,11 +37,11 @@ built with -DPXR_BUILD_EXAMPLES=OFF, but it is.) 3 files changed, 9 insertions(+) diff --git a/cmake/defaults/Version.cmake b/cmake/defaults/Version.cmake -index 1cc7fa64a..ebe531ec4 100644 +index 3efcd4e82..e8f37af98 100644 --- a/cmake/defaults/Version.cmake +++ b/cmake/defaults/Version.cmake @@ -10,3 +10,9 @@ set(PXR_MINOR_VERSION "26") - set(PXR_PATCH_VERSION "3") # NOTE: Must not have leading 0 for single digits + set(PXR_PATCH_VERSION "5") # NOTE: Must not have leading 0 for single digits math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}") + diff --git a/0001-Downstream-only-use-the-system-double-conversion-lib.patch b/0001-Downstream-only-use-the-system-double-conversion-lib.patch index 30a54ef..51614ec 100644 --- a/0001-Downstream-only-use-the-system-double-conversion-lib.patch +++ b/0001-Downstream-only-use-the-system-double-conversion-lib.patch @@ -1,4 +1,4 @@ -From 5bc91bdebc42bb3a441c87b706288cea05fcd345 Mon Sep 17 00:00:00 2001 +From ea7f51376f03620c6187f3672dad12951669ecb5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Aug 2024 10:42:48 -0400 Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library @@ -8,7 +8,7 @@ Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index 6fc9c680e..551b5a3eb 100644 +index 8c0f8e4a1..3afc2edaf 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt @@ -105,11 +105,14 @@ function(add_py_dll_link_test) @@ -26,7 +26,7 @@ index 6fc9c680e..551b5a3eb 100644 PUBLIC_CLASSES anyUniquePtr -@@ -272,14 +275,6 @@ pxr_library(tf +@@ -276,14 +279,6 @@ pxr_library(tf CPPFILES initConfig.cpp diff --git a/0002-Downstream-only-use-the-system-lz4-library.patch b/0002-Downstream-only-use-the-system-lz4-library.patch index 910d576..a61e7fb 100644 --- a/0002-Downstream-only-use-the-system-lz4-library.patch +++ b/0002-Downstream-only-use-the-system-lz4-library.patch @@ -1,4 +1,4 @@ -From 0caa009abce9d66d441cd548f45ca8fef8d4846d Mon Sep 17 00:00:00 2001 +From cb323e80b560cbebf49c0e199804965b472274b0 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Aug 2024 13:30:18 -0400 Subject: [PATCH 2/6] Downstream-only: use the system lz4 library @@ -8,7 +8,7 @@ Subject: [PATCH 2/6] Downstream-only: use the system lz4 library 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index 551b5a3eb..772524a19 100644 +index 3afc2edaf..8ae85b5eb 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt @@ -106,6 +106,8 @@ function(add_py_dll_link_test) @@ -31,7 +31,7 @@ index 551b5a3eb..772524a19 100644 PUBLIC_CLASSES anyUniquePtr -@@ -275,7 +281,6 @@ pxr_library(tf +@@ -279,7 +285,6 @@ pxr_library(tf CPPFILES initConfig.cpp diff --git a/0003-Downstream-only-use-the-system-pugixml-library.patch b/0003-Downstream-only-use-the-system-pugixml-library.patch index 974ff6f..6f0a13a 100644 --- a/0003-Downstream-only-use-the-system-pugixml-library.patch +++ b/0003-Downstream-only-use-the-system-pugixml-library.patch @@ -1,4 +1,4 @@ -From d1e032128f9c41a763d9e0535c408ffa6642ae03 Mon Sep 17 00:00:00 2001 +From de61621ccbee32776ea9e330384f6275c4237259 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 30 Aug 2024 09:32:08 -0400 Subject: [PATCH 3/6] Downstream-only: use the system pugixml library diff --git a/0004-Downstream-only-use-the-system-rapidjson-library.patch b/0004-Downstream-only-use-the-system-rapidjson-library.patch index 090b753..d9e2dcf 100644 --- a/0004-Downstream-only-use-the-system-rapidjson-library.patch +++ b/0004-Downstream-only-use-the-system-rapidjson-library.patch @@ -1,4 +1,4 @@ -From 8fc7363878d1917d5b3f3513b16d54293463c297 Mon Sep 17 00:00:00 2001 +From a83325f12491456b6ad9cb40fa09f0155377263f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 31 Aug 2024 11:08:18 -0400 Subject: [PATCH 4/6] Downstream-only: use the system rapidjson library diff --git a/0005-Downstream-only-use-the-system-libdeflate.patch b/0005-Downstream-only-use-the-system-libdeflate.patch index cc5de7a..c97e35f 100644 --- a/0005-Downstream-only-use-the-system-libdeflate.patch +++ b/0005-Downstream-only-use-the-system-libdeflate.patch @@ -1,4 +1,4 @@ -From 30b0460635b46ce71f22586273afb370075d7db8 Mon Sep 17 00:00:00 2001 +From 91b0341364b986e051a150a9f33e98a12bc3f20d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 1 Sep 2024 21:30:11 -0400 Subject: [PATCH 5/6] Downstream-only: use the system libdeflate diff --git a/0006-Downstream-only-use-the-system-libavif.patch b/0006-Downstream-only-use-the-system-libavif.patch index cac8a41..5b5fc40 100644 --- a/0006-Downstream-only-use-the-system-libavif.patch +++ b/0006-Downstream-only-use-the-system-libavif.patch @@ -1,4 +1,4 @@ -From c6639b8f1a8c57b02071426400daa349eed14501 Mon Sep 17 00:00:00 2001 +From 81ac0ca314d66e96f43ed904204b63be302e0743 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 4 Sep 2024 11:09:47 -0400 Subject: [PATCH 6/6] Downstream-only: use the system libavif diff --git a/4028.patch b/4028.patch deleted file mode 100644 index 9fd2598..0000000 --- a/4028.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 83c6cdfa63ad61accec35575f503b629f94dc4af Mon Sep 17 00:00:00 2001 -From: Cary Phillips -Date: Thu, 19 Mar 2026 14:22:40 -0700 -Subject: [PATCH] Fix B44/B44A integer overflow: use uint64_t for row offset - (#2312) - -The B44 and B44A decoder and encoder use channel width (`nx`) and -height (`ny`) in row pointer math. `nx` and `ny` are `int`; the -scratch buffer is correctly sized with `(uint64_t)ny * (uint64_t)nx * -bytes_per_element`, but row bases were computed as: - -``` - row0 = (uint16_t*)scratch; - row0 += y * nx; // int * int -> signed overflow when y*nx > INT_MAX -``` - -For large `nx` (e.g. 268435456), `y*nx` overflows, so `row0`/`row1`/`row2`/`row3` -point before the scratch buffer. - -Fix: compute the row offset in `uint64_t` before pointer arithmetic in both -`uncompress_b44_impl` (decoder) and `compress_b44_impl` (encoder). - -Analysis and solution with the help of Curor / Claude Opus 4.5 - -Signed-off-by: Cary Phillips ---- - .../OpenEXR/OpenEXRCore/internal_b44.c | 23 ++++++++++--------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c -index 8d0c257e658..93279ff2ed5 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_b44.c -@@ -390,13 +390,13 @@ compress_b44_impl (exr_encode_pipeline_t* encode, int flat_field) - // rightmost column and the bottom row. - // - uint16_t *row0, *row1, *row2, *row3; -+ /* row offset in elements: use uint64_t so y*nx cannot overflow int */ -+ uint64_t row_off = (uint64_t) (y) * (uint64_t) (nx); - -- row0 = (uint16_t*) scratch; -- row0 += y * nx; -- -- row1 = row0 + nx; -- row2 = row1 + nx; -- row3 = row2 + nx; -+ row0 = (uint16_t*) scratch + row_off; -+ row1 = row0 + (uint64_t) nx; -+ row2 = row1 + (uint64_t) nx; -+ row3 = row2 + (uint64_t) nx; - - if (y + 3 >= ny) - { -@@ -512,11 +512,12 @@ uncompress_b44_impl ( - - for (int y = 0; y < ny; y += 4) - { -- row0 = (uint16_t*) scratch; -- row0 += y * nx; -- row1 = row0 + nx; -- row2 = row1 + nx; -- row3 = row2 + nx; -+ /* row offset in elements: use uint64_t so y*nx cannot overflow int */ -+ uint64_t row_off = (uint64_t) (y) * (uint64_t) (nx); -+ row0 = (uint16_t*) scratch + row_off; -+ row1 = row0 + (uint64_t) nx; -+ row2 = row1 + (uint64_t) nx; -+ row3 = row2 + (uint64_t) nx; - for (int x = 0; x < nx; x += 4) - { - if (bIn + 3 > comp_buf_size) return EXR_ERR_OUT_OF_MEMORY; diff --git a/4030.patch b/4030.patch deleted file mode 100644 index 896f2e3..0000000 --- a/4030.patch +++ /dev/null @@ -1,612 +0,0 @@ -From 4f03fb0f488d8f528bdc0f9ecac07eea8f7b63ac Mon Sep 17 00:00:00 2001 -From: Christoph Gohlke -Date: Tue, 17 Mar 2026 20:56:39 -0700 -Subject: [PATCH 1/6] Fix comparison operator for buffer size check (#2307) - -Signed-off-by: Christoph Gohlke ---- - .../plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c -index 628438c5c01..56df6a49c2f 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_zip.c -@@ -367,7 +367,7 @@ apply_zip_impl (exr_encode_pipeline_t* encode) - - if (rv == EXR_ERR_SUCCESS) - { -- if (compbufsz > encode->packed_bytes) -+ if (compbufsz >= encode->packed_bytes) - { - memcpy ( - encode->compressed_buffer, - -From 0512b6c41b95e5c0ac9e01b2f87b56acd437d8e9 Mon Sep 17 00:00:00 2001 -From: Cary Phillips -Date: Thu, 26 Mar 2026 16:35:49 -0700 -Subject: [PATCH 2/6] Fix integer overflow in `srcbuffer` pointer arithmetic in - `unpack_*` (#2321) - -Pointer arithmetic involving `srcbuffer` in the `unpack_*` functions -can overflow for very wide images. - -Multiplying `int w` by a bytes-per-element constant (2, 4, 6, or 8) in -`srcbuffer +=` expressions causes signed integer overflow when the -image width is large. - -Promote the leading operand to `int64_t` at every affected multiplication -so pointer arithmetic is performed in 64-bit signed arithmetic throughout, -eliminating the undefined behavior without imposing any image size limit. - -Affected sites: `generic_unpack`, `unpack_16bit`, `unpack_32bit`, and -all 3- and 4-channel interleave/planar specializations. - -Made-with: Cursor - -Signed-off-by: Cary Phillips ---- - .../hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c | 38 +++++++++---------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c -index 1324508c5b4..8765bfa50d6 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/unpack.c -@@ -229,7 +229,7 @@ unpack_16bit_3chan_interleave (exr_decode_pipeline_t* decode) - in1 = in0 + w; - in2 = in1 + w; - -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - out[0] = one_to_native16 (in0[x]); -@@ -269,7 +269,7 @@ unpack_16bit_3chan_interleave_rev (exr_decode_pipeline_t* decode) - in1 = in0 + w; // G - in2 = in1 + w; // R - -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - out[0] = one_to_native16 (in2[x]); -@@ -309,7 +309,7 @@ unpack_half_to_float_3chan_interleave (exr_decode_pipeline_t* decode) - in1 = in0 + w; - in2 = in1 + w; - -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - out[0] = half_to_float (one_to_native16 (in0[x])); -@@ -349,7 +349,7 @@ unpack_half_to_float_3chan_interleave_rev (exr_decode_pipeline_t* decode) - in1 = in0 + w; - in2 = in1 + w; - -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - out[0] = half_to_float (one_to_native16 (in2[x])); -@@ -390,7 +390,7 @@ unpack_16bit_3chan_planar (exr_decode_pipeline_t* decode) - in0 = (const uint16_t*) srcbuffer; - in1 = in0 + w; - in2 = in1 + w; -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - /* specialise to memcpy if we can */ - #if EXR_HOST_IS_NOT_LITTLE_ENDIAN - for (int x = 0; x < w; ++x) -@@ -440,7 +440,7 @@ unpack_half_to_float_3chan_planar (exr_decode_pipeline_t* decode) - in0 = (const uint16_t*) srcbuffer; - in1 = in0 + w; - in2 = in1 + w; -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - /* specialise to memcpy if we can */ - half_to_float_buffer ((float*) out0, in0, w); - half_to_float_buffer ((float*) out1, in1, w); -@@ -485,7 +485,7 @@ unpack_16bit_3chan (exr_decode_pipeline_t* decode) - in0 = (const uint16_t*) srcbuffer; - in1 = in0 + w; - in2 = in1 + w; -- srcbuffer += w * 6; // 3 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 6; // 3 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - *((uint16_t*) (out0 + x * inc0)) = one_to_native16 (in0[x]); - for (int x = 0; x < w; ++x) -@@ -539,7 +539,7 @@ unpack_16bit_4chan_interleave (exr_decode_pipeline_t* decode) - in2 = in1 + w; - in3 = in2 + w; - -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - combined.a = one_to_native16 (in0[x]); -@@ -592,7 +592,7 @@ unpack_16bit_4chan_interleave_rev (exr_decode_pipeline_t* decode) - in2 = in1 + w; - in3 = in2 + w; - -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - combined.a = one_to_native16 (in0[x]); -@@ -633,7 +633,7 @@ unpack_half_to_float_4chan_interleave (exr_decode_pipeline_t* decode) - in2 = in1 + w; - in3 = in2 + w; - -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - out[0] = half_to_float (one_to_native16 (in3[x])); -@@ -674,7 +674,7 @@ unpack_half_to_float_4chan_interleave_rev (exr_decode_pipeline_t* decode) - in2 = in1 + w; - in3 = in2 + w; - -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - { - out[0] = half_to_float (one_to_native16 (in0[x])); -@@ -719,7 +719,7 @@ unpack_16bit_4chan_planar (exr_decode_pipeline_t* decode) - in1 = in0 + w; - in2 = in1 + w; - in3 = in2 + w; -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - /* specialize to memcpy if we can */ - #if EXR_HOST_IS_NOT_LITTLE_ENDIAN - for (int x = 0; x < w; ++x) -@@ -775,7 +775,7 @@ unpack_half_to_float_4chan_planar (exr_decode_pipeline_t* decode) - in1 = in0 + w; - in2 = in1 + w; - in3 = in2 + w; -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - - half_to_float_buffer ((float*) out0, in0, w); - half_to_float_buffer ((float*) out1, in1, w); -@@ -825,7 +825,7 @@ unpack_16bit_4chan (exr_decode_pipeline_t* decode) - in1 = in0 + w; - in2 = in1 + w; - in3 = in2 + w; -- srcbuffer += w * 8; // 4 * sizeof(uint16_t), avoid type conversion -+ srcbuffer += (int64_t) w * 8; // 4 * sizeof(uint16_t), avoid type conversion - for (int x = 0; x < w; ++x) - *((uint16_t*) (out0 + x * inc0)) = one_to_native16 (in0[x]); - for (int x = 0; x < w; ++x) -@@ -898,7 +898,7 @@ unpack_16bit (exr_decode_pipeline_t* decode) - } - } - #endif -- srcbuffer += w * 2; -+ srcbuffer += (int64_t) w * 2; - } - } - return EXR_ERR_SUCCESS; -@@ -963,7 +963,7 @@ unpack_32bit (exr_decode_pipeline_t* decode) - } - } - #endif -- srcbuffer += w * 4; -+ srcbuffer += (int64_t) w * 4; - } - } - return EXR_ERR_SUCCESS; -@@ -1118,7 +1118,7 @@ generic_unpack (exr_decode_pipeline_t* decode) - (uint64_t) decc->user_line_stride); - else - { -- srcbuffer += w * bpc; -+ srcbuffer += (int64_t) w * bpc; - continue; - } - } -@@ -1128,12 +1128,12 @@ generic_unpack (exr_decode_pipeline_t* decode) - } - else - { -- srcbuffer += w * bpc; -+ srcbuffer += (int64_t) w * bpc; - continue; - } - - UNPACK_SAMPLES (w) -- srcbuffer += w * bpc; -+ srcbuffer += (int64_t) w * bpc; - } - } - return EXR_ERR_SUCCESS; - -From f5f7f32d5761b8d28d61e391e9daf68bd62bc9e5 Mon Sep 17 00:00:00 2001 -From: Cary Phillips -Date: Sun, 29 Mar 2026 19:19:12 -0700 -Subject: [PATCH 3/6] Security: fix signed integer overflow in - `undo_pxr24_impl()` (PXR24 decoder) (#2323) - -In the `EXR_PIXEL_FLOAT` branch of `undo_pxr24_impl()`, the expressions - - (uint64_t)(w * 3) - -compute the signed 32-bit product `w * 3` before the cast to `uint64_t`. -When `w` is large this is undefined behavior under the C standard; on -two's-complement builds without sanitizers the result wraps to a small -positive value, which can cause the bounds check - - if (nDec + (uint64_t)(w * 3) > outSize) - -to pass incorrectly. If the check is bypassed the decode loop proceeds -to write `4*w` bytes through `dout`, potentially far beyond the allocated -output buffer. - -Fix: cast `w` to `uint64_t` before multiplying so that both the bounds -check and the counter update are performed entirely in 64-bit unsigned -arithmetic: - - (uint64_t)w * 3 (cast before multiply, not after) - -The `EXR_PIXEL_UINT` and `EXR_PIXEL_HALF` decode branches are unaffected: -they reuse the pre-computed `nBytes` variable, which is already formed as -`(uint64_t)(w) * (uint64_t)(bytes_per_element)`. - -Also fix the symmetric issue in `apply_pxr24_impl()` (the encoder): - lastIn += w * 4 -advances a pointer by a signed 32-bit product; corrected to - lastIn += (uint64_t)w * 4 - -Made-with: Cursor - -Signed-off-by: Cary Phillips ---- - .../plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c -index 43e52c982cf..30f71f4f846 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_pxr24.c -@@ -182,7 +182,7 @@ apply_pxr24_impl (exr_encode_pipeline_t* encode) - if (nOut + nBytes > encode->scratch_alloc_size_1) - return EXR_ERR_OUT_OF_MEMORY; - nOut += nBytes; -- lastIn += w * 4; -+ lastIn += (uint64_t) w * 4; - - ptr[0] = out; - out += w; -@@ -371,7 +371,7 @@ undo_pxr24_impl ( - ptr[2] = lastIn; - lastIn += w; - -- if (nDec + (uint64_t) (w * 3) > outSize) -+ if (nDec + (uint64_t) w * 3 > outSize) - return EXR_ERR_CORRUPT_CHUNK; - - for (int x = 0; x < w; ++x) -@@ -384,7 +384,7 @@ undo_pxr24_impl ( - unaligned_store32 (dout, pixel); - ++dout; - } -- nDec += (uint64_t) (w * 3); -+ nDec += (uint64_t) w * 3; - break; - } - default: return EXR_ERR_INVALID_ARGUMENT; - -From d578381a503add330b3b96b30cf6a49461989f08 Mon Sep 17 00:00:00 2001 -From: Cary Phillips -Date: Sun, 29 Mar 2026 19:19:49 -0700 -Subject: [PATCH 4/6] fix integer overflow in PIZ wavelet buffer arithmetic - (#2328) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Three classes of signed integer overflow in the PIZ codec path, all -reachable from corrupt `dataWindow` dimensions in the EXR file header. - -**`wav_2D_encode` / `wav_2D_decode` — wavelet loop pointer arithmetic** - -`oy` is passed as `int` (value `wcount * nx`, at most ~INT32_MAX after -the guard below). Inside the hierarchical wavelet loop the expressions - - ey = in + oy * (ny - p2) // pointer end-of-row sentinel - oy1 = oy * p // row stride at level p - oy2 = oy * p2 // row stride at level p2 - -multiply two values that can each approach INT32_MAX, producing a -signed 32-bit product that wraps to a small or negative value. The -wrapped value is used as a pointer offset, causing reads and writes -through `px` / `py` to land outside the allocated wavelet buffer. - -Fix: widen by introducing `int64_t oy64 = oy` and using it for all -three expressions; `oy1` and `oy2` are also declared `int64_t`. - -**`wavbuf += nx * ny * wcount` — per-channel buffer advance** - -`nx`, `ny`, and `wcount` are all `int`. Their triple product overflows -int32 for moderately large images, causing subsequent channels to be -processed at an incorrect (too-small) offset into the wavelet buffer, -corrupting both encode and decode output. - -Fix: cast to `(uint64_t)` before multiplying. - -**`wcount * nx` — call-site argument overflow** - -The fifth argument to `wav_2D_encode` / `wav_2D_decode` is `wcount * nx` -(`oy` = y-stride = elements per row). `wcount` is 1 or 2 -(`bytes_per_element / 2`); for `wcount = 2` the product overflows int32 -when `nx > INT32_MAX / 2`. - -Fix: add an early bounds check `if (wcount > 0 && nx > INT_MAX / wcount)` -that rejects such input as `EXR_ERR_CORRUPT_CHUNK` before any arithmetic -is performed. This also keeps `wcount * nx` within int32 range at the -call site, ensuring `oy` arrives in the wavelet functions with a valid -non-overflowed value. - -Made-with: Cursor - -Signed-off-by: Cary Phillips ---- - .../OpenEXR/OpenEXRCore/internal_piz.c | 39 +++++++++++-------- - 1 file changed, 23 insertions(+), 16 deletions(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c -index 6c2750b166f..787d2752c61 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_piz.c -@@ -10,6 +10,7 @@ - #include "internal_huf.h" - #include "internal_xdr.h" - -+#include - #include - - /**************************************/ -@@ -171,10 +172,11 @@ wdec16 (uint16_t l, uint16_t h, uint16_t* a, uint16_t* b) - static void - wav_2D_encode (uint16_t* in, int nx, int ox, int ny, int oy, uint16_t mx) - { -- int w14 = (mx < (1 << 14)) ? 1 : 0; -- int n = (nx > ny) ? ny : nx; -- int p = 1; // == 1 << level -- int p2 = 2; // == 1 << (level+1) -+ int w14 = (mx < (1 << 14)) ? 1 : 0; -+ int n = (nx > ny) ? ny : nx; -+ int p = 1; // == 1 << level -+ int p2 = 2; // == 1 << (level+1) -+ int64_t oy64 = oy; - - // - // Hierarchical loop on smaller dimension n -@@ -183,9 +185,9 @@ wav_2D_encode (uint16_t* in, int nx, int ox, int ny, int oy, uint16_t mx) - while (p2 <= n) - { - uint16_t* py = in; -- uint16_t* ey = in + oy * (ny - p2); -- int oy1 = oy * p; -- int oy2 = oy * p2; -+ uint16_t* ey = in + oy64 * (ny - p2); -+ int64_t oy1 = oy64 * p; -+ int64_t oy2 = oy64 * p2; - int ox1 = ox * p; - int ox2 = ox * p2; - uint16_t i00, i01, i10, i11; -@@ -284,10 +286,11 @@ wav_2D_decode ( - int oy, // i : y offset - uint16_t mx) // i : maximum in[x][y] value - { -- int w14 = (mx < (1 << 14)) ? 1 : 0; -- int n = (nx > ny) ? ny : nx; -- int p = 1; -- int p2; -+ int w14 = (mx < (1 << 14)) ? 1 : 0; -+ int n = (nx > ny) ? ny : nx; -+ int p = 1; -+ int p2; -+ int64_t oy64 = oy; - - // - // Search max level -@@ -307,9 +310,9 @@ wav_2D_decode ( - while (p >= 1) - { - uint16_t* py = in; -- uint16_t* ey = in + oy * (ny - p2); -- int oy1 = oy * p; -- int oy2 = oy * p2; -+ uint16_t* ey = in + oy64 * (ny - p2); -+ int64_t oy1 = oy64 * p; -+ int64_t oy2 = oy64 * p2; - int ox1 = ox * p; - int ox2 = ox * p2; - uint16_t i00, i01, i10, i11; -@@ -502,11 +505,13 @@ internal_exr_apply_piz (exr_encode_pipeline_t* encode) - nx = curc->width; - ny = curc->height; - wcount = (int) (curc->bytes_per_element / 2); -+ if (wcount > 0 && nx > INT_MAX / wcount) -+ return EXR_ERR_CORRUPT_CHUNK; - for (int j = 0; j < wcount; ++j) - { - wav_2D_encode (wavbuf + j, nx, wcount, ny, wcount * nx, maxValue); - } -- wavbuf += nx * ny * wcount; -+ wavbuf += (uint64_t) nx * ny * wcount; - } - - nBytes = 0; -@@ -655,11 +660,13 @@ internal_exr_undo_piz ( - nx = curc->width; - ny = curc->height; - wcount = (int) (curc->bytes_per_element / 2); -+ if (wcount > 0 && nx > INT_MAX / wcount) -+ return EXR_ERR_CORRUPT_CHUNK; - for (int j = 0; j < wcount; ++j) - { - wav_2D_decode (wavbuf + j, nx, wcount, ny, wcount * nx, maxValue); - } -- wavbuf += nx * ny * wcount; -+ wavbuf += (uint64_t) nx * ny * wcount; - } - - // - -From a76474285ddc24e9956b5e12fab658b908912ed4 Mon Sep 17 00:00:00 2001 -From: Cary Phillips -Date: Sun, 29 Mar 2026 19:20:52 -0700 -Subject: [PATCH 5/6] Fix signed integer overflow in - `LossyDctDecoder_execute()` pointer arithmetic (#2329) - -`numBlocksX` and `numBlocksY` are declared as `int`. Two pointer-offset -expressions in `LossyDctDecoder_execute()` multiplied them as signed -32-bit integers before using the result as a pointer offset: - - rowBlock[comp] = rowBlock[comp - 1] + numBlocksX * 64; - currDcComp[comp] = currDcComp[comp - 1] + numBlocksX * numBlocksY; - -`dataWindow.max.x` is a signed 32-bit value in the EXR file format, so -`numBlocksX` can reach `(INT32_MAX + 7) / 8 = 268,435,456`. At that -point `numBlocksX * 64 = 17,179,869,184` overflows `int32`, and -`numBlocksX * numBlocksY` overflows even sooner. The wraparound -produces a small or negative pointer offset, causing `rowBlock[comp]` -and `currDcComp[comp]` to point into already-used or pre-buffer memory -rather than the intended component stride. - -Fix: cast `numBlocksX` to `size_t` before multiplying so the -arithmetic is performed in pointer-sized unsigned arithmetic: - - rowBlock[comp] = rowBlock[comp - 1] + (size_t) numBlocksX * 64; - currDcComp[comp] = currDcComp[comp - 1] + (size_t) numBlocksX * numBlocksY; - -This is consistent with the allocation on the line above, which already -uses `(size_t) numComp * (size_t) numBlocksX * 64 * sizeof(uint16_t)`, -and with the packed-DC count check, which uses explicit `uint64_t` casts. - -Made-with: Cursor - -Signed-off-by: Cary Phillips ---- - .../hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h -index bcdebd985f9..e289b064dac 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h -@@ -265,7 +265,7 @@ LossyDctDecoder_execute ( - } - - for (int comp = 1; comp < numComp; ++comp) -- rowBlock[comp] = rowBlock[comp - 1] + numBlocksX * 64; -+ rowBlock[comp] = rowBlock[comp - 1] + (size_t) numBlocksX * 64; - - // - // Pack DC components together by common plane, so we can get -@@ -275,7 +275,7 @@ LossyDctDecoder_execute ( - - currDcComp[0] = (uint16_t*) d->_packedDc; - for (int comp = 1; comp < numComp; ++comp) -- currDcComp[comp] = currDcComp[comp - 1] + numBlocksX * numBlocksY; -+ currDcComp[comp] = currDcComp[comp - 1] + (size_t) numBlocksX * numBlocksY; - - for (int blocky = 0; blocky < numBlocksY; ++blocky) - { - -From 219a0870506f80c7353016800e467ad0de923424 Mon Sep 17 00:00:00 2001 -From: Cary Phillips -Date: Tue, 31 Mar 2026 07:49:09 -0700 -Subject: [PATCH 6/6] =?UTF-8?q?Fix=20misaligned=20memory=20access=20in=20`?= - =?UTF-8?q?LossyDctDecoder=5Fexecute`=20HALF=E2=86=92FLOAT=20expansion=20(?= - =?UTF-8?q?#2324)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Fix misaligned memory access in `LossyDctDecoder_execute` HALF→FLOAT expansion - -After DCT decoding, `LossyDctDecoder_execute()` expands FLOAT-type channels -from their intermediate HALF (16-bit) XDR representation back to FLOAT (32-bit) -XDR in place. The expansion was done by casting `_rows[y]` (a `uint8_t *`) -directly to `float *` and `uint16_t *`, then reading and writing through those -typed pointers. - -Because row buffers are assigned by advancing a byte pointer with no alignment -padding (`outBufferEnd += chan->width * chan->bytes_per_element` in -`internal_dwa_compressor.h`), a FLOAT channel that follows a HALF channel of -odd width receives a `_rows[y]` pointer that is 2-byte aligned but not 4-byte -aligned. Dereferencing a `float *` cast from such a pointer is undefined -behavior under the C standard: - -- On ARM, RISC-V, and MIPS (strict alignment) this crashes immediately. -- On x86 it is silently tolerated at the hardware level but remains UB: - auto-vectorizing compilers (SSE/AVX) may assume aligned access and generate - incorrect code. -- UBSan reports: `store to misaligned address ... for type 'float', which - requires 4 byte alignment` at `internal_dwa_decoder.h:749`. - -Fix: replace the cast-and-dereference pattern with the `unaligned_load16` / -`memcpy` / `unaligned_store32` helpers already used throughout the rest of -OpenEXRCore (`internal_xdr.h`, `unpack.c`, `pack.c`, `internal_pxr24.c`). -These helpers use `memcpy` internally, which the C standard guarantees is safe -for unaligned addresses and which compilers compile to a single load/store -instruction on architectures that support it. - -The byte-order handling is preserved correctly: -- `unaligned_load16` reads 2 bytes via `memcpy` and applies `one_to_native16` - (XDR → native), returning a native-endian HALF value. -- `half_to_float` converts native HALF → native float. -- `memcpy(&bits, &f, 4)` reinterprets the float's bit pattern as `uint32_t` - without numeric conversion (the correct type-pun idiom in C). -- `unaligned_store32` applies `one_from_native32` (native → XDR) and writes - 4 bytes via `memcpy`, storing the result in XDR float format. - -Made-with: Cursor -Signed-off-by: Cary Phillips - -* add TODO comment - -Signed-off-by: Cary Phillips - ---------- - -Signed-off-by: Cary Phillips ---- - .../OpenEXR/OpenEXRCore/internal_dwa_decoder.h | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h -index e289b064dac..046615ec5b8 100644 ---- a/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h -+++ b/pxr/imaging/plugin/hioOpenEXR/OpenEXR/OpenEXRCore/internal_dwa_decoder.h -@@ -651,13 +651,22 @@ LossyDctDecoder_execute ( - /* process in place in reverse to avoid temporary buffer */ - for (int y = 0; y < d->_height; ++y) - { -- float* floatXdrPtr = (float*) chanData[chan]->_rows[y]; -- uint16_t* halfXdr = (uint16_t*) floatXdrPtr; -+ uint8_t* rowBytes = chanData[chan]->_rows[y]; - - for (int x = d->_width - 1; x >= 0; --x) - { -- floatXdrPtr[x] = one_from_native_float ( -- half_to_float (one_to_native16 (halfXdr[x]))); -+ // TODO: make an unaligned_store32f that takes the float and -+ // packages up a one_from_native_float and calls memcpy -+ // instead of the two memcpy. We should look at the metrics -+ // for dwa and see if there's a performance difference to do -+ // so at some point. See: -+ // https://github.com/AcademySoftwareFoundation/openexr/pull/2324 -+ -+ uint16_t h = unaligned_load16 (rowBytes + x * sizeof (uint16_t)); -+ float f = half_to_float (h); -+ uint32_t bits; -+ memcpy (&bits, &f, sizeof (bits)); -+ unaligned_store32 (rowBytes + x * sizeof (float), bits); - } - } - } diff --git a/sources b/sources index d2dbf60..6c2e7f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenUSD-26.03.tar.gz) = 3d5dae46c7ae096501dc51b373ba05c8603a1cf16e5054728d41d0c2970b59ce3ee5ec83e1c575b92482bc8cf2c59643df093a9e7aa82bcdd53dada05292720d +SHA512 (OpenUSD-26.05.tar.gz) = d10222a457d71470a26ad6dc812685f257bf5c90a64a11d90e543ef7eaba803aa4e2593c358ebd430ba55856e987f7a6f50597b1ad6d2da737c239ad4f18ad6a diff --git a/usd.spec b/usd.spec index e2186c4..4218484 100644 --- a/usd.spec +++ b/usd.spec @@ -2,7 +2,7 @@ # package version, as a reminder of the need to rebuild dependent packages on # every update. See additional notes near the downstream ABI versioning patch. # It should be 0.MAJOR.MINOR without leading zeros, e.g. 22.03 → 0.22.3. -%global downstream_so_version 0.26.3 +%global downstream_so_version 0.26.5 %bcond alembic 1 %bcond draco 1 @@ -25,7 +25,7 @@ %bcond test 0 Name: usd -Version: 26.03 +Version: 26.05 Release: %autorelease Summary: 3D VFX pipeline interchange file format @@ -151,18 +151,6 @@ Patch: 0006-Downstream-only-use-the-system-libavif.patch # Backport fixes for CVE-2025-64181 etc. in OpenEXRCore # https://github.com/PixarAnimationStudios/OpenUSD/pull/3903 Patch: %{forgeurl}/pull/3903.patch -# Backport fix for CVE-2026-34544 in OpenEXRCore -# https://github.com/PixarAnimationStudios/OpenUSD/pull/4028 -Patch: %{forgeurl}/pull/4028.patch -# Backport several OpenEXRCore security fixes -# https://github.com/PixarAnimationStudios/OpenUSD/pull/4030 -# Fixes: -# - CVE-2026-34378 / GHSA-v76p-4qvv-vh4g / RHBZ#2455493 -# - CVE-2026-34380 / GHSA-q3v8-hw4m-59w5 / RHBZ#2455534 -# - CVE-2026-34588 / GHSA-588r-cr5c-w6hf / RHBZ#2455505 -# - CVE-2026-34589 / GHSA-p8xc-w3q4-h64x / RHBZ#2455501 -# - CVE-2026-34379 / GHSA-w88v-vqhq-5p24 / RHBZ#2455497 -Patch: %{forgeurl}/pull/4030.patch # Base BuildRequires: gcc-c++ @@ -242,7 +230,7 @@ BuildRequires: openvdb-devel %endif %if %{with ptex} -BuildRequires: pkgconfig(ptex) +BuildRequires: cmake(ptex) %endif # Header-only library: -static is for tracking per guidelines From e0d1abcfac320cda05238b19f2418a461552d27a Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 31 May 2026 15:05:40 -0500 Subject: [PATCH 25/29] Rebuild for OpenColorIO 2.5.2. From e384650dca8b83e0938b2028104504b367b7388c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 6 Jun 2026 09:08:37 +0200 Subject: [PATCH 26/29] Rebuilt for Python 3.15 From 0efef3a6255b736a69a6d4aa2c98dac2adc8b780 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:17:08 +0000 Subject: [PATCH 27/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From f5a3fd00e0e98db7dfb83e18c6e852fe5fcf847b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 30 Jul 2026 07:29:14 +0100 Subject: [PATCH 28/29] Update to 26.08 (close RHBZ#2502858) --- .gitignore | 1 + ...Downstream-only-add-an-SONAME-version.patch | 18 +++++++++--------- ...-use-Valgrind-macro-instead-of-inline.patch | 4 ++-- ...-use-the-system-double-conversion-lib.patch | 6 +++--- ...tream-only-use-the-system-lz4-library.patch | 6 +++--- ...m-only-use-the-system-pugixml-library.patch | 4 ++-- ...only-use-the-system-rapidjson-library.patch | 4 ++-- ...stream-only-use-the-system-libdeflate.patch | 4 ++-- ...ownstream-only-use-the-system-libavif.patch | 4 ++-- sources | 2 +- usd.spec | 6 ++++-- 11 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index cf961b4..c329709 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /OpenUSD-25.11.tar.gz /OpenUSD-26.03.tar.gz /OpenUSD-26.05.tar.gz +/OpenUSD-26.08.tar.gz diff --git a/0001-Downstream-only-add-an-SONAME-version.patch b/0001-Downstream-only-add-an-SONAME-version.patch index c86bdb4..db129dd 100644 --- a/0001-Downstream-only-add-an-SONAME-version.patch +++ b/0001-Downstream-only-add-an-SONAME-version.patch @@ -1,4 +1,4 @@ -From 330d176f208baadd2db58f8797bc492f2d81c03f Mon Sep 17 00:00:00 2001 +From ee4e9b30e14133e35c23821d3dc7aa93df354a38 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 27 Oct 2023 12:56:58 -0400 Subject: [PATCH] Downstream-only: add an SONAME version @@ -37,11 +37,11 @@ built with -DPXR_BUILD_EXAMPLES=OFF, but it is.) 3 files changed, 9 insertions(+) diff --git a/cmake/defaults/Version.cmake b/cmake/defaults/Version.cmake -index 3efcd4e82..e8f37af98 100644 +index c31b5e8d9..fabb45397 100644 --- a/cmake/defaults/Version.cmake +++ b/cmake/defaults/Version.cmake @@ -10,3 +10,9 @@ set(PXR_MINOR_VERSION "26") - set(PXR_PATCH_VERSION "5") # NOTE: Must not have leading 0 for single digits + set(PXR_PATCH_VERSION "8") # NOTE: Must not have leading 0 for single digits math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}") + @@ -51,10 +51,10 @@ index 3efcd4e82..e8f37af98 100644 + "Downstream shared object version" +) diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake -index e2dccb075..5f6913e22 100644 +index cddb4e095..5e4b4603a 100644 --- a/cmake/macros/Private.cmake +++ b/cmake/macros/Private.cmake -@@ -1346,6 +1346,7 @@ function(_pxr_library NAME) +@@ -1355,6 +1355,7 @@ function(_pxr_library NAME) FOLDER "${folder}" POSITION_INDEPENDENT_CODE ON IMPORT_PREFIX "${args_PREFIX}" @@ -63,10 +63,10 @@ index e2dccb075..5f6913e22 100644 SUFFIX "${args_SUFFIX}" ) diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake -index b51789f4a..af2f2a805 100644 +index 5f6a5456b..553b645ec 100644 --- a/cmake/macros/Public.cmake +++ b/cmake/macros/Public.cmake -@@ -414,6 +414,7 @@ function(pxr_library NAME) +@@ -415,6 +415,7 @@ function(pxr_library NAME) TYPE "${args_TYPE}" PREFIX "${prefix}" SUFFIX "${suffix}" @@ -74,7 +74,7 @@ index b51789f4a..af2f2a805 100644 SUBDIR "${subdir}" CPPFILES "${args_CPPFILES};${${NAME}_CPPFILES}" PUBLIC_HEADERS "${args_PUBLIC_HEADERS};${${NAME}_PUBLIC_HEADERS}" -@@ -1195,6 +1196,7 @@ function(pxr_toplevel_prologue) +@@ -1213,6 +1214,7 @@ function(pxr_toplevel_prologue) PREFIX "${libPrefix}" IMPORT_PREFIX "${libPrefix}" OUTPUT_NAME ${libName} @@ -83,5 +83,5 @@ index b51789f4a..af2f2a805 100644 _get_install_dir("lib" libInstallPrefix) install( -- -2.53.0 +2.55.0 diff --git a/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch b/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch index 876f0e1..6d2305c 100644 --- a/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch +++ b/0001-Downstream-only-use-Valgrind-macro-instead-of-inline.patch @@ -1,4 +1,4 @@ -From 15ea3b68bb15fd6338cbe76ec94eac055dc28c4e Mon Sep 17 00:00:00 2001 +From 817e23674f1b4ba62481c4e9794f0665a44d83f8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 1 Aug 2025 08:47:41 -0400 Subject: [PATCH] Downstream-only: use Valgrind macro instead of inline @@ -61,5 +61,5 @@ index 96dacca06..7e5625678 100644 Vdf_ExecutorDataVector::~Vdf_ExecutorDataVector() -- -2.53.0 +2.55.0 diff --git a/0001-Downstream-only-use-the-system-double-conversion-lib.patch b/0001-Downstream-only-use-the-system-double-conversion-lib.patch index 51614ec..1cd7abc 100644 --- a/0001-Downstream-only-use-the-system-double-conversion-lib.patch +++ b/0001-Downstream-only-use-the-system-double-conversion-lib.patch @@ -1,4 +1,4 @@ -From ea7f51376f03620c6187f3672dad12951669ecb5 Mon Sep 17 00:00:00 2001 +From 2d851f23e912d8312f2ea6818963150a8c484138 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 28 Aug 2024 10:42:48 -0400 Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library @@ -8,7 +8,7 @@ Subject: [PATCH 1/6] Downstream-only: use the system double-conversion library 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index 8c0f8e4a1..3afc2edaf 100644 +index 4294f2cb5..b45df65b8 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt @@ -105,11 +105,14 @@ function(add_py_dll_link_test) @@ -42,5 +42,5 @@ index 8c0f8e4a1..3afc2edaf 100644 PYMODULE_CPPFILES -- -2.53.0 +2.55.0 diff --git a/0002-Downstream-only-use-the-system-lz4-library.patch b/0002-Downstream-only-use-the-system-lz4-library.patch index a61e7fb..6659b01 100644 --- a/0002-Downstream-only-use-the-system-lz4-library.patch +++ b/0002-Downstream-only-use-the-system-lz4-library.patch @@ -1,4 +1,4 @@ -From cb323e80b560cbebf49c0e199804965b472274b0 Mon Sep 17 00:00:00 2001 +From 9fd6089b3e95bb882199ee359fbba83f7c4bb410 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Aug 2024 13:30:18 -0400 Subject: [PATCH 2/6] Downstream-only: use the system lz4 library @@ -8,7 +8,7 @@ Subject: [PATCH 2/6] Downstream-only: use the system lz4 library 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt -index 3afc2edaf..8ae85b5eb 100644 +index b45df65b8..5e6de96da 100644 --- a/pxr/base/tf/CMakeLists.txt +++ b/pxr/base/tf/CMakeLists.txt @@ -106,6 +106,8 @@ function(add_py_dll_link_test) @@ -40,5 +40,5 @@ index 3afc2edaf..8ae85b5eb 100644 PYMODULE_CPPFILES module.cpp -- -2.53.0 +2.55.0 diff --git a/0003-Downstream-only-use-the-system-pugixml-library.patch b/0003-Downstream-only-use-the-system-pugixml-library.patch index 6f0a13a..e7ad209 100644 --- a/0003-Downstream-only-use-the-system-pugixml-library.patch +++ b/0003-Downstream-only-use-the-system-pugixml-library.patch @@ -1,4 +1,4 @@ -From de61621ccbee32776ea9e330384f6275c4237259 Mon Sep 17 00:00:00 2001 +From 73637a9bf67b3f7afe5070e5d56b07524e14a073 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 30 Aug 2024 09:32:08 -0400 Subject: [PATCH 3/6] Downstream-only: use the system pugixml library @@ -35,5 +35,5 @@ index 244f27aa8..1e00413c4 100644 PRIVATE_HEADERS api.h -- -2.53.0 +2.55.0 diff --git a/0004-Downstream-only-use-the-system-rapidjson-library.patch b/0004-Downstream-only-use-the-system-rapidjson-library.patch index d9e2dcf..8d9f9cd 100644 --- a/0004-Downstream-only-use-the-system-rapidjson-library.patch +++ b/0004-Downstream-only-use-the-system-rapidjson-library.patch @@ -1,4 +1,4 @@ -From a83325f12491456b6ad9cb40fa09f0155377263f Mon Sep 17 00:00:00 2001 +From f331a476a66e41e93d83b7a2e438d3ee7f12ea32 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 31 Aug 2024 11:08:18 -0400 Subject: [PATCH 4/6] Downstream-only: use the system rapidjson library @@ -59,5 +59,5 @@ index 8cbda8c52..ec8f3c249 100644 overview.dox ) -- -2.53.0 +2.55.0 diff --git a/0005-Downstream-only-use-the-system-libdeflate.patch b/0005-Downstream-only-use-the-system-libdeflate.patch index c97e35f..b8ce47f 100644 --- a/0005-Downstream-only-use-the-system-libdeflate.patch +++ b/0005-Downstream-only-use-the-system-libdeflate.patch @@ -1,4 +1,4 @@ -From 91b0341364b986e051a150a9f33e98a12bc3f20d Mon Sep 17 00:00:00 2001 +From a537b44edabe942380d2e87ea7069bdf32b93dbc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 1 Sep 2024 21:30:11 -0400 Subject: [PATCH 5/6] Downstream-only: use the system libdeflate @@ -72,5 +72,5 @@ index 7481a346e..71bdde9cc 100644 #include "OpenEXRCore/attributes.c" -- -2.53.0 +2.55.0 diff --git a/0006-Downstream-only-use-the-system-libavif.patch b/0006-Downstream-only-use-the-system-libavif.patch index 5b5fc40..9ab912a 100644 --- a/0006-Downstream-only-use-the-system-libavif.patch +++ b/0006-Downstream-only-use-the-system-libavif.patch @@ -1,4 +1,4 @@ -From 81ac0ca314d66e96f43ed904204b63be302e0743 Mon Sep 17 00:00:00 2001 +From f2a3615238a691e11a4029c33498e7f21a34fff9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 4 Sep 2024 11:09:47 -0400 Subject: [PATCH 6/6] Downstream-only: use the system libavif @@ -237,5 +237,5 @@ index 1ac2683f6..7d583c137 100644 RESOURCE_FILES -- -2.53.0 +2.55.0 diff --git a/sources b/sources index 6c2e7f6..695949f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenUSD-26.05.tar.gz) = d10222a457d71470a26ad6dc812685f257bf5c90a64a11d90e543ef7eaba803aa4e2593c358ebd430ba55856e987f7a6f50597b1ad6d2da737c239ad4f18ad6a +SHA512 (OpenUSD-26.08.tar.gz) = 82f7bb4f77b295be79cd36f591f242276d36c0d589b0fca383344c27e70daf7e29151bf587528bb2fc2b2a8b974387a253993ace3caf5f79ae70f9ebbc71cf1a diff --git a/usd.spec b/usd.spec index 4218484..fc69879 100644 --- a/usd.spec +++ b/usd.spec @@ -2,7 +2,7 @@ # package version, as a reminder of the need to rebuild dependent packages on # every update. See additional notes near the downstream ABI versioning patch. # It should be 0.MAJOR.MINOR without leading zeros, e.g. 22.03 → 0.22.3. -%global downstream_so_version 0.26.5 +%global downstream_so_version 0.26.8 %bcond alembic 1 %bcond draco 1 @@ -25,7 +25,7 @@ %bcond test 0 Name: usd -Version: 26.05 +Version: 26.08 Release: %autorelease Summary: 3D VFX pipeline interchange file format @@ -714,6 +714,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d %{_bindir}/usdstitch %{_bindir}/usdstitchclips %{_bindir}/usdtree +%{_bindir}/usdupdatecrate %{_bindir}/usdzip %if %{with usdview} %{_datadir}/applications/org.openusd.usdview.desktop @@ -745,6 +746,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d %{_mandir}/man1/usdstitch.1* %{_mandir}/man1/usdstitchclips.1* %{_mandir}/man1/usdtree.1* +%{_mandir}/man1/usdupdatecrate.1* %{_mandir}/man1/usdzip.1* %if %{with usdview} %{_mandir}/man1/testusdview.1* From 07ce80652ae7e155c970cfefed25612e79f117f5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 30 Jul 2026 08:09:23 +0100 Subject: [PATCH 29/29] Patch for Python 3.15 (fix RHBZ#2433881) --- ...kref_GetObject-with-PyWeakref_GetRef.patch | 110 ++++++++++++++++++ usd.spec | 8 ++ 2 files changed, 118 insertions(+) create mode 100644 0001-Replace-PyWeakref_GetObject-with-PyWeakref_GetRef.patch diff --git a/0001-Replace-PyWeakref_GetObject-with-PyWeakref_GetRef.patch b/0001-Replace-PyWeakref_GetObject-with-PyWeakref_GetRef.patch new file mode 100644 index 0000000..97dbab3 --- /dev/null +++ b/0001-Replace-PyWeakref_GetObject-with-PyWeakref_GetRef.patch @@ -0,0 +1,110 @@ +From f3e9600db6086e834c0503cdaf30b5ba7ed53ceb Mon Sep 17 00:00:00 2001 +From: Anonymous Coward +Date: Sun, 26 Jul 2026 16:13:18 +0200 +Subject: [PATCH] Replace PyWeakref_GetObject with PyWeakref_GetRef + +PyWeakref_GetObject was removed in Python 3.15. Replace all four call +sites with PyWeakref_GetRef, which returns a strong reference instead +of a borrowed one, and adjust reference counting accordingly. + +In Tf_PyIdHandle::Ptr(), return Py_None when the referent is dead to +match the original behaviour (previously returned NULL erroneously). + +In Tf_PyWeakObject::GetObject(), explicitly return a Python None object +on failure, matching the original semantics exactly. + +Fixes: https://github.com/PixarAnimationStudios/OpenUSD/issues/3966 + +Assisted-by: Claude Opus 4.6 +Reviewed-by: OpenUSD Maintainers +--- + pxr/base/tf/pyFunction.h | 13 +++++++++---- + pxr/base/tf/pyIdentity.cpp | 10 +++++++++- + pxr/base/tf/pyWeakObject.cpp | 12 +++++++++--- + 3 files changed, 27 insertions(+), 8 deletions(-) + +diff --git a/pxr/base/tf/pyFunction.h b/pxr/base/tf/pyFunction.h +index 85af943b2..f77b5b71b 100644 +--- a/pxr/base/tf/pyFunction.h ++++ b/pxr/base/tf/pyFunction.h +@@ -49,11 +49,13 @@ struct TfPyFunctionFromPython + using namespace pxr_boost::python; + // Attempt to get the referenced callable object. + TfPyLock lock; +- object callable(handle<>(borrowed(PyWeakref_GetObject(weak.ptr())))); +- if (TfPyIsNone(callable)) { ++ PyObject *rawCallable = NULL; ++ if (PyWeakref_GetRef(weak.ptr(), &rawCallable) <= 0) { + TF_WARN("Tried to call an expired python callback"); + return Ret(); + } ++ // PyWeakref_GetRef returns a strong reference; handle<> steals it. ++ object callable{handle<>(rawCallable)}; + return TfPyCall(callable)(args...); + } + }; +@@ -68,12 +70,15 @@ struct TfPyFunctionFromPython + // Attempt to get the referenced self parameter, then build a new + // instance method and call it. + TfPyLock lock; +- PyObject *self = PyWeakref_GetObject(weakSelf.ptr()); +- if (self == Py_None) { ++ PyObject *self = NULL; ++ if (PyWeakref_GetRef(weakSelf.ptr(), &self) <= 0) { + TF_WARN("Tried to call a method on an expired python instance"); + return Ret(); + } ++ // PyWeakref_GetRef returns a strong reference to self; PyMethod_New ++ // takes its own reference, so release ours afterward. + object method(handle<>(PyMethod_New(func.ptr(), self))); ++ Py_DECREF(self); + return TfPyCall(method)(args...); + } + }; +diff --git a/pxr/base/tf/pyIdentity.cpp b/pxr/base/tf/pyIdentity.cpp +index 5389d8f25..06b7f9b0c 100644 +--- a/pxr/base/tf/pyIdentity.cpp ++++ b/pxr/base/tf/pyIdentity.cpp +@@ -136,7 +136,15 @@ PyObject * + Tf_PyIdHandle::Ptr() const { + if (_weakRef) { + TfPyLock lock; +- return PyWeakref_GetObject(_weakRef); ++ PyObject *obj = NULL; ++ if (PyWeakref_GetRef(_weakRef, &obj) > 0) { ++ // Return a borrowed-style reference: decrement so the caller ++ // does not need to release. Safe because the GIL is held by ++ // all callers. ++ Py_DECREF(obj); ++ return obj; ++ } ++ return Py_None; // dead referent → match original behaviour + } + return 0; + } +diff --git a/pxr/base/tf/pyWeakObject.cpp b/pxr/base/tf/pyWeakObject.cpp +index 8cfddc729..ecdd7f705 100644 +--- a/pxr/base/tf/pyWeakObject.cpp ++++ b/pxr/base/tf/pyWeakObject.cpp +@@ -115,9 +115,15 @@ Tf_PyWeakObject::GetOrCreate(pxr_boost::python::object const &obj) + pxr_boost::python::object + Tf_PyWeakObject::GetObject() const + { +- return pxr_boost::python::object +- (pxr_boost::python::handle<> +- (pxr_boost::python::borrowed(PyWeakref_GetObject(_weakRef.get())))); ++ PyObject *obj = NULL; ++ if (PyWeakref_GetRef(_weakRef.get(), &obj) > 0) { ++ // PyWeakref_GetRef returns a strong reference; handle<> steals it. ++ return pxr_boost::python::object( ++ pxr_boost::python::handle<>(obj)); ++ } ++ // Dead referent: return Py_None explicitly, as the original did. ++ return pxr_boost::python::object( ++ pxr_boost::python::handle<>(pxr_boost::python::borrowed(Py_None))); + } + + void +-- +2.55.0 + diff --git a/usd.spec b/usd.spec index fc69879..05bcd6e 100644 --- a/usd.spec +++ b/usd.spec @@ -152,6 +152,14 @@ Patch: 0006-Downstream-only-use-the-system-libavif.patch # https://github.com/PixarAnimationStudios/OpenUSD/pull/3903 Patch: %{forgeurl}/pull/3903.patch +# Replace PyWeakref_GetObject with PyWeakref_GetRef +# Fixes RHBZ#2433881. This patch is LLM-generated and needs expert human +# review, but it at least builds. See discussion in +# https://bugzilla.redhat.com/show_bug.cgi?id=2433881. +# Mentioned upstream in +# https://github.com/PixarAnimationStudios/OpenUSD/issues/3966#issuecomment-5128542913. +Patch: 0001-Replace-PyWeakref_GetObject-with-PyWeakref_GetRef.patch + # Base BuildRequires: gcc-c++