directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach… (#15639)

* directxtex, directxmesh, directxtk, uvatlas ports updated to fix cache-collision issues

* Updated ports to jan2021b

* update baseline

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

16 files changed, 95 insertions, 48 deletions

diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index 0d7dc02a5..9d7d99eb3 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -1585,7 +1585,7 @@
       "port-version": 0
     },
     "directxmesh": {
-      "baseline": "jan2021",
+      "baseline": "jan2021b",
       "port-version": 0
     },
     "directxsdk": {
@@ -1593,15 +1593,15 @@
       "port-version": 0
     },
     "directxtex": {
-      "baseline": "jan2021",
+      "baseline": "jan2021b",
       "port-version": 0
     },
     "directxtk": {
-      "baseline": "jan2021",
+      "baseline": "jan2021b",
       "port-version": 0
     },
     "directxtk12": {
-      "baseline": "jan2021",
+      "baseline": "jan2021b",
       "port-version": 0
     },
     "dirent": {
@@ -5941,7 +5941,7 @@
       "port-version": 0
     },
     "uvatlas": {
-      "baseline": "jan2021",
+      "baseline": "jan2021b",
       "port-version": 0
     },
     "uvw": {
diff --git a/port_versions/d-/directxmesh.json b/port_versions/d-/directxmesh.json
index c8725cb70..81ec78260 100644
--- a/port_versions/d-/directxmesh.json
+++ b/port_versions/d-/directxmesh.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5d476e8f15e28c928fc9de9898951a9eeeb5b2ae",
+      "version-string": "jan2021b",
+      "port-version": 0
+    },
+    {
       "git-tree": "05b2c430ee01c88129da70cf887321d662be4e35",
       "version-string": "jan2021",
       "port-version": 0
diff --git a/port_versions/d-/directxtex.json b/port_versions/d-/directxtex.json
index 70548d6f7..07195843c 100644
--- a/port_versions/d-/directxtex.json
+++ b/port_versions/d-/directxtex.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "ddb9174d08513e8ad6a9ffc4cedc024fc1b6f68d",
+      "version-string": "jan2021b",
+      "port-version": 0
+    },
+    {
       "git-tree": "8bd2114b5c801b2dd0119df1cdf292c706e6c710",
       "version-string": "jan2021",
       "port-version": 0
diff --git a/port_versions/d-/directxtk.json b/port_versions/d-/directxtk.json
index c6060bf3d..314211fc1 100644
--- a/port_versions/d-/directxtk.json
+++ b/port_versions/d-/directxtk.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "d27a700ccc7ce75a1f7d79665795a042d6bd5df5",
+      "version-string": "jan2021b",
+      "port-version": 0
+    },
+    {
       "git-tree": "ec32976b82af8176471254162dd09194e254f7b2",
       "version-string": "jan2021",
       "port-version": 0
diff --git a/port_versions/d-/directxtk12.json b/port_versions/d-/directxtk12.json
index d19fd9689..ce15f05f0 100644
--- a/port_versions/d-/directxtk12.json
+++ b/port_versions/d-/directxtk12.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5f5b3546a9e14c89e73ebe317d01c00833f6345f",
+      "version-string": "jan2021b",
+      "port-version": 0
+    },
+    {
       "git-tree": "33e0b497c7aed981580b9e651a57f202fa8cc2bc",
       "version-string": "jan2021",
       "port-version": 0
diff --git a/port_versions/u-/uvatlas.json b/port_versions/u-/uvatlas.json
index 65fab78a5..1e8f87686 100644
--- a/port_versions/u-/uvatlas.json
+++ b/port_versions/u-/uvatlas.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "7ec0056d64ec3888a78610302a348cb5bf65cd78",
+      "version-string": "jan2021b",
+      "port-version": 0
+    },
+    {
       "git-tree": "59eed2711b70ec9a4dfd37c851d7a7810ea83b3e",
       "version-string": "jan2021",
       "port-version": 0
diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
index dd19d931a..9acc00503 100644
--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@@ -1,5 +1,5 @@
 Source: directxmesh
-Version: jan2021
+Version: jan2021b
 Homepage: https://walbourn.github.io/directxmesh
 Description: DirectXMesh geometry processing library
 Build-Depends: directxmath(linux), directx-headers(linux)
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 9c7d27a70..f88841682 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Microsoft/DirectXMesh

-    REF jan2021

-    SHA512 2e3950571703e48de083900e5f4ff94a6f882071969e48dd200ecbf7d8357f3131f647ba6ad97e7dcdbd3e051edad99521661738e7af73ca6f89e8715cd29f9c

+    REF jan2021b

+    SHA512 dab353d5033c32cf5667b95820cf3048e4773fa3fed16d24b25a515fbf4b6f6792ab5955dc9bb790c911b4cae1af1166aa0fdc4f5a639b3f4c3c81a2451a9a40

     HEAD_REF master

 )

 

@@ -42,17 +42,20 @@ if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
     )

 

 elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))

-  vcpkg_download_distfile(meshconvert

+  vcpkg_download_distfile(

+    MESHCONVERT_EXE

     URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jan2021/meshconvert.exe"

-    FILENAME "meshconvert.exe"

+    FILENAME "meshconvert-jan2021.exe"

     SHA512 7df51baa495859aab418d194fd885cf37945ec2927122c18718b3a1a7d7ceb08c6853d084d74bf2bf2bc9ace47a351fd6b8d03706507f4966111ec1cb83f43a2

   )

 

   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")

 

   file(INSTALL

-    ${DOWNLOADS}/meshconvert.exe

+    ${MESHCONVERT_EXE}

     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/)

+

+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)

 endif()

 

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
index e2611ffd5..45a107c97 100644
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@@ -1,5 +1,5 @@
 Source: directxtex
-Version: jan2021
+Version: jan2021b
 Homepage: https://walbourn.github.io/directxtex
 Description: DirectXTex texture processing library
 Build-Depends: directxmath(linux), directx-headers(linux)
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 9df396562..c3b0ebbd0 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -5,10 +5,9 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTex
-    REF jan2021
-    SHA512 f48f05aea811b2ce04f7e82837ed8da9cd3452d0f582d933dbd8878acdc94d8dfb123fa85f5d483a9cd688d3a129d765514069c6c83c58eb1880f6e5661d61e8
+    REF jan2021b
+    SHA512 bd327d0629bbae199f1b3fd80c0470b15edf221f204a4958b4e47b2b1a155b5c0e0af1cc1c39229d582363798f82efa91a3f63ec118fdb0e9255098a576b98ef
     HEAD_REF master
-    FILE_DISAMBIGUATOR 1
 )
 
 if("openexr" IN_LIST FEATURES)
@@ -69,31 +68,38 @@ if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
     )
 
 elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
-  vcpkg_download_distfile(texassemble
+  vcpkg_download_distfile(
+    TEXASSEMBLE_EXE
     URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texassemble.exe"
-    FILENAME "texassemble.exe"
+    FILENAME "texassemble-jan2021.exe"
     SHA512 0def8873358234ea4cd16acd59cb1dda2a8ad132f362502d643caed43e9aef19f9c7e7248494093cbd61e7501a9b44f545d3fbd5f50972ebcee3d01598a7c3b7
   )
 
-  vcpkg_download_distfile(texconv
+  vcpkg_download_distfile(
+    TEXCONV_EXE
     URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texconv.exe"
-    FILENAME "texconv.exe"
+    FILENAME "texconv-jan2021.exe"
     SHA512 77559db65406ad0343901ff22f7647c4f270674f7b0c31b12d8dc26c718f410708ebe95bdc0ddba4049fa6cefd52ff856174530fc4170f9e725b30aacb78249c
   )
 
-  vcpkg_download_distfile(texdiag
+  vcpkg_download_distfile(
+    TEXDIAG_EXE
     URLS "https://github.com/Microsoft/DirectXTex/releases/download/jan2021/texdiag.exe"
-    FILENAME "texdiag.exe"
+    FILENAME "texdiag-jan2021.exe"
     SHA512 1b9e733050b5f92af86a9a2f415205acbff62f0708e491a3846d7b6e480a9c57086eff636be163d42a40a6d34dafc622cc53940797e7f6f77e739f3a66365f57
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/")
 
   file(INSTALL
-    ${DOWNLOADS}/texassemble.exe
-    ${DOWNLOADS}/texconv.exe
-    ${DOWNLOADS}/texdiag.exe
+    ${TEXASSEMBLE_EXE}
+    ${TEXCONV_EXE}
+    ${TEXDIAG_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/)
+
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
index 21b673e6a..7224fef51 100644
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@@ -1,5 +1,5 @@
 Source: directxtk
-Version: jan2021
+Version: jan2021b
 Homepage: https://walbourn.github.io/directxtk
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
 Supports: windows
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index b9f1944b7..f5541789b 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF jan2021
-    SHA512 c0e8df3ef3a276169c219798978eb948947ba63f49fd08be914eee87ed4bb05a4e33e3a4d1c06c4e932f5ad8fa50a14e0b53a9b9f6f749aa15174f343a17555c
+    REF jan2021b
+    SHA512 87cac6f3ea9e16b5b2d195fd363d5da45d99a08b4bb7be8261a7347ec0e316604acc130129cabc24d635be77ec2487341eca1c5f46238d3ce27fbde1a2e817d1
     HEAD_REF master
 )
 
@@ -45,24 +45,29 @@ if(NOT VCPKG_TARGET_IS_UWP)
   )
 
 elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
-  vcpkg_download_distfile(makespritefont
+  vcpkg_download_distfile(
+    MAKESPRITEFONT_EXE
     URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/MakeSpriteFont.exe"
-    FILENAME "makespritefont.exe"
+    FILENAME "makespritefont-jan2021.exe"
     SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4
   )
 
-  vcpkg_download_distfile(xwbtool
+  vcpkg_download_distfile(
+    XWBTOOL_EXE
     URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/XWBTool.exe"
-    FILENAME "xwbtool.exe"
+    FILENAME "xwbtool-jan2021.exe"
     SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
 
   file(INSTALL
-    ${DOWNLOADS}/makespritefont.exe
-    ${DOWNLOADS}/xwbtool.exe
+    ${MAKESPRITEFONT_EXE}
+    ${XWBTOOL_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/)
+
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL
index fd7e367a3..73b28d2c2 100644
--- a/ports/directxtk12/CONTROL
+++ b/ports/directxtk12/CONTROL
@@ -1,5 +1,5 @@
 Source: directxtk12
-Version: jan2021
+Version: jan2021b
 Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12
 Description: A collection of helper classes for writing DirectX 12 code in C++.
 Supports: windows
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index 99fcea0e8..ac32f2bce 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK12
-    REF jan2021
-    SHA512 a6938194bc8857fe0076cb21f000aaa4ab4e207342e07f76ecea9d3f064c1b0c220a5f410c2e1184f37d98b54ef2f4852a6bc7cb13a029885bd3c39cb3f1a727
+    REF jan2021b
+    SHA512 19e017f11fb6cd25a10fbf2597d1a0fe133a339781f5b1b333eb52224fcf5869c5e5bb5a3f3a2f57ffad527076e6780cccccfbae09c48abfce3010be688b87b5
     HEAD_REF master
 )
 
@@ -20,24 +20,29 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 
 if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
-  vcpkg_download_distfile(makespritefont
+  vcpkg_download_distfile(
+    MAKESPRITEFONT_EXE
     URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/MakeSpriteFont.exe"
-    FILENAME "makespritefont.exe"
+    FILENAME "makespritefont-jan2021.exe"
     SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4
   )
 
-  vcpkg_download_distfile(xwbtool
+  vcpkg_download_distfile(
+    XWBTOOL_EXE
     URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/XWBTool.exe"
-    FILENAME "xwbtool.exe"
+    FILENAME "xwbtool-jan2021.exe"
     SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
 
   file(INSTALL
-    ${DOWNLOADS}/makespritefont.exe
-    ${DOWNLOADS}/xwbtool.exe
+    ${MAKESPRITEFONT_EXE}
+    ${XWBTOOL_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/)
+
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL
index a65d710e2..938b93f7c 100644
--- a/ports/uvatlas/CONTROL
+++ b/ports/uvatlas/CONTROL
@@ -1,5 +1,5 @@
 Source: uvatlas

-Version: jan2021

+Version: jan2021b

 Homepage: https://github.com/Microsoft/UVAtlas

 Description: UVAtlas isochart texture atlas

 Build-Depends: directxmesh(!(uwp|linux)), directxtex(!(uwp|linux)), directxmath(linux), directx-headers(linux)

diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
index 14f7a5eed..42f5043ab 100644
--- a/ports/uvatlas/portfile.cmake
+++ b/ports/uvatlas/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/UVAtlas
-    REF jan2021
-    SHA512 a0248f31626a0835c9aaf7ed9cabfc5771e34257b8e8e4a3139dca69d7242d79fbb7883071379cd9202edecef3a518d6cf9e7ef9b0338afd384bf2c9830878d3
+    REF jan2021b
+    SHA512 6ed43dbe4ea33857ed96a2c05a4618ae935eb9bc0778118af6c791f794c2ad843fe1b52a2aa484914f8aaf3534a282ab80af95350eab2c340bb6b401dc9743b0
     HEAD_REF master
 )
 
@@ -36,17 +36,20 @@ if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
     )
 
 elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
-  vcpkg_download_distfile(uvatlastool
+  vcpkg_download_distfile(
+    UVATLASTOOL_EXE
     URLS "https://github.com/Microsoft/UVAtlas/releases/download/jan2021/uvatlastool.exe"
-    FILENAME "uvatlastool.exe"
+    FILENAME "uvatlastool-jan2021.exe"
     SHA512 8727510f3ec41c2fa7ed75100b8c0f4daa41e93a1b812e5ec3c265dc87c3f48651da37a18af5d8b57a0aa096c42232b58a50a00c036ec7c04dcae4767a2691f9
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/")
 
   file(INSTALL
-    ${DOWNLOADS}/uvatlastool.exe
+    ${UVATLASTOOL_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/)
+
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")