From 3a68779f3fdff007064fb06bf93dbcb484f675a3 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 29 Jul 2024 23:02:11 -0700 Subject: [PATCH] [dstorage, xaudio2redist] updated port to work for arm64ec (#40161) --- ports/dstorage/portfile.cmake | 14 +++++++++++--- ports/dstorage/vcpkg.json | 1 + ports/xaudio2redist/portfile.cmake | 22 ++++++++++++++-------- ports/xaudio2redist/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/dstorage.json | 5 +++++ versions/x-/xaudio2redist.json | 5 +++++ 7 files changed, 39 insertions(+), 14 deletions(-) diff --git a/ports/dstorage/portfile.cmake b/ports/dstorage/portfile.cmake index 38e538ab90..92d3c1f348 100644 --- a/ports/dstorage/portfile.cmake +++ b/ports/dstorage/portfile.cmake @@ -14,13 +14,21 @@ vcpkg_extract_source_archive( NO_REMOVE_ONE_LEVEL ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(DS_ARCH arm64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(DS_ARCH x86) +else() + set(DS_ARCH x64) +endif() + file(INSTALL "${PACKAGE_PATH}/native/include/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${PACKAGE_PATH}/native/include/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${PACKAGE_PATH}/native/lib/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/native/lib/${DS_ARCH}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${DS_ARCH}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${DS_ARCH}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index af71c44c61..198f8de51b 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dstorage", "version": "1.2.3", + "port-version": 1, "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "documentation": "https://github.com/microsoft/DirectStorage", diff --git a/ports/xaudio2redist/portfile.cmake b/ports/xaudio2redist/portfile.cmake index 5d7be988b7..193abfe51a 100644 --- a/ports/xaudio2redist/portfile.cmake +++ b/ports/xaudio2redist/portfile.cmake @@ -13,31 +13,37 @@ vcpkg_extract_source_archive( NO_REMOVE_ONE_LEVEL ) +if(XAUDIO_ARCH STREQUAL "x86") + set(XAUDIO_ARCH x86) +else() + set(XAUDIO_ARCH x64) +endif() + file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h") file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${XAUDIO_ARCH}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${XAUDIO_ARCH}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") set(lib_suffix "_md") else() - file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${XAUDIO_ARCH}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") set(lib_suffix "") endif() -file(INSTALL "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(INSTALL "${PACKAGE_PATH}/build/native/release/bin/${XAUDIO_ARCH}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") if(NOT DEFINED VCPKG_BUILD_TYPE) - file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${XAUDIO_ARCH}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${XAUDIO_ARCH}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") else() - file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${XAUDIO_ARCH}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() - file(INSTALL "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/bin/${XAUDIO_ARCH}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in" diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 73ff55325c..4b96010a22 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xaudio2redist", "version": "1.2.11", - "port-version": 2, + "port-version": 3, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "documentation": "https://aka.ms/XAudio2Redist", diff --git a/versions/baseline.json b/versions/baseline.json index 1be352f38e..2d7bf62886 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2374,7 +2374,7 @@ }, "dstorage": { "baseline": "1.2.3", - "port-version": 0 + "port-version": 1 }, "dtl": { "baseline": "1.20", @@ -9570,7 +9570,7 @@ }, "xaudio2redist": { "baseline": "1.2.11", - "port-version": 2 + "port-version": 3 }, "xbitmaps": { "baseline": "1.1.2", diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index d0666b10b8..6161362933 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5b86f56e2f801673a67e2971ca39d839dd83f6b", + "version": "1.2.3", + "port-version": 1 + }, { "git-tree": "53c80dd514155b13089dca50cc53d539af8503eb", "version": "1.2.3", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index eac07c946d..d73fdd0ba6 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa6ba77559dd683ed82dc24204784c5d3c280dae", + "version": "1.2.11", + "port-version": 3 + }, { "git-tree": "f6cb8fa89efa0d50385ddfb245b02ea67197b0d6", "version": "1.2.11",