From 0fd2ad76efa110d3e4b2b98b60cd17ed5051ac43 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 20 Nov 2023 19:26:38 -0800 Subject: [PATCH] [dstorage] Update for version 1.2.2 (#35179) * [dstorage] Update for version 1.2.2 which drops ARM32 * Update baseline * Code review feedback * Update baseline --- ports/dstorage/portfile.cmake | 5 +++-- ports/dstorage/usage | 4 ++++ ports/dstorage/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/d-/dstorage.json | 5 +++++ 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 ports/dstorage/usage diff --git a/ports/dstorage/portfile.cmake b/ports/dstorage/portfile.cmake index a0c36a349e..2676c59f37 100644 --- a/ports/dstorage/portfile.cmake +++ b/ports/dstorage/portfile.cmake @@ -5,7 +5,7 @@ set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/${VERSION}" FILENAME "directstorage.${VERSION}.zip" - SHA512 5be6219888c89c5f590709d1528b3e6854eabd7b733af5c8f665aa9d7e987fa3bac34472362f845eb902b88d2d6e8afbbcead15e892d72678861a14b0bc13c41 + SHA512 f24f681edf0c5e047573c68ca85ab62e0ffefaf87867d45231d779e9bc8e9525891b56314cc30e58eaef20132335f011f32aba22654d2e7caf23338aeb29c6ce ) vcpkg_extract_source_archive( @@ -25,6 +25,7 @@ file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore. file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") configure_file("${CMAKE_CURRENT_LIST_DIR}/dstorage-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/ports/dstorage/usage b/ports/dstorage/usage new file mode 100644 index 0000000000..259ccf4da9 --- /dev/null +++ b/ports/dstorage/usage @@ -0,0 +1,4 @@ +The DirectStorage package provides CMake targets: + + find_package(dstorage CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectStorage) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 0e62ec9bd9..3bd19390b4 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dstorage", - "version": "1.2.0", + "version": "1.2.2", "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "documentation": "https://github.com/microsoft/DirectStorage", "license": null, - "supports": "windows & !uwp & !xbox" + "supports": "windows & !arm32 & !uwp & !xbox" } diff --git a/versions/baseline.json b/versions/baseline.json index 28c176bcaf..d67d410e9c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2265,7 +2265,7 @@ "port-version": 1 }, "dstorage": { - "baseline": "1.2.0", + "baseline": "1.2.2", "port-version": 0 }, "dtl": { diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index 65d2476f02..48bc43cc54 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7577afa856f2cf3d3ce28d32f3272344987f2a71", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "18440695231677ed659b391e4a31c0100996cdb6", "version": "1.2.0",