Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from microsoft-master #1837

Merged
merged 9 commits into from
Jan 3, 2025
5 changes: 1 addition & 4 deletions ports/alsa/vcpkg-cmake-wrapper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ find_library(
include(SelectLibraryConfigurations)
select_library_configurations(ALSA)
unset(ALSA_FOUND)

if(NOT ALSA_INCLUDE_DIR OR NOT ALSA_LIBRARY)
message(FATAL_ERROR "Broken installation of the alsa vcpkg port")
endif()
set(ALSA_LIBRARY "${ALSA_LIBRARY}" CACHE INTERNAL "")

_find_package(${ARGS})

Expand Down
1 change: 1 addition & 0 deletions ports/alsa/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "alsa",
"version": "1.2.13",
"port-version": 1,
"description": "The Advanced Linux Sound Architecture (ALSA) - library",
"homepage": "https://www.alsa-project.org/",
"license": "LGPL-2.1-or-later",
Expand Down
2 changes: 1 addition & 1 deletion ports/armadillo/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
REPO arma
FILENAME "armadillo-${VERSION}.tar.xz"
SHA512 55ee45be41ca240783edfd61f647401b0a32826850be82f5e957873c18de0dce87fc39d35e5f6363475ed912c3b1d08ff31151f25378d262d840aa6f15163ac8
SHA512 729229d28dbd199503dc15ba11a4f20d2b598993f7da448d40840255ff53ecc9f95bca3b472261d12dda15f2c4e2f8999ea39594c869a31a817be35b256efac5
PATCHES
cmake-config.patch
dependencies.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/armadillo/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "armadillo",
"version": "14.0.3",
"version": "14.2.2",
"description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
"homepage": "https://arma.sourceforge.net/",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/calceph/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(CALCEPH_HASH 0130bf9f48338146eb32aba4c9ceaa2d2a2ba2dfc4812c4c27cf87da06719172e3273cce4890f76233bbe15fc13952a05c06bce6a216e4ae6ca9613c902dca33)
set(CALCEPH_HASH 81cddae9fa0d06758dbbb5fae486bd64eb087dc2ebf2d7b17fa89b6689b86e0e84d1412e6852e980ebed00a4c84a3b1b4ac00b89021f6d0bb2f370a98a6dad25)

vcpkg_download_distfile(ARCHIVE
URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${VERSION}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion ports/calceph/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "calceph",
"version": "4.0.3",
"version": "4.0.4",
"description": "C library to access the binary planetary ephemeris files.",
"homepage": "https://www.imcce.fr/inpop/calceph/",
"documentation": "https://calceph.imcce.fr/docs/latest/html/c/index.html",
Expand Down
2 changes: 1 addition & 1 deletion ports/dp-thread-pool/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 DeveloperPaul123/thread-pool
REF ${VERSION}
SHA512 fccd39616f7961fbd4ff6c2f845b4d1494e50a85e44d1799c30308bdee0b2e13f55011c5a535a555857a91157a7dddf4ec38e1020f693ae33bf0977d8fb97451
SHA512 c2a75117f7def0dacc2679f8eb70835acfba58d1aba7beec9bf0a29cdb23883222294dc4b04b77e323f8ecb8623b70d728bee46bf2c5a4fd6711a749c9709981
HEAD_REF master
)

Expand Down
3 changes: 1 addition & 2 deletions ports/dp-thread-pool/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "dp-thread-pool",
"version": "0.6.2",
"port-version": 1,
"version": "0.7.0",
"maintainers": "Paul Tsouchlos <developer.paul.123@gmail.com>",
"description": "dp::thread_pool - fast, lightweight C++20 thread pool.",
"homepage": "https://github.com/DeveloperPaul123/thread-pool",
Expand Down
2 changes: 1 addition & 1 deletion ports/drogon/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 an-tao/drogon
REF "v${VERSION}"
SHA512 39cbb337d1b83d2202fff8bf43e9173060d1cfc8384369aa3d86e63ac2bfca9b8c3bec4bcf48f8c400788791fbfeccb0cd934cb7b26d95ef12981b4227206726
SHA512 1108aff91e4b6d5f870518cbc2637d4dd53634fd365fa5384a625680fd4ab5d721dd78962f2acc0cfc1f15c6f8800d8911a1a859510df71e215421cccb1f5849
HEAD_REF master
PATCHES
0001-vcpkg.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/drogon/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drogon",
"version-semver": "1.9.8",
"version-semver": "1.9.9",
"description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
"homepage": "https://github.com/an-tao/drogon",
"documentation": "https://drogon.docsforge.com/master/overview/",
Expand Down
2 changes: 1 addition & 1 deletion ports/flatbuffers/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 google/flatbuffers
REF "v${VERSION}"
SHA512 e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662
SHA512 f97762ba41b9cfef648e93932fd789324c6bb6ebc5b7aeca8185c9ef602294b67d73aea7ae371035579a1419cbfbeba7c3e88b31b5a5848db98f5e8a03b982b1
HEAD_REF master
PATCHES
fix-uwp-build.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/flatbuffers/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flatbuffers",
"version": "24.3.25",
"version": "24.12.23",
"description": "FlatBuffers is a cross platform serialization library architected for maximum memory efficiency. It allows you to directly access serialized data without parsing/unpacking it first, while still having great forwards/backwards compatibility.",
"homepage": "https://google.github.io/flatbuffers/",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/fluidsynth/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO FluidSynth/fluidsynth
REF "v${VERSION}"
SHA512 d01d18c42ce98d0daa4e137118fc41f0a59047013870c09bacd9014baadf747e8e73571046781e34bc03eef454f2ef12ee59cf9b2c7f9517c586c08041ebe081
SHA512 8c43e4e86f364f42115a51311231d9926325d7e519c2ddd087a9ed421c9a94cc0dfc5cfbfdfffe9401c634cce14c6e442523550114ac887096dde22ab0c63d98
HEAD_REF master
PATCHES
gentables.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/fluidsynth/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fluidsynth",
"version": "2.4.1",
"version": "2.4.2",
"description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.",
"homepage": "https://github.com/FluidSynth/fluidsynth",
"license": "LGPL-2.1-or-later",
Expand Down
2 changes: 1 addition & 1 deletion ports/jsoncons/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 danielaparker/jsoncons
REF v${VERSION}
SHA512 3df0dddb54eec43885680ab3d1dffb8ba27ebff0e3c674a11577998a1ff930c82def184be7d1d7eb630c38b27e262926d218cf75599768628ab489cc965afc80
SHA512 a33f7f02c3a22e1a01087e9a481d83b5c73b4f34a2ffa3ea760065712e0c308278606b2c837e4394fc8496bb56a43503089a5b617589864f696ff06a192ce652
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/jsoncons/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsoncons",
"version": "0.177.0",
"version": "1.0.0",
"description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON",
"homepage": "https://github.com/danielaparker/jsoncons",
"license": "BSL-1.0",
Expand Down
8 changes: 8 additions & 0 deletions ports/libxcrypt/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,19 @@ if(NOT LIBTOOL_BIN)
message(FATAL_ERROR "${PORT} requires libtool from the system package manager (example: \"sudo apt install libtool\")")
endif()

vcpkg_download_distfile(PATCH_FIX_ERROR_STRICT_OVERFLOW
URLS https://github.com/besser82/libxcrypt/commit/7fc153170ea6c2938c0392794778de7ec995f8f9.patch?full_index=1
SHA512 55f4709c52f6d0a29f159348821c06e3f5df0fae83f487b7a52ce61cd3f6a3a0f48023159fb7029d0a5a3decee36ac6a429cc91e23a83996a3265d681fa11929
FILENAME besser82-libxcrypt-7fc153170ea6c2938c0392794778de7ec995f8f9.patch
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO besser82/libxcrypt
REF "v${VERSION}"
SHA512 61e5e393654f37775457474d4170098314879ee79963d423c1c461e80dc5dc74f0c161dd8754f016ce96109167be6c580ad23994fa1d2c38c54b96e602f3aece
PATCHES
"${PATCH_FIX_ERROR_STRICT_OVERFLOW}"
)

vcpkg_configure_make(
Expand Down
2 changes: 1 addition & 1 deletion ports/libxcrypt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libxcrypt",
"version": "4.4.36",
"port-version": 1,
"port-version": 2,
"description": "libxcrypt is a modern library for one-way hashing of passwords. On Linux-based systems, by default libxcrypt will be binary backward compatible with the libcrypt.so.1 shipped as part of the GNU C Library.",
"homepage": "https://github.com/besser82/libxcrypt",
"license": "LGPL-2.1-only",
Expand Down
5 changes: 5 additions & 0 deletions scripts/test_ports/cmake-user/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
"find-package": {
"description": "Ports to be tested via find_package($package)",
"dependencies": [
{
"$package": "ALSA",
"name": "alsa",
"platform": "linux"
},
{
"$package": "Boost",
"name": "boost",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/alsa.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c80dafc2416d968c6f9060a12de375b70457fb57",
"version": "1.2.13",
"port-version": 1
},
{
"git-tree": "5dd0d76c964da48ce085c9a66ad00463c0607916",
"version": "1.2.13",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/armadillo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1170d44facaee6359f8a38ccfe46d4f0551fa8a6",
"version": "14.2.2",
"port-version": 0
},
{
"git-tree": "03e566acea662b5629f125afdb2a2b96fa486ae5",
"version": "14.0.3",
Expand Down
20 changes: 10 additions & 10 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
},
"alsa": {
"baseline": "1.2.13",
"port-version": 0
"port-version": 1
},
"amd-adl-sdk": {
"baseline": "17.1",
Expand Down Expand Up @@ -233,7 +233,7 @@
"port-version": 0
},
"armadillo": {
"baseline": "14.0.3",
"baseline": "14.2.2",
"port-version": 0
},
"arpack-ng": {
Expand Down Expand Up @@ -1493,7 +1493,7 @@
"port-version": 0
},
"calceph": {
"baseline": "4.0.3",
"baseline": "4.0.4",
"port-version": 0
},
"camport3": {
Expand Down Expand Up @@ -2393,8 +2393,8 @@
"port-version": 0
},
"dp-thread-pool": {
"baseline": "0.6.2",
"port-version": 1
"baseline": "0.7.0",
"port-version": 0
},
"dpdk": {
"baseline": "24.07",
Expand All @@ -2417,7 +2417,7 @@
"port-version": 0
},
"drogon": {
"baseline": "1.9.8",
"baseline": "1.9.9",
"port-version": 0
},
"dstorage": {
Expand Down Expand Up @@ -2821,7 +2821,7 @@
"port-version": 0
},
"flatbuffers": {
"baseline": "24.3.25",
"baseline": "24.12.23",
"port-version": 0
},
"flatbush": {
Expand All @@ -2845,7 +2845,7 @@
"port-version": 0
},
"fluidsynth": {
"baseline": "2.4.1",
"baseline": "2.4.2",
"port-version": 0
},
"flux": {
Expand Down Expand Up @@ -3893,7 +3893,7 @@
"port-version": 7
},
"jsoncons": {
"baseline": "0.177.0",
"baseline": "1.0.0",
"port-version": 0
},
"jsoncpp": {
Expand Down Expand Up @@ -5378,7 +5378,7 @@
},
"libxcrypt": {
"baseline": "4.4.36",
"port-version": 1
"port-version": 2
},
"libxcvt": {
"baseline": "0.1.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/calceph.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "08d3667453a109eb1030f613e946d0fbdf64e1ad",
"version": "4.0.4",
"port-version": 0
},
{
"git-tree": "49026767cbf6ab4fa4dde6df55f440d3a244c5d3",
"version": "4.0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/dp-thread-pool.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9016b440875e13fa99e727ed07d87eb06c6ccee6",
"version": "0.7.0",
"port-version": 0
},
{
"git-tree": "b1d9e561e042312a0001dfbcb150bec1f4a40e98",
"version": "0.6.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/drogon.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9bbcd1c695ccc0436b6956e73e0507ed4f704a0e",
"version-semver": "1.9.9",
"port-version": 0
},
{
"git-tree": "4c701ae2548b41370eeebae23e5e14a806268c06",
"version-semver": "1.9.8",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/flatbuffers.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0d7ebd8b3c4d124bad8101cdecc4ae77d4386c8c",
"version": "24.12.23",
"port-version": 0
},
{
"git-tree": "f8e85b45608b4005d8e8b4a96cfe11a5c2686e92",
"version": "24.3.25",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fluidsynth.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "025500ba826fc8b6661b1c5d64d799ad2b85c2ef",
"version": "2.4.2",
"port-version": 0
},
{
"git-tree": "de4e154ef67ed501c491813ca14696a0a3fc6e11",
"version": "2.4.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/j-/jsoncons.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "990e01ef6724efa0a427fedf3d453beee6243df6",
"version": "1.0.0",
"port-version": 0
},
{
"git-tree": "b7fcd14b062d2f5fcfa8234ea128f2658fc08b17",
"version": "0.177.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libxcrypt.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "825ff0426ce377f1e386f7effd1f3dfb5e218a64",
"version": "4.4.36",
"port-version": 2
},
{
"git-tree": "89d7de97e87cb0eb10479d47ec43e1cc732b2734",
"version": "4.4.36",
Expand Down