Skip to content

Commit 80502c6

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

21 files changed

+1241
-76
lines changed

‎ports/usd/001-fix_rename_find_package_to_find_dependency.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
2+
index b26f1ea31..a7dd9603d 100644
3+
--- a/pxr/pxrConfig.cmake.in
4+
+++ b/pxr/pxrConfig.cmake.in
5+
@@ -41,9 +41,9 @@ if(@PXR_ENABLE_PYTHON_SUPPORT@)
6+
endif()
7+
8+
if (NOT DEFINED Python3_VERSION)
9+
- find_package(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development REQUIRED)
10+
+ find_dependency(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development)
11+
else()
12+
- find_package(Python3 COMPONENTS Development REQUIRED)
13+
+ find_dependency(Python3 COMPONENTS Development)
14+
endif()
15+
endif()
16+
17+
@@ -57,7 +57,7 @@ if(@PXR_ENABLE_MATERIALX_SUPPORT@)
18+
set(MaterialX_DIR [[@MaterialX_DIR@]])
19+
endif()
20+
endif()
21+
- find_package(MaterialX REQUIRED)
22+
+ find_dependency(MaterialX)
23+
endif()
24+
25+
# Similar to MaterialX above, we are using Imath's cmake package config, so set
26+
@@ -71,7 +71,7 @@ if(@Imath_FOUND@)
27+
set(Imath_DIR [[@Imath_DIR@]])
28+
endif()
29+
endif()
30+
- find_package(Imath REQUIRED)
31+
+ find_dependency(Imath)
32+
endif()
33+
34+
include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")

‎ports/usd/002-vcpkg_find_tbb.patch‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index fe60570b3..ef8cfdaba 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -137,7 +137,7 @@ endif()
6+
7+
8+
# --TBB
9+
-find_package(TBB REQUIRED COMPONENTS tbb)
10+
+find_package(TBB CONFIG REQUIRED)
11+
add_definitions(${TBB_DEFINITIONS})
12+
13+
# --math
14+
diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt
15+
index b236184c4..342296512 100644
16+
--- a/pxr/base/tf/CMakeLists.txt
17+
+++ b/pxr/base/tf/CMakeLists.txt
18+
@@ -116,12 +116,11 @@ pxr_library(tf
19+
${WINLIBS}
20+
${PYTHON_LIBRARIES}
21+
${Boost_PYTHON_LIBRARY}
22+
- ${TBB_tbb_LIBRARY}
23+
+ TBB::tbb
24+
25+
INCLUDE_DIRS
26+
${PYTHON_INCLUDE_DIRS}
27+
${Boost_INCLUDE_DIRS}
28+
- ${TBB_INCLUDE_DIRS}
29+
30+
PUBLIC_CLASSES
31+
anyUniquePtr
32+
diff --git a/pxr/imaging/plugin/hdEmbree/CMakeLists.txt b/pxr/imaging/plugin/hdEmbree/CMakeLists.txt
33+
index 43aa0826e..a1f443b9c 100644
34+
--- a/pxr/imaging/plugin/hdEmbree/CMakeLists.txt
35+
+++ b/pxr/imaging/plugin/hdEmbree/CMakeLists.txt
36+
@@ -21,11 +21,10 @@ pxr_plugin(hdEmbree
37+
hf
38+
hd
39+
hdx
40+
- ${TBB_tbb_LIBRARY}
41+
+ TBB::tbb
42+
${EMBREE_LIBRARY}
43+
44+
INCLUDE_DIRS
45+
- ${TBB_INCLUDE_DIRS}
46+
${EMBREE_INCLUDE_DIR}
47+
48+
PUBLIC_CLASSES
49+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
50+
index afe3dc448..041cd8cba 100644
51+
--- a/pxr/pxrConfig.cmake.in
52+
+++ b/pxr/pxrConfig.cmake.in
53+
@@ -18,6 +18,8 @@ set(PXR_VERSION "@PXR_VERSION@")
54+
55+
include(CMakeFindDependencyMacro)
56+
57+
+find_dependency(TBB CONFIG)
58+
+
59+
# If Python support was enabled for this USD build, find the import
60+
# targets by invoking the appropriate FindPython module. Use the same
61+
# LIBRARY and INCLUDE_DIR settings from the original build if they
62+
diff --git a/pxr/usd/usd/CMakeLists.txt b/pxr/usd/usd/CMakeLists.txt
63+
index fd86e9085..de087ea5f 100644
64+
--- a/pxr/usd/usd/CMakeLists.txt
65+
+++ b/pxr/usd/usd/CMakeLists.txt
66+
@@ -13,12 +13,11 @@ pxr_library(usd
67+
trace
68+
vt
69+
work
70+
+ TBB::tbb
71+
${Boost_PYTHON_LIBRARY}
72+
- ${TBB_tbb_LIBRARY}
73+
74+
INCLUDE_DIRS
75+
${Boost_INCLUDE_DIRS}
76+
- ${TBB_INCLUDE_DIRS}
77+
78+
PUBLIC_CLASSES
79+
apiSchemaBase

‎ports/usd/003-vcpkg_find_opensubdiv.patch‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index ef8cfdaba..4e06391d3 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -259,8 +259,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_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
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/imaging/pxOsd/CMakeLists.txt b/pxr/imaging/pxOsd/CMakeLists.txt
21+
index 46f02889a..e3435372b 100644
22+
--- a/pxr/imaging/pxOsd/CMakeLists.txt
23+
+++ b/pxr/imaging/pxOsd/CMakeLists.txt
24+
@@ -6,12 +6,9 @@ pxr_library(pxOsd
25+
tf
26+
gf
27+
vt
28+
- ${OPENSUBDIV_OSDCPU_LIBRARY}
29+
+ OpenSubdiv::osdCPU_static
30+
${Boost_PYTHON_LIBRARY}
31+
32+
- INCLUDE_DIRS
33+
- ${OPENSUBDIV_INCLUDE_DIR}
34+
-
35+
PUBLIC_HEADERS
36+
api.h
37+
38+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
39+
index 041cd8cba..692d045b9 100644
40+
--- a/pxr/pxrConfig.cmake.in
41+
+++ b/pxr/pxrConfig.cmake.in
42+
@@ -20,6 +20,10 @@ include(CMakeFindDependencyMacro)
43+
44+
find_dependency(TBB CONFIG)
45+
46+
+if(@PXR_BUILD_IMAGING@)
47+
+ find_dependency(OpenSubdiv 3 CONFIG)
48+
+endif()
49+
+
50+
# If Python support was enabled for this USD build, find the import
51+
# targets by invoking the appropriate FindPython module. Use the same
52+
# LIBRARY and INCLUDE_DIR settings from the original build if they

‎ports/usd/004-vcpkg_find_openimageio.patch‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 4e06391d3..88212a2fa 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -195,7 +195,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..8c7be6d34 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)
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+
@@ -22,12 +24,7 @@ pxr_plugin(hioOiio
35+
gf
36+
hio
37+
tf
38+
- ${OIIO_LIBRARIES}
39+
- ${__OIIO_IMATH_LIBS}
40+
-
41+
- INCLUDE_DIRS
42+
- ${OIIO_INCLUDE_DIRS}
43+
- ${__OIIO_IMATH_INCLUDE}
44+
+ OpenImageIO::OpenImageIO
45+
46+
CPPFILES
47+
oiioImage.cpp
48+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
49+
index 692d045b9..a934c336b 100644
50+
--- a/pxr/pxrConfig.cmake.in
51+
+++ b/pxr/pxrConfig.cmake.in
52+
@@ -22,6 +22,9 @@ find_dependency(TBB CONFIG)
53+
54+
if(@PXR_BUILD_IMAGING@)
55+
find_dependency(OpenSubdiv 3 CONFIG)
56+
+ if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@)
57+
+ find_dependency(OpenImageIO CONFIG)
58+
+ endif()
59+
endif()
60+
61+
# If Python support was enabled for this USD build, find the import
62+
@@ -79,7 +82,7 @@ if(@Imath_FOUND@)
63+
set(Imath_DIR [[@Imath_DIR@]])
64+
endif()
65+
endif()
66+
- find_dependency(Imath)
67+
+ find_dependency(Imath CONFIG)
68+
endif()
69+
70+
include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")

‎ports/usd/005-vcpkg_find_shaderc.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 88212a2fa..953dfbeaa 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -232,6 +232,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+
@@ -241,6 +242,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+
@@ -257,6 +259,7 @@ if (PXR_BUILD_IMAGING)
22+
else()
23+
message(FATAL_ERROR "VULKAN_SDK not valid")
24+
endif()
25+
+ find_package(unofficial-shaderc CONFIG REQUIRED)
26+
endif()
27+
# --Opensubdiv
28+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
29+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
30+
index 97e422894..aaac93ee6 100644
31+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
32+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
33+
@@ -14,6 +14,7 @@ pxr_library(hgiVulkan
34+
tf
35+
trace
36+
${VULKAN_LIBS}
37+
+ unofficial::shaderc::shaderc
38+
39+
PUBLIC_CLASSES
40+
blitCmds
41+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
42+
index a934c336b..62bb13a1b 100644
43+
--- a/pxr/pxrConfig.cmake.in
44+
+++ b/pxr/pxrConfig.cmake.in
45+
@@ -25,6 +25,9 @@ if(@PXR_BUILD_IMAGING@)
46+
if(@PXR_BUILD_OPENIMAGEIO_PLUGIN@)
47+
find_dependency(OpenImageIO CONFIG)
48+
endif()
49+
+ if(@PXR_ENABLE_VULKAN_SUPPORT@)
50+
+ find_dependency(unofficial-shaderc CONFIG)
51+
+ endif()
52+
endif()
53+
54+
# If Python support was enabled for this USD build, find the import

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index 953dfbeaa..ec4ab0c43 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -260,6 +260,7 @@ 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+
endif()
11+
# --Opensubdiv
12+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
13+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
14+
index aaac93ee6..7dadea311 100644
15+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
16+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
17+
@@ -15,6 +15,7 @@ pxr_library(hgiVulkan
18+
trace
19+
${VULKAN_LIBS}
20+
unofficial::shaderc::shaderc
21+
+ unofficial::SPIRV-Reflect::SPIRV-Reflect
22+
23+
PUBLIC_CLASSES
24+
blitCmds
25+
@@ -47,9 +48,6 @@ pxr_library(hgiVulkan
26+
api.h
27+
vulkan.h
28+
29+
- PRIVATE_CLASSES
30+
- spirv_reflect
31+
-
32+
RESOURCE_FILES
33+
plugInfo.json
34+
)
35+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
36+
index 62bb13a1b..d5b0d2f77 100644
37+
--- a/pxr/pxrConfig.cmake.in
38+
+++ b/pxr/pxrConfig.cmake.in
39+
@@ -27,6 +27,7 @@ if(@PXR_BUILD_IMAGING@)
40+
endif()
41+
if(@PXR_ENABLE_VULKAN_SUPPORT@)
42+
find_dependency(unofficial-shaderc CONFIG)
43+
+ find_dependency(unofficial-spirv-reflect CONFIG)
44+
endif()
45+
endif()
46+

‎ports/usd/007-vcpkg_find_vma.patch‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
2+
index ec4ab0c43..ab42bc276 100644
3+
--- a/cmake/defaults/Packages.cmake
4+
+++ b/cmake/defaults/Packages.cmake
5+
@@ -261,6 +261,7 @@ if (PXR_BUILD_IMAGING)
6+
endif()
7+
find_package(unofficial-shaderc CONFIG REQUIRED)
8+
find_package(unofficial-spirv-reflect CONFIG REQUIRED)
9+
+ find_package(unofficial-vulkanmemoryallocator CONFIG REQUIRED)
10+
endif()
11+
# --Opensubdiv
12+
find_package(OpenSubdiv 3 CONFIG REQUIRED)
13+
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
14+
index 7dadea311..a50ac1517 100644
15+
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
16+
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
17+
@@ -16,6 +16,7 @@ pxr_library(hgiVulkan
18+
${VULKAN_LIBS}
19+
unofficial::shaderc::shaderc
20+
unofficial::SPIRV-Reflect::SPIRV-Reflect
21+
+ unofficial::VulkanMemoryAllocator::VulkanMemoryAllocator
22+
23+
PUBLIC_CLASSES
24+
blitCmds
25+
@@ -42,7 +43,6 @@ pxr_library(hgiVulkan
26+
shaderProgram
27+
shaderSection
28+
texture
29+
- vk_mem_alloc
30+
31+
PUBLIC_HEADERS
32+
api.h
33+
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
34+
index d5b0d2f77..fc6074d3d 100644
35+
--- a/pxr/pxrConfig.cmake.in
36+
+++ b/pxr/pxrConfig.cmake.in
37+
@@ -28,6 +28,7 @@ if(@PXR_BUILD_IMAGING@)
38+
if(@PXR_ENABLE_VULKAN_SUPPORT@)
39+
find_dependency(unofficial-shaderc CONFIG)
40+
find_dependency(unofficial-spirv-reflect CONFIG)
41+
+ find_dependency(unofficial-vulkanmemoryallocator CONFIG)
42+
endif()
43+
endif()
44+

0 commit comments

Comments
 (0)