[usd] Bump to v24.08 #40225

theblackunknown · 2024-08-02T05:00:26Z

This PR updates usd port to v24.08.

This versions has no more dependency on boost (when USD Python is disabled, which is already set like this in the current port).
Moreover this version is now compatible with oneTBB so we should now be able to test it on the CI.

Changes comply with the maintainer guide.
SHA512s are updated for each updated download.
The "supports" clause reflects platforms that may be fixed by this new version.
Any fixed CI baseline entries are removed from that file.
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

dg0yt

Some early comments, not a full review.

ports/usd/001-fix_rename_find_package_to_find_dependency.patch

ports/usd/002-vcpkg_find_tbb.patch

dg0yt · 2024-08-02T05:17:23Z

ports/usd/002-vcpkg_find_tbb.patch

+
+include(CMakeFindDependencyMacro)
+
+find_dependency(TBB CONFIG REQUIRED)


Suggested change

+find_dependency(TBB CONFIG REQUIRED)

+find_dependency(TBB CONFIG)

(All use of find_dependency depends on this patch. Hm.)

dg0yt · 2024-08-02T05:19:25Z

ports/usd/004-vcpkg_find_openimageio.patch

+-# Use the import targets set by Imath's package config
+-if (Imath_FOUND)
+-    set(__OIIO_IMATH_LIBS "Imath::Imath")


This must work in vcpkg.

Can you clarify what you meant ?
I think instead of removing I could use a if(0) ... endif().
But what I am really after is to not use Imath::Imath and use OpenImageIO::OpenImageIO instead: here OpenUSD is micro-managing the indirect dependency.

ports/usd/007-vcpkg_find_vma.patch

ports/usd/portfile.cmake

theblackunknown

Thanks for the early review, here is a partial review on your feedbacks @dg0yt

ports/usd/001-fix_rename_find_package_to_find_dependency.patch

ports/usd/002-vcpkg_find_tbb.patch

Cheney-W · 2024-09-06T08:54:48Z

/azp run

azure-pipelines · 2024-09-06T08:54:59Z

Azure Pipelines successfully started running 1 pipeline(s).

scripts/ci.baseline.txt

ports/usd/portfile.cmake

theblackunknown · 2024-10-25T21:12:14Z

ports/usd/004-vcpkg_find_openimageio.patch

+-# Use the import targets set by Imath's package config
+-if (Imath_FOUND)
+-    set(__OIIO_IMATH_LIBS "Imath::Imath")


Can you clarify what you meant ?
I think instead of removing I could use a if(0) ... endif().
But what I am really after is to not use Imath::Imath and use OpenImageIO::OpenImageIO instead: here OpenUSD is micro-managing the indirect dependency.

ports/usd/007-vcpkg_find_vma.patch

theblackunknown · 2024-10-26T16:03:49Z

@dg0yt sorry for taking this long, I think I have addressed all your suggestions and comments.

theblackunknown · 2024-10-26T16:04:55Z

Also OpenUSD v24.11 has just been released and I would like to work toward making usd port compatible with it, so let me know what remain to be done for this PR.

dg0yt

(Community feedback)

You could go straight to the latest version if it isn't too much work to update the patches.

Patch should be kept small. This might be different from what one submit upstream.

ports/usd/002-vcpkg_find_tbb.patch

ports/usd/portfile.cmake

dg0yt · 2024-10-27T16:43:14Z

ports/usd/portfile.cmake

+    if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        vcpkg_copy_tools(
+            TOOL_NAMES ${tools}
+            SEARCH_DIR "${CURRENT_PACKAGES_DIR}/debug/bin"
+            DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}"
+        )
+    endif()


I guess there is a reason why vcpkg_copy_tools normally omits debug tools.
If the port is really meant to install the debug tools, it might be good to add a comment.
And btw it is enough to check if(NOT VCPKG_BUILD_TYPE) in a portfile.

I'll remove it for now, it is useful to have it around for troubleshooting but I do not think I am ready to commit this.

ports/usd/vcpkg.json

ports/usd/portfile.cmake

dg0yt · 2024-10-31T07:07:13Z

There is #41864 now. How to coordinate that simple update with your changes?

theblackunknown · 2024-10-31T10:30:32Z

There is #41864 now. How to coordinate that simple update with your changes?

I really want to make the port dependency simplification to go in.
Is there any chance we can get this one in this week and ask #41864 to rebase their changes on top ?

theblackunknown · 2024-10-31T10:32:54Z

Also this PR also brings back CI coverage, so we would have more confidence when modifying the port because as of now nothing is tested without this PR.

theblackunknown

I have made another pass and will remove the draft status.
@dg0yt and @Cheney-W can you review those and let me know if we are good to go ?

ports/usd/002-vcpkg_find_tbb.patch

ports/usd/portfile.cmake

theblackunknown · 2024-11-01T13:57:33Z

ports/usd/portfile.cmake

+    if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        vcpkg_copy_tools(
+            TOOL_NAMES ${tools}
+            SEARCH_DIR "${CURRENT_PACKAGES_DIR}/debug/bin"
+            DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}"
+        )
+    endif()


I'll remove it for now, it is useful to have it around for troubleshooting but I do not think I am ready to commit this.

ports/usd/vcpkg.json

theblackunknown · 2024-11-01T14:03:02Z

Ok I cannot remove the draft status, so the future of this PR is in your hands @Cheney-W :)

theblackunknown · 2024-11-07T23:13:11Z

Gentle reminder on this PR, is there anything I can do to help @Cheney-W ?

Cheney-W · 2024-11-08T08:53:40Z

ports/usd/portfile.cmake

+
+vcpkg_download_distfile(MATERIALX_1_39_PATCH
+  URLS "https://github.com/PixarAnimationStudios/OpenUSD/pull/3159.diff?full_index=1"
+  SHA512 f31b682d5d15c54d8bcaff4bcacc4a00b25c95b9735660f5e3908fb995bc5f29a6a71400b710a9feea4d9a5a6dcb2975131f9a249597e1efdf939ef34c795fd0


Suggested change

SHA512 f31b682d5d15c54d8bcaff4bcacc4a00b25c95b9735660f5e3908fb995bc5f29a6a71400b710a9feea4d9a5a6dcb2975131f9a249597e1efdf939ef34c795fd0

SHA512 4e91794bd418c329019e212a93052b06f947f360e4210e757a88d5774ed3a23b03c3063f40f3120f7d1c562ef73fca9aa410f116ce536ba193d8552b85c5b73e

Cheney-W · 2024-11-08T08:56:04Z

I got below error with this command: .\vcpkg.exe install usd[*]:x64-windows
F:\v\vcpkg-40225\buildtrees\usd\config-x64-windows-out.log

CMake Error at F:/v/vcpkg-40225/scripts/buildsystems/vcpkg.cmake:857 (_find_package):
  Could not find a package configuration file provided by
  "unofficial-vulkanmemoryallocator" with any of the following names:

    unofficial-vulkanmemoryallocatorConfig.cmake
    unofficial-vulkanmemoryallocator-config.cmake

  Add the installation prefix of "unofficial-vulkanmemoryallocator" to
  CMAKE_PREFIX_PATH or set "unofficial-vulkanmemoryallocator_DIR" to a
  directory containing one of the above files.  If
  "unofficial-vulkanmemoryallocator" provides a separate development package
  or SDK, be sure it has been installed.

dg0yt · 2024-11-08T17:38:56Z

ports/usd/portfile.cmake

-See https://vcpkg.io/en/docs/examples/versioning.getting-started.html for instructions.
-]=])
+vcpkg_download_distfile(FIND_DEPENDENCY_PATCH
+  URLS "https://github.com/PixarAnimationStudios/OpenUSD/pull/3205.diff?full_index=1"


This PR isn't merged. Its content and SHA512 may change, breaking the port.

dg0yt · 2024-11-08T17:39:35Z

ports/usd/portfile.cmake

+# )
+
+vcpkg_download_distfile(MATERIALX_1_39_PATCH
+  URLS "https://github.com/PixarAnimationStudios/OpenUSD/pull/3159.diff?full_index=1"


This PR isn't merged. Its content and SHA512 may change, breaking the port.

dg0yt · 2024-11-08T17:54:07Z

Ok I cannot remove the draft status,

You are the author. I'm sure you can.

theblackunknown · 2024-11-10T15:25:09Z

install usd[*]:x64-windows

Good catch, I have made this port upgrade by backporting some of the patches we maintain internally but I need to test it against the more recent vulkan-memory-allocator in microsoft/vcpkg.

I am now testing again with usd[*] instead of usd:

metal is not something expected to build on all platforms, I have added a supports entry to the metal feature to reflect this.
materialx seems broken, it requires fixing the materialx port to correctly installed all headers corresponding to requesting features (i.e. materialx[glsl-generator] here). Do you mind if I follow up on this ?

theblackunknown · 2024-11-10T15:25:58Z

Ok I cannot remove the draft status,

You are the author. I'm sure you can.

Sorry for the confusion, somehow the button was not available on my webpage.
But the error is on me as it seems to clearly be available now.

theblackunknown · 2024-11-10T20:34:39Z

So it turns out that while I am trying to converge this PR, oneTBB 2022 was out last week and that we now have a port for it (which is great !)
Unfortunately this now breaks this port.

I'll investigate if I can easily fix this, otherwise I may simply revert my changes on ci.baseline.txt

theblackunknown · 2024-11-13T05:50:48Z

I have pushed a new patch which now makes this port compatible with TBB 2022 and pass the CI.

Let me know what you think of the latest changes @dg0yt @Cheney-W

Cheney-W · 2024-11-13T06:23:38Z

Feature openimageio and vulkan test passed with x64-windows triplet.
Usage test passed with x64-windows triplet.

dg0yt reviewed Aug 2, 2024

View reviewed changes

WangWeiLin-MV assigned Cheney-W Aug 2, 2024

Cheney-W reviewed Aug 2, 2024

View reviewed changes

ports/usd/portfile.cmake Outdated Show resolved Hide resolved

Cheney-W added the category:port-update The issue is with a library, which is requesting update new revision label Aug 2, 2024

theblackunknown commented Aug 4, 2024

View reviewed changes

ports/usd/001-fix_rename_find_package_to_find_dependency.patch Outdated Show resolved Hide resolved

ports/usd/002-vcpkg_find_tbb.patch Show resolved Hide resolved

theblackunknown force-pushed the usd branch 5 times, most recently from 2b8d78e to dd944d0 Compare August 5, 2024 15:23

Cheney-W reviewed Sep 9, 2024

View reviewed changes

scripts/ci.baseline.txt Show resolved Hide resolved

theblackunknown force-pushed the usd branch from dd944d0 to 5dbf9f4 Compare October 25, 2024 21:20

theblackunknown commented Oct 25, 2024

View reviewed changes

theblackunknown marked this pull request as ready for review October 25, 2024 21:20

theblackunknown requested review from Cheney-W and dg0yt October 25, 2024 21:20

theblackunknown force-pushed the usd branch from 5dbf9f4 to 80502c6 Compare October 26, 2024 16:02

theblackunknown force-pushed the usd branch from 80502c6 to 74bd447 Compare October 26, 2024 23:11

dg0yt reviewed Oct 27, 2024

View reviewed changes

Cheney-W reviewed Oct 28, 2024

View reviewed changes

ports/usd/vcpkg.json Outdated Show resolved Hide resolved

Cheney-W reviewed Oct 28, 2024

View reviewed changes

ports/usd/portfile.cmake Outdated Show resolved Hide resolved

Cheney-W marked this pull request as draft October 28, 2024 09:20

dg0yt mentioned this pull request Oct 31, 2024

[usd] update to 24.11 #41864

Draft

7 tasks

theblackunknown force-pushed the usd branch 2 times, most recently from 6996c7c to 775abe8 Compare November 1, 2024 14:01

theblackunknown commented Nov 1, 2024

View reviewed changes

theblackunknown marked this pull request as ready for review November 7, 2024 23:13

michaelmigliore mentioned this pull request Nov 8, 2024

[usd] Fixes for recent TBB versions and osx-arm64 #39292

Closed

7 tasks

Cheney-W reviewed Nov 8, 2024

View reviewed changes

Cheney-W marked this pull request as draft November 8, 2024 08:56

dg0yt reviewed Nov 8, 2024

View reviewed changes

theblackunknown force-pushed the usd branch 3 times, most recently from cdb2443 to a832d9e Compare November 10, 2024 14:53

theblackunknown force-pushed the usd branch from a832d9e to 2383b44 Compare November 10, 2024 15:25

theblackunknown force-pushed the usd branch 2 times, most recently from d469550 to abffe1b Compare November 10, 2024 16:35

theblackunknown marked this pull request as ready for review November 10, 2024 16:35

theblackunknown force-pushed the usd branch 2 times, most recently from fe6f37d to 4fb6441 Compare November 11, 2024 21:28

[usd] Bump to v24.08

300984d

theblackunknown force-pushed the usd branch from 4fb6441 to 300984d Compare November 11, 2024 21:32

Cheney-W approved these changes Nov 13, 2024

View reviewed changes

Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Nov 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[usd] Bump to v24.08 #40225

[usd] Bump to v24.08 #40225

theblackunknown commented Aug 2, 2024

dg0yt left a comment

dg0yt Aug 2, 2024

dg0yt Aug 2, 2024

theblackunknown Oct 25, 2024

theblackunknown left a comment

Cheney-W commented Sep 6, 2024

azure-pipelines bot commented Sep 6, 2024

theblackunknown Oct 25, 2024

theblackunknown commented Oct 26, 2024

theblackunknown commented Oct 26, 2024

dg0yt left a comment

dg0yt Oct 27, 2024

theblackunknown Nov 1, 2024

dg0yt commented Oct 31, 2024

theblackunknown commented Oct 31, 2024

theblackunknown commented Oct 31, 2024

theblackunknown left a comment

theblackunknown Nov 1, 2024

theblackunknown commented Nov 1, 2024

theblackunknown commented Nov 7, 2024

Cheney-W Nov 8, 2024

Cheney-W commented Nov 8, 2024 •

edited

Loading

dg0yt Nov 8, 2024

dg0yt Nov 8, 2024

dg0yt commented Nov 8, 2024

theblackunknown commented Nov 10, 2024 •

edited

Loading

theblackunknown commented Nov 10, 2024

theblackunknown commented Nov 10, 2024

theblackunknown commented Nov 13, 2024

Cheney-W commented Nov 13, 2024

	+find_dependency(TBB CONFIG REQUIRED)
	+find_dependency(TBB CONFIG)

	SHA512 f31b682d5d15c54d8bcaff4bcacc4a00b25c95b9735660f5e3908fb995bc5f29a6a71400b710a9feea4d9a5a6dcb2975131f9a249597e1efdf939ef34c795fd0
	SHA512 4e91794bd418c329019e212a93052b06f947f360e4210e757a88d5774ed3a23b03c3063f40f3120f7d1c562ef73fca9aa410f116ce536ba193d8552b85c5b73e

[usd] Bump to v24.08 #40225

Are you sure you want to change the base?

[usd] Bump to v24.08 #40225

Conversation

theblackunknown commented Aug 2, 2024

dg0yt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theblackunknown left a comment

Choose a reason for hiding this comment

Cheney-W commented Sep 6, 2024

azure-pipelines bot commented Sep 6, 2024

Choose a reason for hiding this comment

theblackunknown commented Oct 26, 2024

theblackunknown commented Oct 26, 2024

dg0yt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dg0yt commented Oct 31, 2024

theblackunknown commented Oct 31, 2024

theblackunknown commented Oct 31, 2024

theblackunknown left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theblackunknown commented Nov 1, 2024

theblackunknown commented Nov 7, 2024

Choose a reason for hiding this comment

Cheney-W commented Nov 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dg0yt commented Nov 8, 2024

theblackunknown commented Nov 10, 2024 • edited Loading

theblackunknown commented Nov 10, 2024

theblackunknown commented Nov 10, 2024

theblackunknown commented Nov 13, 2024

Cheney-W commented Nov 13, 2024

Cheney-W commented Nov 8, 2024 •

edited

Loading

theblackunknown commented Nov 10, 2024 •

edited

Loading