[directxmesh, directxtex, directxtk, uvatlas] update ports for Dec 2022 releases (#28482)

* [directxmesh, directxtex, directxtk, uvatlas] update ports for December 2022 releases

* [directxtk12] fixed spectre feature

* Update baseline

* Upstream fixes for WSL

* Update baseline

Co-authored-by: walbourn <chuckw_walbourn@yahoo.com>
This commit is contained in:
Chuck Walbourn 2023-01-04 14:44:07 -08:00 коммит произвёл GitHub
Родитель 58054d0572
Коммит aa45329eb6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
17 изменённых файлов: 100 добавлений и 52 удалений

Просмотреть файл

@ -1,4 +1,4 @@
set(DIRECTXMESH_TAG oct2022)
set(DIRECTXMESH_TAG dec2022)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
REF ${DIRECTXMESH_TAG}
SHA512 05bc2460a35ecb13c766d2e66546cfc5b589f22a60ce236730ce865eba2fe57caffae6b730bad2491c9c89bc3472e5f7437d197c8bb9f9f80a055707681943a1
SHA512 9a3f76b956b002ec0bd943746fe896348c2095c113d4b78efe257f3bc32af4995f4b33d5b13dad48798e706066c55acbbe4de5809240b052983ef322998f7734
HEAD_REF main
)
@ -14,16 +14,19 @@ vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
dx12 BUILD_DX12
spectre ENABLE_SPECTRE_MITIGATION
)
if (VCPKG_HOST_IS_LINUX)
message(WARNING "Build ${PORT} requires GCC version 9 or later")
endif()
set(EXTRA_OPTIONS -DBUILD_TESTING=OFF)
if(VCPKG_TARGET_IS_UWP)
set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
else()
set(EXTRA_OPTIONS -DBUILD_TOOLS=ON)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
endif()
vcpkg_cmake_configure(
@ -39,7 +42,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
MESHCONVERT_EXE
URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe"
FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe"
SHA512 471f39dffca6b2fcfb439e94c9fbec3721bf8792635cdf67a0ec3e136445d83dc9d0abdfa3908b2f2aea969fb69e8bc8391eababc92305060a04a577e960a591
SHA512 46b5fc3dcf58a7c03075927511de5ae4c62c09ceb22076125d3be29044d7da1cc32225a43500ed53ddf0c30d969091b705345a5eb3bb49cc07233dba988357c8
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "directxmesh",
"version-date": "2022-10-17",
"version-date": "2022-12-15",
"description": "DirectXMesh geometry processing library",
"homepage": "https://github.com/Microsoft/DirectXMesh",
"documentation": "https://github.com/microsoft/DirectXMesh/wiki",
@ -21,6 +21,9 @@
"features": {
"dx12": {
"description": "Build with DirectX12 support for Windows 10"
},
"spectre": {
"description": "Build Spectre-mitigated library"
}
}
}

Просмотреть файл

@ -1,4 +1,4 @@
set(DIRECTXTEX_TAG oct2022)
set(DIRECTXTEX_TAG dec2022)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@ -9,8 +9,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTex
REF oct2022b
SHA512 48db2d88f84cda0692e887d5b26fb6051649eae2f9699803170926a9660abaf836f567b2dacdf4900a7a041c22e936d612615247825e256f840808e5ae497e4d
REF dec2022b
SHA512 353ac25b77218e7e7f11495d51bf10552444f71b2dd3a13e64264328fd8814fb3d65704dc7c517ff349a5143e9c454ae6a7782c16dc74f992b0ae9d517daa404
HEAD_REF main
)
@ -19,26 +19,24 @@ vcpkg_check_features(
FEATURES
dx12 BUILD_DX12
openexr ENABLE_OPENEXR_SUPPORT
spectre ENABLE_SPECTRE_MITIGATION
)
if (VCPKG_HOST_IS_LINUX)
message(WARNING "Build ${PORT} requires GCC version 9 or later")
endif()
set(EXTRA_OPTIONS -DBUILD_SAMPLE=OFF -DBUILD_TESTING=OFF -DBC_USE_OPENMP=ON -DBUILD_DX11=ON)
if(VCPKG_TARGET_IS_UWP)
set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
else()
set(EXTRA_OPTIONS -DBUILD_TOOLS=ON)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
${EXTRA_OPTIONS}
-DBUILD_SAMPLE=OFF
-DBC_USE_OPENMP=ON
-DBUILD_DX11=ON
OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
)
vcpkg_cmake_install()
@ -49,21 +47,21 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT
TEXASSEMBLE_EXE
URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe"
FILENAME "texassemble-${DIRECTXTEX_TAG}.exe"
SHA512 cdf2394c83900fa09f4d8c127863223891fb713090c18407fd83581fdd3e476292cfca4e5accaaa66310d62e03c2836bddac37e508aecb1c2a2346d35eecf08b
SHA512 78f556d6fa7808f6c22b6b1fa130c7c0c694ab8011ebb2ed633d3f35b281b39a2aee2c171da665ccbbbc49be1af6e90bdecc7d837a789aac5d9ef54afd2d0951
)
vcpkg_download_distfile(
TEXCONV_EXE
URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe"
FILENAME "texconv-${DIRECTXTEX_TAG}.exe"
SHA512 d2c5899a2b4abea5e975699326143f198c04808f9ac5b19c0580618601ed671b12eaef846938142bfa22eb7338ad7fabbdaadff76bc1776f543ecbd33b8d2586
SHA512 6bd3f5d9a986887b618d3cb2c765f29c8e632f70df96c60ee3492bed26f1f3407e5293177c479b7f80d8178491dbe22b25737b34e426712e6e1dede7eebb84df
)
vcpkg_download_distfile(
TEXDIAG_EXE
URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe"
FILENAME "texdiag-${DIRECTXTEX_TAG}.exe"
SHA512 99e9073c6a22b54b56337dfaa18c6723febe6ca65b1e8b53a64dadee149e06111511115bf06aca95ad4b30a5cc24da9d7b526260f7c58e38740a38ff7a6e007b
SHA512 e443407d69e628341d72b18a6ae2ebddf69d0554c468a7aa77e2dbf87a4498c4cefe59be709d9d786c7a940ac4cc523e95a31a1a8fd056b103045ef0412f3775
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/")

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "directxtex",
"version-date": "2022-10-17",
"version-date": "2022-12-15",
"description": "DirectXTex texture processing library",
"homepage": "https://github.com/Microsoft/DirectXTex",
"documentation": "https://github.com/microsoft/DirectXTex/wiki",
@ -27,6 +27,9 @@
"dependencies": [
"openexr"
]
},
"spectre": {
"description": "Build Spectre-mitigated library"
}
}
}

Просмотреть файл

@ -1,4 +1,4 @@
set(DIRECTXTK_TAG oct2022)
set(DIRECTXTK_TAG dec2022)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@ -10,22 +10,25 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTK
REF ${DIRECTXTK_TAG}
SHA512 59cdfb0e7c3ca121ffc4935f93702b67b66dc000920de915b1589b74a192b015aa46e42438f6a2e68da344001ec69896691cf343eae3379cec272feeeb2ee02c
SHA512 4830becb1100566a1f0d176c1eb08f94ce3f36600b7a8e0c55b423e0f9d40bafb5018914be4903b9a21682f04a92571019e2d6c4549a145f0b3f0198c50c639a
HEAD_REF main
)
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
spectre ENABLE_SPECTRE_MITIGATION
xaudio2-9 BUILD_XAUDIO_WIN10
xaudio2-8 BUILD_XAUDIO_WIN8
xaudio2redist BUILD_XAUDIO_WIN7
)
set(EXTRA_OPTIONS -DBUILD_TESTING=OFF)
if(VCPKG_TARGET_IS_UWP)
set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
else()
set(EXTRA_OPTIONS -DBUILD_TOOLS=ON)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
endif()
vcpkg_cmake_configure(
@ -41,14 +44,14 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
MAKESPRITEFONT_EXE
URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe"
FILENAME "makespritefont-${DIRECTXTK_TAG}.exe"
SHA512 1a55c1fe22f10c883fad4c263437a5d5084275f4303863afc7c1cc871221364d189963f248b7b338f002fac1ae7fda40352a7ef6c96bfdc1ffded2f53c187c32
SHA512 6cb4351206707308382f2fe152c10dd2c99f300d960e6feac09f63e64c38225381d95f77ec557ec3dc60031227b4b878cfb18059c1bc2122e87cda1f1d25d7e2
)
vcpkg_download_distfile(
XWBTOOL_EXE
URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe"
FILENAME "xwbtool-${DIRECTXTK_TAG}.exe"
SHA512 ab14800b36a7e40785c0e8b88e08e3d6e0ab8f25711093633ce66e0c123cb5eef72ac7e6a3ce714ad6b6881d54c04149ba64101f768b5dd40c48f52b41514abc
SHA512 901b326b8c86a94c5867e26ca35fa355cadcb283bb81c1fd630385a2ed68ffb43b00ed702953781db660d184ef221184bac0cc905e8502e4d484b01c5b3ff124
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/")

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "directxtk",
"version-date": "2022-10-17",
"version-date": "2022-12-15",
"description": "A collection of helper classes for writing DirectX 11.x code in C++.",
"homepage": "https://github.com/Microsoft/DirectXTK",
"documentation": "https://github.com/microsoft/DirectXTK/wiki",
@ -18,6 +18,9 @@
}
],
"features": {
"spectre": {
"description": "Build Spectre-mitigated library"
},
"xaudio2-8": {
"description": "Build with XAudio 2.8 support for Windows 8.x or later"
},

Просмотреть файл

@ -1,4 +1,4 @@
set(DIRECTXTK_TAG oct2022)
set(DIRECTXTK_TAG dec2022)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@ -6,13 +6,14 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTK12
REF ${DIRECTXTK_TAG}
SHA512 f9117e3e2119cf54dd003efa04a3a803558c4326a884c604ff3502e488b40e4372d226d3070d509b8e462fdddd3b23fae3b3aebd1ebfa74d99e01b2f4bfac312
SHA512 2ebff3d18c7d96e402ff3cb8d69f2e650030628375725785b767c9e5784e7933d1bf6264a92ef326f054b5a73c2195f49020bf9773ffd013dc32f4396bd415b6
HEAD_REF main
)
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
spectre ENABLE_SPECTRE_MITIGATION
xaudio2-9 BUILD_XAUDIO_WIN10
xaudio2redist BUILD_XAUDIO_REDIST
)
@ -20,7 +21,7 @@ vcpkg_check_features(
set(DXCPATH ${CURRENT_HOST_INSTALLED_DIR}/tools/directx-dxc)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS} -DBUILD_DXIL_SHADERS=ON -DDIRECTX_DXC_PATH=${DXCPATH}
OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DBUILD_DXIL_SHADERS=ON -DDIRECTX_DXC_PATH=${DXCPATH}
)
vcpkg_cmake_install()
@ -31,14 +32,14 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
MAKESPRITEFONT_EXE
URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe"
FILENAME "makespritefont-${DIRECTXTK_TAG}.exe"
SHA512 1a55c1fe22f10c883fad4c263437a5d5084275f4303863afc7c1cc871221364d189963f248b7b338f002fac1ae7fda40352a7ef6c96bfdc1ffded2f53c187c32
SHA512 6cb4351206707308382f2fe152c10dd2c99f300d960e6feac09f63e64c38225381d95f77ec557ec3dc60031227b4b878cfb18059c1bc2122e87cda1f1d25d7e2
)
vcpkg_download_distfile(
XWBTOOL_EXE
URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe"
FILENAME "xwbtool-${DIRECTXTK_TAG}.exe"
SHA512 ab14800b36a7e40785c0e8b88e08e3d6e0ab8f25711093633ce66e0c123cb5eef72ac7e6a3ce714ad6b6881d54c04149ba64101f768b5dd40c48f52b41514abc
SHA512 901b326b8c86a94c5867e26ca35fa355cadcb283bb81c1fd630385a2ed68ffb43b00ed702953781db660d184ef221184bac0cc905e8502e4d484b01c5b3ff124
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "directxtk12",
"version-date": "2022-10-17",
"version-date": "2022-12-15",
"description": "A collection of helper classes for writing DirectX 12 code in C++.",
"homepage": "https://github.com/Microsoft/DirectXTK12",
"documentation": "https://github.com/microsoft/DirectXTK12/wiki",
@ -26,6 +26,9 @@
"xaudio2-9"
],
"features": {
"spectre": {
"description": "Build Spectre-mitigated library"
},
"xaudio2-9": {
"description": "Build with XAudio 2.9 support for Windows 10/11"
},

Просмотреть файл

@ -1,12 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9c3d37..52c6f93 100644
index e20dfdb..fd3279c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,6 +228,7 @@ if(MSVC)
endif()
@@ -230,6 +230,7 @@ if(MSVC)
if((MSVC_VERSION GREATER_EQUAL 1928) AND (CMAKE_SIZEOF_VOID_P EQUAL 8)
if((MSVC_VERSION GREATER_EQUAL 1928)
AND (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ AND NOT TARGET OpenEXR::OpenEXR # as dependency of package directxtex
AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)))
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
target_compile_options(${t} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")

Просмотреть файл

@ -1,15 +1,14 @@
set(UVATLAS_TAG oct2022)
set(UVATLAS_TAG dec2022)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/UVAtlas
REF ${UVATLAS_TAG}
SHA512 d6c6428ee7d19888cf5b50bff328fa55dec13a8e660f65eab4e4a4538cbf57282d75fbfd079880fa322522d5fd5db10dcb42d62c1b57f76cf04f0843d4b52705
REF dec2022b
SHA512 305985bee492a5fec85dd46e6e59200f88c963bc4e5e4f9f8319dd3a16f677de9d802db0407b85703e3e5274570bb41ac418c639a595640f6049fad595ba8046
HEAD_REF main
PATCHES
openexr.patch
PATCHES openexr.patch
)
if (VCPKG_HOST_IS_LINUX)
@ -20,12 +19,15 @@ vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
eigen ENABLE_USE_EIGEN
spectre ENABLE_SPECTRE_MITIGATION
)
set(EXTRA_OPTIONS -DBUILD_TESTING=OFF)
if(VCPKG_TARGET_IS_UWP)
set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
else()
set(EXTRA_OPTIONS -DBUILD_TOOLS=ON)
list(APPEND EXTRA_OPTIONS -DBUILD_TOOLS=ON)
endif()
vcpkg_cmake_configure(
@ -41,7 +43,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT
UVATLASTOOL_EXE
URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe"
FILENAME "uvatlastool-${UVATLAS_TAG}.exe"
SHA512 7ee673db394a83762d6227faa9e643fafeb2ef3e1be1fdfff363f04f3e5d826ff2d314530f6372357fac8a01d284e6861cc3a88ce81f3bd7baa71303d68e3c86
SHA512 55c8458964ab7682718decf51e69ab3e2d2e3d56744af3dd4fc678acabbdc90ed663075e5d17e74af1f6a58bf439d314720b7ec1242d85d0e7991237d19265e1
)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/")

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "uvatlas",
"version-date": "2022-10-17",
"version-date": "2022-12-15",
"description": "UVAtlas isochart texture atlas",
"homepage": "https://github.com/Microsoft/UVAtlas",
"documentation": "https://github.com/Microsoft/UVAtlas/wiki",
@ -33,6 +33,9 @@
"eigen3",
"spectra"
]
},
"spectre": {
"description": "Build Spectre-mitigated library"
}
}
}

Просмотреть файл

@ -1953,7 +1953,7 @@
"port-version": 0
},
"directxmesh": {
"baseline": "2022-10-17",
"baseline": "2022-12-15",
"port-version": 0
},
"directxsdk": {
@ -1961,15 +1961,15 @@
"port-version": 5
},
"directxtex": {
"baseline": "2022-10-17",
"baseline": "2022-12-15",
"port-version": 0
},
"directxtk": {
"baseline": "2022-10-17",
"baseline": "2022-12-15",
"port-version": 0
},
"directxtk12": {
"baseline": "2022-10-17",
"baseline": "2022-12-15",
"port-version": 0
},
"dirent": {
@ -7829,7 +7829,7 @@
"port-version": 2
},
"uvatlas": {
"baseline": "2022-10-17",
"baseline": "2022-12-15",
"port-version": 0
},
"uvw": {

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bd91052caa19a0a0a99a2918109b247efe659285",
"version-date": "2022-12-15",
"port-version": 0
},
{
"git-tree": "f2254f431933140ed94dc8aa57109322a212217c",
"version-date": "2022-10-17",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "79c75c423a2d930e31e207bfb8c2d4bfe5ea85d6",
"version-date": "2022-12-15",
"port-version": 0
},
{
"git-tree": "e6122779b24211d1cc9fe1a8c8ea36c81ceb4179",
"version-date": "2022-10-17",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c562456d423e0821f50b8ad2ea94b1ecd7c52b8d",
"version-date": "2022-12-15",
"port-version": 0
},
{
"git-tree": "29b7fdf1ce9b66105a1bfa329e5309afe8505dc7",
"version-date": "2022-10-17",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7a61cc956783e1bf296de6516a6fc15e939ad657",
"version-date": "2022-12-15",
"port-version": 0
},
{
"git-tree": "ab664013d6d38eec729d66e97dc9c60490725186",
"version-date": "2022-10-17",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9335adc59658d7c81ea85d849249b1bdd4047ef5",
"version-date": "2022-12-15",
"port-version": 0
},
{
"git-tree": "d2385783dc5930f93f8ef1eea64a8818f301e3ae",
"version-date": "2022-10-17",