From f622049f754bb0fff90d26f9f94216362ec03fd1 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 25 Mar 2025 14:01:17 -0700 Subject: [PATCH 1/8] [directxmesh, direcxtex] Update for October 2025 release --- ports/directxmesh/portfile.cmake | 10 +- ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/FixStdByteAndCMake.patch | 284 ---------------------- ports/directxtex/portfile.cmake | 22 +- ports/directxtex/vcpkg.json | 2 +- 5 files changed, 15 insertions(+), 305 deletions(-) delete mode 100644 ports/directxtex/FixStdByteAndCMake.patch diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index bdf5d05cba7ca6..eb4e72b015bb3e 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,12 +1,10 @@ -set(DIRECTXMESH_TAG oct2024) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(DIRECTXMESH_TAG mar2025) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh REF ${DIRECTXMESH_TAG} - SHA512 a7d6eca75315a8f24fdc7753fd0e0b26b1b170ef0ffa1954065164f5da567ba09d1605c45cae91cf73dccc04f52162c3ad62f6a83eddf33c076e6ffb4723276d + SHA512 cedc5a18b875b7d893d0f8e07ae500c0bceeffc876ead6877d13abfeb9c2909de250f568967ed086f1a1ed5a9ba0e63deb23b54dfdec42450068b212131895c0 HEAD_REF main ) @@ -41,7 +39,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe" - SHA512 6b437004ee3b8a44d475db51f01558d777bf3c65b1ea132606b9b682ab6310dbdf0c939ecdf7b621255b6130a424de6db368dd73b8d22393bd932342fd3f45e0 + SHA512 5b7eff37f4009a30d5fa6668928543d7d4d06972721b1f1d86ccc81b5866defc4e37249e1a356a7474fc31c6e1b8daf784a6a8ff8a2b032fdc9cb0afe267d2db ) file(INSTALL @@ -56,7 +54,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert_arm64.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}-arm64.exe" - SHA512 e4f9eb983ea6cfbf18c342d5f1a52210d933ca6bbe7fe5dbca4fee516106f02ac4936804ab222c337ac42eb809c16f06132d51ffa44fb67315c2f28f282afdf3 + SHA512 ac2532295efc42d584af5f60402b652dea640f7b359672b53d5679706d2bd66c9ba1b5bf60e2bf78bad47a2c9cf4cb3544735aad945766cade3324d88c2f3d97 ) file(INSTALL diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 89d0d4cf187317..26998317873e54 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2024-10-28", + "version-date": "2025-03-24", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxtex/FixStdByteAndCMake.patch b/ports/directxtex/FixStdByteAndCMake.patch deleted file mode 100644 index f1aa25537ddba1..00000000000000 --- a/ports/directxtex/FixStdByteAndCMake.patch +++ /dev/null @@ -1,284 +0,0 @@ -diff --git a/Auxiliary/DirectXTexXbox.h b/Auxiliary/DirectXTexXbox.h -index 0829c8f..9f75866 100644 ---- a/Auxiliary/DirectXTexXbox.h -+++ b/Auxiliary/DirectXTexXbox.h -@@ -132,6 +132,39 @@ namespace Xbox - HRESULT __cdecl SaveToDDSMemory(_In_ const XboxImage& xbox, _Out_ DirectX::Blob& blob); - HRESULT __cdecl SaveToDDSFile(_In_ const XboxImage& xbox, _In_z_ const wchar_t* szFile); - -+#ifdef __cpp_lib_byte -+ inline HRESULT __cdecl GetMetadataFromDDSMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox) -+ { -+ return GetMetadataFromDDSMemory(reinterpret_cast(pSource), size, metadata, isXbox); -+ } -+ -+ inline HRESULT __cdecl GetMetadataFromDDSMemoryEx( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _Out_ DirectX::TexMetadata& metadata, _Out_ bool& isXbox, -+ _Out_opt_ DirectX::DDSMetaData* ddPixelFormat) -+ { -+ return GetMetadataFromDDSMemoryEx(reinterpret_cast(pSource), size, metadata, isXbox, ddPixelFormat); -+ } -+ -+ inline HRESULT __cdecl LoadFromDDSMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _Out_opt_ DirectX::TexMetadata* metadata, _Out_ XboxImage& image) -+ { -+ return LoadFromDDSMemory(reinterpret_cast(pSource), size, metadata, image); -+ } -+ -+ inline HRESULT __cdecl LoadFromDDSMemoryEx( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _Out_opt_ DirectX::TexMetadata* metadata, -+ _Out_opt_ DirectX::DDSMetaData* ddPixelFormat, -+ _Out_ XboxImage& image) -+ { -+ return LoadFromDDSMemoryEx(reinterpret_cast(pSource), size, metadata, ddPixelFormat, image); -+ } -+#endif // __cpp_lib_byte -+ - //--------------------------------------------------------------------------------- - // Xbox Texture Tiling / Detiling (requires XG DLL to be present at runtime) - -@@ -178,4 +211,20 @@ namespace Xbox - const XboxImage& xbox, - _Out_writes_bytes_(maxsize) uint8_t* pDestination, _In_ size_t maxsize) noexcept; - -+#ifdef __cpp_lib_byte -+ inline HRESULT __cdecl EncodeDDSHeader( -+ const XboxImage& xbox, -+ _Out_writes_bytes_(maxsize) std::byte* pDestination, _In_ size_t maxsize) noexcept -+ { -+ return EncodeDDSHeader(xbox, reinterpret_cast(pDestination), maxsize); -+ } -+ -+ inline HRESULT __cdecl EncodeDDSHeader( -+ const XboxImage& xbox, -+ _Reserved_ std::nullptr_t, _In_ size_t maxsize) noexcept -+ { -+ return EncodeDDSHeader(xbox, static_cast(nullptr), maxsize); -+ } -+#endif -+ - } // namespace -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cffe5ca..e26b5a1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -311,7 +311,11 @@ endif() - - if(MINGW OR (NOT WIN32)) - find_package(directxmath CONFIG REQUIRED) -+ target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath) -+ - find_package(directx-headers CONFIG REQUIRED) -+ target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers) -+ target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS) - else() - find_package(directxmath CONFIG QUIET) - find_package(directx-headers CONFIG QUIET) -@@ -319,13 +323,13 @@ endif() - - if(directxmath_FOUND) - message(STATUS "Using DirectXMath package") -- target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath) -+ target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXMath) - endif() - - if(directx-headers_FOUND) - message(STATUS "Using DirectX-Headers package") -- target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers) -- target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS) -+ target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers) -+ target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS) - target_compile_options(${PROJECT_NAME} PRIVATE $<$:/wd4062> $<$:-Wno-switch-enum>) - endif() - -diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h -index e24142c..4dc36c8 100644 ---- a/DirectXTex/DirectXTex.h -+++ b/DirectXTex/DirectXTex.h -@@ -382,6 +382,34 @@ namespace DirectX - _In_z_ const wchar_t* szFile, - _Out_ TexMetadata& metadata) noexcept; - -+#ifdef __cpp_lib_byte -+ HRESULT __cdecl GetMetadataFromDDSMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ DDS_FLAGS flags, -+ _Out_ TexMetadata& metadata) noexcept; -+ HRESULT __cdecl GetMetadataFromDDSMemoryEx( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ DDS_FLAGS flags, -+ _Out_ TexMetadata& metadata, -+ _Out_opt_ DDSMetaData* ddPixelFormat) noexcept; -+ HRESULT __cdecl GetMetadataFromHDRMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _Out_ TexMetadata& metadata) noexcept; -+ HRESULT __cdecl GetMetadataFromTGAMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ TGA_FLAGS flags, -+ _Out_ TexMetadata& metadata) noexcept; -+ -+#ifdef _WIN32 -+ HRESULT __cdecl GetMetadataFromWICMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ WIC_FLAGS flags, -+ _Out_ TexMetadata& metadata, -+ _In_ std::function getMQR = nullptr); -+#endif -+#endif // __cpp_lib_byte -+ -+ - //--------------------------------------------------------------------------------- - // Bitmap image container - struct Image -@@ -590,6 +618,34 @@ namespace DirectX - HRESULT __cdecl SaveToTGAMemory(_In_ const Image& image, _Out_ Blob& blob, _In_opt_ const TexMetadata* metadata = nullptr) noexcept; - HRESULT __cdecl SaveToTGAFile(_In_ const Image& image, _In_z_ const wchar_t* szFile, _In_opt_ const TexMetadata* metadata = nullptr) noexcept; - -+#ifdef __cpp_lib_byte -+ HRESULT __cdecl LoadFromDDSMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ DDS_FLAGS flags, -+ _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept; -+ HRESULT __cdecl LoadFromDDSMemoryEx( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ DDS_FLAGS flags, -+ _Out_opt_ TexMetadata* metadata, -+ _Out_opt_ DDSMetaData* ddPixelFormat, -+ _Out_ ScratchImage& image) noexcept; -+ HRESULT __cdecl LoadFromHDRMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept; -+ HRESULT __cdecl LoadFromTGAMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ TGA_FLAGS flags, -+ _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept; -+ -+#ifdef _WIN32 -+ HRESULT __cdecl LoadFromWICMemory( -+ _In_reads_bytes_(size) const std::byte* pSource, _In_ size_t size, -+ _In_ WIC_FLAGS flags, -+ _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image, -+ _In_ std::function getMQR = nullptr); -+#endif -+#endif // __cpp_lib_byte -+ - //--------------------------------------------------------------------------------- - // Texture conversion, resizing, mipmap generation, and block compression - -@@ -959,6 +1015,18 @@ namespace DirectX - _Out_writes_bytes_to_opt_(maxsize, required) uint8_t* pDestination, _In_ size_t maxsize, - _Out_ size_t& required) noexcept; - -+#ifdef __cpp_lib_byte -+ HRESULT __cdecl EncodeDDSHeader( -+ _In_ const TexMetadata& metadata, DDS_FLAGS flags, -+ _Out_writes_bytes_to_opt_(maxsize, required) std::byte* pDestination, _In_ size_t maxsize, -+ _Out_ size_t& required) noexcept; -+ -+ HRESULT __cdecl EncodeDDSHeader( -+ _In_ const TexMetadata& metadata, DDS_FLAGS flags, -+ _Reserved_ std::nullptr_t, _In_ size_t maxsize, -+ _Out_ size_t& required) noexcept; -+#endif -+ - //--------------------------------------------------------------------------------- - // Direct3D interop - -diff --git a/DirectXTex/DirectXTex.inl b/DirectXTex/DirectXTex.inl -index 49745ae..d20f41e 100644 ---- a/DirectXTex/DirectXTex.inl -+++ b/DirectXTex/DirectXTex.inl -@@ -190,3 +190,85 @@ inline HRESULT __cdecl SaveToTGAFile(const Image& image, const wchar_t* szFile, - { - return SaveToTGAFile(image, TGA_FLAGS_NONE, szFile, metadata); - } -+ -+ -+//===================================================================================== -+// C++17 helpers -+//===================================================================================== -+#ifdef __cpp_lib_byte -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl GetMetadataFromDDSMemory(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata& metadata) noexcept -+{ -+ return GetMetadataFromDDSMemory(reinterpret_cast(pSource), size, flags, metadata); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl LoadFromDDSMemory(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata* metadata, ScratchImage& image) noexcept -+{ -+ return LoadFromDDSMemory(reinterpret_cast(pSource), size, flags, metadata, image); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl GetMetadataFromDDSMemoryEx(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata& metadata, DDSMetaData* ddPixelFormat) noexcept -+{ -+ return GetMetadataFromDDSMemoryEx(reinterpret_cast(pSource), size, flags, metadata, ddPixelFormat); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl LoadFromDDSMemoryEx(const std::byte* pSource, size_t size, DDS_FLAGS flags, TexMetadata* metadata, DDSMetaData* ddPixelFormat, ScratchImage& image) noexcept -+{ -+ return LoadFromDDSMemoryEx(reinterpret_cast(pSource), size, flags, metadata, ddPixelFormat, image); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl GetMetadataFromHDRMemory(const std::byte* pSource, size_t size, TexMetadata& metadata) noexcept -+{ -+ return GetMetadataFromHDRMemory(reinterpret_cast(pSource), size, metadata); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl LoadFromHDRMemory(const std::byte* pSource, size_t size, TexMetadata* metadata, ScratchImage& image) noexcept -+{ -+ return LoadFromHDRMemory(reinterpret_cast(pSource), size, metadata, image); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl GetMetadataFromTGAMemory(const std::byte* pSource, size_t size, TGA_FLAGS flags, TexMetadata& metadata) noexcept -+{ -+ return GetMetadataFromTGAMemory(reinterpret_cast(pSource), size, flags, metadata); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl LoadFromTGAMemory(const std::byte* pSource, size_t size, TGA_FLAGS flags, TexMetadata* metadata, ScratchImage& image) noexcept -+{ -+ return LoadFromTGAMemory(reinterpret_cast(pSource), size, flags, metadata, image); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl EncodeDDSHeader(const TexMetadata& metadata, DDS_FLAGS flags, std::byte* pDestination, size_t maxsize, size_t& required) noexcept -+{ -+ return EncodeDDSHeader(metadata, flags, reinterpret_cast(pDestination), maxsize, required); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl EncodeDDSHeader(const TexMetadata& metadata, DDS_FLAGS flags, std::nullptr_t, size_t maxsize, size_t& required) noexcept -+{ -+ return EncodeDDSHeader(metadata, flags, static_cast(nullptr), maxsize, required); -+} -+ -+#ifdef _WIN32 -+_Use_decl_annotations_ -+inline HRESULT __cdecl GetMetadataFromWICMemory(const std::byte* pSource, size_t size, WIC_FLAGS flags, TexMetadata& metadata, std::function getMQR) -+{ -+ return GetMetadataFromWICMemory(reinterpret_cast(pSource), size, flags, metadata, getMQR); -+} -+ -+_Use_decl_annotations_ -+inline HRESULT __cdecl LoadFromWICMemory(const std::byte* pSource, size_t size, WIC_FLAGS flags, TexMetadata* metadata, ScratchImage& image, std::function getMQR) -+{ -+ return LoadFromWICMemory(reinterpret_cast(pSource), size, flags, metadata, image, getMQR); -+} -+#endif // _WIN32 -+ -+#endif // __cpp_lib_byte --- -2.47.0.vfs.0.3 - diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 18dd8a20dddb74..09980ace502276 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,16 +1,12 @@ -set(DIRECTXTEX_TAG oct2024) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(DIRECTXTEX_TAG mar2025) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex REF ${DIRECTXTEX_TAG} - SHA512 4ac9307ab6e36aa727afa5bd5bb945fb431c89fa01c9c8283eebf512707acfb15a0d7cd84f72349d4271b0eef2e13bca38a38226c1afafd8f1e36b38c1c4b07f + SHA512 9d9f57b80e3167229bf1e8e95568c8924771fd0ba769f2f1933d74b36d03f949e02506e68f43f834974982fb02d285c943c3eb6a71e17fd34c28b56d2381272f HEAD_REF main - PATCHES - FixStdByteAndCMake.patch - ) +) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -69,21 +65,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}.exe" - SHA512 bb3c45d35305a56b80035bd7c076cd0000461cb37a5cd9495ac8f8a1647967fb6ecb02245336356674829f179ef05330d5aa9e768637e93b9db587d7eb684dfe + SHA512 1a03ccf6aaec391fd15a9c5308ce2fe30d672080694a5288f396fb077a8944d157c432a2eba1abfcf51f198a16ceb5abffd1064bb231a5c8824e223246a9e8fa ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe" FILENAME "texconv-${DIRECTXTEX_TAG}.exe" - SHA512 6376ee91dca0b53c043e1e86ec56f418029591885dd9fd49f8e932aa635e6668d430aeb30b497daa4e8c1f02ac42f7dc901ebec107d8bc1e611c9a0ec8747029 + SHA512 b3e91200c0ebc8395c43eeccb460a30fb024a91a1e82f27548827b3e63946b50014b4bc1a8fd0a5f05317e3be8b7e15d28767475a7d96d222e54af79843343db ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}.exe" - SHA512 31261ceefc17ce30c7f21dff961bfe03b2dc65619f60c64891a5fc56847cd7468a6629c36b1fcbf4c6f967232ad88eb85cf5c2ea874084dfe0d8da4ffabc12c8 + SHA512 880ab7fd3b9823dbe3ad2253e9d52e7e9c051a6ab51f498f2197f3565dae66b9eb1d08c29f712f089e5d9227137326b200c7b81507267ae15064ea271017b4a1 ) file(INSTALL @@ -102,21 +98,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 48b629b7aead482c0dc96c2fcfb28d534076d62dc77ce94256ad52df48596c1993645900873bf0dfd3d888087b423c350ba3f420b1305ef2ed7a43eafecfb523 + SHA512 28ecb38b112457c35e714c5662daf9e863d3d0228b97f12a8e0d92c7290a03a386066eb4b06d87d9d86e7be4ead96bc6d403f6959c19dff7cc8045bac79e69c9 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe" FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 53f319be7e739d9e3addc2e86648022ec802315a94c600eb6886a4474232aa25de0c9fb8d72868d2871d29eb36ee1dd6a186094edb6d9ab8f249b4eb4849a10c + SHA512 27c2f65d15bf81b169380c056df2870c8a9f14d0ab5b74582b389b3daab5999ca35388a4713e47f8c73504c8216e29168a7e756b83046b80031b1ab41455eb04 ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 638b6b8443767ca390efdfdb8e4e8a655f0cc370a81b946678414481a6c3fc0c431a7082d08206fa86bc4ccf9c8b0027a427d483474a8c3d1ff0a030011779f7 + SHA512 ed403c44f3b4fc23fcbe33c820f58ee2446bc8aa8247022be145ebf16c40123a58b9d8d86967572556a79d2910cdcdc751f1d181c70722af70e461c0b855a99e ) file(INSTALL diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 50c8d71f153222..c2a9ccf488899d 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2024-10-28", + "version-date": "2025-03-24", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", From 9ad632d124fd4862f1a9c5c55db64eee2be43fb0 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 25 Mar 2025 14:01:56 -0700 Subject: [PATCH 2/8] Update basdeline --- versions/baseline.json | 4 ++-- versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a84004f4e278fe..015fb13a2de7fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2329,7 +2329,7 @@ "port-version": 1 }, "directxmesh": { - "baseline": "2024-10-28", + "baseline": "2025-03-24", "port-version": 0 }, "directxsdk": { @@ -2337,7 +2337,7 @@ "port-version": 8 }, "directxtex": { - "baseline": "2024-10-28", + "baseline": "2025-03-24", "port-version": 0 }, "directxtk": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index 2daef5c8ebfb36..2b0de115d89ce4 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97670a115e8a82b23b281c2b289f4e43e22798e0", + "version-date": "2025-03-24", + "port-version": 0 + }, { "git-tree": "bf34ce542e4e55ddd839cb50381cb0207c94b3d7", "version-date": "2024-10-28", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 2c461354249f8e..6e6da8ec336838 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdb9b4f3484bd708850ee14d0550ea05aef608ad", + "version-date": "2025-03-24", + "port-version": 0 + }, { "git-tree": "5ba303f8b50e8237cef6809bbf8a891adea2203d", "version-date": "2024-10-28", From 06f597ea2a974f5b1f18ad6f57b19915ff8d8370 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 27 Mar 2025 11:40:51 -0700 Subject: [PATCH 3/8] Code review for directxtex port --- ports/directxtex/portfile.cmake | 6 ++++++ ports/directxtex/usage | 7 ------- ports/directxtex/vcpkg.json | 8 ++++++-- ports/directxtex/xboxusage | 7 +++++++ 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 ports/directxtex/xboxusage diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 09980ace502276..4f91c31c6c6ec2 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -138,4 +138,10 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +if("xbox" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/xboxusage" USAGE_CONTENT) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" ${USAGE_CONTENT}) +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtex/usage b/ports/directxtex/usage index 6066b0ccb7449f..525d1f0c3d9560 100644 --- a/ports/directxtex/usage +++ b/ports/directxtex/usage @@ -2,10 +2,3 @@ The DirectXTex package provides CMake targets: find_package(directxtex CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::DirectXTex) - -For the 'xbox' feature, it defaults to targeting Xbox Series X|S. To set it to Xbox One, -create a custom triplet from x64-windows with the addition of the following: - - if (PORT STREQUAL "directxtex") - set(DIRECTXTEX_XBOX_CONSOLE_TARGET "xboxone") - endif() diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index c2a9ccf488899d..8d7e36f7ad7343 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -26,11 +26,15 @@ } ], "default-features": [ - "dx11" + { + "name": "dx11", + "platform": "windows & !xbox" + } ], "features": { "dx11": { - "description": "Build with DirectX11 support" + "description": "Build with DirectX11 support", + "supports": "windows & !xbox" }, "dx12": { "description": "Build with DirectX12 support for Windows 10/Windows 11", diff --git a/ports/directxtex/xboxusage b/ports/directxtex/xboxusage new file mode 100644 index 00000000000000..c0287b2270a45f --- /dev/null +++ b/ports/directxtex/xboxusage @@ -0,0 +1,7 @@ + +For the 'xbox' feature, it defaults to targeting Xbox Series X|S. To set it to Xbox One, +create a custom triplet from x64-windows with the addition of the following: + + if (PORT STREQUAL "directxtex") + set(DIRECTXTEX_XBOX_CONSOLE_TARGET "xboxone") + endif() From 9bd0f41ed212ee9ae46919b77e4278fc14fd94e8 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 27 Mar 2025 11:41:18 -0700 Subject: [PATCH 4/8] Update baseline --- versions/d-/directxtex.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 6e6da8ec336838..5fe9116a736238 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fdb9b4f3484bd708850ee14d0550ea05aef608ad", + "git-tree": "6dabc0c6bb883c709ee7d7e5b57375e53d78786d", "version-date": "2025-03-24", "port-version": 0 }, From 4cae96ec06ccc227200614c4ee19a39d7c52f905 Mon Sep 17 00:00:00 2001 From: walbourn Date: Thu, 27 Mar 2025 20:22:20 -0700 Subject: [PATCH 5/8] [uvtlas] update for March 2025 release --- ports/uvatlas/FixCMake.patch | 36 ------------------------------------ ports/uvatlas/portfile.cmake | 8 +++----- ports/uvatlas/vcpkg.json | 2 +- 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 ports/uvatlas/FixCMake.patch diff --git a/ports/uvatlas/FixCMake.patch b/ports/uvatlas/FixCMake.patch deleted file mode 100644 index ad5f81448e9d74..00000000000000 --- a/ports/uvatlas/FixCMake.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9be54f3..5656d03 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -139,7 +139,11 @@ endif() - - if(MINGW OR (NOT WIN32)) - find_package(directxmath CONFIG REQUIRED) -+ target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath) -+ - find_package(directx-headers CONFIG REQUIRED) -+ target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers) -+ target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS) - else() - find_package(directxmath CONFIG QUIET) - find_package(directx-headers CONFIG QUIET) -@@ -147,13 +151,13 @@ endif() - - if(directxmath_FOUND) - message(STATUS "Using DirectXMath package") -- target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectXMath) -+ target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXMath) - endif() - - if(directx-headers_FOUND) - message(STATUS "Using DirectX-Headers package") -- target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers) -- target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS) -+ target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers) -+ target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS) - endif() - - if(ENABLE_USE_EIGEN) --- -2.47.0.vfs.0.3 - diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 2a911866e518c7..f7b7a051cf8014 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,4 +1,4 @@ -set(UVATLAS_TAG oct2024) +set(UVATLAS_TAG mar2025) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,10 +6,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas REF ${UVATLAS_TAG} - SHA512 0ff09914445344eac748e7e6cfddebb062a0c7f36dc79d1591f5337b6600e69430aafc6f8a4cf5e3c343aea990feac4afa4cf4cf5f1e2d0865746008583bcf3d + SHA512 9d0248b9282d97998b0f9c0794523dace50e695aec149caa464b66baad1f2200a163d03717fbeb7956a514aff04122cacb2e8e3b2b46958bcc2a5c6699fde4a2 HEAD_REF main - PATCHES - FixCMake.patch ) vcpkg_check_features( @@ -43,7 +41,7 @@ if("tools" IN_LIST FEATURES) UVATLASTOOL_EXE URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe" FILENAME "uvatlastool-${UVATLAS_TAG}.exe" - SHA512 e4b08d355b311481cabb11afb2c0da745b033b4f9c09461a07da2f265944e84e4730e38f4f5f3ff7f1438b8f066f714876bdccc4d26d7dfb82a21646e509389b + SHA512 e987977cd861b07134ca4dec1eb333fa19562d225eed98178bbcb2085fe2f045e89b56d33595a86de9625e1922e3b1d8ef5ddd1186edb4131dc5ceda2fa4edbc ) file(INSTALL diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 4168ac3f83a9c4..59d38319d5d6d2 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2024-10-29", + "version-date": "2025-03-26", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", From 916e4a9025f4575ab8a99f3e0cc013f69b1e22d2 Mon Sep 17 00:00:00 2001 From: walbourn Date: Thu, 27 Mar 2025 20:22:32 -0700 Subject: [PATCH 6/8] Update baseline --- versions/baseline.json | 2 +- versions/u-/uvatlas.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 015fb13a2de7fe..c22a4c9ec1b5fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9537,7 +9537,7 @@ "port-version": 1 }, "uvatlas": { - "baseline": "2024-10-29", + "baseline": "2025-03-26", "port-version": 0 }, "uvw": { diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 876de4fd18be63..ecd3f5f0e945ff 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecd88f9027d2a8950a46a884234051b28042d80c", + "version-date": "2025-03-26", + "port-version": 0 + }, { "git-tree": "2059b1fac30299fb988bee51c78964d8aa42b30e", "version-date": "2024-10-29", From f96f91dbe1519ac0e97e0e3a44a311e1d284f6e4 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 27 Mar 2025 22:05:48 -0700 Subject: [PATCH 7/8] Code review --- ports/uvatlas/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index f7b7a051cf8014..fa9f5ef7e62470 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,7 +1,5 @@ set(UVATLAS_TAG mar2025) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas From 68789a9c26b9a0bc71eb475bb2d879ec9a5dca27 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 27 Mar 2025 22:05:56 -0700 Subject: [PATCH 8/8] Update baseline --- versions/u-/uvatlas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index ecd3f5f0e945ff..2e8b896e175ccc 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ecd88f9027d2a8950a46a884234051b28042d80c", + "git-tree": "c31a26b41cee3d6a6e4a0d540c95b89793fbdb44", "version-date": "2025-03-26", "port-version": 0 },