Skip to content

Commit

Permalink
Merge branch 'microsoft:master' into mesa-vulkan
Browse files Browse the repository at this point in the history
  • Loading branch information
dg0yt committed Mar 31, 2024
2 parents 02c8a3c + ce19164 commit 234fc35
Show file tree
Hide file tree
Showing 420 changed files with 2,625 additions and 1,154 deletions.
2 changes: 1 addition & 1 deletion ports/ableton-link/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Ableton/link
REF "Link-${VERSION}"
SHA512 4c62357b74ed8bed21455d977504787ff4c11a862a0ee583c491742c93f6f4bc44b98df2a35f7811584277456b7580835098bc7b9afdd57caf7bd91f9462d202
SHA512 d82529d08897833c3fd6f19eca1689dfbfeac945daa4f1cb5a5719248ba1428875084155761d4de9521d486552e82ea47c71009fa8ef868ed4dca86a561f5c3e
HEAD_REF master
PATCHES
replace_local_asiostandalone_by_vcpkg_asio.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/ableton-link/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ableton-link",
"version": "3.1.0",
"version": "3.1.1",
"description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.",
"homepage": "https://www.ableton.com/en/link/",
"documentation": "http://ableton.github.io/link/",
Expand Down
2 changes: 1 addition & 1 deletion ports/ada-url/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ada-url/ada
REF "v${VERSION}"
SHA512 941b522f8aec7959557a1238b23a48b7d3e4ff4035b0897d23fc7dba26cc227b2b3e48d8ecd03431c871041d52870015361ff6a595fa4872a640943b55c62617
SHA512 987782dacee5115f061f5579257fddf3ed26cdb8654279ce47915bef03abe7ca9904f0f4082b774be23772a3400925e908db45d9da935c7683269aae0ac2186a
HEAD_REF main
PATCHES
no-cpm.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/ada-url/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ada-url",
"version": "2.7.6",
"version": "2.7.7",
"description": "WHATWG-compliant and fast URL parser written in modern C++",
"homepage": "https://ada-url.com/",
"license": "MIT",
Expand Down
8 changes: 3 additions & 5 deletions ports/adios2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ornladios/ADIOS2
REF 473fe8c7d1a13c0746910361aa45ee1b96f57bfb
SHA512 ef8af30419cf57183b52ce9cb29613a381b06e16848a6d22d83c751c43b8485e504be90cead1381adcc92bb8d4912611083cd6d0b73d161b33f779231a041e6c
REF "v${VERSION}"
SHA512 05decc3ff14e7458df9ec16ca6230a9770ca992e7d0ce3a18b3c9295a19dad94d8a9367102e50347a9487c6a3f35a8d52fbaa6a6fd98807aaec9636e607541ee
HEAD_REF master
PATCHES
zfp-version.patch # Backport zfp 1.0 support to v2.8.3 (https://github.com/ornladios/ADIOS2/pull/3312), included upstream in v2.9.0 when released.
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -21,7 +19,7 @@ list(APPEND disabled_options SZ LIBPRESSIO MGARD DAOS DataMan DataSpaces MHS SST
list(TRANSFORM disabled_options PREPEND "-DADIOS2_USE_")
list(TRANSFORM disabled_options APPEND ":BOOL=OFF")
set(enabled_options "")
list(APPEND enabled_options BZip2 Blosc PNG ZeroMQ HDF5 Endian_Reverse Sodium)
list(APPEND enabled_options BZip2 Blosc2 PNG ZeroMQ HDF5 Endian_Reverse Sodium)
list(TRANSFORM enabled_options PREPEND "-DADIOS2_USE_")
list(TRANSFORM enabled_options APPEND ":BOOL=OFF")

Expand Down
3 changes: 1 addition & 2 deletions ports/adios2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "adios2",
"version": "2.8.3",
"port-version": 1,
"version": "2.9.2",
"description": "Next generation of ADIOS developed in the Exascale Computing Program",
"homepage": "https://github.com/ornladios/ADIOS2",
"license": "Apache-2.0",
Expand Down
65 changes: 0 additions & 65 deletions ports/adios2/zfp-version.patch

This file was deleted.

14 changes: 5 additions & 9 deletions ports/aliyun-oss-c-sdk/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} does not currently support UWP")
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aliyun/aliyun-oss-c-sdk
REF f9e441137620d712c7d89587c951bed459ebc843 # 3.10.0
SHA512 6621d105706fb69b3f1998d7c83c94ff93747946040f0c45ec52986c0e8d8db3d48237d1e3f0959e09536ca43bcbe3bcdb32f90622ce51de6ea7132be6dd7cf7
REF ${VERSION}
SHA512 f92b2dac43bdfe1a5c9fc012325751ee83d6f5c5f5a646ac8606894c458bd9488bc4a56f926218b213cb905becccddd976e8e94a257d77adf4269d48df27638e
HEAD_REF master
PATCHES
patch.patch
PATCHES
patch.patch
)

vcpkg_cmake_configure(
Expand All @@ -19,4 +15,4 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
9 changes: 3 additions & 6 deletions ports/aliyun-oss-c-sdk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
{
"name": "aliyun-oss-c-sdk",
"version": "3.10.0",
"port-version": 3,
"version": "3.10.1",
"description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.",
"homepage": "https://github.com/aliyun/aliyun-oss-c-sdk",
"license": "MIT",
"supports": "!(uwp | linux | osx)",
"dependencies": [
"apr-util",
"curl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion ports/amqpcpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CopernicaMarketingSoftware/AMQP-CPP
REF "v${VERSION}"
SHA512 3af0c0a9aeb98e349cedc7144bfc4ef1b63270d3b20d240b98b990c048402d5d4ea3a2ba28a468aab24ad45544b111809a0692716dc33af493ea5160f132834b
SHA512 0fb280bfea6dc665d44efa7321a4b69c130a5f0b10be7ada7909e00ec8a3ca0b98125bd96475386f1b3627bac9f8e5c9bbd71b462868b46919737da32e021cb4
HEAD_REF master
PATCHES
find-openssl.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/amqpcpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amqpcpp",
"version": "4.3.23",
"version": "4.3.26",
"description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker",
"homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/ankurvdev-embedresource/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ankurvdev/embedresource
REF "v${VERSION}"
SHA512 96d2208fd5d654dad5662968296fa363cea0a935fec8474b780717c9303d2dd763833370bcdf02d6d63e264368b0955fa1f13c6e55685280df5fdaf9e72b8c9f
SHA512 90b4e40b84cd5b6de155a17890b5d8094cf772f56657230ad13a0c51a332e84fa4a38d8640a3890ae4b521a2eb897666d8c3f58e7cd9dc98e6eb3d55c84dfe44
HEAD_REF main)

vcpkg_cmake_configure(
Expand Down
2 changes: 1 addition & 1 deletion ports/ankurvdev-embedresource/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ankurvdev-embedresource",
"version": "0.0.10",
"version": "0.0.11",
"description": "Cross Platform Resource Embedding",
"homepage": "https://github.com/ankurvdev/embedresource",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion ports/annoy/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO spotify/annoy
REF "v${VERSION}"
SHA512 bf6e3095871cef2da20310f0a6260d65079cd2116b00ee39c82a6cb96d6cc80780b4f677c3746b85e7fe45672707a06c37bd8e8ecf793507584eca4760731018
SHA512 a8ec84440019a29dc2939b193ca1f894aad6bc95d2814a7f0296fbd5faf7bdb69072514db496a445993b20182133a8e4e6e774c75f17d3057d146e98bdde28ce
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/annoy/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "annoy",
"version": "1.17.2",
"version": "1.17.3",
"description": "Approximate Nearest Neighbors optimized for memory usage and loading/saving to disk",
"homepage": "https://github.com/spotify/annoy",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/apache-datasketches/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/datasketches-cpp
REF "${VERSION}"
SHA512 81047ec2ac4559afc46d68b2332256b3950fc7092404606a872d9204c7e0ac13b7b0e0d6a34de01483bcb03c813ab75ce4866cc0c6783ebf4adddaa6535d322a
SHA512 eb307d0e6468fc4784fb4ba2a49b894c59c2669386c5983afd671695dadd4e50711de6a50a2824d14af7c474fdbb0c6bbe2f3352d2481fb74fd16654674cbbfc
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/apache-datasketches/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apache-datasketches",
"version": "4.1.0",
"version": "5.0.2",
"description": "Apache DataSketches Core C++ Library Component.",
"homepage": "https://datasketches.apache.org/",
"license": "Apache-2.0",
Expand Down
26 changes: 26 additions & 0 deletions ports/atliac-minitest/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Atliac/minitest
REF "v${VERSION}"
SHA512 bd39aa9d4f897f03f0f42b28ee7aabc0fbe5168d09009ebcb253ee3cb5f52ae1d81e9c6657aaa93fe8f67d20d9d92874432a06cadcb78f750681772bb3316d78
HEAD_REF master
)

vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_TESTS=OFF
-DMINITEST_PACKAGE_NAME=${PORT}
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup()

configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage")

vcpkg_copy_pdbs()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
5 changes: 5 additions & 0 deletions ports/atliac-minitest/usage
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
minitest provides CMake targets:

# Note: the `MINITEST_RUN_TESTS(argc, argv);` must be called in the main function
find_package(${PORT} CONFIG REQUIRED)
minitest_discover_tests(target)
17 changes: 17 additions & 0 deletions ports/atliac-minitest/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "atliac-minitest",
"version": "1.0.0",
"description": "A C++ unit testing framework that helps write tests alongside the code being tested.",
"homepage": "https://github.com/Atliac/minitest",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion ports/aws-c-s3/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-s3
REF "v${VERSION}"
SHA512 e3ed2fe0f009eda23bb9bfc5bc1551a348e7c9a32ba18a3b654b9819c4ed955085a8852f3a3a7a2e9c4292d88d2fc7c902366e1c914de7019c9abb8570b2b7fc
SHA512 2fe2a33fa1470a6f993e53c66dff3cc984dcd25b50001fb49e8e901602ea22a6b363a6d5221e56e54356615245718459eed73f63d1d2425c88b35496572845f1
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/aws-c-s3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-c-s3",
"version": "0.5.2",
"version": "0.5.3",
"description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
"homepage": "https://github.com/awslabs/aws-c-s3",
"license": "Apache-2.0",
Expand Down
2 changes: 2 additions & 0 deletions ports/backward-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ vcpkg_from_github(

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBACKWARD_TESTS=OFF
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/backward)
Expand Down
1 change: 1 addition & 0 deletions ports/backward-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "backward-cpp",
"version-date": "2023-11-24",
"port-version": 1,
"description": "A beautiful stack trace pretty printer for C++",
"homepage": "https://github.com/bombela/backward-cpp",
"supports": "!uwp & !(windows & arm)",
Expand Down
2 changes: 1 addition & 1 deletion ports/baresip-libre/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO baresip/re
REF "v${VERSION}"
SHA512 d19fc5c48399ad4942c27d86c47350f579f8ebeaf8dc04b13a930b930c13a20e5e7dd5f0fe05d11b6b365667d8306f2499f5cb925850f4484049ba853d36b0b1
SHA512 f7aadce42e6d3477ab36cac44557d0c1c2df2f5a4c8f0d295d230345b1a73e2747360893d4d5de7dce3326eb0713680f59865eb86bdd3f224015c197fa41ccfe
HEAD_REF main
PATCHES
fix-static-library-build.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/baresip-libre/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "baresip-libre",
"version": "3.9.0",
"version": "3.10.0",
"description": "Generic library for real-time communications with async IO support",
"homepage": "https://github.com/baresip/re",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion ports/blake3/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO BLAKE3-team/BLAKE3
REF "${VERSION}"
SHA512 eb782d48240cf2fa8cc3cddd699dce3a362eb480b3ca58a97d54cd3595a0c969e51fe14374b91136036e8e29c8f745efbd5a4d1aaed2c17f23cb89fb756645d0
SHA512 a2ac662b0e45d1f4c4ee01a5e556a47c49ab5407a6057034033ce6fd0fc6b88f66dd428d80f5e7c4a8413356cb4b5ab655924d96138213499893e0204d7c8d24
HEAD_REF main
PATCHES
fix-windows-arm-build-error.patch
Expand Down
3 changes: 1 addition & 2 deletions ports/blake3/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "blake3",
"version": "1.5.0",
"port-version": 1,
"version": "1.5.1",
"description": "BLAKE3 cryptographic hash function.",
"homepage": "https://github.com/BLAKE3-team/BLAKE3",
"license": "CC0-1.0 OR Apache-2.0",
Expand Down
6 changes: 3 additions & 3 deletions ports/blitz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ vcpkg_from_github(
HEAD_REF master
)

vcpkg_find_acquire_program(PYTHON2)
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
vcpkg_add_to_path("${PYTHON2_DIR}")
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
vcpkg_add_to_path("${PYTHON3_DIR}")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
Expand Down
Loading

0 comments on commit 234fc35

Please sign in to comment.