Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[directxmesh, directxtex, directxtk(12), uvatlas] Updated for October 2024 releases #41878

Merged
merged 15 commits into from
Nov 4, 2024

Conversation

walbourn
Copy link
Member

Includes adding new gameinput feature for directxtk and directxtk12 which makes use of the recently added gameinput port.

@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 31, 2024
@walbourn
Copy link
Member Author

Hmmm. Looks like the DirectXTex change broke something used by rsm-bsa. That said, I can't repro it locally. I probably need to fix something up stream and/or make a patch

@dg0yt
Copy link
Contributor

dg0yt commented Oct 31, 2024

Please fix also uvatlas #41844 (comment) (if not already included).

@walbourn
Copy link
Member Author

Fixed the failure in rsm-bsa via a patch which is also in the mainline now for the upstream project so will be included in the next release of DirectXTex. A small one-line patch is still needed for rms-bsa which has also been submitted to that project.

Applied a small patch per @dg0yt's request to uvatlas. Again, the changes are upstream as well as in the mainline.

@walbourn walbourn mentioned this pull request Oct 31, 2024
11 tasks
@walbourn walbourn changed the title [directxmesh, directxtex, directxtk, uvatlas] Updated for October 2024 releases [directxmesh, directxtex, directxtk(12), uvatlas] Updated for October 2024 releases Oct 31, 2024
@walbourn
Copy link
Member Author

Locally verified all supported triplets and features:

vcpkg install directxmesh:x86-windows
vcpkg install directxmesh[tools]:x86-windows --recurse
vcpkg install directxmesh[dx12]:x86-windows --recurse
vcpkg install directxmesh[spectre]:x86-windows --recurse
vcpkg install directxmesh:x86-windows-static
vcpkg install directxmesh:x86-windows-static-md

vcpkg install directxmesh:x64-windows
vcpkg install directxmesh[tools]:x64-windows --recurse
vcpkg install directxmesh[dx12]:x64-windows --recurse
vcpkg install directxmesh[spectre]:x64-windows --recurse
vcpkg install directxmesh:x64-windows-static
vcpkg install directxmesh:x64-windows-static-md

vcpkg install directxmesh:arm64-windows
vcpkg install directxmesh[tools]:arm64-windows --recurse
vcpkg install directxmesh[spectre]:arm64-windows --recurse
vcpkg install directxmesh:arm64-windows-static
vcpkg install directxmesh:arm64-windows-static-md
vcpkg install directxmesh:arm64ec-windows
vcpkg install directxmesh[tools]:arm64ec-windows --recurse
vcpkg install directxmesh[spectre]:arm64ec-windows --recurse

vcpkg install directxmesh:x86-uwp
vcpkg install directxmesh:x64-uwp
vcpkg install directxmesh:arm64-uwp

vcpkg install directxmesh:x64-mingw-static
vcpkg install directxmesh[dx12]:x64-mingw-static --recurse
vcpkg install directxmesh[tools]:x64-mingw-static --recurse

vcpkg install directxmesh:x86-mingw-static
vcpkg install directxmesh[dx12]:x86-mingw-static --recurse
vcpkg install directxmesh[tools]:x86-mingw-static --recurse

./vcpkg install directxmesh:x64-linux
./vcpkg install directxmesh[dx12]:x64-linux --recurse

./vcpkg install directxmesh:arm64-linux
./vcpkg install directxmesh[dx12]:arm64-linux --recurse
vcpkg install directxtk:x86-windows
vcpkg install directxtk[tools]:x86-windows --recurse
vcpkg install directxtk[xaudio2-8]:x86-windows --recurse
vcpkg install directxtk[xaudio2-9]:x86-windows --recurse
vcpkg install directxtk[xaudio2redist]:x86-windows --recurse
vcpkg install directxtk[xaudio2redist]:x86-windows-static-md --recurse
vcpkg install directxtk[spectre]:x86-windows --recurse
vcpkg install directxtk:x86-windows-static
vcpkg install directxtk:x86-windows-static-md

vcpkg install directxtk:x64-windows
vcpkg install directxtk[tools]:x64-windows --recurse
vcpkg install directxtk[xaudio2-8]:x64-windows --recurse
vcpkg install directxtk[xaudio2-9]:x64-windows --recurse
vcpkg install directxtk[xaudio2redist]:x64-windows --recurse
vcpkg install directxtk[xaudio2redist]:x64-windows-static-md --recurse
vcpkg install directxtk[gameinput]:x64-windows --recurse
vcpkg install directxtk[spectre]:x64-windows --recurse
vcpkg install directxtk:x64-windows-static
vcpkg install directxtk:x64-windows-static-md

vcpkg install directxtk:arm64-windows
vcpkg install directxtk[tools]:arm64-windows --recurse
vcpkg install directxtk[spectre]:arm64-windows --recurse
vcpkg install directxtk:arm64-windows-static
vcpkg install directxtk:arm64-windows-static-md
vcpkg install directxtk:arm64ec-windows
vcpkg install directxtk[tools]:arm64ec-windows --recurse
vcpkg install directxtk[spectre]:arm64ec-windows --recurse

vcpkg install directxtk:x86-uwp
vcpkg install directxtk:x64-uwp
vcpkg install directxtk:arm64-uwp

vcpkg install directxtk:x64-mingw-static
vcpkg install directxtk[xaudio2redist]:x64-mingw-static --recurse
vcpkg install directxtk[tools]:x64-mingw-static --recurse

vcpkg install directxtk:x86-mingw-static
vcpkg install directxtk[xaudio2redist]:x86-mingw-static --recurse
vcpkg install directxtk[tools]:x86-mingw-static --recurse
vcpkg install directxtk12[core]:x86-windows
vcpkg install directxtk12[xaudio2-9]:x86-windows --recurse
vcpkg install directxtk12[xaudio2redist]:x86-windows --recurse
vcpkg install directxtk12[xaudio2redist]:x86-windows-static-md --recurse
vcpkg install directxtk12[spectre]:x86-windows-static-md --recurse
vcpkg install directxtk12:x86-windows-static
vcpkg install directxtk12:x86-windows-static-md

vcpkg install directxtk12[core]:x64-windows
vcpkg install directxtk12[tools]:x64-windows --recurse
vcpkg install directxtk12[xaudio2-9]:x64-windows --recurse
vcpkg install directxtk12[xaudio2redist]:x64-windows --recurse
vcpkg install directxtk12[xaudio2redist]:x64-windows-static-md --recurse
vcpkg install directxtk12[gameinput]:x64-windows --recurse
vcpkg install directxtk12[spectre]:x64-windows --recurse
vcpkg install directxtk12:x64-windows-static
vcpkg install directxtk12:x64-windows-static-md

vcpkg install directxtk12[core]:arm64-windows
vcpkg install directxtk12[tools]:arm64-windows --recurse
vcpkg install directxtk12[spectre]:arm64-windows --recurse
vcpkg install directxtk12:arm64-windows-static
vcpkg install directxtk12:arm64-windows-static-md
vcpkg install directxtk12[core]:arm64ec-windows
vcpkg install directxtk12[tools]:arm64ec-windows --recurse
vcpkg install directxtk12[spectre]:arm64ec-windows --recurse

vcpkg install directxtk12:x86-uwp
vcpkg install directxtk12:x64-uwp
vcpkg install directxtk12:arm64-uwp

vcpkg install directxtk12:x64-mingw-static
vcpkg install directxtk12[xaudio2redist]:x64-mingw-static --recurse
vcpkg install directxtk12[tools]:x64-mingw-static --recurse

vcpkg install directxtk12:x86-mingw-static
vcpkg install directxtk12[xaudio2redist]:x86-mingw-static --recurse
vcpkg install directxtex[core]:x86-windows
vcpkg install directxtex:x86-windows --recurse
vcpkg install directxtex[tools]:x86-windows --recurse
vcpkg install directxtex[dx12]:x86-windows --recurse
vcpkg install directxtex[openexr,tools]:x86-windows --recurse
vcpkg install directxtex[spectre]:x86-windows --recurse
vcpkg install directxtex:x86-windows-static
vcpkg install directxtex:x86-windows-static-md

vcpkg install directxtex[core]:x64-windows
vcpkg install directxtex:x64-windows --recurse
vcpkg install directxtex[tools]:x64-windows --recurse
vcpkg install directxtex[dx12]:x64-windows --recurse
vcpkg install directxtex[openexr,tools]:x64-windows --recurse
vcpkg install directxtex[spectre]:x64-windows --recurse
vcpkg install directxtex:x64-windows-static
vcpkg install directxtex:x64-windows-static-md

vcpkg install directxtex:arm64-windows
vcpkg install directxtex[tools]:arm64-windows --recurse 
vcpkg install directxtex[spectre]:arm64-windows --recurse
vcpkg install directxtex:arm64-windows-static
vcpkg install directxtex:arm64-windows-static-md
vcpkg install directxtex:arm64ec-windows
vcpkg install directxtex[tools]:arm64ec-windows --recurse 
vcpkg install directxtex[spectre]:arm64ec-windows --recurse

vcpkg install directxtex:x86-uwp
vcpkg install directxtex:x64-uwp
vcpkg install directxtex:arm64-uwp

vcpkg install directxtex:x64-mingw-static
vcpkg install directxtex[dx12]:x64-mingw-static --recurse
vcpkg install directxtex[tools]:x64-mingw-static --recurse

vcpkg install directxtex:x86-mingw-static
vcpkg install directxtex[dx12]:x86-mingw-static --recurse
vcpkg install directxtex[tools]:x86-mingw-static --recurse

./vcpkg install directxtex:x64-linux
./vcpkg install directxtex[dx12]:x64-linux --recurse
./vcpkg install directxtex[openexr]:x64-linux --recurse
./vcpkg install directxtex[jpeg]:x64-linux --recurse
./vcpkg install directxtex[png]:x64-linux --recurse

./vcpkg install directxtex:arm64-linux
./vcpkg install directxtex[dx12]:arm64-linux --recurse
./vcpkg install directxtex[openexr]:arm64-linux --recurse
./vcpkg install directxtex[jpeg]:arm64-linux --recurse
./vcpkg install directxtex[png]:arm64-linux --recurse
vcpkg install uvatlas:x86-windows
vcpkg install uvatlas[tools]:x86-windows --recurse
vcpkg install uvatlas[eigen]:x86-windows --recurse
vcpkg install uvatlas[spectre]:x86-windows --recurse
vcpkg install uvatlas:x86-windows-static
vcpkg install uvatlas:x86-windows-static-md

vcpkg install uvatlas:x64-windows
vcpkg install uvatlas[tools]:x64-windows --recurse
vcpkg install uvatlas[eigen]:x64-windows --recurse
vcpkg install uvatlas[spectre]:x64-windows --recurse
vcpkg install uvatlas:x64-windows-static
vcpkg install uvatlas:x64-windows-static-md

vcpkg install uvatlas:arm64-windows
vcpkg install uvatlas[tools]:arm64-windows --recurse
vcpkg install uvatlas[spectre]:arm64-windows --recurse
vcpkg install uvatlas:arm64-windows-static
vcpkg install uvatlas:arm64-windows-static-md
vcpkg install uvatlas:arm64ec-windows
vcpkg install uvatlas[tools]:arm64ec-windows --recurse
vcpkg install uvatlas[spectre]:arm64ec-windows --recurse

vcpkg install uvatlas:x86-uwp
vcpkg install uvatlas:x64-uwp
vcpkg install uvatlas:arm64-uwp

vcpkg install uvatlas:x64-mingw-static
vcpkg install uvatlas[tools]:x64-mingw-static --recurse

vcpkg install uvatlas:x86-mingw-static
vcpkg install uvatlas[tools]:x86-mingw-static --recurse

./vcpkg install uvatlas:x64-linux
./vcpkg install uvatlas[eigen]:x64-linux --recurse

./vcpkg install uvatlas:arm64-linux
./vcpkg install uvatlas[eigen]:arm64-linux --recurse

And with the Microsoft GDK with Xbox Extensions installed:

vcpkg install directxmesh:x64-xbox-scarlett
vcpkg install directxmesh:x64-xbox-scarlett-static
vcpkg install directxmesh:x64-xbox-xboxone
vcpkg install directxmesh:x64-xbox-xboxone-static

vcpkg install directxtex:x64-xbox-scarlett
vcpkg install directxtex:x64-xbox-scarlett-static
vcpkg install directxtex:x64-xbox-xboxone
vcpkg install directxtex:x64-xbox-xboxone-static

vcpkg install directxtk12:x64-xbox-scarlett
vcpkg install directxtk12:x64-xbox-scarlett-static
vcpkg install directxtk12:x64-xbox-xboxone
vcpkg install directxtk12:x64-xbox-xboxone-static

vcpkg install uvatlas:x64-xbox-scarlett
vcpkg install uvatlas:x64-xbox-scarlett-static
vcpkg install uvatlas:x64-xbox-xboxone
vcpkg install uvatlas:x64-xbox-xboxone-static

ARM (32-bit) is being deprecated, so the arm-windows, arm-uwp triplets for these ports will no longer build.

JonLiu1993
JonLiu1993 previously approved these changes Nov 1, 2024
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Nov 1, 2024
ports/directxtex/Support-using-C-17-std-byte.patch Outdated Show resolved Hide resolved
ports/rsm-bsa/DirectXTexUint8Byte.patch Show resolved Hide resolved
ports/uvatlas/CMakeHeadersPrivate.patch Outdated Show resolved Hide resolved
@vicroms vicroms merged commit 0f16cea into microsoft:master Nov 4, 2024
16 checks passed
@walbourn walbourn deleted the directxoct2024 branch November 4, 2024 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants