diff --git a/ports/directx-dxc/portfile.cmake b/ports/directx-dxc/portfile.cmake index 5c735aa6bc..22251e30dc 100644 --- a/ports/directx-dxc/portfile.cmake +++ b/ports/directx-dxc/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.6.2112/dxc_2021_12_08.zip" - FILENAME "dxc_2021_12_08.zip" - SHA512 e9b36e896c1d47b39b648adbecf44da7f8543216fd1df539760f0c591907aea081ea6bfc59eb927073aaa1451110c5dc63003546509ff84c9e4445488df97c27 + URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip" + FILENAME "dxc_2022_07_18.zip" + SHA512 b34d770ed9299e6a9ade12cd8d9add28f50e41abdfcdbc7e272568d7f78fe5a8f2bbe5f905839981b97d34b52e1fa627ceacd55743f2cf71e39861418b11ae3b ) vcpkg_download_distfile( LICENSE_TXT - URLS "https://raw.githubusercontent.com/microsoft/DirectXShaderCompiler/v1.6.2112/LICENSE.TXT" - FILENAME "LICENSE.v1.6.2112" + URLS "https://raw.githubusercontent.com/microsoft/DirectXShaderCompiler/v1.7.2207/LICENSE.TXT" + FILENAME "LICENSE.v1.7.2207" SHA512 7589f152ebc3296dca1c73609a2a23a911b8fc0029731268a6151710014d82005a868c85c8249219f060f64ab1ddecdddff5ed6ea34ff509f63ea3e42bbbf47e ) @@ -19,24 +19,30 @@ vcpkg_extract_source_archive_ex( NO_REMOVE_ONE_LEVEL ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(DXC_ARCH arm64) +else() + set(DXC_ARCH x64) +endif() + file(INSTALL "${PACKAGE_PATH}/inc/d3d12shader.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(INSTALL "${PACKAGE_PATH}/inc/dxcapi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${PACKAGE_PATH}/lib/x64/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${PACKAGE_PATH}/lib/x64/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -file(COPY "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -file(COPY "${PACKAGE_PATH}/bin/x64/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/bin/x64/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") file(INSTALL - "${PACKAGE_PATH}/bin/x64/dxc.exe" - "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" - "${PACKAGE_PATH}/bin/x64/dxil.dll" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxc.exe" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json index 67feec1ab2..3f86fd8a38 100644 --- a/ports/directx-dxc/vcpkg.json +++ b/ports/directx-dxc/vcpkg.json @@ -1,9 +1,9 @@ { "name": "directx-dxc", - "version-date": "2021-12-08", + "version-date": "2022-07-18", "description": "DirectX Shader Compiler (LLVM/Clang)", "homepage": "https://github.com/microsoft/DirectXShaderCompiler", "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki", "license": null, - "supports": "windows & x64 & !uwp & !staticcrt" + "supports": "windows & (x64 | arm64) & !uwp & !staticcrt" } diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 8524ce3fbb..a53e3d9e5c 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF jun2022b - SHA512 b72080d83ff894fcf5b9efd4f90715fc4a7d457150e1561a3093188d5533e4e856146f83277a5ddee8d7a84a193484cf9d13165a6a7ffb8ada931cf1ccb31eb3 + REF jun2022c + SHA512 48c923920634c74fd0e9a40d29a01d8a6afe321cb3e41145f76bdcc63320a5bb1552a52550b975dbd7d238c576bf75e3e7d5024f347e2cce80495f05313a1a94 HEAD_REF main ) diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 7a0613d49e..b82bf8ff1e 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2022-06-15", + "version-date": "2022-07-19", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index 0e5dae463f..126364cd3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1885,7 +1885,7 @@ "port-version": 3 }, "directx-dxc": { - "baseline": "2021-12-08", + "baseline": "2022-07-18", "port-version": 0 }, "directx-headers": { @@ -1913,7 +1913,7 @@ "port-version": 0 }, "directxtk12": { - "baseline": "2022-06-15", + "baseline": "2022-07-19", "port-version": 0 }, "dirent": { diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json index 227c7bf95c..5af87edbbe 100644 --- a/versions/d-/directx-dxc.json +++ b/versions/d-/directx-dxc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a28201604813ea41d43456d40bdbea61af0db69", + "version-date": "2022-07-18", + "port-version": 0 + }, { "git-tree": "6f2dfd1c848d67e0f36d83b8a6e7078b96d82df1", "version-date": "2021-12-08", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 0eb3cf42a0..7a427e9172 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "406076922dc0aec8b45b0024e00b0718fd6eb65f", + "version-date": "2022-07-19", + "port-version": 0 + }, { "git-tree": "12033a288a049744a73de4d48c55210ba7201310", "version-date": "2022-06-15",