diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake index 299266c23a835d..0bf3a1b531f7c0 100644 --- a/ports/cnats/portfile.cmake +++ b/ports/cnats/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nats-io/nats.c - REF 8c36c16a9d086738512c9e55157481f8ce46be7c #v3.3.0 - SHA512 5540916cadadb1e0e84be111fe69b88b5f953cacea6d05d3030f8f11b67865c18e5ef7739303def67e7c57b1032656ab78675f2c6e2ecacf058900575278b5eb + REF b26143da7566e816db66e86f6336ebf5c226c4ad #v3.4.1 + SHA512 6422d3d5b59a700ac56730870dab1bbdadd8f85c9a0cef2c685cdd36189b1689d04d5a710500fbc5299445ca32df9434b404fae3018e8266c284aa34259f110a HEAD_REF master ) diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json index 5b2566b4a6dced..e6eefd91cfef8e 100644 --- a/ports/cnats/vcpkg.json +++ b/ports/cnats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cnats", - "version": "3.3.0", + "version": "3.4.1", "description": "A C client for the NATS messaging system", "homepage": "https://github.com/nats-io/nats.c", "license": "Apache-2.0", diff --git a/ports/cppcoro/portfile.cmake b/ports/cppcoro/portfile.cmake index 39c110e2a483e1..eab7e397a3fe96 100644 --- a/ports/cppcoro/portfile.cmake +++ b/ports/cppcoro/portfile.cmake @@ -7,30 +7,29 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lewissbaker/cppcoro - REF 92892f31d0c41b8e34e6292d7c9d99228da5c501 - SHA512 d1997b7449f1c5c0790575d0755ffbb5f9eef13a7610f3ec666a585bdbb93bb1553f79214c1023a1ef23aaeef64078ca6ee3784107645d7a75c7bba943c10b84 + REF 391215262bd40d68ac6534810164131f5f9eb148 #2022-10-25 + SHA512 22372a0385d6628e81d44cb3096186f7f79f53dff7786815546bfe6d8e1f5af4eae769c6b23e7d18aa123105418780d022239ebd48d25237fe6face9b74e42e8 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - DESTINATION ${SOURCE_PATH} +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=False ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/cppcoro/vcpkg.json b/ports/cppcoro/vcpkg.json index 794309e34db813..53e75578e8ef65 100644 --- a/ports/cppcoro/vcpkg.json +++ b/ports/cppcoro/vcpkg.json @@ -1,8 +1,18 @@ { "name": "cppcoro", - "version-date": "2020-02-28", - "port-version": 3, + "version-date": "2022-10-25", "description": "A library of C++ coroutine abstractions for the Coroutines TS", "homepage": "https://github.com/lewissbaker/cppcoro", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 9424e326b416cc..11aa0b7f7e5dff 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF d32ba610088041429d48b4f3398f8d1eb84cfe58 #v2.68.1 - SHA512 4d25b5d83401ea36ea4b987ee7530824d3599a36fd8ca8b0bb4ff7560854550eb267414d762770f8b30179178d5d2758060eedd6534913088a5c220f0d14915d + REF d639561ff10faef04eee88a972213e611be9839e #v2.72.1 + SHA512 ebefddb9566bfa9764ac7b6d5bf5ec6f8ed469297f7f5c600a235ded7dd71c0c3850fd4b3a3b1b0feb79635f8aa8f06d096b75e0aa2cb22446db4b5539127500 HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 94980babcc7b37..47d2a7b4c95618 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-header-libraries", - "version": "2.68.1", + "version": "2.72.1", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", "license": "BSL-1.0", diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index c3da5a9a77ea65..4780dd4702e839 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF 6275cd9dadfed96e1b21e552657680ea9fce24cb #v3.0.4 - SHA512 7ba326480047b1cfc3cf40114d2793e368d5bc8e90a4e690f17fbac1066e6a89b2c031bef19abab9199b83314dff327651b67f73654e306b17b070b85c50a0f6 + REF f324fbfe2b563b11ca58c12743bfce4672990e5b #v3.1.1 + SHA512 01873ad03772922d588839667a0e82e4d47f82662b8901b252b8ddf7b368d22f2d09f67eecacfdab9bbdf9a3af4494ba0d3b72aacdcf7efd043e3970e0f1ba4d HEAD_REF master ) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index 62ebae40d1ec8a..2e255a7767837c 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-json-link", - "version": "3.0.4", + "version": "3.1.1", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "license": "BSL-1.0", diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index 8a58b690a18fce..85b00ba25d8225 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -29,4 +29,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gif") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/giflib/usage b/ports/giflib/usage new file mode 100644 index 00000000000000..ebd07d1c12d93e --- /dev/null +++ b/ports/giflib/usage @@ -0,0 +1,4 @@ +The package giflib is compatible with built-in CMake targets: + + find_package(GIF REQUIRED) + target_link_libraries(main PRIVATE GIF::GIF) diff --git a/ports/giflib/vcpkg-cmake-wrapper.cmake b/ports/giflib/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..8812b5ab17cae7 --- /dev/null +++ b/ports/giflib/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,25 @@ +find_path(GIF_INCLUDE_DIR NAMES gif_lib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) +find_library(GIF_LIBRARY_RELEASE NAMES gif PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(GIF_LIBRARY_DEBUG NAMES gif PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +include(SelectLibraryConfigurations) +select_library_configurations(GIF) +set(GIF_LIBRARY "${GIF_LIBRARY}" CACHE STRING "") +unset(GIF_LIBRARY) +unset(GIF_FOUND) +if(NOT TARGET GIF::GIF) + add_library(GIF::GIF UNKNOWN IMPORTED) + set_target_properties(GIF::GIF PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${GIF_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS RELEASE + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" + IMPORTED_LOCATION_RELEASE "${GIF_LIBRARY_RELEASE}" + ) + if("${GIF_LIBRARY_DEBUG}") + set_property(TARGET GIF::GIF APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(GIF::GIF PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C" + IMPORTED_LOCATION_DEBUG "${GIF_LIBRARY_DEBUG}") + endif() +endif() +_find_package(${ARGS}) diff --git a/ports/giflib/vcpkg.json b/ports/giflib/vcpkg.json index 2e950baed3d9bd..a13fa5811e1e6e 100644 --- a/ports/giflib/vcpkg.json +++ b/ports/giflib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "giflib", "version": "5.2.1", - "port-version": 2, + "port-version": 3, "description": "A library for reading and writing gif images.", "homepage": "https://sourceforge.net/projects/giflib/", "license": "MIT", diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 6aa2e4e393e0e5..bc6d11c9e3e5f5 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -11,21 +11,21 @@ vcpkg_from_github( 0004_fix-config-expected-paths.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DOPTION_BUILD_TESTS=OFF - -DOPTION_BUILD_GPU_TESTS=OFF -DOPTION_BUILD_TOOLS=OFF -DOPTION_BUILD_EXAMPLES=OFF -DGIT_REV=0 -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON -DOPTION_BUILD_EXAMPLES=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_cpplocate ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() ## _IMPORT_PREFIX needs to go up one extra level in the directory tree. @@ -48,12 +48,12 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) file(WRITE ${TARGET_CMAKE} "${_contents}") endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Remove files already published by egl-registry -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR") # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/glbinding/vcpkg.json b/ports/glbinding/vcpkg.json index 4a13308968ca2a..0112b09202a96c 100644 --- a/ports/glbinding/vcpkg.json +++ b/ports/glbinding/vcpkg.json @@ -1,10 +1,19 @@ { "name": "glbinding", - "version-string": "3.1.0", - "port-version": 3, + "version": "3.1.0", + "port-version": 4, "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API", "homepage": "https://github.com/cginternals/glbinding", + "license": "MIT", "dependencies": [ - "egl-registry" + "egl-registry", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 816a30b7eade6d..c9d356c79ca194 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -30,16 +30,16 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 722d78250a30c89c92970a78be970269a395be36 # v2.0.7 - SHA512 69c7e6c02db6ff6b10d94b52470eda38839b4121960f7d19c3829eb453a84a62f017e1607bbb8dd63528c1461686fa6f30af605a046faae2c9c916aa688b555f + REF 64817e0e8793d0875fc10245de52ffb2540a223d # v2.0.8 + SHA512 607172e6a806d78bb34443101bd384ac7a42e0edc3e7c4a2cf5c3ab5f2be64f84557726dce16c2fbaaa2ba254529a8871b3123b0e79fe87cd5bf26021ecb59da HEAD_REF RC_2_0 ) vcpkg_from_github( OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH REPO arvidn/try_signal - REF 751a7e5a5be14892bcfdff1e63c653bcbf71cf39 - SHA512 4ccea4f67a79acf49a9943d8aec3999475357d7ad3cfc7b37f0e1c4527f8f4536993c6f6241bb3eb166a1dc939133a4f3b35197f9e47fb2ac9c713b64f8cb96d + REF 105cce59972f925a33aa6b1c3109e4cd3caf583d #2022-10-27 + SHA512 4a0090755831e0e4a1930817345fa5934144421d9a9d710fe8ed3712233fa2fa037fc0e0d4f88b7cc8fb1bc05fe2d55372af1ff47d6fbf5208e03f45f2a424e4 HEAD_REF master ) @@ -54,8 +54,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH LIB_SIMULATOR_SOURCE_PATH REPO arvidn/libsimulator - REF 64fb5b4fde1879abc09c018604d57e485a12e999 - SHA512 20b57eb436127028339528f34a9db7e7149d2c5d86149114444205370482d3f5284e76493f2fbc1c6904175e6482671bfcaeb98d0bee7d399e546abef02f32f3 + REF 39144efe83fcd38778cf76fc609e3475694642ca #2022-10-27 + SHA512 a021f769d52d127355ecaceaf912bf3e86aaa256d4768d270fbe6066793b6159eddecd0262f3f2158602f883d49b3aac39eb79be5399212cdd7711f921ffa15a HEAD_REF master ) diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index 9ea765211d8ba3..a3ea9a77da281d 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.7", + "version": "2.0.8", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index d5b8266ef3bc54..e1b4e124f1a14b 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aspnet/SignalR-Client-Cpp - REF v0.1.0-alpha3 - SHA512 7dbd75748535c7b7fef36afe246b132b243b8b4932c218a63aa18c7a44d6691c002144c6d2f5603ad63c03d018907436ad259fdfcc0d7749917931bdebef670b + REF v0.1.0-alpha4 + SHA512 b87c94e8bc81781c1cfb4292f1fe3ce046a5f192a25c02104f454b533349c1c0ed965570bd749b496bb316ccb89ae51c5e7461ffa06055e71dac659fbde79456 HEAD_REF main ) diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index 12e555add59c87..b1007355555198 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "microsoft-signalr", - "version-string": "0.1.0-alpha3", + "version": "0.1.0-alpha4", "port-version": 1, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", @@ -23,6 +23,7 @@ "default-features": { "description": "Features installed by default", "dependencies": [ + "jsoncpp", { "name": "microsoft-signalr", "features": [ diff --git a/ports/plib/portfile.cmake b/ports/plib/portfile.cmake index 1991b2f6be5d42..603aeb3ffe1616 100644 --- a/ports/plib/portfile.cmake +++ b/ports/plib/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json index 421823aff3c706..4579c4a4685c70 100644 --- a/ports/plib/vcpkg.json +++ b/ports/plib/vcpkg.json @@ -1,6 +1,14 @@ { "name": "plib", - "version-string": "1.8.5", - "port-version": 5, - "description": "A suite of portable game libraries" + "version": "1.8.5", + "port-version": 6, + "description": "A suite of portable game libraries", + "license": "LGPL-2.0-only", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 5599b6f771ab71..6d0d9391531e91 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.27 - SHA512 c763e7083e1e832d39adb507cc6b34b1ad0a0b7f2b7ffe390428f93fb1df84fcbbf43bcb31dd2f2381da2ac563c88a10fbd932ea5155bd43c604025960039b58 + REF QuantLib-v1.28 + SHA512 720bc18e5a01367e5cea5c9a28f2103357e6d2708dbc13c208a73b52bc615ba03ab248eca75f94e9c7631e340faa87a18bef94b4ae9f277006fc62fac4b30bc4 HEAD_REF master ) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index b668af29fb9d98..e9e6b4a685ff26 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.27", + "version": "1.28", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "license": "BSD-3-Clause", diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index e36b10bdae7d0d..a49c9b5b504b10 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v2.2.0 - SHA512 cf9ef0f45f6afad38aebcfb7884dc52207d09416cc42c01710b6bbb9ade9ff1cb0d58d7dd8b09a9e08457fbeeddcccb73a75316c1c80dc4241652b2b7786ebb6 + REF v2.3.0 + SHA512 6f3e905ea04adcf2d93e51b2065749523bc5a5c47400273c7f21049c6178d4e74e6541d8785bd1e5f81b7eafda301a5ebf8f19c989ca296c31a4568435364457 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 459e699c4aa502..6f2466702bc14b 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "2.2.0", + "version": "2.3.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/ports/sdl2-net/CMakeLists.txt b/ports/sdl2-net/CMakeLists.txt deleted file mode 100644 index 87c77929c9b57d..00000000000000 --- a/ports/sdl2-net/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(SDL2_NET C) - -if (MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996") -endif() - -find_path(SDL_INCLUDE_DIR SDL2/SDL.h) -find_package(SDL2 CONFIG REQUIRED) - -add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) - -set_target_properties(SDL2_net PROPERTIES DEFINE_SYMBOL DLL_EXPORT) -target_compile_definitions(SDL2_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) -target_include_directories(SDL2_net PRIVATE ${SDL_INCLUDE_DIR}/SDL2) - -if (WIN32) - target_link_libraries(SDL2_net SDL2::SDL2 ws2_32 iphlpapi) -endif() - -install(TARGETS SDL2_net - EXPORT SDL2_net - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -install(EXPORT SDL2_net - DESTINATION "share/sdl2-net" - FILE sdl2-net-config.cmake - NAMESPACE SDL2:: -) - -if(NOT DEFINED SDL_NET_SKIP_HEADERS) - install(FILES SDL_net.h DESTINATION include/SDL2) -endif() - -message(STATUS "Link-time dependencies:") -message(STATUS " " SDL2::SDL2) diff --git a/ports/sdl2-net/portfile.cmake b/ports/sdl2-net/portfile.cmake index 9534a9aa4f8421..c949d23138d89e 100644 --- a/ports/sdl2-net/portfile.cmake +++ b/ports/sdl2-net/portfile.cmake @@ -1,26 +1,31 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz" - FILENAME "SDL2_net-2.0.1.tar.gz" - SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsdl-org/SDL_net + REF 669e75b84632e2c6cc5c65974ec9e28052cb7a4e # release-2.2.0 + SHA512 180c757d704c72dc7fcc392c13942214c87b90de22e32045ec9eb6cde5da2b762516e14120d8bee52f7f4a59ad8e30d4f71e313918432ae07ef71df8e9380e4b + HEAD_REF main ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSDL2NET_SAMPLES=OFF ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_cmake_install() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DSDL_NET_SKIP_HEADERS=ON) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_net CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_net CONFIG_PATH lib/cmake/SDL2_net) +endif() -vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/sdl2-net/usage b/ports/sdl2-net/usage new file mode 100644 index 00000000000000..f08bbc7d10203c --- /dev/null +++ b/ports/sdl2-net/usage @@ -0,0 +1,4 @@ +sdl2-net provides CMake targets: + + find_package(SDL2_net CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_net::SDL2_net,SDL2_net::SDL2_net-static>) diff --git a/ports/sdl2-net/vcpkg.json b/ports/sdl2-net/vcpkg.json index 03aa452d8ed8d8..be317156c97b5c 100644 --- a/ports/sdl2-net/vcpkg.json +++ b/ports/sdl2-net/vcpkg.json @@ -1,10 +1,18 @@ { "name": "sdl2-net", - "version-string": "2.0.1", - "port-version": 9, + "version": "2.2.0", "description": "Networking library for SDL", - "homepage": "https://www.libsdl.org/projects/SDL_net", + "homepage": "https://github.com/libsdl-org/SDL_net", + "license": "Zlib", "dependencies": [ - "sdl2" + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/vowpal-wabbit/portfile.cmake b/ports/vowpal-wabbit/portfile.cmake index 59d9cc637d06d0..f41dda8ec3eeae 100644 --- a/ports/vowpal-wabbit/portfile.cmake +++ b/ports/vowpal-wabbit/portfile.cmake @@ -28,3 +28,4 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_D file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/VowpalWabbit) +vcpkg_fixup_pkgconfig() diff --git a/ports/vowpal-wabbit/vcpkg.json b/ports/vowpal-wabbit/vcpkg.json index 1ccac5c3efebed..65c1ec7e442820 100644 --- a/ports/vowpal-wabbit/vcpkg.json +++ b/ports/vowpal-wabbit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vowpal-wabbit", "version": "9.5.0", + "port-version": 1, "description": "Reduction based online learning framework with a focus on contextual bandits and reinforcement learning.", "homepage": "https://github.com/vowpalwabbit/vowpal_wabbit", "license": "BSD-3-Clause", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5e0a37281540ad..d15e1f09c6d682 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -442,6 +442,7 @@ libmariadb:arm64-windows = skip libmariadb:arm-uwp = skip libmariadb:x64-linux = skip libmariadb:x64-osx = skip +libmariadb:arm64-osx = skip libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip @@ -822,10 +823,6 @@ pfring:x64-linux=fail pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail -plib:arm-uwp=fail -plib:x64-osx=fail -plib:arm64-osx=fail -plib:x64-uwp=fail plibsys:arm-uwp=fail plibsys:x64-uwp=fail plplot:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 9e2877d72469cf..a10aafdb9a2bc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1509,7 +1509,7 @@ "port-version": 1 }, "cnats": { - "baseline": "3.3.0", + "baseline": "3.4.1", "port-version": 0 }, "cnl": { @@ -1653,8 +1653,8 @@ "port-version": 3 }, "cppcoro": { - "baseline": "2020-02-28", - "port-version": 3 + "baseline": "2022-10-25", + "port-version": 0 }, "cppfs": { "baseline": "1.3.0", @@ -1861,11 +1861,11 @@ "port-version": 0 }, "daw-header-libraries": { - "baseline": "2.68.1", + "baseline": "2.72.1", "port-version": 0 }, "daw-json-link": { - "baseline": "3.0.4", + "baseline": "3.1.1", "port-version": 0 }, "daw-utf-range": { @@ -2610,7 +2610,7 @@ }, "giflib": { "baseline": "5.2.1", - "port-version": 2 + "port-version": 3 }, "ginkgo": { "baseline": "1.4.0", @@ -2634,7 +2634,7 @@ }, "glbinding": { "baseline": "3.1.0", - "port-version": 3 + "port-version": 4 }, "glew": { "baseline": "2.2.0", @@ -4281,7 +4281,7 @@ "port-version": 2 }, "libtorrent": { - "baseline": "2.0.7", + "baseline": "2.0.8", "port-version": 0 }, "libu2f-server": { @@ -4797,7 +4797,7 @@ "port-version": 3 }, "microsoft-signalr": { - "baseline": "0.1.0-alpha3", + "baseline": "0.1.0-alpha4", "port-version": 1 }, "mikktspace": { @@ -5786,7 +5786,7 @@ }, "plib": { "baseline": "1.8.5", - "port-version": 5 + "port-version": 6 }, "plibsys": { "baseline": "0.0.4", @@ -6361,7 +6361,7 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.27", + "baseline": "1.28", "port-version": 0 }, "quaternions": { @@ -6381,7 +6381,7 @@ "port-version": 8 }, "quill": { - "baseline": "2.2.0", + "baseline": "2.3.0", "port-version": 0 }, "quirc": { @@ -6765,8 +6765,8 @@ "port-version": 2 }, "sdl2-net": { - "baseline": "2.0.1", - "port-version": 9 + "baseline": "2.2.0", + "port-version": 0 }, "sdl2-ttf": { "baseline": "2.20.0", @@ -7806,7 +7806,7 @@ }, "vowpal-wabbit": { "baseline": "9.5.0", - "port-version": 0 + "port-version": 1 }, "vs-yasm": { "baseline": "0.5.0", diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json index d3693cfa0b8966..e63418364d8a4f 100644 --- a/versions/c-/cnats.json +++ b/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d886b7595504b34bc08246edd99ceead043f083f", + "version": "3.4.1", + "port-version": 0 + }, { "git-tree": "e4045ec63d36d672939a5bd17e2733acaf759a14", "version": "3.3.0", diff --git a/versions/c-/cppcoro.json b/versions/c-/cppcoro.json index 5febcb385298ae..891a449daf942e 100644 --- a/versions/c-/cppcoro.json +++ b/versions/c-/cppcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c12bf37fe268e0d060a6092ac597f8f8560416fa", + "version-date": "2022-10-25", + "port-version": 0 + }, { "git-tree": "76350a224261bfe57c726e6f3a022d925cb26606", "version-date": "2020-02-28", diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index b9b911686dcdf5..e646cb4b7aa64e 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a43fb1fbf9864d6ff4a5acf4319300ec1e3933ba", + "version": "2.72.1", + "port-version": 0 + }, { "git-tree": "c183461d315649b9c1fbbb8f2701767d68a38820", "version": "2.68.1", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 84775c81e540e2..fa30aa26f94f4d 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2020a01c366b2f953c0538a8f942e4682cbcaa54", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "512359aae4c09860c5ec50624d01ba0d0f21d2a2", "version": "3.0.4", diff --git a/versions/g-/giflib.json b/versions/g-/giflib.json index e9456f42e36ac8..4992cc68769a86 100644 --- a/versions/g-/giflib.json +++ b/versions/g-/giflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ba54b2de43f1fe619e5a7e554f108fc01a771da", + "version": "5.2.1", + "port-version": 3 + }, { "git-tree": "5b5833304ba0e1be5ff125f265d1f2e1098a93cb", "version": "5.2.1", diff --git a/versions/g-/glbinding.json b/versions/g-/glbinding.json index 657a17a96eef8c..d5e9c8711fdb69 100644 --- a/versions/g-/glbinding.json +++ b/versions/g-/glbinding.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5932f5a201e721aa59a787380b9448e1018bb4b3", + "version": "3.1.0", + "port-version": 4 + }, { "git-tree": "6feb489ecd418b013262401ff4911eccf5c03deb", "version-string": "3.1.0", diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index 0e34f91c40ffae..075d5cfafd5cb6 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d333acbdb5428b1468d2a83036b08b72543639be", + "version": "2.0.8", + "port-version": 0 + }, { "git-tree": "d1c101af3351c28c84e89394e1fb6826352bec76", "version": "2.0.7", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index 3a7cdf9a9e1e8a..07df40cdacd2a3 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfae1e03d5239a637b313baa81f03e6fa025c45a", + "version": "0.1.0-alpha4", + "port-version": 1 + }, { "git-tree": "f95ed360cce7fb3a2acd3684ba74619ebc1d75a3", "version-string": "0.1.0-alpha3", diff --git a/versions/p-/plib.json b/versions/p-/plib.json index 03df101ad2ec54..c77021e1cda00f 100644 --- a/versions/p-/plib.json +++ b/versions/p-/plib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df2cccd607d973a945593bfec6ef15bd7549e6c0", + "version": "1.8.5", + "port-version": 6 + }, { "git-tree": "7b00da126126e5e721ab3f6b1f931f7ec4df77f8", "version-string": "1.8.5", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 14ea49faa86f1b..14f6b96be85254 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9507c0b648cda5733adf67cabafd6cadb849eff5", + "version": "1.28", + "port-version": 0 + }, { "git-tree": "1b757843f94ec0950f693324ea419498a12e415f", "version": "1.27", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 48468ceb413b00..424ab3f7443dcf 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "970b5bf8d060f0cd51048c922226b755c21ac4b8", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "a49ab25dd1b0c7287b11f8ca4c0ba4a0117658cc", "version": "2.2.0", diff --git a/versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json index 822436b19c1146..fe6a74c4dca691 100644 --- a/versions/s-/sdl2-net.json +++ b/versions/s-/sdl2-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42bbc8fde95dbe42390656e720cf852e08b31b77", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "fcebb3e918a41e08cc320cede3d15872c53ad204", "version-string": "2.0.1", diff --git a/versions/v-/vowpal-wabbit.json b/versions/v-/vowpal-wabbit.json index e047f4e2888424..4a769566d325c7 100644 --- a/versions/v-/vowpal-wabbit.json +++ b/versions/v-/vowpal-wabbit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e78d44b4949b1d3d2e11f177f8638952c61d711e", + "version": "9.5.0", + "port-version": 1 + }, { "git-tree": "1c4abceff85b2e9257c68742f509cbf4f4858c7d", "version": "9.5.0",