[directxtk12][directxtex] Update to latest version (#11971)

https://github.com/microsoft/DirectXTK12/releases/tag/jun2020b
https://github.com/microsoft/DirectXTex/releases/tag/jun2020b

4 files changed, 79 insertions, 79 deletions

diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index 296a2299b..e7d5ac079 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,4 +1,4 @@
-Source: directxtex

-Version: jun2020

-Homepage: https://walbourn.github.io/directxtex

+Source: directxtex
+Version: jun2020b
+Homepage: https://walbourn.github.io/directxtex
 Description: DirectXTex texture processing library
\ No newline at end of file
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 51c15218c..171998225 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -1,70 +1,70 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)

-

-vcpkg_from_github(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO Microsoft/DirectXTex

-    REF jun2020

-    SHA512 cc0ef27f047c34aeb7aa19d1cae66e4b02d3c817a56fd983635178dc2d17d66728ccf6756b11f65376aa17e8622b923a359d0d0d8df94edf9e755ecf2e401c19

-    HEAD_REF master

-)

-

-IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")

-    SET(BUILD_ARCH "Win32")

-ELSE()

-    SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})

-ENDIF()

-

-if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")

-    set(VS_VERSION "2015")

-elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141")

-    set(VS_VERSION "2017")

-elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142")

-    set(VS_VERSION "2019")

-else()

-    message(FATAL_ERROR "Unsupported platform toolset.")

-endif()

-

-if(VCPKG_TARGET_IS_UWP)

-    set(SLN_NAME "Windows10_${VS_VERSION}")

-else()

-    if(TRIPLET_SYSTEM_ARCH STREQUAL "arm64")

-        set(SLN_NAME "Desktop_${VS_VERSION}_Win10")

-    else()

-        set(SLN_NAME "Desktop_${VS_VERSION}")

-    endif()

-endif()

-

-vcpkg_build_msbuild(

-    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_${SLN_NAME}.sln

-    PLATFORM ${TRIPLET_SYSTEM_ARCH}

-)

-

-file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/DirectXTex.h

-    ${SOURCE_PATH}/DirectXTex/DirectXTex.inl

-    DESTINATION ${CURRENT_PACKAGES_DIR}/include

-)

-file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTex.lib

-    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTex.pdb

-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

-file(INSTALL

-    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.lib

-    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.pdb

-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

-

-if(NOT VCPKG_TARGET_IS_UWP AND NOT TRIPLET_SYSTEM_ARCH STREQUAL "arm64")

-    set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtex)

-    file(MAKE_DIRECTORY ${TOOL_PATH})

-    file(INSTALL

-        ${SOURCE_PATH}/Texdiag/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/texdiag.exe

-        DESTINATION ${TOOL_PATH})

-    file(INSTALL

-        ${SOURCE_PATH}/Texconv/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Texconv.exe

-        DESTINATION ${TOOL_PATH})

-    file(INSTALL

-        ${SOURCE_PATH}/Texassemble/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Texassemble.exe

-        DESTINATION ${TOOL_PATH})

-endif()

-

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/DirectXTex
+    REF jun2020b
+    SHA512 e6b978c2c01f7ed4440cf60df65bcf795cc772af4f4f7e6b32e02c32575bc6f779fad45c137ab6b69871463abb4800532318d9e95e12d9a9c0e52197d20c5bd1
+    HEAD_REF master
+)
+
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+    SET(BUILD_ARCH "Win32")
+ELSE()
+    SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
+    set(VS_VERSION "2015")
+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+    set(VS_VERSION "2017")
+elseif (VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
+    set(VS_VERSION "2019")
+else()
+    message(FATAL_ERROR "Unsupported platform toolset.")
+endif()
+
+if(VCPKG_TARGET_IS_UWP)
+    set(SLN_NAME "Windows10_${VS_VERSION}")
+else()
+    if(TRIPLET_SYSTEM_ARCH STREQUAL "arm64")
+        set(SLN_NAME "Desktop_${VS_VERSION}_Win10")
+    else()
+        set(SLN_NAME "Desktop_${VS_VERSION}")
+    endif()
+endif()
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_${SLN_NAME}.sln
+    PLATFORM ${TRIPLET_SYSTEM_ARCH}
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/DirectXTex/DirectXTex.h
+    ${SOURCE_PATH}/DirectXTex/DirectXTex.inl
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+file(INSTALL
+    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTex.lib
+    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTex.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL
+    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.lib
+    ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+
+if(NOT VCPKG_TARGET_IS_UWP AND NOT TRIPLET_SYSTEM_ARCH STREQUAL "arm64")
+    set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtex)
+    file(MAKE_DIRECTORY ${TOOL_PATH})
+    file(INSTALL
+        ${SOURCE_PATH}/Texdiag/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/texdiag.exe
+        DESTINATION ${TOOL_PATH})
+    file(INSTALL
+        ${SOURCE_PATH}/Texconv/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Texconv.exe
+        DESTINATION ${TOOL_PATH})
+    file(INSTALL
+        ${SOURCE_PATH}/Texassemble/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/Texassemble.exe
+        DESTINATION ${TOOL_PATH})
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL
index 90007bd69..eb0388148 100644
--- a/ports/directxtk12/CONTROL
+++ b/ports/directxtk12/CONTROL
@@ -1,4 +1,4 @@
-Source: directxtk12

-Version: jun2020

-Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12

-Description: A collection of helper classes for writing DirectX 12 code in C++.

+Source: directxtk12
+Version: jun2020b
+Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12
+Description: A collection of helper classes for writing DirectX 12 code in C++.
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index fd2994d4b..154b0880e 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK12
-    REF jun2020
-    SHA512 32744ead91216e6e19fb7f8de4924cdb5eba1d04ff7c17d41dd9f497f848c031ac9ec03924d389af2ef893f93995a0f05ffb682383c4ec37253189e405a8eae0
+    REF jun2020b
+    SHA512 5c8815e574d5acfffcf4c14ca06f028353bc30fb3b3680235fba9f94472a553a36cdfd38d0f8a87c63e2be7672b62174482373635fb55020c5ec4a097805dbff
     HEAD_REF master
 )