Skip to content

Commit a832d9e

Browse files
theblackunknowntheblackunknown
committed
[usd] Bump to v24.08
1 parent 198d68d commit a832d9e

21 files changed

+1091
-77
lines changed

‎ports/usd/001-fix_rename_find_package_to_find_dependency.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
2+
index b26f1ea31..afe3dc448 100644
3+
--- a/pxr/pxrConfig.cmake.in
4+
+++ b/pxr/pxrConfig.cmake.in
5+
@@ -16,6 +16,8 @@ set(PXR_MINOR_VERSION "@PXR_MINOR_VERSION@")
6+
set(PXR_PATCH_VERSION "@PXR_PATCH_VERSION@")
7+
set(PXR_VERSION "@PXR_VERSION@")
8+
9+
+include(CMakeFindDependencyMacro)
10+
+
11+
# If Python support was enabled for this USD build, find the import
12+
# targets by invoking the appropriate FindPython module. Use the same
13+
# LIBRARY and INCLUDE_DIR settings from the original build if they
14+
@@ -41,9 +43,9 @@ if(@PXR_ENABLE_PYTHON_SUPPORT@)
15+
endif()
16+
17+
if (NOT DEFINED Python3_VERSION)
18+
- find_package(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development REQUIRED)
19+
+ find_dependency(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development)
20+
else()
21+
- find_package(Python3 COMPONENTS Development REQUIRED)
22+
+ find_dependency(Python3 COMPONENTS Development)
23+
endif()
24+
endif()
25+
26+
@@ -57,7 +59,7 @@ if(@PXR_ENABLE_MATERIALX_SUPPORT@)
27+
set(MaterialX_DIR [[@MaterialX_DIR@]])
28+
endif()
29+
endif()
30+
- find_package(MaterialX REQUIRED)
31+
+ find_dependency(MaterialX)
32+
endif()
33+
34+
# Similar to MaterialX above, we are using Imath's cmake package config, so set
35+
@@ -71,7 +73,7 @@ if(@Imath_FOUND@)
36+
set(Imath_DIR [[@Imath_DIR@]])
37+
endif()
38+
endif()
39+
- find_package(Imath REQUIRED)
40+
+ find_dependency(Imath)
41+
endif()
42+
43+
include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")

‎ports/usd/002-vcpkg_find_tbb.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index fe60570b3..ccaabe765 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -137,7 +137,8 @@ endif()
6+
7+
8+
# --TBB
9+
-find_package(TBB REQUIRED COMPONENTS tbb)
10+
+find_package(TBB CONFIG REQUIRED)
11+
+set(TBB_tbb_LIBRARY TBB::tbb)
12+
add_definitions(${TBB_DEFINITIONS})
13+
14+
# --math
15+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
16+
index afe3dc448..041cd8cba 100644
17+
--- a/pxr/pxrConfig.cmake.in
18+
+++ b/pxr/pxrConfig.cmake.in
19+
@@ -18,6 +18,8 @@ set(PXR_VERSION "@PXR_VERSION@")
20+
21+
include(CMakeFindDependencyMacro)
22+
23+
+find_dependency(TBB CONFIG)
24+
+
25+
# If Python support was enabled for this USD build, find the import
26+
# targets by invoking the appropriate FindPython module. Use the same
27+
# LIBRARY and INCLUDE_DIR settings from the original build if they

‎ports/usd/003-vcpkg_find_opensubdiv.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index ccaabe765..d4eea2988 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -260,8 +260,12 @@ if (PXR_BUILD_IMAGING)
6+
endif()
7+
endif()
8+
# --Opensubdiv
9+
- set(OPENSUBDIV_USE_GPU ${PXR_ENABLE_GL_SUPPORT})
10+
- find_package(OpenSubdiv 3 REQUIRED)
11+
+ find_package(OpenSubdiv 3 CONFIG REQUIRED)
12+
+ set(OPENSUBDIV_LIBRARIES OpenSubdiv::osdCPU_static)
13+
+ set(OPENSUBDIV_OSDCPU_LIBRARY OpenSubdiv::osdCPU_static) # For compatibility
14+
+ if(PXR_ENABLE_GL_SUPPORT)
15+
+ list(APPEND OPENSUBDIV_LIBRARIES OpenSubdiv::osdGPU_static)
16+
+ endif()
17+
# --Ptex
18+
if (PXR_ENABLE_PTEX_SUPPORT)
19+
find_package(PTex REQUIRED)
20+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
21+
index 041cd8cba..692d045b9 100644
22+
--- a/pxr/pxrConfig.cmake.in
23+
+++ b/pxr/pxrConfig.cmake.in
24+
@@ -20,6 +20,10 @@ include(CMakeFindDependencyMacro)
25+
26+
find_dependency(TBB CONFIG)
27+
28+
+if(@PXR_BUILD_IMAGING@)
29+
+ find_dependency(OpenSubdiv 3 CONFIG)
30+
+endif()
31+
+
32+
# If Python support was enabled for this USD build, find the import
33+
# targets by invoking the appropriate FindPython module. Use the same
34+
# LIBRARY and INCLUDE_DIR settings from the original build if they

‎ports/usd/004-vcpkg_find_openimageio.patch‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index d4eea2988..3763c9997 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -196,7 +196,7 @@ if (PXR_BUILD_IMAGING)
6+
# --OpenImageIO
7+
if (PXR_BUILD_OPENIMAGEIO_PLUGIN)
8+
set(REQUIRES_Imath TRUE)
9+
- find_package(OpenImageIO REQUIRED)
10+
+ find_package(OpenImageIO CONFIG REQUIRED)
11+
add_definitions(-DPXR_OIIO_PLUGIN_ENABLED)
12+
if (OIIO_idiff_BINARY)
13+
set(IMAGE_DIFF_TOOL ${OIIO_idiff_BINARY} CACHE STRING "Uses idiff for image diffing")
14+
diff --git a/pxr/imaging/plugin/hioOiio/CMakeLists.txt b/pxr/imaging/plugin/hioOiio/CMakeLists.txt
15+
index 0a055b711..de4b73a47 100644
16+
--- a/pxr/imaging/plugin/hioOiio/CMakeLists.txt
17+
+++ b/pxr/imaging/plugin/hioOiio/CMakeLists.txt
18+
@@ -7,6 +7,7 @@ if (NOT ${PXR_BUILD_GPU_SUPPORT})
19+
return()
20+
endif()
21+
22+
+if(0) # No need because OpenImageIO::OpenImageIO already declare its transitive dependencies correctly
23+
# Use the import targets set by Imath's package config
24+
if (Imath_FOUND)
25+
set(__OIIO_IMATH_LIBS "Imath::Imath")
26+
@@ -14,6 +15,7 @@ else()
27+
set(__OIIO_IMATH_INCLUDE ${OPENEXR_INCLUDE_DIRS})
28+
set(__OIIO_IMATH_LIBS ${OPENEXR_LIBRARIES})
29+
endif()
30+
+endif()
31+
32+
pxr_plugin(hioOiio
33+
LIBRARIES
34+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
35+
index 692d045b9..a934c336b 100644
36+
--- a/pxr/pxrConfig.cmake.in
37+
+++ b/pxr/pxrConfig.cmake.in
38+
@@ -22,6 +22,9 @@ find_dependency(TBB CONFIG)
39+
40+
if(@PXR_BUILD_IMAGING@)
41+
find_dependency(OpenSubdiv 3 CONFIG)
42+
+ if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@)
43+
+ find_dependency(OpenImageIO CONFIG)
44+
+ endif()
45+
endif()
46+
47+
# If Python support was enabled for this USD build, find the import
48+
@@ -79,7 +82,7 @@ if(@Imath_FOUND@)
49+
set(Imath_DIR [[@Imath_DIR@]])
50+
endif()
51+
endif()
52+
- find_dependency(Imath)
53+
+ find_dependency(Imath CONFIG)
54+
endif()
55+
56+
include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")

‎ports/usd/005-vcpkg_find_shaderc.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 3763c9997..79679ca13 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -233,6 +233,7 @@ if (PXR_BUILD_IMAGING)
6+
find_package(Vulkan REQUIRED)
7+
list(APPEND VULKAN_LIBS Vulkan::Vulkan)
8+
9+
+ if(0)
10+
# Find the extra vulkan libraries we need
11+
set(EXTRA_VULKAN_LIBS shaderc_combined)
12+
if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
13+
@@ -242,6 +243,7 @@ if (PXR_BUILD_IMAGING)
14+
find_library("${EXTRA_LIBRARY}_PATH" NAMES "${EXTRA_LIBRARY}" PATHS $ENV{VULKAN_SDK}/lib)
15+
list(APPEND VULKAN_LIBS "${${EXTRA_LIBRARY}_PATH}")
16+
endforeach()
17+
+ endif()
18+
19+
# Find the OS specific libs we need
20+
if (APPLE)
21+
@@ -258,6 +260,8 @@ if (PXR_BUILD_IMAGING)
22+
else()
23+
message(FATAL_ERROR "VULKAN_SDK not valid")
24+
endif()
25+
+ find_package(unofficial-shaderc CONFIG REQUIRED)
26+
+ list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc)
27+
endif()
28+
# --Opensubdiv
29+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
30+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
31+
index a934c336b..62bb13a1b 100644
32+
--- a/pxr/pxrConfig.cmake.in
33+
+++ b/pxr/pxrConfig.cmake.in
34+
@@ -25,6 +25,9 @@ if(@PXR_BUILD_IMAGING@)
35+
if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@)
36+
find_dependency(OpenImageIO CONFIG)
37+
endif()
38+
+ if(@PXR_ENABLE_VULKAN_SUPPORT@)
39+
+ find_dependency(unofficial-shaderc CONFIG)
40+
+ endif()
41+
endif()
42+
43+
# If Python support was enabled for this USD build, find the import

‎ports/usd/006-vcpkg_find_spirv-reflect.patch‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 79679ca13..d1a8169a2 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -261,7 +261,9 @@ if (PXR_BUILD_IMAGING)
6+
message(FATAL_ERROR "VULKAN_SDK not valid")
7+
endif()
8+
find_package(unofficial-shaderc CONFIG REQUIRED)
9+
+ find_package(unofficial-spirv-reflect CONFIG REQUIRED)
10+
list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc)
11+
+ list(APPEND VULKAN_LIBS unofficial::spirv-reflect)
12+
endif()
13+
# --Opensubdiv
14+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
15+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
16+
index 97e422894..d13837e45 100644
17+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
18+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
19+
@@ -46,9 +46,6 @@ pxr_library(hgiVulkan
20+
api.h
21+
vulkan.h
22+
23+
- PRIVATE_CLASSES
24+
- spirv_reflect
25+
-
26+
RESOURCE_FILES
27+
plugInfo.json
28+
)
29+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
30+
index 62bb13a1b..d5b0d2f77 100644
31+
--- a/pxr/pxrConfig.cmake.in
32+
+++ b/pxr/pxrConfig.cmake.in
33+
@@ -27,6 +27,7 @@ if(@PXR_BUILD_IMAGING@)
34+
endif()
35+
if(@PXR_ENABLE_VULKAN_SUPPORT@)
36+
find_dependency(unofficial-shaderc CONFIG)
37+
+ find_dependency(unofficial-spirv-reflect CONFIG)
38+
endif()
39+
endif()
40+

‎ports/usd/007-vcpkg_find_vma.patch‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index d1a8169a2..0fb6776a9 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -262,8 +262,10 @@ if (PXR_BUILD_IMAGING)
6+
endif()
7+
find_package(unofficial-shaderc CONFIG REQUIRED)
8+
find_package(unofficial-spirv-reflect CONFIG REQUIRED)
9+
+ find_package(VulkanMemoryAllocator CONFIG REQUIRED)
10+
list(APPEND VULKAN_LIBS unofficial::shaderc::shaderc)
11+
list(APPEND VULKAN_LIBS unofficial::spirv-reflect)
12+
+ list(APPEND VULKAN_LIBS GPUOpen::VulkanMemoryAllocator)
13+
endif()
14+
# --Opensubdiv
15+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
16+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
17+
index d13837e45..92dcfe6f9 100644
18+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
19+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
20+
@@ -40,7 +40,6 @@ pxr_library(hgiVulkan
21+
shaderProgram
22+
shaderSection
23+
texture
24+
- vk_mem_alloc
25+
26+
PUBLIC_HEADERS
27+
api.h
28+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
29+
index d5b0d2f77..c8039c310 100644
30+
--- a/pxr/pxrConfig.cmake.in
31+
+++ b/pxr/pxrConfig.cmake.in
32+
@@ -28,6 +28,7 @@ if(@PXR_BUILD_IMAGING@)
33+
if(@PXR_ENABLE_VULKAN_SUPPORT@)
34+
find_dependency(unofficial-shaderc CONFIG)
35+
find_dependency(unofficial-spirv-reflect CONFIG)
36+
+ find_dependency(VulkanMemoryAllocator CONFIG)
37+
endif()
38+
endif()
39+

‎ports/usd/008-fix_cmake_package.patch‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
diff --git a/pxr/CMakeLists.txt b/pxr/CMakeLists.txt
2+
index 00cafd3d9..c9faeabf0 100644
3+
--- a/pxr/CMakeLists.txt
4+
+++ b/pxr/CMakeLists.txt
5+
@@ -12,13 +12,31 @@ endif()
6+
7+
pxr_core_epilogue()
8+
9+
-export(PACKAGE pxr)
10+
+include(GNUInstallDirs)
11+
+include(CMakePackageConfigHelpers)
12+
13+
-configure_file(pxrConfig.cmake.in
14+
- "${PROJECT_BINARY_DIR}/pxrConfig.cmake" @ONLY)
15+
-install(FILES
16+
+configure_file(
17+
+ "pxrConfig.cmake.in"
18+
"${PROJECT_BINARY_DIR}/pxrConfig.cmake"
19+
- DESTINATION "${CMAKE_INSTALL_PREFIX}"
20+
+ @ONLY
21+
)
22+
23+
-install(EXPORT pxrTargets DESTINATION "cmake")
24+
+write_basic_package_version_file("${PROJECT_BINARY_DIR}/pxrConfigVersion.cmake"
25+
+ VERSION "${PXR_MAJOR_VERSION}.${PXR_MINOR_VERSION}.${PXR_PATCH_VERSION}"
26+
+ COMPATIBILITY AnyNewerVersion
27+
+)
28+
+
29+
+install(
30+
+ FILES
31+
+ "${PROJECT_BINARY_DIR}/pxrConfig.cmake"
32+
+ "${PROJECT_BINARY_DIR}/pxrConfigVersion.cmake"
33+
+
34+
+ DESTINATION
35+
+ "${CMAKE_INSTALL_DATADIR}/pxr"
36+
+)
37+
+
38+
+install(
39+
+ EXPORT pxrTargets
40+
+ # NAMESPACE "pxr::"
41+
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/pxr"
42+
+)
43+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
44+
index c8039c310..9e104abb7 100644
45+
--- a/pxr/pxrConfig.cmake.in
46+
+++ b/pxr/pxrConfig.cmake.in
47+
@@ -90,14 +90,14 @@ if(@Imath_FOUND@)
48+
find_dependency(Imath CONFIG)
49+
endif()
50+
51+
-include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")
52+
+include("${PXR_CMAKE_DIR}/pxrTargets.cmake")
53+
if (TARGET usd_ms)
54+
set(libs "usd_ms")
55+
else()
56+
set(libs "@PXR_ALL_LIBS@")
57+
endif()
58+
set(PXR_LIBRARIES "")
59+
-set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/include")
60+
+set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/../../include")
61+
string(REPLACE " " ";" libs "${libs}")
62+
foreach(lib ${libs})
63+
get_target_property(location ${lib} LOCATION)

‎ports/usd/009-fix_cmake_hgi_interop.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/pxr/imaging/hgiInterop/CMakeLists.txt b/pxr/imaging/hgiInterop/CMakeLists.txt
2+
index 64ebfcb9e..0087d89aa 100644
3+
--- a/pxr/imaging/hgiInterop/CMakeLists.txt
4+
+++ b/pxr/imaging/hgiInterop/CMakeLists.txt
5+
@@ -15,6 +15,7 @@ set(optionalPrivateHeaders "")
6+
list(APPEND optionalLibraries garch)
7+
8+
if (PXR_ENABLE_GL_SUPPORT)
9+
+ list(APPEND optionalLibraries hgiGL)
10+
list(APPEND optionalCppFiles opengl.cpp)
11+
list(APPEND optionalPrivateHeaders opengl.h)
12+
endif()
13+
@@ -32,6 +33,10 @@ if (PXR_ENABLE_METAL_SUPPORT)
14+
list(APPEND optionalPrivateHeaders metal.h)
15+
endif()
16+
17+
+if (NOT (PXR_ENABLE_GL_SUPPORT OR PXR_ENABLE_VULKAN_SUPPORT OR PXR_ENABLE_METAL_SUPPORT))
18+
+ message(FATAL_ERROR "No valid GPU backend set for hgiInterop")
19+
+endif()
20+
+
21+
pxr_library(hgiInterop
22+
LIBRARIES
23+
gf

‎ports/usd/010-fix_missing_find_dependency_vulkan.patch‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
2+
index 9e104abb7..2aa4a3bd3 100644
3+
--- a/pxr/pxrConfig.cmake.in
4+
+++ b/pxr/pxrConfig.cmake.in
5+
@@ -26,6 +26,12 @@ if(@PXR_BUILD_IMAGING@)
6+
find_dependency(OpenImageIO CONFIG)
7+
endif()
8+
if(@PXR_ENABLE_VULKAN_SUPPORT@)
9+
+ if (NOT DEFINED Vulkan_DIR)
10+
+ if (NOT [[@Vulkan_DIR@]] STREQUAL "")
11+
+ set(Vulkan_DIR [[@Vulkan_DIR@]])
12+
+ endif()
13+
+ endif()
14+
+ find_dependency(Vulkan REQUIRED)
15+
find_dependency(unofficial-shaderc CONFIG)
16+
find_dependency(unofficial-spirv-reflect CONFIG)
17+
find_dependency(VulkanMemoryAllocator CONFIG)

0 commit comments

Comments
 (0)