diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2021-01-15 15:24:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 15:24:06 -0800 |
| commit | a2cc2b1735dc260f455ef7ce6ef935646dc69329 (patch) | |
| tree | 118b55beb7805c0bb2df0185407da0b9c4af1f67 /ports/directxtex | |
| parent | 21b569f3e6773554b9e8284318c118bce0426f7b (diff) | |
| download | vcpkg-a2cc2b1735dc260f455ef7ce6ef935646dc69329.tar.gz vcpkg-a2cc2b1735dc260f455ef7ce6ef935646dc69329.zip | |
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>
Diffstat (limited to 'ports/directxtex')
| -rw-r--r-- | ports/directxtex/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtex/portfile.cmake | 30 |
2 files changed, 19 insertions, 13 deletions
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") |