From defe7b7fb383da1dd55fdef49a2344235d93001c Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Fri, 5 May 2023 13:55:33 -0400 Subject: [PATCH 001/533] [draco] Update to v1.5.6 (#31220) * [draco] Update to v1.5.6 * [draco] Update baseline * [draco] Fix pkgconfig * [draco] Update version * [draco] Use VERSION variable for git ref Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * [draco] Revert line ending change * [draco] Update version --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/draco/disable-symlinks.patch | 16 ++++++++-------- ports/draco/fix-compile-error-uwp.patch | 9 ++++----- ports/draco/fix-pkgconfig.patch | 13 +++++++++++++ ports/draco/portfile.cmake | 5 +++-- ports/draco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 7 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 ports/draco/fix-pkgconfig.patch diff --git a/ports/draco/disable-symlinks.patch b/ports/draco/disable-symlinks.patch index feca85f15a03fc..df39449e23c127 100644 --- a/ports/draco/disable-symlinks.patch +++ b/ports/draco/disable-symlinks.patch @@ -1,10 +1,10 @@ diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake -index f96dbb1..179b9f9 100644 +index c8c79f5..1cec5b8 100644 --- a/cmake/draco_targets.cmake +++ b/cmake/draco_targets.cmake -@@ -103,9 +103,6 @@ macro(draco_add_executable) - add_executable(${exe_NAME} ${exe_SOURCES}) - target_compile_features(${exe_NAME} PRIVATE cxx_std_11) +@@ -111,9 +111,6 @@ macro(draco_add_executable) + + target_compile_features(${exe_NAME} PUBLIC cxx_std_11) - if(NOT EMSCRIPTEN) - set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) @@ -12,16 +12,16 @@ index f96dbb1..179b9f9 100644 if(exe_OUTPUT_NAME) set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) -@@ -340,14 +337,6 @@ macro(draco_add_library) +@@ -364,14 +361,6 @@ macro(draco_add_library) set_target_properties(${lib_NAME} PROPERTIES PREFIX "") endif() - if(NOT EMSCRIPTEN) - # VERSION and SOVERSION as necessary - if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) -- set_target_properties(${lib_NAME} -- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION -- ${DRACO_SOVERSION_MAJOR}) +- set_target_properties( +- ${lib_NAME} PROPERTIES VERSION ${DRACO_SOVERSION} +- SOVERSION ${DRACO_SOVERSION_MAJOR}) - endif() - endif() diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index 0b62512bcdf9c9..ca68cb5986e585 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,18 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0362420..2b09073 100644 +index a93267d..3a3ccf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -86,6 +86,10 @@ draco_set_cxx_flags() +@@ -85,6 +85,9 @@ draco_set_cxx_flags() draco_set_exe_linker_flags() draco_generate_features_h() +if (MSVC) + add_compile_options(/wd4996) +endif() -+ # Draco source file listing variables. - list(APPEND draco_attributes_sources - "${draco_src_root}/attributes/attribute_octahedron_transform.cc" + list( + APPEND draco_attributes_sources diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc index 378de73..be7e032 100644 --- a/src/draco/io/parser_utils.cc diff --git a/ports/draco/fix-pkgconfig.patch b/ports/draco/fix-pkgconfig.patch new file mode 100644 index 00000000000000..b4e3f2100907e6 --- /dev/null +++ b/ports/draco/fix-pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/draco.pc.template b/cmake/draco.pc.template +index 050219c..2886bfc 100644 +--- a/cmake/draco.pc.template ++++ b/cmake/draco.pc.template +@@ -1,6 +1,6 @@ + Name: @PROJECT_NAME@ + Description: Draco geometry de(com)pression library. + Version: @DRACO_VERSION@ +-Cflags: -I@includes_path@ +-Libs: -L@libs_path@ -ldraco ++Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -ldraco + Libs.private: @CMAKE_THREAD_LIBS_INIT@ diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index d34619dde7ae55..e05f9c0a06b5c8 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.5.3 - SHA512 8575ea78e0d8025facddbd42453b0251387f4e31eb0854135e050fc26aaf0d28ed30ccc3f93578fdc6cdb50369c2ef735291f1f5fb60238b289e0ee019446e1d + REF "${VERSION}" + SHA512 d4bc48aeac23aba377d1770a46e6676cb01596a436493385fb0c4ef9ba3f0fae42027232131a3d438250909aff4311353e114925753d045cc585af42660be0b1 HEAD_REF master PATCHES fix-compile-error-uwp.patch fix-uwperror.patch + fix-pkgconfig.patch disable-symlinks.patch ) diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 3fedb46f23d339..636f863eaa4dcd 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "draco", - "version": "1.5.3", + "version": "1.5.6", "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", "homepage": "https://github.com/google/draco", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 03cfedf422885d..08cde7d2af56ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2157,7 +2157,7 @@ "port-version": 1 }, "draco": { - "baseline": "1.5.3", + "baseline": "1.5.6", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index dace9381ae2f66..c4aaf83ac17128 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bed378402e689e540a924f99869f7134d74bbdfb", + "version": "1.5.6", + "port-version": 0 + }, { "git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354", "version": "1.5.3", From 21ba00c5d5ed3ab207e3a62c2eb144ab9ebb2de1 Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Fri, 5 May 2023 20:12:49 +0200 Subject: [PATCH 002/533] [librdkafka] Upgrade up to 2.1.1 (#31266) * [librdkafka] upgrade version up to 2.1.1 * [librdkafka] upgrade version up to 2.1.1 * Update ports/librdkafka/portfile.cmake Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * [librdkafka] upgrade version up to 2.1.1 * remove blank * update version --------- Co-authored-by: Smyslov Alexander Nikolayevich Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/librdkafka/fix_curl.patch | 25 ------------------------- ports/librdkafka/portfile.cmake | 5 ++--- ports/librdkafka/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/librdkafka.json | 5 +++++ 5 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 ports/librdkafka/fix_curl.patch diff --git a/ports/librdkafka/fix_curl.patch b/ports/librdkafka/fix_curl.patch deleted file mode 100644 index 7d81ccf15b3c97..00000000000000 --- a/ports/librdkafka/fix_curl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 37b43c4..106fe38 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -213,6 +213,11 @@ if(WITH_ZLIB) - target_link_libraries(rdkafka PUBLIC ZLIB::ZLIB) - endif() - -+if(WITH_CURL) -+ find_package(CURL CONFIG REQUIRED) -+ target_link_libraries(rdkafka PUBLIC CURL::libcurl) -+endif() -+ - if(WITH_ZSTD) - target_link_libraries(rdkafka PRIVATE ${ZSTD_LIBRARY}) - target_include_directories(rdkafka PRIVATE ${ZSTD_INCLUDE_DIR}) -@@ -296,7 +301,7 @@ if(NOT RDKAFKA_BUILD_STATIC) - set(PKG_CONFIG_DESCRIPTION "The Apache Kafka C/C++ library") - - if(WITH_CURL) -- string(APPEND PKG_CONFIG_REQUIRES "curl ") -+ string(APPEND PKG_CONFIG_REQUIRES "libcurl ") - endif() - - if(WITH_ZLIB) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 950e7250ac728e..2a33c35e7ce3a2 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka - REF v2.1.0 - SHA512 eeefa8833e7c178015ff8d0914d927d1bf4e09a75c5f227ba75e527f9bfc46407798d69642b5db3edafb93fcdbe56e8b506df826d01c7793af0f11e96c38caed + REF "v${VERSION}" + SHA512 6bf1761e7ed1820b587fda24277f6606ec046da281064df13c4380f49a92f3e2b165614b9c622d46b27078ec024a4dc211610e500e597265e8219f8869c4d203 HEAD_REF master PATCHES lz4.patch - fix_curl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 32678407fc94e8..53b640077a89e6 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,6 +1,6 @@ { "name": "librdkafka", - "version": "2.1.0", + "version": "2.1.1", "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 08cde7d2af56ff..cf0820dcad6e98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4425,7 +4425,7 @@ "port-version": 0 }, "librdkafka": { - "baseline": "2.1.0", + "baseline": "2.1.1", "port-version": 0 }, "libredwg": { diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 9ccb4391da8eb4..57cd7b0269493e 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65bfe7c79910979e418a3c20b1cc615a64997e82", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "e524f201bfa539b35c11c270d3e25a9c48eeff14", "version": "2.1.0", From ec6cd90d6ed4af879195d91bd2d290c28e7b44ad Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 6 May 2023 02:13:22 +0800 Subject: [PATCH 003/533] update to 2.2.0 (#31265) --- ports/libcopp/portfile.cmake | 2 +- ports/libcopp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libcopp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index fef1d645a32453..9fe462a4286d2c 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO owent/libcopp REF "v${VERSION}" - SHA512 b2a944d826521dbbf481da3e8d072bb024a0894207b5d9759636959d98b75c1fb37db24f6651d108832bbb4379008d17b0cb4bfc3b6c6ba1c1fdcfbc96f68b82 + SHA512 aa594e1cab9e8489feb864539834a66f700be51000e551840456cbb27971894b3481b300be88a8273f7efc189e3003ecc680eabb3ae8131a90daa2ba90447973 HEAD_REF v2 PATCHES fix-x86-windows.patch ) diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json index ec4f82ce4c7f9b..a4f4067193843c 100644 --- a/ports/libcopp/vcpkg.json +++ b/ports/libcopp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcopp", - "version": "2.1.4", + "version": "2.2.0", "maintainers": "owent ", "description": "A cross-platfrom coroutine library for C++", "homepage": "https://github.com/owent/libcopp", diff --git a/versions/baseline.json b/versions/baseline.json index cf0820dcad6e98..943b14ad2e9a55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3877,7 +3877,7 @@ "port-version": 4 }, "libcopp": { - "baseline": "2.1.4", + "baseline": "2.2.0", "port-version": 0 }, "libcorrect": { diff --git a/versions/l-/libcopp.json b/versions/l-/libcopp.json index d5d9b5a89cf4ef..81a62990f80a92 100644 --- a/versions/l-/libcopp.json +++ b/versions/l-/libcopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45c928d0a5c7281930ae8f7cd424a939da766f1a", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "9a5300e82b2e96e71c1357f2dbb4b7c311a18022", "version": "2.1.4", From f3cc1e393f355df51db717546a0e241190248dc7 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 6 May 2023 02:16:48 +0800 Subject: [PATCH 004/533] [simde] update to 0.7.4 (#31264) --- ports/simde/fix-windows-minmax.patch | 12 ------------ ports/simde/portfile.cmake | 10 ++++------ ports/simde/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/simde.json | 5 +++++ 5 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 ports/simde/fix-windows-minmax.patch diff --git a/ports/simde/fix-windows-minmax.patch b/ports/simde/fix-windows-minmax.patch deleted file mode 100644 index 52feeafc561041..00000000000000 --- a/ports/simde/fix-windows-minmax.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/simde/x86/sse.h b/simde/x86/sse.h -index 00119d3..a9dd705 100644 ---- a/simde/x86/sse.h -+++ b/simde/x86/sse.h -@@ -33,6 +33,7 @@ - #include "mmx.h" - - #if defined(_WIN32) -+ #define NOMINMAX - #include - #endif - diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index 510d93d5de9d46..86f029646390d5 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -2,14 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO nemequ/simde - REF v0.7.2 - SHA512 E4EE5A4A7E8453F116F1325D147F91D358A300F41EA5566EA30FC19649BABABF3B87E3DC838D5608B578BD152207DF4156200FFC7FB98141BC7C0BB60C75F1F5 + REPO simd-everywhere/simde + REF "v${VERSION}" + SHA512 9add192021014f503699dedff8644ad8079a6381302fe56b91950a3b498b58ba7d069a4779007738edfad1ec57dbce02d462bd833a517240e8ff992e3867868a HEAD_REF master - PATCHES - fix-windows-minmax.patch ) file(COPY "${SOURCE_PATH}/simde" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/simde/vcpkg.json b/ports/simde/vcpkg.json index cfa1b0664322a8..61b94ea0f33738 100644 --- a/ports/simde/vcpkg.json +++ b/ports/simde/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simde", - "version": "0.7.2", - "port-version": 1, + "version": "0.7.4", "description": "Implementations of SIMD instruction sets for systems which don't natively support them", "homepage": "https://github.com/simd-everywhere/simde", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 943b14ad2e9a55..4dbd8874b42139 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7389,8 +7389,8 @@ "port-version": 1 }, "simde": { - "baseline": "0.7.2", - "port-version": 1 + "baseline": "0.7.4", + "port-version": 0 }, "simdjson": { "baseline": "3.1.7", diff --git a/versions/s-/simde.json b/versions/s-/simde.json index e60cf9df4d6095..67f9b147786015 100644 --- a/versions/s-/simde.json +++ b/versions/s-/simde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f46b6e3bc03d59a8f45ae99c0c0d08b8386f230a", + "version": "0.7.4", + "port-version": 0 + }, { "git-tree": "b9f97efd430bad429766d57361f329bb1e1597f4", "version": "0.7.2", From dc965d08df5e1961bc475d2b16e6ec8662644fca Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 6 May 2023 02:17:01 +0800 Subject: [PATCH 005/533] [libphonenumber] Update to 8.13.11 (#31260) * update version * update version --- ports/libphonenumber/portfile.cmake | 2 +- ports/libphonenumber/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libphonenumber.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libphonenumber/portfile.cmake b/ports/libphonenumber/portfile.cmake index 9db9c58c66379b..4ea3e1fc07846e 100644 --- a/ports/libphonenumber/portfile.cmake +++ b/ports/libphonenumber/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libphonenumber REF "v${VERSION}" - SHA512 b864f0ff25ed32813dfa7db5d92ada501566b4d6c366f6ee856dff82680631b88acf24def742015d112e20d4e8aa7c6312c04afb846d492d1f5bef93099775ec + SHA512 e685bb9501104527ceec9af7ac424a5f642f6960454fe5a6f10f5e6555bb6d52b68a0465c5475162e8a1ac20a0b1bfb68bd4587ffae64dc017a5c8a5efc5b09f HEAD_REF master PATCHES fix-re2-identifiers.patch diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index de26ea3f3d2d1f..461ef828614282 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libphonenumber", - "version": "8.13.9", + "version": "8.13.11", "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.", "license": "Apache-2.0", "supports": "!linux & !osx", diff --git a/versions/baseline.json b/versions/baseline.json index 4dbd8874b42139..cd49ac264ff5d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4365,7 +4365,7 @@ "port-version": 1 }, "libphonenumber": { - "baseline": "8.13.9", + "baseline": "8.13.11", "port-version": 0 }, "libplist": { diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index bc18673b8148d9..b6cc94794aea0e 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f6bcac3d621a03907f69278cb2a1e303fa414f1", + "version": "8.13.11", + "port-version": 0 + }, { "git-tree": "c67ed43ff7bcb68e7d676e1a3be1139e7f5bdc2f", "version": "8.13.9", From 4eda0e3c7062e61dd89a91357ddc50f742da75ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= <70097935+omarhogni@users.noreply.github.com> Date: Fri, 5 May 2023 18:17:13 +0000 Subject: [PATCH 006/533] [glaze] update 1.2.2 (#31249) * Glaze updated to 1.2.2 * Vcpkg version database update --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index f7101616c691e8..80b4dd54d3e844 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 7943056d02711fbabddeaa84918171d552b9d17fdfb19e44e3a21cced565ba5ba04cc69257720228f6fd3daff2d7fd4455b0b20165642ae23b6eaafb068102e7 + SHA512 8016328a347dac7c4826cb5ff944d38b1b32dd2fbfe9080f73e3351d2f3682c06c5500f05b2f2dfda5925af8605469b26f78f2522ff498a2131867edceb7b709 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index bd34b44fe7a2e0..bbc4d890f501c9 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.2.1", + "version": "1.2.2", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index cd49ac264ff5d7..ab4e7f9c9965d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2805,7 +2805,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 62ad7ca8faf7cd..a5f443606085a4 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16c37a75de3f8e60dca6acec5bb868b869cb7e76", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "e4e6b08e9aa73b948606044ed5c5c95c471a8f1f", "version": "1.2.1", From 924d8d4662bfbfdab19f625f5826d932a8db5541 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sat, 6 May 2023 02:17:41 +0800 Subject: [PATCH 007/533] [uwebsockets] update to 20.40.0 (#31240) * [uwebsockets] update to 20.40.0 * update version --- ports/uwebsockets/portfile.cmake | 2 +- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 4346b73823c4e2..13da419e021f2f 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 c686eaffd18a925661f2b3fbae108bdd227dc5e87981bf494e3299a9b7d8dbee2838b53eefc05d20eb9669643882dc0de4fdd6f1f57d1a878107bbe69aba6fa5 + SHA512 2fa0172d262e5c5e4333cee92c34f01f97441960753a19c9f91806ce3b412622292372b6f5401416033695dbb094ba19f61c316856e8ddff0cb02c4c12458f93 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 742a2098dcd0d3..0dee479976dbbc 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.36.0", + "version-semver": "20.40.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ab4e7f9c9965d9..f1b45f066e401b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8233,7 +8233,7 @@ "port-version": 2 }, "uwebsockets": { - "baseline": "20.36.0", + "baseline": "20.40.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 9a3cc140af6128..aee5a0b4dbd0b1 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93461a35ff4e9611909379c0e64a1b22213a1c57", + "version-semver": "20.40.0", + "port-version": 0 + }, { "git-tree": "4d9dadfe2a7ad5ed25314c0511325f05c20702fc", "version-semver": "20.36.0", From 6a3dd0874f153f8b375ec26210ea6d41dee3bb26 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 6 May 2023 02:30:57 +0800 Subject: [PATCH 008/533] [edflib] Update to v1.24 (#31250) * [edflib] Add dynamic build support * [edflib] Bump version * [edflib] Update to v1.24 * Revert "[edflib] Bump version" This reverts commit d45db16a0e2b5d19778494185113103ef9a9340a. * [edflib] Bump version --- ports/edflib/CMakeLists.txt | 13 ++++++++++++- ports/edflib/portfile.cmake | 16 ++++++++++++---- ports/edflib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/edflib.json | 5 +++++ 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ports/edflib/CMakeLists.txt b/ports/edflib/CMakeLists.txt index 6a60fa5104968b..8358e27a9c1961 100644 --- a/ports/edflib/CMakeLists.txt +++ b/ports/edflib/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(EDFlib VERSION 1.21 LANGUAGES C) +project(EDFlib LANGUAGES C) option(BUILD_TOOLS "Build EDFlib tools." OFF) @@ -10,6 +10,15 @@ set(sources edflib.h edflib.c) add_library(EDFlib ${sources}) +if(BUILD_SHARED_LIBS) + target_compile_definitions(EDFlib + PUBLIC + EDFLIB_SO_DLL + PRIVATE + $ + ) +endif() + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_definitions(EDFlib PRIVATE _LARGEFILE64_SOURCE _LARGEFILE_SOURCE) target_compile_options(EDFlib PRIVATE -Wall -Wextra -Wshadow -Wformat-nonliteral -Wformat-security) @@ -21,6 +30,8 @@ install(TARGETS EDFlib EXPORT EDFlibTargets PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) diff --git a/ports/edflib/portfile.cmake b/ports/edflib/portfile.cmake index 2987b5919abe83..ec397bedecadbd 100644 --- a/ports/edflib/portfile.cmake +++ b/ports/edflib/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO Teuniz/EDFlib - REF v1.21 - SHA512 6153cec44e26c0b9cd2f7e00d014f38ee7bdc444015eaf6169fecaf4aa16b04a552d3755ac83d48728de8dac7fe22cb2d0c9566f0fdc967e15bc3f000f456106 + REF "v${VERSION}" + SHA512 3994d108efa45f49c4b9b68e6cfd10997b0c379631c1096dad7dd637cabe69c946d02e4204883308439ee5c9fe2382fc2f533ea14fe36bbbe6cedbaf04736b67 HEAD_REF master ) @@ -25,8 +23,18 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +vcpkg_copy_pdbs() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/edflib.h" + "#if defined(EDFLIB_SO_DLL)" + "#if 1 // defined(EDFLIB_SO_DLL)" + ) +endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-EDFlib) if ("tools" IN_LIST FEATURES) diff --git a/ports/edflib/vcpkg.json b/ports/edflib/vcpkg.json index e13eccddb10c4d..1b9b16be36e8e8 100644 --- a/ports/edflib/vcpkg.json +++ b/ports/edflib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "edflib", - "version": "1.21", + "version": "1.24", "description": "A C library to read/write EDF/EDF+/BDF/BDF+ files", "homepage": "https://www.teuniz.net/edflib/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f1b45f066e401b..d9ce8380a5a7ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2257,7 +2257,7 @@ "port-version": 3 }, "edflib": { - "baseline": "1.21", + "baseline": "1.24", "port-version": 0 }, "edlib": { diff --git a/versions/e-/edflib.json b/versions/e-/edflib.json index 03caf49f1e1b6c..f9e78d8901e2c5 100644 --- a/versions/e-/edflib.json +++ b/versions/e-/edflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1866b8a8e3db616811041a4f147a0dbed3db64cc", + "version": "1.24", + "port-version": 0 + }, { "git-tree": "161f6ffc0519e0944bce2573bbfb7ed800899690", "version": "1.21", From 7fc86fe37d90b1cefb678b33e5963d5afd79cc62 Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Mon, 8 May 2023 19:07:54 +0200 Subject: [PATCH 009/533] [Libvault] new port (#28266) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * [libvault] new port * [libvault] new port * [libvault] new port * [libvault] new port * add [200~ * format * update versions file * Update ports/libvault/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * update fix review * fix remarks * fix remarks * fix remarks * fix remarks * fix remarks * update version * add version * Implement find_dependency correctly. --------- Co-authored-by: Alexander Smyslov Co-authored-by: Smyslov Alexander Nikolayevich Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/libvault/0001-fix-dependencies.patch | 37 ++++++++++++++++++++++ ports/libvault/portfile.cmake | 32 +++++++++++++++++++ ports/libvault/usage | 4 +++ ports/libvault/vcpkg.json | 19 +++++++++++ versions/baseline.json | 4 +++ versions/l-/libvault.json | 9 ++++++ 6 files changed, 105 insertions(+) create mode 100644 ports/libvault/0001-fix-dependencies.patch create mode 100644 ports/libvault/portfile.cmake create mode 100644 ports/libvault/usage create mode 100644 ports/libvault/vcpkg.json create mode 100644 versions/l-/libvault.json diff --git a/ports/libvault/0001-fix-dependencies.patch b/ports/libvault/0001-fix-dependencies.patch new file mode 100644 index 00000000000000..1ff1696e6be951 --- /dev/null +++ b/ports/libvault/0001-fix-dependencies.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd4482b..ac50fb5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,9 +17,8 @@ option(LINK_CURL "Link curl library for vault" OFF) + option(BUILD_SHARED_LIBS "Build vault as a shared library" ON) + option(INSTALL "Run install targets" ON) + +-find_package(CURL) ++find_package(CURL CONFIG REQUIRED) + if(CURL_FOUND) +- include_directories(${CURL_INCLUDE_DIR}) + else(CURL_FOUND) + message(FATAL_ERROR "CURL not found") + endif(CURL_FOUND) +@@ -126,7 +125,7 @@ set_target_properties( + target_include_directories(vault PRIVATE src) + + if(LINK_CURL) +- target_link_libraries(vault curl) ++ target_link_libraries(vault CURL::libcurl) + endif(LINK_CURL) + + if(ENABLE_COVERAGE) +diff --git a/VaultConfig.cmake.in b/VaultConfig.cmake.in +index 67a40ab..82db52d 100644 +--- a/VaultConfig.cmake.in ++++ b/VaultConfig.cmake.in +@@ -1,5 +1,8 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(CURL CONFIG) ++ + include("${CMAKE_CURRENT_LIST_DIR}/libvaultTargets.cmake") + + check_required_components(vault) diff --git a/ports/libvault/portfile.cmake b/ports/libvault/portfile.cmake new file mode 100644 index 00000000000000..34b2b0ed11801f --- /dev/null +++ b/ports/libvault/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO abedra/libvault + REF 0.56.0 + SHA512 6a8d14a755ea3d39c2912ee6d33cec9c6f30a498c57efc40603cecbbd90d400dba52be7b42287c87cd425694c89edbae86218021b2beaa5edca748c3d5dd7c77 + PATCHES + 0001-fix-dependencies.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_TEST=OFF + -DLINK_CURL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME libvault CONFIG_PATH lib/cmake/libvault) +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") + +# Install usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/libvault/usage b/ports/libvault/usage new file mode 100644 index 00000000000000..766be39f097e81 --- /dev/null +++ b/ports/libvault/usage @@ -0,0 +1,4 @@ +libvault provides CMake targets: + + find_package(libvault CONFIG REQUIRED) + target_link_libraries(main PRIVATE libvault::vault) diff --git a/ports/libvault/vcpkg.json b/ports/libvault/vcpkg.json new file mode 100644 index 00000000000000..e39477c98f81b5 --- /dev/null +++ b/ports/libvault/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libvault", + "version": "0.56.0", + "description": "A C++ library for Hashicorp Vault", + "homepage": "https://github.com/abedra/libvault", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d9ce8380a5a7ce..b09525eebaa39e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4656,6 +4656,10 @@ "baseline": "2020-11-24", "port-version": 4 }, + "libvault": { + "baseline": "0.56.0", + "port-version": 0 + }, "libvmdk": { "baseline": "20200926", "port-version": 4 diff --git a/versions/l-/libvault.json b/versions/l-/libvault.json new file mode 100644 index 00000000000000..441d33f1c4283f --- /dev/null +++ b/versions/l-/libvault.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3ab55180dfc75f58d833bae81f6e303416c992e6", + "version": "0.56.0", + "port-version": 0 + } + ] +} From 3a409cdf210466d3d86bbb8aeb0fa20a5bbf95e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=9C=E5=A7=AC?= Date: Tue, 9 May 2023 01:12:45 +0800 Subject: [PATCH 010/533] [libass] update to 0.17.1 (#29767) * [libass] update to 0.17.1 * [libass] Add to versions file --- ports/libass/CMakeLists.txt | 63 +++++++++++++++++-------------------- ports/libass/config.h.in | 15 ++++++++- ports/libass/portfile.cmake | 8 +++-- ports/libass/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libass.json | 5 +++ 6 files changed, 55 insertions(+), 40 deletions(-) diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 9fb8548cb15a0b..f4f0aa29999b20 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -1,23 +1,20 @@ cmake_minimum_required(VERSION 3.9) -project(libass C CXX) +project(libass C) -set(LIBASS_VERSION 0.16.0) - -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) +set(LIBASS_VERSION 0.17.1) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -add_compile_definitions(CONFIG_FREETYPE) -add_compile_definitions(CONFIG_FRIBIDI) -add_compile_definitions(CONFIG_HARFBUZZ) +set(CONFIG_FREETYPE 1) +set(CONFIG_FRIBIDI 1) +set(CONFIG_HARFBUZZ 1) -file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) +file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) -include(CheckCSourceCompiles) set(PKG_REQUIRES_LIBASS "harfbuzz >= 1.2.3, fribidi >= 0.19.1, freetype2 >= 9.17.3") set(PKG_LIBS_LIBASS) if(WIN32) - add_compile_definitions(CONFIG_DIRECTWRITE) + set(CONFIG_DIRECTWRITE 1) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") @@ -25,10 +22,11 @@ if(WIN32) set(FONT_LIBRARY gdi32) set(PKG_LIBS_LIBASS -lgdi32) elseif(APPLE) - add_compile_definitions(CONFIG_CORETEXT) + set(CONFIG_CORETEXT 1) list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + include(CheckCSourceCompiles) check_c_source_compiles( " #include @@ -39,56 +37,51 @@ elseif(APPLE) " CHECK_OLD_OSX ) - if (CHECK_OLD_OSX) + if(CHECK_OLD_OSX) set(FONT_LIBRARY "-framework ApplicationServices -framework CoreFoundation") set(PKG_LIBS_LIBASS "-framework ApplicationServices -framework CoreFoundation") else() set(FONT_LIBRARY "-framework CoreText -framework CoreFoundation") set(PKG_LIBS_LIBASS "-framework CoreText -framework CoreFoundation") endif() -else() - add_compile_definitions(CONFIG_FONTCONFIG) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(CONFIG_FONTCONFIG 1) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") find_package(Fontconfig REQUIRED) set(FONT_LIBRARY Fontconfig::Fontconfig) set(PKG_REQUIRES_LIBASS "fontconfig >= 2.10.92, ${PKG_REQUIRES_LIBASS}") +else() + list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") + list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") endif() -if (NOT WIN32) +if(NOT WIN32) set(PKG_LIBS_LIBASS "${PKG_LIBS_LIBASS} -lm") endif() find_package(Freetype REQUIRED) -find_path(FRIBIDI_INCLUDE_DIR - NAMES fribidi.h - PATH_SUFFIXES fribidi) - -find_path(HARFBUZZ_INCLUDE_DIR - NAMES hb.h - PATH_SUFFIXES harfbuzz) +find_package(PkgConfig REQUIRED) +pkg_check_modules(FRIBIDI REQUIRED IMPORTED_TARGET fribidi) +pkg_check_modules(HARFBUZZ REQUIRED IMPORTED_TARGET harfbuzz) # libass use win32 api to open files on windows since https://github.com/libass/libass/commit/f664ced049394e2a5d4300ba526e206df73ec729 # so remove dependency dirent. -find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi) -find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def) target_include_directories(ass PRIVATE - ${FRIBIDI_INCLUDE_DIR} - ${HARFBUZZ_INCLUDE_DIR}) -if(DIRENT_INCLUDE_DIR) - target_include_directories(ass PRIVATE - ${DIRENT_INCLUDE_DIR}) -endif() + PkgConfig::FRIBIDI + PkgConfig::HARFBUZZ) target_link_libraries(ass PRIVATE Freetype::Freetype - ${FRIBIDI_LIBRARY} - ${HARFBUZZ_LIBRARY} + PkgConfig::FRIBIDI + PkgConfig::HARFBUZZ ${FONT_LIBRARY}) install(TARGETS ass @@ -103,11 +96,11 @@ set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(PACKAGE_VERSION ${LIBASS_VERSION}) if(BUILD_SHARED_LIBS) - set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) - set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) -else() set(PKG_REQUIRES_PUBLIC ${PKG_REQUIRES_LIBASS}) set(PKG_LIBS_PUBLIC ${PKG_LIBS_LIBASS}) +else() + set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) endif() configure_file(libass.pc.in libass.pc @ONLY) install(FILES diff --git a/ports/libass/config.h.in b/ports/libass/config.h.in index ffc4c1b4942b7c..fc2445dde152ba 100644 --- a/ports/libass/config.h.in +++ b/ports/libass/config.h.in @@ -1 +1,14 @@ -#define CONFIG_SOURCEVERSION "tarball: 0.16.0" +#define CONFIG_SOURCEVERSION "tarball: @LIBASS_VERSION@" + +#cmakedefine CONFIG_ICONV +#cmakedefine CONFIG_FREETYPE +#cmakedefine CONFIG_FRIBIDI +#cmakedefine CONFIG_HARFBUZZ +#cmakedefine CONFIG_LIBPNG +#cmakedefine CONFIG_UNIBREAK +#cmakedefine CONFIG_FONTCONFIG +#cmakedefine CONFIG_CORETEXT +#cmakedefine CONFIG_DIRECTWRITE +#cmakedefine01 CONFIG_ASM +#cmakedefine01 ARCH_X86 +#cmakedefine01 CONFIG_LARGE_TILES diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index 45cf6ad5394dd3..0ea90c7fd9f41c 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass - REF 0.16.0 - SHA512 fea93b36d05cd69a5920b603951dd63f46b2434e0dcbb12414bf6e1e584bacc2743fbfc03682d0a672bbfe9bcc057452a942f9967d95a30e535bd3694e40fc7d + REF 0.17.1 + SHA512 8bc83347c87c47577cd52230b3698c34301250e9a23f190a565c913defcd47a05695a4f7d9cd2e9a6ad0cfc6341e8ea2d6d779b1d714b2d6144466d2dea53951 HEAD_REF master ) @@ -15,6 +15,10 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${SOURCE_PATH}/libass/ass.h ${SOURCE_PATH}/libass/ass_types.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ass) +vcpkg_find_acquire_program(PKGCONFIG) +get_filename_component(PKGCONFIG_EXE_PATH ${PKGCONFIG} DIRECTORY) +vcpkg_add_to_path(${PKGCONFIG_EXE_PATH}) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} ) diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index 31d51e293b23de..56aac58a6e2819 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libass", - "version": "0.16.0", + "version": "0.17.1", "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", "license": "ISC", diff --git a/versions/baseline.json b/versions/baseline.json index b09525eebaa39e..9cd873130d6507 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3817,7 +3817,7 @@ "port-version": 0 }, "libass": { - "baseline": "0.16.0", + "baseline": "0.17.1", "port-version": 0 }, "libassuan": { diff --git a/versions/l-/libass.json b/versions/l-/libass.json index 1ab96ad462397e..2b132b24868ccf 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c71ba164ee51e31be931c03973fbeb756de7631e", + "version": "0.17.1", + "port-version": 0 + }, { "git-tree": "b5dfc84a884c525317deec9d8e62df51d64a8e3d", "version": "0.16.0", From f55c3b5fd6078f9fa9ec1a969844a7aa51432cb7 Mon Sep 17 00:00:00 2001 From: Andrew Kornilov Date: Tue, 9 May 2023 01:06:19 +0300 Subject: [PATCH 011/533] [libsonic] Add new port (#29374) * [libsonic] Add new port * [libsonic] Update version * [libsonic] Fix porfiles * [libsonic] Update version * [libsonic] Add tool feature * [libsonic] Update version --- ports/libsonic/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ ports/libsonic/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/libsonic/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libsonic.json | 9 +++++++++ 5 files changed, 96 insertions(+) create mode 100644 ports/libsonic/CMakeLists.txt create mode 100644 ports/libsonic/portfile.cmake create mode 100644 ports/libsonic/vcpkg.json create mode 100644 versions/l-/libsonic.json diff --git a/ports/libsonic/CMakeLists.txt b/ports/libsonic/CMakeLists.txt new file mode 100644 index 00000000000000..d89ece21509748 --- /dev/null +++ b/ports/libsonic/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.8) +project(sonic + VERSION 0.2.0 + LANGUAGES C +) + +option(BUILD_TOOL "Build sonic tool" ON) + +add_library(libsonic sonic.c) +set_target_properties(libsonic + PROPERTIES + PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/sonic.h" + SOVERSION ${PROJECT_VERSION_MAJOR} + VERSION ${CMAKE_PROJECT_VERSION} + OUTPUT_NAME sonic +) + +install(TARGETS libsonic + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include +) + +if (BUILD_TOOL) + add_executable(sonic wave.c main.c) + target_link_libraries(sonic + PRIVATE + libsonic + ) + + install(TARGETS sonic + RUNTIME DESTINATION bin + ) +endif() diff --git a/ports/libsonic/portfile.cmake b/ports/libsonic/portfile.cmake new file mode 100644 index 00000000000000..adacd0a2a3066a --- /dev/null +++ b/ports/libsonic/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO waywardgeek/sonic + REF "release-${VERSION}" + SHA512 e70510c89c4f29c30f2a3443a1c4fc1aab2c99147e2ebd1dea3cbb2b89b8bdcee14dc504600ac1f04e82d32c19f17b06fbb417311853beb764c24d15687a126f + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool BUILD_TOOL +) + + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TOOL=${BUILD_TOOL} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(BUILD_TOOL) + vcpkg_copy_tools(TOOL_NAMES sonic AUTO_CLEAN) +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libsonic/vcpkg.json b/ports/libsonic/vcpkg.json new file mode 100644 index 00000000000000..9b30096792c017 --- /dev/null +++ b/ports/libsonic/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libsonic", + "version": "0.2.0", + "description": "Simple library to speed up or slow down speech", + "homepage": "https://github.com/waywardgeek/sonic", + "license": "Apache-2.0", + "supports": "linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build tool" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 9cd873130d6507..be4144ae5e0f50 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4512,6 +4512,10 @@ "baseline": "1.0.18", "port-version": 8 }, + "libsonic": { + "baseline": "0.2.0", + "port-version": 0 + }, "libsoundio": { "baseline": "2.0.0", "port-version": 7 diff --git a/versions/l-/libsonic.json b/versions/l-/libsonic.json new file mode 100644 index 00000000000000..e0c8976a623d8e --- /dev/null +++ b/versions/l-/libsonic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b81fb841c7bcf7ce50cedfbdec8ff83b627a2d7a", + "version": "0.2.0", + "port-version": 0 + } + ] +} From 1f94beda2b8974eeaadaae66626eea680b3ea87a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 May 2023 00:54:25 +0200 Subject: [PATCH 012/533] [nettle] Switch from yasm to clang (#30175) * Add export list generation [skip actions] * Refresh exports using dumpbin * [nettle] Update to 3.8.1 [skip actions] * Disable testsuite and examples [skip actions] * Update exports for x64 [skip actions] * Update exports for x86 [skip actions] * Finish update * [shiftmedia-libgnutls] Fix 'supports' * Build arm * Switch from yasm to clang * Revise msvc support patch * Add feature to control tools * Fix DLL installation * [skip actions] * Cleanup --- ports/nettle/ccas.patch | 39 +- ports/nettle/hogweed-arm.def | 282 ++++++++++++++ ports/nettle/hogweed-arm64.def | 282 ++++++++++++++ ports/nettle/install-dll.patch | 26 -- ports/nettle/msvc-support.patch | 85 ++++ ports/nettle/nettle-arm.def | 518 ++++++++++++++++++++++++ ports/nettle/nettle-arm64.def | 542 ++++++++++++++++++++++++++ ports/nettle/portfile.cmake | 124 +++--- ports/nettle/vcpkg.json | 9 +- ports/shiftmedia-libgnutls/vcpkg.json | 4 +- scripts/ci.baseline.txt | 2 - versions/baseline.json | 4 +- versions/n-/nettle.json | 5 + versions/s-/shiftmedia-libgnutls.json | 5 + 14 files changed, 1816 insertions(+), 111 deletions(-) create mode 100644 ports/nettle/hogweed-arm.def create mode 100644 ports/nettle/hogweed-arm64.def delete mode 100644 ports/nettle/install-dll.patch create mode 100644 ports/nettle/msvc-support.patch create mode 100644 ports/nettle/nettle-arm.def create mode 100644 ports/nettle/nettle-arm64.def diff --git a/ports/nettle/ccas.patch b/ports/nettle/ccas.patch index 087081a33bb43b..703e622f5ab00a 100644 --- a/ports/nettle/ccas.patch +++ b/ports/nettle/ccas.patch @@ -7,19 +7,33 @@ index d00b565..c465d0b 100644 %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s - $(COMPILE) -c $*.s -+ $(COMPILE_AS) -c $*.s ++ $(COMPILE_AS) -c $*.s -o $@ %.$(OBJEXT): %.c $(COMPILE) -c $< \ +diff --git a/aclocal.m4 b/aclocal.m4 +index 1d218a0..1ff02c8 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -301,7 +301,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE], + [cat >conftest.s <&AC_FD_CC + ifelse([$2],,:,[$2]) diff --git a/config.make.in b/config.make.in index f8e1f74..4668884 100644 --- a/config.make.in +++ b/config.make.in -@@ -73,6 +73,8 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib +@@ -73,6 +73,9 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib # flags before CPPFLAGS and LDFLAGS. While EXTRA_CFLAGS are added at the end. COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS) +CCAS = @CCAS@ ++ASMFLAGS = @ASMFLAGS@ +COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(ASMFLAGS) $(DEP_FLAGS) COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS) LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) @@ -28,13 +42,32 @@ diff --git a/configure.ac b/configure.ac index 1012718..8db139d 100644 --- a/configure.ac +++ b/configure.ac -@@ -118,6 +118,9 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ +@@ -134,6 +134,10 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ # Checks for programs. AC_PROG_CC +# Copied from gmp +test -n "$CCAS" || CCAS='$(CC)' +AC_SUBST(CCAS) ++AC_SUBST(ASMFLAGS) NETTLE_CHECK_IFUNC +@@ -321,7 +325,7 @@ W64_ABI=no # For x86_64 windows + case "$host_cpu" in + [x86_64 | amd64]) + AC_TRY_COMPILE([ +-#if defined(__x86_64__) || defined(__arch64__) ++#if defined(__x86_64__) || defined(__arch64__) || defined(_M_AMD64) + #error 64-bit x86 + #endif + ], [], [ +@@ -374,7 +378,7 @@ case "$host_cpu" in + ;; + aarch64*) + AC_TRY_COMPILE([ +-#if defined(__aarch64__) ++#if defined(__aarch64__) || defined(_M_ARM64) + #error 64-bit arm + #endif + ], [], [ diff --git a/ports/nettle/hogweed-arm.def b/ports/nettle/hogweed-arm.def new file mode 100644 index 00000000000000..dd9dccdde81649 --- /dev/null +++ b/ports/nettle/hogweed-arm.def @@ -0,0 +1,282 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify_itch + _nettle_eddsa_verify + _nettle_eddsa_sign_itch + _nettle_eddsa_sign + _nettle_eddsa_public_key_itch + _nettle_eddsa_public_key + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress_itch + _nettle_eddsa_decompress + _nettle_eddsa_compress_itch + _nettle_eddsa_compress + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_ecc_gostdsa_verify + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecc_gostdsa_sign + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecc_ecdsa_verify + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_ecdsa_sign + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_init + nettle_ecc_scalar_clear + nettle_ecc_scalar_set + nettle_ecc_scalar_get + nettle_ecc_point_init + nettle_ecc_point_clear + nettle_ecc_point_set + nettle_ecc_point_get + nettle_ecc_scalar_random + _nettle_ecc_mod_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_zero_p + _nettle_ecc_mod_equal_p + _nettle_ecc_mod_add + _nettle_ecc_mod_sub + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_sec_zero_p + _nettle_mpz_limbs_copy + _nettle_mpz_set_n + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_gmp_alloc_limbs + _nettle_gmp_free_limbs + _nettle_gmp_alloc + _nettle_gmp_free + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_dsa_openssl_private_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_public_key_from_der_iterator + nettle_rsa_private_key_from_der_iterator + nettle_rsa_keypair_from_der + nettle_asn1_der_get_bignum + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_get_uint32 + nettle_rsa_keypair_to_openpgp + nettle_pgp_put_uint32 + nettle_pgp_put_uint16 + nettle_pgp_put_mpi + nettle_pgp_put_string + nettle_pgp_put_length + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_sub_packet_start + nettle_pgp_put_sub_packet + nettle_pgp_sub_packet_end + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_userid + nettle_pgp_crc24 + nettle_pgp_armor + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_public_key_init + nettle_dsa_public_key_clear + nettle_dsa_private_key_init + nettle_dsa_private_key_clear + nettle_dsa_params_init + nettle_dsa_params_clear + nettle_dsa_signature_init + nettle_dsa_signature_clear + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_sec_compute_root + _nettle_rsa_verify + _nettle_rsa_verify_recover + nettle_rsa_compute_root_tr + _nettle_rsa_sec_compute_root_tr + nettle_rsa_private_key_init + nettle_rsa_private_key_clear + nettle_rsa_private_key_prepare + nettle_rsa_compute_root + nettle_rsa_public_key_init + nettle_rsa_public_key_clear + nettle_rsa_public_key_prepare + _nettle_rsa_check_size + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + nettle_random_prime + _nettle_generate_pocklington_prime + nettle_mpz_random_size + nettle_mpz_random + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_mpz_get_str_256 + nettle_mpz_set_str_256_s + nettle_mpz_init_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_init_set_str_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_first + nettle_sexp_iterator_next + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_subexpr + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_assoc diff --git a/ports/nettle/hogweed-arm64.def b/ports/nettle/hogweed-arm64.def new file mode 100644 index 00000000000000..dd9dccdde81649 --- /dev/null +++ b/ports/nettle/hogweed-arm64.def @@ -0,0 +1,282 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify_itch + _nettle_eddsa_verify + _nettle_eddsa_sign_itch + _nettle_eddsa_sign + _nettle_eddsa_public_key_itch + _nettle_eddsa_public_key + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress_itch + _nettle_eddsa_decompress + _nettle_eddsa_compress_itch + _nettle_eddsa_compress + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_ecc_gostdsa_verify + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecc_gostdsa_sign + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecc_ecdsa_verify + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_ecdsa_sign + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_init + nettle_ecc_scalar_clear + nettle_ecc_scalar_set + nettle_ecc_scalar_get + nettle_ecc_point_init + nettle_ecc_point_clear + nettle_ecc_point_set + nettle_ecc_point_get + nettle_ecc_scalar_random + _nettle_ecc_mod_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_zero_p + _nettle_ecc_mod_equal_p + _nettle_ecc_mod_add + _nettle_ecc_mod_sub + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_sec_zero_p + _nettle_mpz_limbs_copy + _nettle_mpz_set_n + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_gmp_alloc_limbs + _nettle_gmp_free_limbs + _nettle_gmp_alloc + _nettle_gmp_free + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_dsa_openssl_private_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_public_key_from_der_iterator + nettle_rsa_private_key_from_der_iterator + nettle_rsa_keypair_from_der + nettle_asn1_der_get_bignum + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_get_uint32 + nettle_rsa_keypair_to_openpgp + nettle_pgp_put_uint32 + nettle_pgp_put_uint16 + nettle_pgp_put_mpi + nettle_pgp_put_string + nettle_pgp_put_length + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_sub_packet_start + nettle_pgp_put_sub_packet + nettle_pgp_sub_packet_end + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_userid + nettle_pgp_crc24 + nettle_pgp_armor + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_public_key_init + nettle_dsa_public_key_clear + nettle_dsa_private_key_init + nettle_dsa_private_key_clear + nettle_dsa_params_init + nettle_dsa_params_clear + nettle_dsa_signature_init + nettle_dsa_signature_clear + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_sec_compute_root + _nettle_rsa_verify + _nettle_rsa_verify_recover + nettle_rsa_compute_root_tr + _nettle_rsa_sec_compute_root_tr + nettle_rsa_private_key_init + nettle_rsa_private_key_clear + nettle_rsa_private_key_prepare + nettle_rsa_compute_root + nettle_rsa_public_key_init + nettle_rsa_public_key_clear + nettle_rsa_public_key_prepare + _nettle_rsa_check_size + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + nettle_random_prime + _nettle_generate_pocklington_prime + nettle_mpz_random_size + nettle_mpz_random + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_mpz_get_str_256 + nettle_mpz_set_str_256_s + nettle_mpz_init_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_init_set_str_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_first + nettle_sexp_iterator_next + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_subexpr + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_assoc diff --git a/ports/nettle/install-dll.patch b/ports/nettle/install-dll.patch deleted file mode 100644 index 1d75a8f9c815a7..00000000000000 --- a/ports/nettle/install-dll.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 6e1585b..88c8b05 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -491,8 +491,8 @@ install-static: $(LIBTARGETS) - done - - install-dll-nettle: -- $(MKDIR_P) $(DESTDIR)$(bindir) -- $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(bindir)/$(LIBNETTLE_FORLINK) -+ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin -+ $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBNETTLE_FORLINK) - - install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle - $(MKDIR_P) $(DESTDIR)$(libdir) -@@ -504,8 +504,8 @@ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle - && $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK)) - - install-dll-hogweed: -- $(MKDIR_P) $(DESTDIR)$(bindir) -- $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(bindir)/$(LIBHOGWEED_FORLINK) -+ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin -+ $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBHOGWEED_FORLINK) - - install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed - $(MKDIR_P) $(DESTDIR)$(libdir) diff --git a/ports/nettle/msvc-support.patch b/ports/nettle/msvc-support.patch new file mode 100644 index 00000000000000..0e335897a07074 --- /dev/null +++ b/ports/nettle/msvc-support.patch @@ -0,0 +1,85 @@ +diff --git a/Makefile.in b/Makefile.in +index 6e1585b..88c8b05 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -29,8 +29,9 @@ include config.make + PRE_CPPFLAGS = -I. + EXTRA_CFLAGS = $(CCPIC) + +-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a ++LIBTARGETS = @IF_STATIC@ @LIBNETTLE_ARCHIVE@ @IF_HOGWEED@ @LIBHOGWEED_ARCHIVE@ + SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) ++MSVC_TARGET = @MSVC_TARGET@ + + getopt_SOURCES = getopt.c getopt1.c + getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT)) +@@ -279,13 +280,13 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) \ + hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \ + $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT) + +-libnettle.a: $(nettle_OBJS) ++@LIBNETTLE_ARCHIVE@: $(nettle_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(nettle_OBJS) + $(RANLIB) $@ + echo nettle > libnettle.stamp + +-libhogweed.a: $(hogweed_OBJS) ++@LIBHOGWEED_ARCHIVE@: $(hogweed_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(hogweed_OBJS) + $(RANLIB) $@ +@@ -491,8 +492,8 @@ install-static: $(LIBTARGETS) + done + + install-dll-nettle: +- $(MKDIR_P) $(DESTDIR)$(bindir) +- $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(bindir)/$(LIBNETTLE_FORLINK) ++ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin ++ $(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBNETTLE_FORLINK) + + install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle + $(MKDIR_P) $(DESTDIR)$(libdir) +@@ -504,8 +505,8 @@ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle + && $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK)) + + install-dll-hogweed: +- $(MKDIR_P) $(DESTDIR)$(bindir) +- $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(bindir)/$(LIBHOGWEED_FORLINK) ++ $(MKDIR_P) $(DESTDIR)$(libdir)/../bin ++ $(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/../bin/$(LIBHOGWEED_FORLINK) + + install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed + $(MKDIR_P) $(DESTDIR)$(libdir) +diff --git a/configure.ac b/configure.ac +index d50d1f5..2464514 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -877,6 +877,27 @@ case "$host_os" in + LIBHOGWEED_LIBS='libnettle.so $(LIBS)' + ;; + esac ++AC_ARG_VAR(MSVC_TARGET,[Enable msvc and set target architecture]) ++case "$MSVC_TARGET" in ++x86|x64|arm|arm64) ++ LIBNETTLE_ARCHIVE='nettle.lib' ++ LIBNETTLE_FORLINK='nettle-$(LIBNETTLE_MAJOR).dll' ++ LIBNETTLE_FILE='nettle.lib' ++ LIBNETTLE_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBNETTLE_FILE) -Wl,-DEF:$(srcdir)/nettle-$(MSVC_TARGET).def' ++ LIBNETTLE_LIBS='$(LIBS)' ++ LIBHOGWEED_FILE='hogweed.lib' ++ LIBHOGWEED_ARCHIVE='hogweed.lib' ++ LIBHOGWEED_FORLINK='hogweed-$(LIBHOGWEED_MAJOR).dll' ++ LIBHOGWEED_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBHOGWEED_FILE) -Wl,-DEF:$(srcdir)/hogweed-$(MSVC_TARGET).def' ++ LIBHOGWEED_LIBS='$(LIBNETTLE_FILE) $(LIBS)' ++ ;; ++*) ++ LIBNETTLE_ARCHIVE='libnettle.a' ++ LIBHOGWEED_ARCHIVE='libhogweed.a' ++ ;; ++esac ++AC_SUBST(LIBNETTLE_ARCHIVE) ++AC_SUBST(LIBHOGWEED_ARCHIVE) + + ASM_SYMBOL_PREFIX='' + ASM_ELF_STYLE='no' diff --git a/ports/nettle/nettle-arm.def b/ports/nettle/nettle-arm.def new file mode 100644 index 00000000000000..d174e5f694eea1 --- /dev/null +++ b/ports/nettle/nettle-arm.def @@ -0,0 +1,518 @@ +EXPORTS + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_decrypt_message + nettle_xts_aes128_set_encrypt_key + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_decrypt_message + nettle_xts_encrypt_message + nettle_xts_decrypt_message + nettle_yarrow_key_event_init + nettle_yarrow_key_event_estimate + nettle_yarrow256_init + nettle_yarrow256_seed + nettle_yarrow256_update + nettle_yarrow256_random + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_fast_reseed + nettle_yarrow256_slow_reseed + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac128_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac96_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac64_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + nettle_umac32_digest + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3_init + _nettle_umac_l3 + _nettle_umac_l2_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish_set_key + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_encrypt + nettle_twofish_decrypt + nettle_streebog256 + nettle_streebog512 + nettle_streebog512_init + nettle_streebog512_update + nettle_streebog512_digest + nettle_streebog256_init + nettle_streebog256_digest + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent_set_key + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_sm3 + nettle_sm3_init + nettle_sm3_update + nettle_sm3_digest + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_512_digest + nettle_sha3_384 + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_384_digest + nettle_sha3_256 + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_256_digest + nettle_sha3_224 + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_224_digest + nettle_sha3_permute + _nettle_sha3_update + _nettle_sha3_pad + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha512_init + nettle_sha512_update + nettle_sha512_digest + nettle_sha384_init + nettle_sha384_digest + nettle_sha512_224_init + nettle_sha512_224_digest + nettle_sha512_256_init + nettle_sha512_256_digest + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress + nettle_sha256_init + nettle_sha256_update + nettle_sha256_digest + nettle_sha224_init + nettle_sha224_digest + nettle_sha1 + nettle_sha1_compress + nettle_sha1_init + nettle_sha1_update + nettle_sha1_digest + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_init + nettle_ripemd160_update + nettle_ripemd160_digest + nettle_realloc + nettle_xrealloc + _nettle_poly1305_set_key + _nettle_poly1305_digest + _nettle_poly1305_block + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_poly1305_aes_digest + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Init + nettle_MD5Update + nettle_MD5Final + nettle_md5_compress + nettle_md5_init + nettle_md5_update + nettle_md5_digest + nettle_md4 + nettle_md4_init + nettle_md4_update + nettle_md4_digest + nettle_md2 + nettle_md2_init + nettle_md2_update + nettle_md2_digest + nettle_hkdf_extract + nettle_hkdf_expand + nettle_knuth_lfib_init + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_random + nettle_hmac_sm3 + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_sm3_set_key + nettle_hmac_sm3_update + nettle_hmac_sm3_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_streebog512_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog256_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha512_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha384_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha256_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha224_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_sha1_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_ripemd160_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_md5_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_hmac_digest + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94_digest + nettle_gosthash94cp_update + nettle_gosthash94cp_digest + _nettle_gost28147_param_test_3411 + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_encrypt_block + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_des3_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes256_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac_aes128_digest + nettle_cmac64_set_key + nettle_cmac64_init + nettle_cmac64_update + nettle_cmac64_digest + nettle_cmac128_set_key + nettle_cmac128_init + nettle_cmac128_update + nettle_cmac128_digest + nettle_gcm_camellia256 + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_update + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia128 + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_update + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_aes256 + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes192 + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes128 + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes_set_key + nettle_gcm_aes_set_iv + nettle_gcm_aes_update + nettle_gcm_aes_encrypt + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_set_key + nettle_gcm_set_iv + nettle_gcm_update + nettle_gcm_encrypt + nettle_gcm_decrypt + nettle_gcm_digest + _nettle_ghash_update + _nettle_ghash_set_key + nettle_eax_aes128 + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_aes128_encrypt + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_eax_encrypt + nettle_eax_decrypt + nettle_eax_digest + nettle_des3_set_key + nettle_des3_encrypt + nettle_des3_decrypt + nettle_des_set_key + nettle_des_encrypt + nettle_des_decrypt + nettle_des_check_parity + nettle_des_fix_parity + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_set_key + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_decrypt_message + nettle_cfb_encrypt + nettle_cfb_decrypt + nettle_cfb8_encrypt + nettle_cfb8_decrypt + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_decrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_ccm_encrypt + nettle_ccm_decrypt + nettle_ccm_digest + nettle_ccm_encrypt_message + nettle_ccm_decrypt_message + nettle_cbc_aes256_encrypt + nettle_cbc_aes192_encrypt + nettle_cbc_aes128_encrypt + nettle_cbc_encrypt + nettle_cbc_decrypt + nettle_cast128 + nettle_cast5_set_key + nettle_cast128_set_key + nettle_cast128_encrypt + nettle_cast128_decrypt + nettle_camellia256 + nettle_camellia256_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia192_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia256_set_encrypt_key + nettle_camellia192_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia_set_decrypt_key + nettle_camellia128_invert_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_clear + nettle_buffer_reset + nettle_buffer_grow + nettle_buffer_write + nettle_buffer_space + nettle_buffer_copy + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_decode_final + nettle_base64_encode_init + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base64_encode_final + nettle_base64_encode_raw + nettle_base64_encode_group + nettle_base16 + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_decode_final + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_initial_ctx + nettle_blowfish_set_key + nettle_blowfish128_set_key + nettle_blowfish_encrypt + nettle_blowfish_decrypt + _nettle_blowfish_encround + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo128 + nettle_arctwo_gutmann128 + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo128_set_key + nettle_arctwo_set_key_gutmann + nettle_arctwo128_set_key_gutmann + nettle_arctwo_encrypt + nettle_arctwo_decrypt + nettle_arcfour_crypt + nettle_arcfour_set_key + nettle_arcfour128_set_key + nettle_nist_keywrap16 + nettle_nist_keyunwrap16 + nettle_aes128_keywrap + nettle_aes192_keywrap + nettle_aes256_keywrap + nettle_aes128_keyunwrap + nettle_aes192_keyunwrap + nettle_aes256_keyunwrap + nettle_aes256 + nettle_aes256_set_decrypt_key + nettle_aes256_invert_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_set_decrypt_key + nettle_aes192_invert_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_set_decrypt_key + nettle_aes128_invert_key + nettle_aes128_set_encrypt_key + nettle_aes_set_decrypt_key + nettle_aes_invert_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + nettle_aes256_encrypt + nettle_aes192_encrypt + nettle_aes128_encrypt + _nettle_aes_encrypt_table + nettle_aes_encrypt + _nettle_aes_encrypt + nettle_aes256_decrypt + nettle_aes192_decrypt + nettle_aes128_decrypt + _nettle_aes_decrypt_table + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/ports/nettle/nettle-arm64.def b/ports/nettle/nettle-arm64.def new file mode 100644 index 00000000000000..591c1505e67e9d --- /dev/null +++ b/ports/nettle/nettle-arm64.def @@ -0,0 +1,542 @@ +EXPORTS + _nettle_sha256_compress_arm64 + _nettle_sha1_compress_arm64 + _nettle_ghash_update_arm64 + _nettle_ghash_set_key_arm64 + _nettle_chacha_4core + _nettle_chacha_4core32 + _nettle_chacha_2core + _nettle_chacha_2core32 + _nettle_aes256_decrypt_arm64 + _nettle_aes256_encrypt_arm64 + _nettle_aes192_decrypt_arm64 + _nettle_aes192_encrypt_arm64 + _nettle_aes128_decrypt_arm64 + _nettle_aes128_encrypt_arm64 + nettle_aes128_encrypt + nettle_aes128_decrypt + nettle_aes192_encrypt + nettle_aes192_decrypt + nettle_aes256_encrypt + nettle_aes256_decrypt + _nettle_ghash_set_key + _nettle_ghash_update + nettle_sha1_compress + _nettle_sha256_compress + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_decrypt_message + nettle_xts_aes128_set_encrypt_key + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_decrypt_message + nettle_xts_encrypt_message + nettle_xts_decrypt_message + nettle_yarrow_key_event_init + nettle_yarrow_key_event_estimate + nettle_yarrow256_init + nettle_yarrow256_seed + nettle_yarrow256_update + nettle_yarrow256_random + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_fast_reseed + nettle_yarrow256_slow_reseed + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac128_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac96_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac64_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + nettle_umac32_digest + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3_init + _nettle_umac_l3 + _nettle_umac_l2_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish_set_key + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_encrypt + nettle_twofish_decrypt + nettle_streebog256 + nettle_streebog512 + nettle_streebog512_init + nettle_streebog512_update + nettle_streebog512_digest + nettle_streebog256_init + nettle_streebog256_digest + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent_set_key + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_sm3 + nettle_sm3_init + nettle_sm3_update + nettle_sm3_digest + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_512_digest + nettle_sha3_384 + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_384_digest + nettle_sha3_256 + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_256_digest + nettle_sha3_224 + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_224_digest + nettle_sha3_permute + _nettle_sha3_update + _nettle_sha3_pad + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha512_init + nettle_sha512_update + nettle_sha512_digest + nettle_sha384_init + nettle_sha384_digest + nettle_sha512_224_init + nettle_sha512_224_digest + nettle_sha512_256_init + nettle_sha512_256_digest + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress_c + nettle_sha256_init + nettle_sha256_update + nettle_sha256_digest + nettle_sha224_init + nettle_sha224_digest + nettle_sha1 + _nettle_sha1_compress_c + nettle_sha1_init + nettle_sha1_update + nettle_sha1_digest + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_init + nettle_ripemd160_update + nettle_ripemd160_digest + nettle_realloc + nettle_xrealloc + _nettle_poly1305_set_key + _nettle_poly1305_digest + _nettle_poly1305_block + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_poly1305_aes_digest + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Init + nettle_MD5Update + nettle_MD5Final + nettle_md5_compress + nettle_md5_init + nettle_md5_update + nettle_md5_digest + nettle_md4 + nettle_md4_init + nettle_md4_update + nettle_md4_digest + nettle_md2 + nettle_md2_init + nettle_md2_update + nettle_md2_digest + nettle_hkdf_extract + nettle_hkdf_expand + nettle_knuth_lfib_init + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_random + nettle_hmac_sm3 + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_sm3_set_key + nettle_hmac_sm3_update + nettle_hmac_sm3_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_streebog512_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog256_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha512_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha384_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha256_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha224_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_sha1_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_ripemd160_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_md5_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_hmac_digest + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94_digest + nettle_gosthash94cp_update + nettle_gosthash94cp_digest + _nettle_gost28147_param_test_3411 + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_encrypt_block + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_des3_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes256_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac_aes128_digest + nettle_cmac64_set_key + nettle_cmac64_init + nettle_cmac64_update + nettle_cmac64_digest + nettle_cmac128_set_key + nettle_cmac128_init + nettle_cmac128_update + nettle_cmac128_digest + nettle_gcm_camellia256 + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_update + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia128 + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_update + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_aes256 + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes192 + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes128 + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes_set_key + nettle_gcm_aes_set_iv + nettle_gcm_aes_update + nettle_gcm_aes_encrypt + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_set_key + nettle_gcm_set_iv + nettle_gcm_update + nettle_gcm_encrypt + nettle_gcm_decrypt + nettle_gcm_digest + _nettle_ghash_update_c + _nettle_ghash_set_key_c + nettle_eax_aes128 + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_aes128_encrypt + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_eax_encrypt + nettle_eax_decrypt + nettle_eax_digest + nettle_des3_set_key + nettle_des3_encrypt + nettle_des3_decrypt + nettle_des_set_key + nettle_des_encrypt + nettle_des_decrypt + nettle_des_check_parity + nettle_des_fix_parity + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_set_key + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_decrypt_message + nettle_cfb_encrypt + nettle_cfb_decrypt + nettle_cfb8_encrypt + nettle_cfb8_decrypt + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_decrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_ccm_encrypt + nettle_ccm_decrypt + nettle_ccm_digest + nettle_ccm_encrypt_message + nettle_ccm_decrypt_message + nettle_cbc_aes256_encrypt + nettle_cbc_aes192_encrypt + nettle_cbc_aes128_encrypt + nettle_cbc_encrypt + nettle_cbc_decrypt + nettle_cast128 + nettle_cast5_set_key + nettle_cast128_set_key + nettle_cast128_encrypt + nettle_cast128_decrypt + nettle_camellia256 + nettle_camellia256_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia192_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia256_set_encrypt_key + nettle_camellia192_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia_set_decrypt_key + nettle_camellia128_invert_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_clear + nettle_buffer_reset + nettle_buffer_grow + nettle_buffer_write + nettle_buffer_space + nettle_buffer_copy + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_decode_final + nettle_base64_encode_init + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base64_encode_final + nettle_base64_encode_raw + nettle_base64_encode_group + nettle_base16 + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_decode_final + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_initial_ctx + nettle_blowfish_set_key + nettle_blowfish128_set_key + nettle_blowfish_encrypt + nettle_blowfish_decrypt + _nettle_blowfish_encround + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo128 + nettle_arctwo_gutmann128 + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo128_set_key + nettle_arctwo_set_key_gutmann + nettle_arctwo128_set_key_gutmann + nettle_arctwo_encrypt + nettle_arctwo_decrypt + nettle_arcfour_crypt + nettle_arcfour_set_key + nettle_arcfour128_set_key + nettle_nist_keywrap16 + nettle_nist_keyunwrap16 + nettle_aes128_keywrap + nettle_aes192_keywrap + nettle_aes256_keywrap + nettle_aes128_keyunwrap + nettle_aes192_keyunwrap + nettle_aes256_keyunwrap + nettle_aes256 + nettle_aes256_set_decrypt_key + nettle_aes256_invert_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_set_decrypt_key + nettle_aes192_invert_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_set_decrypt_key + nettle_aes128_invert_key + nettle_aes128_set_encrypt_key + nettle_aes_set_decrypt_key + nettle_aes_invert_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes256_encrypt_c + _nettle_aes192_encrypt_c + _nettle_aes128_encrypt_c + _nettle_aes_encrypt_table + nettle_aes_encrypt + _nettle_aes_encrypt + _nettle_aes256_decrypt_c + _nettle_aes192_decrypt_c + _nettle_aes128_decrypt_c + _nettle_aes_decrypt_table + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index ba848f86daa932..a0b36b05a78e4b 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -1,11 +1,3 @@ -vcpkg_list(SET extra_patches) -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_list(APPEND extra_patches - yasm.patch # the asm changes are a downgrade to an older version - libname-windows.patch # libtool rules for lib naming, exports - ) -endif() - vcpkg_from_gitlab( GITLAB_URL https://git.lysator.liu.se/ OUT_SOURCE_PATH SOURCE_PATH @@ -19,53 +11,72 @@ vcpkg_from_gitlab( compile.patch host-tools.patch ccas.patch - install-dll.patch - ${extra_patches} + msvc-support.patch ) -# Temporarily set to 1 to re-generate the lists of exported symbols. -# This is needed when the version is bumped. +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +# Maintainer switch: Temporarily set this to 1 to re-generate the lists +# of exported symbols. This is needed when the version is bumped. set(GENERATE_SYMBOLS 0) if(GENERATE_SYMBOLS) - if(VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS) - set(GENERATE_SYMBOLS 0) - else() + if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + else() + set(GENERATE_SYMBOLS 0) endif() endif() vcpkg_list(SET OPTIONS) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_list(APPEND OPTIONS --disable-static) -else() - vcpkg_list(APPEND OPTIONS --disable-shared) -endif() - if("tools" IN_LIST FEATURES) vcpkg_list(APPEND OPTIONS --enable-tools) endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(asmflag win64) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(asmflag win32) +# As in gmp +set(disable_assembly OFF) +set(ccas "") +set(asmflags "") +if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") + vcpkg_list(APPEND OPTIONS ac_cv_func_memset=yes) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND asmflags " --target=i686-pc-windows-msvc -m32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND asmflags " --target=x86_64-pc-windows-msvc") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + string(APPEND asmflags " --target=arm64-pc-windows-msvc") + else() + set(disable_assembly ON) + endif() + if(NOT disable_assembly) + vcpkg_find_acquire_program(CLANG) + set(ccas "${CLANG}") endif() - set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") - vcpkg_list(APPEND OPTIONS - ac_cv_func_memset=yes - nettle_cv_asm_type_percent_function=no - nettle_cv_asm_align_log=no - ) else() - vcpkg_list(APPEND OPTIONS "CCAS=") # configure will use CC + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") +endif() + +if(disable_assembly) + vcpkg_list(APPEND OPTIONS "--enable-assembler=no") +elseif(ccas) + cmake_path(GET ccas PARENT_PATH ccas_dir) + vcpkg_add_to_path("${ccas_dir}") + cmake_path(GET ccas FILENAME ccas_command) + vcpkg_list(APPEND OPTIONS "CCAS=${ccas_command}" "ASMFLAGS=${asmflags}") endif() if(VCPKG_CROSSCOMPILING) set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}") endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(GLOB def_files "${CMAKE_CURRENT_LIST_DIR}/*.def") + file(COPY ${def_files} DESTINATION "${SOURCE_PATH}") + vcpkg_list(APPEND OPTIONS "MSVC_TARGET=${VCPKG_TARGET_ARCHITECTURE}") +else() + vcpkg_list(APPEND OPTIONS "MSVC_TARGET=no") +endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG @@ -77,40 +88,8 @@ vcpkg_configure_make( OPTIONS_DEBUG --disable-tools ) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - # def files are created by running 'llvm-nm | findstr /R /C:"[RT] _*nettle_"' on the static build and replacing '00[0-9abcdef]+ [RT]' with spaces - # please update the defs if the version is bumped - set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") - configure_file( - "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/nettle.def" - COPYONLY - ) - configure_file( - "${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/hogweed.def" - COPYONLY - ) - if(NOT VCPKG_BUILD_TYPE) - set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") - configure_file( - "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/nettle.def" - COPYONLY - ) - configure_file("${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" - "${build_dir}/hogweed.def" - COPYONLY - ) - endif() - endif() -endif() vcpkg_install_make() - -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") +vcpkg_fixup_pkgconfig() if(NOT VCPKG_CROSSCOMPILING) set(tool_names desdata eccdata) # aes gcm sha twofish? @@ -120,9 +99,14 @@ if(NOT VCPKG_CROSSCOMPILING) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") endif() -vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if("tools" IN_LIST FEATURES) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYINGv3") diff --git a/ports/nettle/vcpkg.json b/ports/nettle/vcpkg.json index ade31eac42897e..d7c2e93089d59c 100644 --- a/ports/nettle/vcpkg.json +++ b/ports/nettle/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nettle", "version": "3.8.1", + "port-version": 1, "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", "homepage": "https://git.lysator.liu.se/nettle/nettle", "license": null, @@ -11,12 +12,8 @@ "host": true }, { - "name": "yasm", - "host": true, - "features": [ - "tools" - ], - "platform": "windows" + "name": "vcpkg-cmake-get-vars", + "host": true } ], "features": { diff --git a/ports/shiftmedia-libgnutls/vcpkg.json b/ports/shiftmedia-libgnutls/vcpkg.json index 788e0aeb410459..d2abccbc581b62 100644 --- a/ports/shiftmedia-libgnutls/vcpkg.json +++ b/ports/shiftmedia-libgnutls/vcpkg.json @@ -1,11 +1,11 @@ { "name": "shiftmedia-libgnutls", "version": "3.7.6", - "port-version": 1, + "port-version": 2, "description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ", "homepage": "https://github.com/ShiftMediaProject/gnutls", "license": "LGPL-2.1-only", - "supports": "windows", + "supports": "windows & !arm & !mingw", "dependencies": [ "gettext", "gmp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index be0d9d76b2b0ba..f6b6210154cdaa 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1052,8 +1052,6 @@ nanodbc:x64-linux=skip nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail netcdf-cxx4:x64-windows-static-md=fail -nettle:arm-uwp=fail -nettle:arm64-windows=fail ngspice:x64-android=fail ngspice:x64-windows-static=fail nmap:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index be4144ae5e0f50..c1b9c0919e39b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5534,7 +5534,7 @@ }, "nettle": { "baseline": "3.8.1", - "port-version": 0 + "port-version": 1 }, "networkdirect-sdk": { "baseline": "2.0.1", @@ -7358,7 +7358,7 @@ }, "shiftmedia-libgnutls": { "baseline": "3.7.6", - "port-version": 1 + "port-version": 2 }, "shiftmedia-libgpg-error": { "baseline": "1.45", diff --git a/versions/n-/nettle.json b/versions/n-/nettle.json index 6415658430e774..ce348da9711767 100644 --- a/versions/n-/nettle.json +++ b/versions/n-/nettle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7734b67cb656bf12488ea137779b56d8865bbb02", + "version": "3.8.1", + "port-version": 1 + }, { "git-tree": "1ca3c1210bb511a4d94b53684fcb557e92678d7b", "version": "3.8.1", diff --git a/versions/s-/shiftmedia-libgnutls.json b/versions/s-/shiftmedia-libgnutls.json index 889cb5531d457a..4b698fb548a469 100644 --- a/versions/s-/shiftmedia-libgnutls.json +++ b/versions/s-/shiftmedia-libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44e16573e54fa8a8c8599c0b2cb82a0d1f829e22", + "version": "3.7.6", + "port-version": 2 + }, { "git-tree": "1af7188530a656fe2103e74844333d8c37c5232d", "version": "3.7.6", From 9a5e44fcc1d6d734f46e385245438afaa7e53e28 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 May 2023 01:01:29 +0200 Subject: [PATCH 013/533] [ignition-modularscripts] Disable docs, reduce warnings, update style (#31309) * [ignition-modularscripts] CMake style update * Add MAYBE_UNUSED_VARIABLES * Don't build docs (unless overriden) * Require install for host --- .../vcpkg-port-config.cmake | 43 ++++++++++--------- ports/ignition-modularscripts/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/i-/ignition-modularscripts.json | 5 +++ 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 6b589d7f866efd..2fb83d6b5d009d 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -5,15 +5,20 @@ function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) set(oneValueArgs NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME) set(multiValueArgs OPTIONS) - cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 0 IML "${options}" "${oneValueArgs}" "${multiValueArgs}") vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${IML_SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DBUILD_DOCS=OFF -DBUILD_TESTING=OFF ${IML_OPTIONS} + MAYBE_UNUSED_VARIABLES + BUILD_DOCS + BUILD_TESTING + PKG_CONFIG_EXECUTABLE ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -29,7 +34,7 @@ function(ignition_modular_build_library) foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" - PACKAGE_NAME ${COMPONENT_CMAKE_PACKAGE_NAME} + PACKAGE_NAME "${COMPONENT_CMAKE_PACKAGE_NAME}" DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() @@ -48,10 +53,7 @@ function(ignition_modular_build_library) # Make pkg-config files relocatable if(NOT IML_DISABLE_PKGCONFIG_INSTALL) - if(VCPKG_TARGET_IS_LINUX) - set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread) - endif() - vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES}) + vcpkg_fixup_pkgconfig() else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") @@ -121,9 +123,9 @@ function(ignition_modular_library) set(options DISABLE_PKGCONFIG_INSTALL) set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME) set(multiValueArgs PATCHES OPTIONS) - cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 0 IML "${options}" "${oneValueArgs}" "${multiValueArgs}") - string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION}) + string(REPLACE "." ";" IML_VERSION_LIST "${IML_VERSION}") list(GET IML_VERSION_LIST 0 IML_MAJOR_VERSION) # If the REF option is omitted, use the canonical one @@ -139,32 +141,33 @@ function(ignition_modular_library) # If the CMAKE_PACKAGE_NAME option is omitted, use the canonical one set(DEFAULT_CMAKE_PACKAGE_NAME "ignition-${IML_NAME}${IML_MAJOR_VERSION}") if(NOT DEFINED IML_CMAKE_PACKAGE_NAME) - set(IML_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME}) + set(IML_CMAKE_PACKAGE_NAME "${DEFAULT_CMAKE_PACKAGE_NAME}") endif() # Download library from github, to support also the --head option vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO ignitionrobotics/ign-${IML_NAME} - REF ${IML_REF} - SHA512 ${IML_SHA512} - HEAD_REF ${IML_HEAD_REF} + REPO "ignitionrobotics/ign-${IML_NAME}" + REF "${IML_REF}" + SHA512 "${IML_SHA512}" + HEAD_REF "${IML_HEAD_REF}" PATCHES ${IML_PATCHES} FILE_DISAMBIGUATOR 1 ) + set(extra_arguments "") if (IML_DISABLE_PKGCONFIG_INSTALL) - set(EXTRA_OPTIONS DISABLE_PKGCONFIG_INSTALL) + list(APPEND extra_arguments DISABLE_PKGCONFIG_INSTALL) endif() # Build library ignition_modular_build_library( - NAME ${IML_NAME} - MAJOR_VERSION ${IML_MAJOR_VERSION} - SOURCE_PATH ${SOURCE_PATH} - CMAKE_PACKAGE_NAME ${IML_CMAKE_PACKAGE_NAME} - DEFAULT_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME} - ${EXTRA_OPTIONS} + NAME "${IML_NAME}" + MAJOR_VERSION "${IML_MAJOR_VERSION}" + SOURCE_PATH "${SOURCE_PATH}" + CMAKE_PACKAGE_NAME "${IML_CMAKE_PACKAGE_NAME}" + DEFAULT_CMAKE_PACKAGE_NAME "${DEFAULT_CMAKE_PACKAGE_NAME}" + ${extra_arguments} OPTIONS ${IML_OPTIONS} ) endfunction() diff --git a/ports/ignition-modularscripts/vcpkg.json b/ports/ignition-modularscripts/vcpkg.json index ef7fdd97ad0450..27af10243cb1b3 100644 --- a/ports/ignition-modularscripts/vcpkg.json +++ b/ports/ignition-modularscripts/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ignition-modularscripts", - "version-date": "2022-05-11", - "port-version": 2, + "version-date": "2023-05-05", "description": "Vcpkg helpers to package ignition libraries", "license": null, + "supports": "native", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c1b9c0919e39b1..51011f65433256 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3229,8 +3229,8 @@ "port-version": 1 }, "ignition-modularscripts": { - "baseline": "2022-05-11", - "port-version": 2 + "baseline": "2023-05-05", + "port-version": 0 }, "ignition-msgs1": { "baseline": "1.0.0", diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 748dd797a245ad..f217614af800e7 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f770940cc2085c2f24a1673730fd8d642b49717f", + "version-date": "2023-05-05", + "port-version": 0 + }, { "git-tree": "bc5dc2fa00b5023e9f2fa1610a986e8d61874380", "version-date": "2022-05-11", From 4746870785b3b4a77556cfc9cf260b4034724e10 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 9 May 2023 07:40:12 +0800 Subject: [PATCH 014/533] [qtbase] fix glib2 not found (#30379) * fix glib2 no found * update version * update version * update version * update version * update version * update version * update version * update version * update verion * update verion * merge master * version * fix new error * update version * update version * update version * Update qtbase.json --------- Co-authored-by: Jim Wang (Beyondsoft Corporation) --- ports/qtbase/GLIB2-static.patch | 28 +++++++++++++++++++ ports/qtbase/cmake/qt_install_submodule.cmake | 10 +++++++ ports/qtbase/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 ++++ 5 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ports/qtbase/GLIB2-static.patch b/ports/qtbase/GLIB2-static.patch index c384b741cef8b8..5bbcb289da4a03 100644 --- a/ports/qtbase/GLIB2-static.patch +++ b/ports/qtbase/GLIB2-static.patch @@ -73,3 +73,31 @@ index 24a194c..91c8e41 100644 include(FeatureSummary) set_package_properties(GLIB2 PROPERTIES +diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake +index 7d52f48..2b1b221 100644 +--- a/src/corelib/configure.cmake ++++ b/src/corelib/configure.cmake +@@ -25,7 +25,7 @@ endif() + qt_find_package(WrapSystemDoubleConversion + PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion + MODULE_NAME core QMAKE_LIB doubleconversion) +-qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib) ++qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib) + qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data + MODULE_NAME core QMAKE_LIB icu) + +diff --git a/src/network/configure.cmake b/src/network/configure.cmake +index aef7f15..21b0c1d 100644 +--- a/src/network/configure.cmake ++++ b/src/network/configure.cmake +@@ -10,8 +10,8 @@ + qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli) + qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy) + qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi) +-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject) +-qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio) ++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject) ++qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio) + + + #### Tests diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index c6393713a664f1..e8d1fb0a367257 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -192,6 +192,16 @@ function(qt_cmake_configure) QT_SYNCQT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE ${_qarg_OPTIONS_MAYBE_UNUSED} + INPUT_bundled_xcb_xinput + INPUT_freetype + INPUT_harfbuzz + INPUT_libjpeg + INPUT_libmd4c + INPUT_libpng + INPUT_opengl + INPUT_openssl + INPUT_xcb + INPUT_xkbcommon ) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) endfunction() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index c7a66c307ed4a5..c2cd75d9c04ab7 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.5.0", - "port-version": 1, + "port-version": 2, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 51011f65433256..c6b5c5427a6700 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6654,7 +6654,7 @@ }, "qtbase": { "baseline": "6.5.0", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.5.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index a1285aee6ee3cf..1ebe8e2187e4c3 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a00cef259fdf1a9198f95e0618c98b7f1b21527", + "version": "6.5.0", + "port-version": 2 + }, { "git-tree": "a66d81c3d9432499f24c76df346a4daf5725f90b", "version": "6.5.0", From d5952607f3f3848bdc3fdd2cf1c8690b17c10d18 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Mon, 8 May 2023 20:12:23 -0400 Subject: [PATCH 015/533] [vsg] New port (VulkanSceneGraph) (#31300) * [vsg] New port (VulkanSceneGraph) * [vsg] Fix deprecated function usage * [vsg] Remove redundant linkage specification * [vsg] Devendor glslang * [vsg] Remove DISABLE_PARALLEL_CONFIGURE flag --- ports/vsg/devendor-glslang.patch | 68 ++++++++++++++++++++++++++++++++ ports/vsg/portfile.cmake | 17 ++++++++ ports/vsg/vcpkg.json | 19 +++++++++ versions/baseline.json | 4 ++ versions/v-/vsg.json | 9 +++++ 5 files changed, 117 insertions(+) create mode 100644 ports/vsg/devendor-glslang.patch create mode 100644 ports/vsg/portfile.cmake create mode 100644 ports/vsg/vcpkg.json create mode 100644 versions/v-/vsg.json diff --git a/ports/vsg/devendor-glslang.patch b/ports/vsg/devendor-glslang.patch new file mode 100644 index 00000000000000..356d4c4041a4d8 --- /dev/null +++ b/ports/vsg/devendor-glslang.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61da709f..472bc6af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,9 +37,11 @@ find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED) + + find_package(Threads REQUIRED) + ++find_package(glslang CONFIG REQUIRED) ++ + # Enable/disable shader compilation support that pulls in glslang + set(VSG_SUPPORTS_ShaderCompiler 1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." ) +-if (VSG_SUPPORTS_ShaderCompiler) ++if (FALSE) + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/glslang/build_vars.cmake) + + if (Git_FOUND) +diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt +index 4154312f..49d63b97 100644 +--- a/src/vsg/CMakeLists.txt ++++ b/src/vsg/CMakeLists.txt +@@ -226,7 +226,7 @@ set(SOURCES + utils/LoadPagedLOD.cpp + ) + +-if (${VSG_SUPPORTS_ShaderCompiler}) ++if (FALSE) + + # include glslang source code directly into the VulkanScenegraph library build. + include(../glslang/build_vars.cmake) +@@ -236,6 +236,14 @@ endif() + set(LIBRARIES PUBLIC + Vulkan::Vulkan + Threads::Threads ++ glslang::glslang ++ glslang::OSDependent ++ glslang::MachineIndependent ++ glslang::GenericCodeGen ++ glslang::glslang-default-resource-limits ++ glslang::OGLCompiler ++ glslang::SPVRemapper ++ glslang::SPIRV + ) + + # Check for std::atomic +@@ -364,9 +372,6 @@ target_include_directories(vsg + PUBLIC + $ + $ +- PRIVATE +- $ +- $ + ) + + target_link_libraries(vsg ${LIBRARIES}) +diff --git a/src/vsg/utils/ShaderCompiler.cpp b/src/vsg/utils/ShaderCompiler.cpp +index 71a7f09f..803f26a1 100644 +--- a/src/vsg/utils/ShaderCompiler.cpp ++++ b/src/vsg/utils/ShaderCompiler.cpp +@@ -20,7 +20,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI + #include + + #if VSG_SUPPORTS_ShaderCompiler +-# include ++# include + # include + # include + #endif diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake new file mode 100644 index 00000000000000..5efaaff6af1958 --- /dev/null +++ b/ports/vsg/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vsg-dev/VulkanSceneGraph + REF "v${VERSION}" + SHA512 da5c9448da6bd2bd6edcb82ed1ac67aded9c3fd957fb7d3c78bb741d8993a5e90b134433237a63bf1a6eb23b30a1e6b4ea2115416f8d32464bd04925d8dbcd34 + HEAD_REF master + PATCHES devendor-glslang.patch +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json new file mode 100644 index 00000000000000..dd3b617dc1b1e7 --- /dev/null +++ b/ports/vsg/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "vsg", + "version": "1.0.5", + "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", + "homepage": "http://www.vulkanscenegraph.org/", + "license": "MIT", + "dependencies": [ + "glslang", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c6b5c5427a6700..1147c3584ebcdd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8388,6 +8388,10 @@ "baseline": "0.5.0", "port-version": 2 }, + "vsg": { + "baseline": "1.0.5", + "port-version": 0 + }, "vtk": { "baseline": "9.2.0-pv5.11.0", "port-version": 6 diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json new file mode 100644 index 00000000000000..440b6c40114975 --- /dev/null +++ b/versions/v-/vsg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0542d7bb873d65fa6ecbf2c3a02d7a2c7221d34a", + "version": "1.0.5", + "port-version": 0 + } + ] +} From fd259a15f1c91d21cc9869bcb9ca3316993f9ae1 Mon Sep 17 00:00:00 2001 From: xyz347 Date: Tue, 9 May 2023 08:12:47 +0800 Subject: [PATCH 016/533] [xpack]Update to 1.0.5 (#31299) * update xpack version * update xpack version --- ports/xpack/portfile.cmake | 4 ++-- ports/xpack/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xpack.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/xpack/portfile.cmake b/ports/xpack/portfile.cmake index 8fb9bf86dc088f..723f6eebcb2012 100644 --- a/ports/xpack/portfile.cmake +++ b/ports/xpack/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xyz347/xpack - REF 137467c05badd88b8569d161f27afb498ea4ff9a - SHA512 349ff9fb9ca74bd1401d8f0f121b263e40c021fde57a500d31eb14eeba8f3d3e8d7f6f629fc696d3052095d311700aa42b7b3a0a19c61787246e6680ea27928e + REF f7985ea64426d09f9c3d65558e905b7773f9de2e + SHA512 db4793536648084868c6645306d89026e7fefddc9875dcacb6e44abf7513ff1ce690f41681a35503ba6ad0ab5510ca80418065216a1c2d8f40df6114c1eee2ab HEAD_REF master ) diff --git a/ports/xpack/vcpkg.json b/ports/xpack/vcpkg.json index bc5ab5e069b4c0..34c3036a10d060 100644 --- a/ports/xpack/vcpkg.json +++ b/ports/xpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xpack", - "version-date": "2023-02-06", + "version": "1.0.5", "description": "Convert C++ struct from/to json/xml", "homepage": "https://github.com/xyz347/xpack", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1147c3584ebcdd..fc5f4ad38dd5c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8681,7 +8681,7 @@ "port-version": 0 }, "xpack": { - "baseline": "2023-02-06", + "baseline": "1.0.5", "port-version": 0 }, "xproperty": { diff --git a/versions/x-/xpack.json b/versions/x-/xpack.json index b87511faff68ce..432728c90ac005 100644 --- a/versions/x-/xpack.json +++ b/versions/x-/xpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05f0ea1a83e35833ccf855d9cb507ab1c9a99a0b", + "version": "1.0.5", + "port-version": 0 + }, { "git-tree": "5123943d7e13cfac8d5a58f7fe3cf027275e5bee", "version-date": "2023-02-06", From c8b9f10f39ee293945dbdb3fa886eca1fce2418c Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 9 May 2023 08:47:02 +0800 Subject: [PATCH 017/533] [microsoft-signalr] Fix usage issue (#31286) --- ports/microsoft-signalr/find-msgpack.patch | 14 ++++++++++++++ ports/microsoft-signalr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/microsoft-signalr.json | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ports/microsoft-signalr/find-msgpack.patch b/ports/microsoft-signalr/find-msgpack.patch index 882c85bfc560cf..04a812758610a3 100644 --- a/ports/microsoft-signalr/find-msgpack.patch +++ b/ports/microsoft-signalr/find-msgpack.patch @@ -13,3 +13,17 @@ index 676cde2..4562873 100644 endif() include_directories (include) +diff --git a/src/signalrclient/microsoft-signalr-config.in.cmake b/src/signalrclient/microsoft-signalr-config.in.cmake +index b28235b..09a7d56 100644 +--- a/src/signalrclient/microsoft-signalr-config.in.cmake ++++ b/src/signalrclient/microsoft-signalr-config.in.cmake +@@ -7,7 +7,7 @@ endif() + find_dependency(jsoncpp) + + if(@USE_MSGPACK@) +- find_dependency(msgpack) ++ find_dependency(msgpack-cxx CONFIG) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/microsoft-signalr-targets.cmake") +\ No newline at end of file diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index 4e0c4fca712b0d..085cf5ddb4d548 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "microsoft-signalr", "version": "0.1.0-alpha4", - "port-version": 4, + "port-version": 5, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fc5f4ad38dd5c7..2f154536e3ef7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5174,7 +5174,7 @@ }, "microsoft-signalr": { "baseline": "0.1.0-alpha4", - "port-version": 4 + "port-version": 5 }, "mikktspace": { "baseline": "2020-10-06", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index d021059291196b..6034938ec990ae 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d404283aa7fbee588db56cbe0a470d82c1f9258", + "version": "0.1.0-alpha4", + "port-version": 5 + }, { "git-tree": "1ea9d11c361ff46b14b9872df5b71b634ff1d709", "version": "0.1.0-alpha4", From 461fd253f5ec433d09eb4b73f18f52f2a160a7d0 Mon Sep 17 00:00:00 2001 From: theartful <101147828+theartful@users.noreply.github.com> Date: Tue, 9 May 2023 04:02:30 +0300 Subject: [PATCH 018/533] [gstreamer]: fix pkgconfig parameters of gstreamer (#31301) --- ports/gstreamer/portfile.cmake | 19 +++++++++++++++++++ ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 6fece48a3de1e1..9cbe522b25b360 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -703,6 +703,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # move plugins to ${prefix}/plugins/${PORT} instead of ${prefix}/lib/gstreamer-1.0 if(NOT VCPKG_BUILD_TYPE) file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" @@ -717,6 +718,24 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0") endif() + + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-1.0.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() + + set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-1.0.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index f9b309733b29d8..8885f357361cf6 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.20.5", - "port-version": 6, + "port-version": 7, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 2f154536e3ef7a..92365cdb6dc718 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2970,7 +2970,7 @@ }, "gstreamer": { "baseline": "1.20.5", - "port-version": 6 + "port-version": 7 }, "gtest": { "baseline": "1.13.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 86aac8dc08736f..c9d4aa5bf2191b 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "877a4687de4ef7b958624b55a558f91b4b34c32b", + "version": "1.20.5", + "port-version": 7 + }, { "git-tree": "631b03d07848f5a632168da7e3f9e1bc753d4085", "version": "1.20.5", From be5a9aab2dc5a89cd13def8416f73c5c54792355 Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Mon, 8 May 2023 21:04:23 -0400 Subject: [PATCH 019/533] [jsoncons] Update to 0.170.1 (#31284) * [jsoncons] Update to 0.170.1 * Update baseline --- ports/jsoncons/portfile.cmake | 2 +- ports/jsoncons/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jsoncons.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index 4d7535efc9f9d3..d50aab56cd11ee 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons REF v${VERSION} - SHA512 0cf84a40d5af574352f7e157647f3b6e676b9c4080108a64e5f05edc6ddf6a0d2409772481d4f502c096f2821b03578643fbea0a5f3b5031189e7ce9f9b3e99b + SHA512 f292e5034ad1d39ae3d6887bd59b92a7211b9de05b46229ad021514acb11965c33fd16b6bb264becd08e40f287cee76c15339ccefce2d80b7a43747319bbc93d HEAD_REF master ) diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json index 1e37fb1bfafeca..07e441d1bfdb0b 100644 --- a/ports/jsoncons/vcpkg.json +++ b/ports/jsoncons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsoncons", - "version": "0.170.0", + "version": "0.170.1", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 92365cdb6dc718..e64109b97c5a45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3457,7 +3457,7 @@ "port-version": 5 }, "jsoncons": { - "baseline": "0.170.0", + "baseline": "0.170.1", "port-version": 0 }, "jsoncpp": { diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index eaba417f4d7dab..fba857e3b3d262 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5e66f5d2ae477089e3f87c432bdfdb7a7929da9", + "version": "0.170.1", + "port-version": 0 + }, { "git-tree": "32422a6f4405b4c330cc992bc40fc11e4e274450", "version": "0.170.0", From fb46486c20a088a5168a9f70172313807d566675 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 9 May 2023 04:11:15 +0300 Subject: [PATCH 020/533] [qt5-imageformats] Move deps to features (#31282) --- ports/qt5-imageformats/portfile.cmake | 66 ++++++++++++++------------- ports/qt5-imageformats/vcpkg.json | 47 ++++++++++++++++--- versions/baseline.json | 2 +- versions/q-/qt5-imageformats.json | 5 ++ 4 files changed, 80 insertions(+), 40 deletions(-) diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index d82fc421793d2a..fd97931e4b5eb7 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -1,47 +1,49 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") list(APPEND CORE_OPTIONS - -system-tiff - -system-webp - -jasper -no-mng # must be explicitly disabled to not automatically pick up mng - -verbose) - -x_vcpkg_pkgconfig_get_modules(PREFIX tiff MODULES libtiff-4 LIBS) + -verbose +) -find_library(JPEG_RELEASE NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(JPEG_DEBUG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +if("jasper" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -jasper) -find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + x_vcpkg_pkgconfig_get_modules(PREFIX jasper MODULES jasper LIBS) -if(NOT VCPKG_TARGET_IS_OSX AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) - set(FREEGLUT_NEEDED ON) -endif() + file(READ "${CURRENT_INSTALLED_DIR}/share/jasper/vcpkg_abi_info.txt" jasper_abi_info) + if(jasper_abi_info MATCHES "(^|;)opengl(;|$)") + find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) + find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + endif() -if(FREEGLUT_NEEDED) - find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) - find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) + list(APPEND OPT_REL "JASPER_LIBS=${jasper_LIBS_RELEASE} ${FREEGLUT_RELEASE}") + list(APPEND OPT_DBG "JASPER_LIBS=${jasper_LIBS_DEBUG} ${FREEGLUT_DEBUG}") +else() + list(APPEND CORE_OPTIONS -no-jasper) endif() -x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS) - -set(OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}" - "WEBP_LIBS=${webp_LIBS_RELEASE}" - "JASPER_LIBS=${JASPER_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies -set(OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}" - "WEBP_LIBS=${webp_LIBS_DEBUG}" - "JASPER_LIBS=${JASPER_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") +if("tiff" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -system-tiff) -if(FREEGLUT_NEEDED) - set(OPT_REL "${OPT_REL} ${FREEGLUT_RELEASE}") - set(OPT_DBG "${OPT_DBG} ${FREEGLUT_DEBUG}") + x_vcpkg_pkgconfig_get_modules(PREFIX tiff MODULES libtiff-4 LIBS) + list(APPEND OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}") + list(APPEND OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}") +else() + list(APPEND CORE_OPTIONS -no-tiff) endif() -list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] +if("webp" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -system-webp) + + x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS) + list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] + # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies + list(APPEND OPT_REL "WEBP_LIBS=${webp_LIBS_RELEASE}") + list(APPEND OPT_DBG "WEBP_LIBS=${webp_LIBS_DEBUG}") +else() + list(APPEND CORE_OPTIONS -no-webp) +endif() -qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) \ No newline at end of file +qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index 9935a5599a7cda..16df8c3290a116 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,19 +1,52 @@ { "name": "qt5-imageformats", "version": "5.15.9", + "port-version": 1, "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ - "jasper", - "libwebp", { "name": "qt5-base", "default-features": false - }, + } + ], + "default-features": [ "tiff", - { - "name": "vcpkg-pkgconfig-get-modules", - "host": true + "webp" + ], + "features": { + "jasper": { + "description": "Enable JPEG-2000 support using the JasPer library", + "dependencies": [ + { + "name": "jasper", + "default-features": false + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] + }, + "tiff": { + "description": "Enable TIFF support", + "dependencies": [ + "tiff", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] + }, + "webp": { + "description": "Enable WEBP support", + "dependencies": [ + "libwebp", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] } - ] + } } diff --git a/versions/baseline.json b/versions/baseline.json index e64109b97c5a45..c495ad3685bccf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6518,7 +6518,7 @@ }, "qt5-imageformats": { "baseline": "5.15.9", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.9", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 1b9bf74e42f34b..ba72baeefbd950 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f076f78b7733120039477509c1472f270ad3e88", + "version": "5.15.9", + "port-version": 1 + }, { "git-tree": "889e130592f375153e49fc8d334204ccdaf6010d", "version": "5.15.9", From a9adae73567d5155c5f311a6315b63124314fdbd Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 May 2023 03:11:51 +0200 Subject: [PATCH 021/533] [libgit2] use support expressions (#31278) --- ports/libgit2/portfile.cmake | 9 --------- ports/libgit2/vcpkg.json | 15 ++++++--------- versions/baseline.json | 2 +- versions/l-/libgit2.json | 5 +++++ 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 867d0b175f3949..626f6385ca2630 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -37,19 +37,10 @@ foreach(GIT2_FEATURE ${FEATURES}) elseif(GIT2_FEATURE STREQUAL "openssl") set_tls_backend("OpenSSL") elseif(GIT2_FEATURE STREQUAL "winhttp") - if(NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "winhttp is not supported on non-Windows and uwp platforms") - endif() set_tls_backend("WinHTTP") elseif(GIT2_FEATURE STREQUAL "sectransp") - if(NOT VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") - endif() set_tls_backend("SecureTransport") elseif(GIT2_FEATURE STREQUAL "mbedtls") - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "mbedtls is not supported on Windows because a certificate file must be specified at compile time") - endif() set_tls_backend("mbedTLS") endif() endforeach() diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 1614564db7fb8c..beba21e29cd365 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgit2", "version-semver": "1.4.2", + "port-version": 1, "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", @@ -23,6 +24,7 @@ "features": { "mbedtls": { "description": "SSL support (mbedTLS)", + "supports": "!windows", "dependencies": [ "mbedtls" ] @@ -46,18 +48,12 @@ ] }, "sectransp": { - "description": "SSL support (sectransp)" + "description": "SSL support (sectransp)", + "supports": "!osx" }, "ssh": { "description": "SSH support via libssh2", "dependencies": [ - { - "name": "libgit2", - "default-features": false, - "features": [ - "openssl" - ] - }, "libssh2" ] }, @@ -91,7 +87,8 @@ ] }, "winhttp": { - "description": "SSL support (WinHTTP)" + "description": "SSL support (WinHTTP)", + "supports": "windows & !uwp" } } } diff --git a/versions/baseline.json b/versions/baseline.json index c495ad3685bccf..45e30f61ff0f0b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4034,7 +4034,7 @@ }, "libgit2": { "baseline": "1.4.2", - "port-version": 0 + "port-version": 1 }, "libgme": { "baseline": "0.6.3", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 170466619c5b3f..472f701a485b3e 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53a1a7485857995d3b4cc5a2b6eaa22d6c6b036c", + "version-semver": "1.4.2", + "port-version": 1 + }, { "git-tree": "e036ca61d2e12b110c920cadf92f0aa4f39cac9b", "version-semver": "1.4.2", From f1a37c0d84e5a04738dedf82ef99d221b5554326 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 May 2023 03:13:00 +0200 Subject: [PATCH 022/533] [gz-math7] Control options (#31277) --- ports/gz-math7/portfile.cmake | 15 ++++++++++----- ports/gz-math7/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gz-math7.json | 5 +++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ports/gz-math7/portfile.cmake b/ports/gz-math7/portfile.cmake index 7f8d1bba88b664..f64aa64517f3cc 100644 --- a/ports/gz-math7/portfile.cmake +++ b/ports/gz-math7/portfile.cmake @@ -1,7 +1,12 @@ set(PACKAGE_NAME math) -ignition_modular_library(NAME ${PACKAGE_NAME} - REF ${PORT}_${VERSION} - VERSION ${VERSION} - SHA512 84617eeb6840b0bad8f94c38e8af11bf010c2e3166042541d0d79c44f60a70ee6fde395b2a1b801abedb36aa024f7fb14bbb993eb7be2949c72d8756ba4b3196 - ) +ignition_modular_library( + NAME "${PACKAGE_NAME}" + REF "${PORT}_${VERSION}" + VERSION "${VERSION}" + SHA512 84617eeb6840b0bad8f94c38e8af11bf010c2e3166042541d0d79c44f60a70ee6fde395b2a1b801abedb36aa024f7fb14bbb993eb7be2949c72d8756ba4b3196 + OPTIONS + -DSKIP_SWIG=ON + -DSKIP_PYBIND11=ON + -DBUILD_DOCS=OFF +) diff --git a/ports/gz-math7/vcpkg.json b/ports/gz-math7/vcpkg.json index bfaad979766616..9eb5c8cdcfc1a2 100644 --- a/ports/gz-math7/vcpkg.json +++ b/ports/gz-math7/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-math7", "version": "7.0.2", + "port-version": 1, "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 45e30f61ff0f0b..597d24e54910ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3026,7 +3026,7 @@ }, "gz-math7": { "baseline": "7.0.2", - "port-version": 0 + "port-version": 1 }, "gz-tools2": { "baseline": "2.0.0", diff --git a/versions/g-/gz-math7.json b/versions/g-/gz-math7.json index 07d76106f2d73e..7574a7ada977ae 100644 --- a/versions/g-/gz-math7.json +++ b/versions/g-/gz-math7.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "687462541825396052367baec48a08e4657d63d4", + "version": "7.0.2", + "port-version": 1 + }, { "git-tree": "13b399f38d70db748d1babf9296d2a4fc80dc302", "version": "7.0.2", From 991c56491771f0d9e9e73a2cbd09eee9d596c61a Mon Sep 17 00:00:00 2001 From: Michael <73815580+michaelmigliore@users.noreply.github.com> Date: Tue, 9 May 2023 03:14:59 +0200 Subject: [PATCH 023/533] [usd] Add missing dependency (#31274) --- ports/usd/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/u-/usd.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index 677fb73e4aea03..b90d7f9adb6296 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "usd", "version": "23.2", + "port-version": 1, "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, @@ -15,6 +16,7 @@ "boost-program-options", "boost-regex", "boost-system", + "boost-variant", "boost-vmd", "tbb", { diff --git a/versions/baseline.json b/versions/baseline.json index 597d24e54910ba..7ed0e5b2b873bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8198,7 +8198,7 @@ }, "usd": { "baseline": "23.2", - "port-version": 0 + "port-version": 1 }, "usockets": { "baseline": "0.8.5", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 66cac186b9e3da..507b91d7961c10 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9db13a48bde68c5107143c6a68fb50b6b71b8483", + "version": "23.2", + "port-version": 1 + }, { "git-tree": "f52bda67df8cc837cf678d105ecba88358c016c0", "version": "23.2", From 714774fd4f8805d0c50dcb2d11d1093e648c2fb4 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 9 May 2023 09:18:38 +0800 Subject: [PATCH 024/533] [bond] Update to 10.0.0 (#31269) * update bond * update version --------- Co-authored-by: Monica --- ports/bond/portfile.cmake | 16 +++++++--------- ports/bond/skip-grpc-compilation.patch | 16 ++++++++++------ ports/bond/vcpkg.json | 3 +-- versions/b-/bond.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 5c72c8af4c9ca8..4c70c9f44b73ce 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -1,21 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(BOND_VER 9.0.3) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/bond - REF ${BOND_VER} - SHA512 3a7884eb00e6d0ab40c688f4a40cb2d3f356c48b38d48a9a08c756047a94b82619ef345483f42c3240732f5da06816b65a61acb83bfebb3c2c6b44099ce71bf9 + REF "${VERSION}" + SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014 HEAD_REF master PATCHES fix-install-path.patch skip-grpc-compilation.patch ) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(GBC_ARCHIVE - URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip" - FILENAME "gbc-${BOND_VER}-amd64.zip" - SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd + URLS "https://github.com/microsoft/bond/releases/download/${VERSION}/gbc-${VERSION}-amd64.zip" + FILENAME "gbc-${VERSION}-amd64.zip" + SHA512 590b051aa47ad161f8a8a5f782e22d2201ad536e0772c9e528f98df1d1fd2b154723d21587d35c8b948805ab229dfb3b515273ae37d05028554fd49b39dc5418 ) # Clear the generator to prevent it from updating @@ -24,7 +22,7 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL) file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools") - set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe") + set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${VERSION}-amd64.exe") if(NOT EXISTS "${FETCHED_GBC_PATH}") message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exist, but it doesn't.") endif() @@ -71,4 +69,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Put the license file where vcpkg expects it -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/bond/skip-grpc-compilation.patch b/ports/bond/skip-grpc-compilation.patch index 10906b13137b6b..eb45faba4265c8 100644 --- a/ports/bond/skip-grpc-compilation.patch +++ b/ports/bond/skip-grpc-compilation.patch @@ -1,11 +1,15 @@ diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index f8c7bf3..e69de29 100644 +index 8c1f368..8b13789 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -1,6 +0,0 @@ +@@ -1,10 +1 @@ -include (Compiler) -- + -if (BOND_ENABLE_GRPC) -- cxx_add_compile_options (Clang -Wno-unused-value) -- add_subdirectory(grpc) --endif() +- if (BOND_FIND_GRPC) +- find_package(grpc CONFIG REQUIRED) +- else () +- cxx_add_compile_options(Clang -Wno-unused-value) +- add_subdirectory(grpc) +- endif () +-endif () diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index 8abedfb472a1bb..1fc94cea811587 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bond", - "version": "9.0.3", - "port-version": 3, + "version": "10.0.0", "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/versions/b-/bond.json b/versions/b-/bond.json index be81891dac45ee..4ce5e1675fa552 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ce8875d8de21ca31d61b521c2e84a974e325436", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "96ecc1c6ea2a8fabfbdfd7d0a8535821446af89f", "version": "9.0.3", diff --git a/versions/baseline.json b/versions/baseline.json index 7ed0e5b2b873bb..1c3fae15b1ef45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -613,8 +613,8 @@ "port-version": 0 }, "bond": { - "baseline": "9.0.3", - "port-version": 3 + "baseline": "10.0.0", + "port-version": 0 }, "boolinq": { "baseline": "3.0.4", From 24e389168d6047992cd7c96ea13d1e60efd9d2e1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 9 May 2023 03:23:01 +0200 Subject: [PATCH 025/533] [cpp-httplib] Update to 0.12.3 (#31281) * Update cpp-httplib to 0.12.3 * Update CI baseline * Use "v${VERSION}" * Update patch * Update CI baseline --------- Co-authored-by: chausner --- ports/cpp-httplib/fix-find-brotli.patch | 9 ++++----- ports/cpp-httplib/portfile.cmake | 4 ++-- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/cpp-httplib/fix-find-brotli.patch b/ports/cpp-httplib/fix-find-brotli.patch index ea200c909f1ea4..087e47daee9bbf 100644 --- a/ports/cpp-httplib/fix-find-brotli.patch +++ b/ports/cpp-httplib/fix-find-brotli.patch @@ -1,8 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c98daf5..88d1aad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -128,9 +128,9 @@ endif() +@@ -131,9 +131,9 @@ endif() # Adds our cmake folder to the search path for find_package list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") if(HTTPLIB_REQUIRE_BROTLI) @@ -14,9 +13,9 @@ index c98daf5..88d1aad 100644 endif() # Just setting this variable here for people building in-tree if(Brotli_FOUND) -@@ -209,9 +209,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} +@@ -216,9 +216,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} # Needed for API from MacOS Security framework - "$<$,$>:-framework CoreFoundation -framework Security>" + "$<$,$,$>:-framework CoreFoundation -framework Security>" # Can't put multiple targets in a single generator expression or it bugs out. - $<$:Brotli::common> - $<$:Brotli::encoder> @@ -27,7 +26,7 @@ index c98daf5..88d1aad 100644 $<$:ZLIB::ZLIB> $<$:OpenSSL::SSL> $<$:OpenSSL::Crypto> -@@ -266,9 +266,6 @@ install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE) +@@ -274,9 +274,6 @@ install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 313865d658927d..05d31c8cb3a4f6 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF v0.12.2 - SHA512 dda47f76eaf5b4daa35f1295e482f1d81dd8823ae06339b9f4c93e4fbe7b54ae28760d3083b5d5cff212f1a679616adfa47dbb9d06c6810fac4b58197f575429 + REF "v${VERSION}" + SHA512 3465e5c843ad4087bababadf8fe9f3e6961213301540053bb47f242f958280f43c85b03b8cf6f955a6b91bf9511a81669feeb9989344caf2a1e42ff587b3a460 HEAD_REF master PATCHES fix-find-brotli.patch diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 0d57f30df5a251..b8cb1d9e3b35ed 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.12.2", + "version": "0.12.3", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1c3fae15b1ef45..0fc463733cfbaa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1733,7 +1733,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.12.2", + "baseline": "0.12.3", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index b6674a872c0b63..6d613ba2355923 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "570d0fcd52fa9bb8048dfe84df6a31b2473949b5", + "version": "0.12.3", + "port-version": 0 + }, { "git-tree": "05e123da2bcd7b05fc8c31fd88e6d3d5aa06d520", "version": "0.12.2", From 8805e31bb4981802cb23dc437a5dd1f01cc42235 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 May 2023 03:25:24 +0200 Subject: [PATCH 026/533] [libxlsxwriter] Fix pc file, de-vendor minizip (#31262) --- ports/libxlsxwriter/dependencies.diff | 26 ++++++++++++++++++++++++++ ports/libxlsxwriter/portfile.cmake | 14 ++++++++------ ports/libxlsxwriter/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/l-/libxlsxwriter.json | 5 +++++ 5 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 ports/libxlsxwriter/dependencies.diff diff --git a/ports/libxlsxwriter/dependencies.diff b/ports/libxlsxwriter/dependencies.diff new file mode 100644 index 00000000000000..eb7a1cf9f80495 --- /dev/null +++ b/ports/libxlsxwriter/dependencies.diff @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e656184..776c88a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -225,8 +225,8 @@ message("zlib version: " ${ZLIB_VERSION}) + + # MINIZIP + if (USE_SYSTEM_MINIZIP) +- find_package(MINIZIP REQUIRED "1.0") +- list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) ++ find_package(MINIZIP NAMES unofficial-minizip REQUIRED) ++ set(MINIZIP_LIBRARIES unofficial::minizip::minizip) + endif() + + # LIBRARY +diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt +index a87d080..fa58047 100644 +--- a/dev/release/pkg-config.txt ++++ b/dev/release/pkg-config.txt +@@ -7,4 +7,5 @@ Name: libxlsxwriter + Description: A C library for creating Excel XLSX files + Version: @VERSION@ + Cflags: -I${includedir} +-Libs: -L${libdir} -lxlsxwriter -lz ++Libs: -L${libdir} -lxlsxwriter ++Requires.private: minizip zlib diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index 02053c7ec3434c..2ccfb6f76a42b8 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,20 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF RELEASE_1.1.5 + REF "RELEASE_${VERSION}" SHA512 bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6 HEAD_REF master + PATCHES + dependencies.diff ) +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/minizip") +set(USE_WINDOWSSTORE OFF) if (VCPKG_TARGET_IS_UWP) - set(USE_WINDOWSSTORE ON) -else() - set(USE_WINDOWSSTORE OFF) + set(USE_WINDOWSSTORE ON) endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DUSE_SYSTEM_MINIZIP=1 -DWINDOWSSTORE=${USE_WINDOWSSTORE} ) @@ -24,5 +27,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json index 5fd73fa2ce84cb..da65e5f14d9b9a 100644 --- a/ports/libxlsxwriter/vcpkg.json +++ b/ports/libxlsxwriter/vcpkg.json @@ -1,10 +1,12 @@ { "name": "libxlsxwriter", "version": "1.1.5", + "port-version": 1, "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", "homepage": "https://github.com/jmcnamara/libxlsxwriter", "license": null, "dependencies": [ + "minizip", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 0fc463733cfbaa..8fb8a71cc3ffbe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4758,7 +4758,7 @@ }, "libxlsxwriter": { "baseline": "1.1.5", - "port-version": 0 + "port-version": 1 }, "libxml2": { "baseline": "2.10.3", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index 4014a60641a4b5..c44d7202685620 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2769eadc216de088f724efd09edce1c73f9e8b4b", + "version": "1.1.5", + "port-version": 1 + }, { "git-tree": "1fec6d7beb6dff8486fb16b04849725ac466d409", "version": "1.1.5", From 1f7f116718637bb45cc5ce635483b92232a3eb36 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Mon, 8 May 2023 21:28:15 -0400 Subject: [PATCH 027/533] [pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build (#31257) * [pdal] Update to v2.5.3 * [pdal] Update baseline * [pdal-c] Update to v2.2.0 * [pdal-c] Update baseline * update usage * update version --------- Co-authored-by: Monica --- ports/pdal-c/portfile.cmake | 4 ++-- ports/pdal-c/vcpkg.json | 3 +-- ports/pdal/fix-dependency.patch | 7 +++---- ports/pdal/fix-gcc-13-build.patch | 12 ++++++++++++ ports/pdal/fix-gcc8-compatibility.patch | 15 --------------- ports/pdal/fix-unix-compiler-options.patch | 4 ++-- ports/pdal/portfile.cmake | 6 +++--- ports/pdal/usage | 2 +- ports/pdal/vcpkg.json | 3 +-- versions/baseline.json | 8 ++++---- versions/p-/pdal-c.json | 5 +++++ versions/p-/pdal.json | 5 +++++ 12 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 ports/pdal/fix-gcc-13-build.patch delete mode 100644 ports/pdal/fix-gcc8-compatibility.patch diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index bb06b4d04cfeca..559361d80ccf5d 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/CAPI - REF v2.1.0 - SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd + REF "v${VERSION}" + SHA512 6fe2136831e37c2f87643b3c971a1397d8912c230e9bfde53a51ec1769bc5c2f08482395263906975c5d40dbabd32852a5a145a159cdcf2548390a0aff72a295 HEAD_REF master ) diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index 717ffa816c0f2c..8626a5050e8cd4 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pdal-c", - "version": "2.1", - "port-version": 1, + "version": "2.2.0", "description": "C API for the Point Data Abstraction Library (PDAL)", "homepage": "https://github.com/PDAL/CAPI#readme", "supports": "!(windows & staticcrt)", diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 1c29b56898fdba..af6cca16c610a8 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,9 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42cca1e..43b0ced 100644 +index 1705a8426..248edcd38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} - target_link_libraries(${PDAL_BASE_LIB_NAME} +@@ -269,7 +269,7 @@ target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} @@ -13,7 +12,7 @@ index 42cca1e..43b0ced 100644 ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake -index bfaa5b2..e73ec9e 100644 +index dfe3dc024..42a78d646 100644 --- a/cmake/zstd.cmake +++ b/cmake/zstd.cmake @@ -4,7 +4,14 @@ diff --git a/ports/pdal/fix-gcc-13-build.patch b/ports/pdal/fix-gcc-13-build.patch new file mode 100644 index 00000000000000..888826c1717bd7 --- /dev/null +++ b/ports/pdal/fix-gcc-13-build.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/e57/libE57Format/include/E57Format.h b/plugins/e57/libE57Format/include/E57Format.h +index 267d8c77bb..89d2b36a09 100644 +--- a/plugins/e57/libE57Format/include/E57Format.h ++++ b/plugins/e57/libE57Format/include/E57Format.h +@@ -31,6 +31,7 @@ + + //! @file E57Format.h header file for the E57 API + ++#include + #include + #include + #include diff --git a/ports/pdal/fix-gcc8-compatibility.patch b/ports/pdal/fix-gcc8-compatibility.patch deleted file mode 100644 index 58eea53bc25f0d..00000000000000 --- a/ports/pdal/fix-gcc8-compatibility.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 5b48ba8..e031e2b 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -46,3 +46,10 @@ set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES - CLEAN_DIRECT_OUTPUT 1) - - set_property(GLOBAL PROPERTY _UTIL_INCLUDED TRUE) -+ -+# Compatibility for GCC8: std::filesystem requires linking with libstdc++fs -+target_link_libraries( -+ ${PDAL_UTIL_LIB_NAME} -+ PRIVATE -+ "$<$,$,9.0>>:-lstdc++fs>" -+) diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch index 79a379cb9cea96..8143a568dfcfe5 100644 --- a/ports/pdal/fix-unix-compiler-options.patch +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 679b4e7..08965d9 100644 +index 1705a8426..d13d41786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,7 +187,7 @@ add_subdirectory(apps) +@@ -192,7 +192,7 @@ add_subdirectory(apps) # so that users only need link libpdalcpp. # if (APPLE) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 88ed82bd17cdbc..f48b7d06a5c795 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL - REF 2.4.3 - SHA512 0293760c778be88e98e9c056730674c4e25bdba9094ff590e439a1ed1f61c880b7c03449b9cbc92190e12b3c0894cb337d93b2534c954f91277a0ee5cde5c78a + REF "${VERSION}" + SHA512 cefc610682f8dafd5c186ed612edc2db904690c3a53d5111ece0965d197053b064bd8cbd9adab293c47ec1894949b5e33623b0f0e6b6cad35617a20f0039bd79 HEAD_REF master PATCHES fix-dependency.patch @@ -12,7 +12,7 @@ vcpkg_from_github( fix-find-library-suffix.patch no-pkgconfig-requires.patch no-rpath.patch - fix-gcc8-compatibility.patch #Upstream PR: https://github.com/PDAL/PDAL/pull/3864 + fix-gcc-13-build.patch #upstream PR: https://github.com/PDAL/PDAL/pull/4039 ) # Prefer pristine CMake find modules + wrappers and config files from vcpkg. diff --git a/ports/pdal/usage b/ports/pdal/usage index eaf37886430891..759bf7feb72e5f 100644 --- a/ports/pdal/usage +++ b/ports/pdal/usage @@ -1,7 +1,7 @@ The package pdal provides CMake variables: find_package(PDAL CONFIG REQUIRED) - target_include_directories(${PDAL_INCLUDE_DIRS}) + target_include_directories(main PRIVATE ${PDAL_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${PDAL_LIBRARIES}) If necessary, override the default plugin search path by setting the diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 667d78e9494aac..66ef0317526d12 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pdal", - "version": "2.4.3", - "port-version": 3, + "version": "2.5.3", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 8fb8a71cc3ffbe..ee83724ee44aea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6109,12 +6109,12 @@ "port-version": 1 }, "pdal": { - "baseline": "2.4.3", - "port-version": 3 + "baseline": "2.5.3", + "port-version": 0 }, "pdal-c": { - "baseline": "2.1", - "port-version": 1 + "baseline": "2.2.0", + "port-version": 0 }, "pdcurses": { "baseline": "3.9", diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index 23b71a949170da..99ecbc9777cee2 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7916bf5653f1e62814a0a975e2af90d6862c881", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "e84b5eb190d2b4885ff56ec4168b1c6ba5569fb9", "version": "2.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 97426b36e5e237..16bb79fb0ff11d 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36cec2be04df8ba1771c374ccc8ae3c8a0cc96f3", + "version": "2.5.3", + "port-version": 0 + }, { "git-tree": "e0e82c8480da2e69cc7532911895844095466aad", "version": "2.4.3", From ea222747b888b8d63df56240b262db38b095c68f Mon Sep 17 00:00:00 2001 From: Denis Barkar Date: Tue, 9 May 2023 05:32:52 +0400 Subject: [PATCH 028/533] [sdl2-mixer-ext] add new port (#31253) --- ports/sdl2-mixer-ext/fix-dependencies.patch | 304 ++++++++++++++++++++ ports/sdl2-mixer-ext/portfile.cmake | 96 +++++++ ports/sdl2-mixer-ext/usage | 4 + ports/sdl2-mixer-ext/vcpkg.json | 121 ++++++++ versions/baseline.json | 4 + versions/s-/sdl2-mixer-ext.json | 9 + 6 files changed, 538 insertions(+) create mode 100644 ports/sdl2-mixer-ext/fix-dependencies.patch create mode 100644 ports/sdl2-mixer-ext/portfile.cmake create mode 100644 ports/sdl2-mixer-ext/usage create mode 100644 ports/sdl2-mixer-ext/vcpkg.json create mode 100644 versions/s-/sdl2-mixer-ext.json diff --git a/ports/sdl2-mixer-ext/fix-dependencies.patch b/ports/sdl2-mixer-ext/fix-dependencies.patch new file mode 100644 index 00000000000000..a662dcf9ce54f5 --- /dev/null +++ b/ports/sdl2-mixer-ext/fix-dependencies.patch @@ -0,0 +1,304 @@ +diff --git a/src/codecs/music_ffmpeg.cmake b/src/codecs/music_ffmpeg.cmake +index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac430ca50d 100644 +--- a/src/codecs/music_ffmpeg.cmake ++++ b/src/codecs/music_ffmpeg.cmake +@@ -3,7 +3,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) + option(USE_FFMPEG_DYNAMIC "Use dynamical loading of FFMPEG" ON) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(FFMPEG QUIET) ++ find_package(FFMPEG REQUIRED) + message("FFMPEG: [${FFMPEG_avcodec_FOUND}] ${FFMPEG_INCLUDE_DIRS} ${FFMPEG_swresample_LIBRARY} ${FFMPEG_avformat_LIBRARY} ${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avutil_LIBRARY}") + if(USE_FFMPEG_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS +@@ -16,10 +16,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) + message("Dynamic FFMPEG: ${FFMPEG_avutil_DYNAMIC_LIBRARY} ${FFMPEG_avcodec_DYNAMIC_LIBRARY} ${FFMPEG_avformat_DYNAMIC_LIBRARY} ${FFMPEG_swresample_DYNAMIC_LIBRARY}") + endif() + set(FFMPEG_LINK_LIBRARIES +- ${FFMPEG_swresample_LIBRARY} +- ${FFMPEG_avformat_LIBRARY} +- ${FFMPEG_avcodec_LIBRARY} +- ${FFMPEG_avutil_LIBRARY} ++ ${FFMPEG_LIBRARIES} + ) + else() + message(WARNING "FFMPEG libraries are not a part of AudioCodecs yet. Using any available from the system.") +@@ -41,7 +38,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) + set(FFMPEG_swresample_FOUND 1) + endif() + +- if(FFMPEG_avcodec_FOUND AND FFMPEG_avformat_FOUND AND FFMPEG_avutil_FOUND AND FFMPEG_swresample_FOUND) ++ if(1) + set(FFMPEG_FOUND 1) + endif() + +diff --git a/src/codecs/music_flac.cmake b/src/codecs/music_flac.cmake +index 8fb69ed54894dc2657e6da326015a606f567eb9d..9caf2b1a817258b957416f20aa57a5cd21f06c3c 100644 +--- a/src/codecs/music_flac.cmake ++++ b/src/codecs/music_flac.cmake +@@ -3,7 +3,10 @@ if(USE_FLAC) + option(USE_FLAC_DYNAMIC "Use dynamical loading of FLAC" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(FLAC QUIET) ++ find_package(FLAC CONFIG REQUIRED) ++ get_target_property(FLAC_INCLUDE_DIRS FLAC::FLAC INTERFACE_INCLUDE_DIRECTORIES) ++ set(FLAC_LIBRARIES FLAC::FLAC) ++ set(FLAC_FOUND 1) + message("FLAC: [${FLAC_FOUND}] ${FLAC_INCLUDE_DIRS} ${FLAC_LIBRARIES}") + if(USE_FLAC_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DFLAC_DYNAMIC=\"${FLAC_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_fluidsynth.cmake b/src/codecs/music_fluidsynth.cmake +index ee90c2708aa3857514dd4154dcc94ec17a8f22ec..d4d8d921e9863857a4bdce45b87b30e330379b2c 100644 +--- a/src/codecs/music_fluidsynth.cmake ++++ b/src/codecs/music_fluidsynth.cmake +@@ -6,7 +6,10 @@ if(USE_MIDI_FLUIDSYNTH AND NOT USE_MIDI_FLUIDLITE AND MIXERX_LGPL) + message(WARNING "AudioCodecs doesn't ship FluidSynth, it will be recognized from a system!!!") + endif() + +- find_package(FluidSynth QUIET) ++ find_package(FluidSynth CONFIG REQUIRED) ++ get_target_property(FluidSynth_INCLUDE_DIRS FluidSynth::libfluidsynth INTERFACE_INCLUDE_DIRECTORIES) ++ set(FluidSynth_LIBRARIES FluidSynth::libfluidsynth) ++ set(FluidSynth_FOUND 1) + message("FluidSynth: [${FluidSynth_FOUND}] ${FluidSynth_INCLUDE_DIRS} ${FluidSynth_LIBRARIES}") + if(USE_MIDI_FLUIDSYNTH_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DFLUIDSYNTH_DYNAMIC=\"${FluidSynth_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_gme.cmake b/src/codecs/music_gme.cmake +index 7e0df24427f4793bd19f2def937853d949957340..a407ccb4c41eb3c900e3a07687e2a15eae166b96 100644 +--- a/src/codecs/music_gme.cmake ++++ b/src/codecs/music_gme.cmake +@@ -3,7 +3,14 @@ if(USE_GME AND MIXERX_LGPL) + option(USE_GME_DYNAMIC "Use dynamical loading of Game Music Emulators library" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(GME QUIET) ++ find_path(GME_INCLUDE_DIRS "gme.h" PATH_SUFFIXES gme) ++ find_library(GME_LIBRARY_RELEASE NAMES gme PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) ++ find_library(GME_LIBRARY_DEBUG NAMES gme PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) ++ include(SelectLibraryConfigurations) ++ select_library_configurations(GME) ++ find_package(ZLIB REQUIRED) ++ list(APPEND GME_LIBRARIES ${ZLIB_LIBRARIES}) ++ set(GME_FOUND 1) + message("GME: [${GME_FOUND}] ${GME_INCLUDE_DIRS} ${GME_LIBRARIES}") + if(USE_GME_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DGME_DYNAMIC=\"${GME_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_midi_adl.cmake b/src/codecs/music_midi_adl.cmake +index 0d3b302f1d73ba01ec6a3b187559f1892f8a4c76..26864407f0e26d2affde07829d28407d8eea1a9f 100644 +--- a/src/codecs/music_midi_adl.cmake ++++ b/src/codecs/music_midi_adl.cmake +@@ -3,7 +3,15 @@ if(USE_MIDI_ADLMIDI AND MIXERX_GPL) + option(USE_MIDI_ADLMIDI_DYNAMIC "Use dynamical loading of libADLMIDI library" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(ADLMIDI QUIET) ++ find_package(libADLMIDI CONFIG REQUIRED) ++ if(SDL_MIXER_X_STATIC) ++ set(_adlmidi libADLMIDI::ADLMIDI_static) ++ else() ++ set(_adlmidi libADLMIDI::ADLMIDI_shared) ++ endif() ++ get_target_property(ADLMIDI_INCLUDE_DIRS ${_adlmidi} INTERFACE_INCLUDE_DIRECTORIES) ++ set(ADLMIDI_LIBRARIES ${_adlmidi}) ++ set(ADLMIDI_FOUND 1) + message("ADLMIDI: [${ADLMIDI_FOUND}] ${ADLMIDI_INCLUDE_DIRS} ${ADLMIDI_LIBRARIES}") + if(USE_MIDI_ADLMIDI_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DADLMIDI_DYNAMIC=\"${ADLMIDI_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_midi_opn.cmake b/src/codecs/music_midi_opn.cmake +index 34169046fe51bd6d1b27d314733b2a13209b7968..3dc4409dc7ea6b6a340f7082c0567bbf946c9132 100644 +--- a/src/codecs/music_midi_opn.cmake ++++ b/src/codecs/music_midi_opn.cmake +@@ -3,7 +3,15 @@ if(USE_MIDI_OPNMIDI AND MIXERX_GPL) + option(USE_MIDI_OPNMIDI_DYNAMIC "Use dynamical loading of libOPNMIDI library" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(OPNMIDI QUIET) ++ find_package(libOPNMIDI CONFIG REQUIRED) ++ if(SDL_MIXER_X_STATIC) ++ set(_opnmidi libOPNMIDI::OPNMIDI_static) ++ else() ++ set(_opnmidi libOPNMIDI::OPNMIDI_shared) ++ endif() ++ get_target_property(OPNMIDI_INCLUDE_DIRS ${_opnmidi} INTERFACE_INCLUDE_DIRECTORIES) ++ set(OPNMIDI_LIBRARIES ${_opnmidi}) ++ set(OPNMIDI_FOUND 1) + message("OPNMIDI: [${OPNMIDI_FOUND}] ${OPNMIDI_INCLUDE_DIRS} ${OPNMIDI_LIBRARIES}") + if(USE_MIDI_OPNMIDI_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DOPNMIDI_DYNAMIC=\"${OPNMIDI_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_modplug.cmake b/src/codecs/music_modplug.cmake +index 555bcd91574d1c65761121648b331715a5fe8dad..ad065be36cd0176aa7f08631a6df48e857f76e42 100644 +--- a/src/codecs/music_modplug.cmake ++++ b/src/codecs/music_modplug.cmake +@@ -4,7 +4,12 @@ if(USE_MODPLUG) + option(USE_MODPLUG_STATIC "Use linking with a static ModPlug" ON) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(ModPlug QUIET) ++ find_path(ModPlug_INCLUDE_DIRS "modplug.h" PATH_SUFFIXES libmodplug) ++ find_library(ModPlug_LIBRARY_RELEASE NAMES modplug PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) ++ find_library(ModPlug_LIBRARY_DEBUG NAMES modplug PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) ++ include(SelectLibraryConfigurations) ++ select_library_configurations(ModPlug) ++ set(ModPlug_FOUND 1) + message("ModPlug: [${ModPlug_FOUND}] ${ModPlug_INCLUDE_DIRS} ${ModPlug_LIBRARIES}") + if(USE_MODPLUG_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DMODPLUG_DYNAMIC=\"${ModPlug_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_mpg123.cmake b/src/codecs/music_mpg123.cmake +index c615896cd95e2854ced2d4188ea8e0d18870ad91..602a7b136ec135d55839cf7ab103df56357a8a4c 100644 +--- a/src/codecs/music_mpg123.cmake ++++ b/src/codecs/music_mpg123.cmake +@@ -4,7 +4,10 @@ if(USE_MP3_MPG123 AND MIXERX_LGPL) + option(USE_MP3_MPG123_DYNAMIC "Use dynamical loading of MPG123" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(Mpg123 QUIET) ++ find_package(MPG123 CONFIG REQUIRED) ++ get_target_property(MPG123_INCLUDE_DIR MPG123::libmpg123 INTERFACE_INCLUDE_DIRECTORIES) ++ set(MPG123_LIBRARIES MPG123::libmpg123) ++ set(MPG123_FOUND 1) + message("MPG123 found in ${MPG123_INCLUDE_DIR} folder") + if(USE_MP3_MPG123_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DMPG123_DYNAMIC=\"${MPG123_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_ogg.cmake b/src/codecs/music_ogg.cmake +index e7930f9c7e1a583f77306f6838933b991382872f..33a8a59e72e30e3cabd4e834895a23ae7b101324 100644 +--- a/src/codecs/music_ogg.cmake ++++ b/src/codecs/music_ogg.cmake +@@ -1,4 +1,4 @@ +-if(LIBOGG_NEEDED) ++if(0) + if(USE_SYSTEM_AUDIO_LIBRARIES) + find_package(OGG REQUIRED) + else() +diff --git a/src/codecs/music_ogg_vorbis.cmake b/src/codecs/music_ogg_vorbis.cmake +index 475c7ea67663d114a4fc0fef243e15fbf66a00c1..66fa87521c91d1f25fc335b026078b384509dc6a 100644 +--- a/src/codecs/music_ogg_vorbis.cmake ++++ b/src/codecs/music_ogg_vorbis.cmake +@@ -10,7 +10,10 @@ if(USE_OGG_VORBIS) + find_package(Tremor QUIET) + message("Tremor: [${Tremor_FOUND}] ${Tremor_INCLUDE_DIRS} ${Tremor_LIBRARIES}") + else() +- find_package(Vorbis QUIET) ++ find_package(Vorbis CONFIG REQUIRED) ++ get_target_property(Vorbis_INCLUDE_DIRS Vorbis::vorbisfile INTERFACE_INCLUDE_DIRECTORIES) ++ set(Vorbis_LIBRARIES Vorbis::vorbisfile) ++ set(Vorbis_FOUND 1) + message("Vorbis: [${Vorbis_FOUND}] ${Vorbis_INCLUDE_DIRS} ${Vorbis_LIBRARIES}") + endif() + +diff --git a/src/codecs/music_opus.cmake b/src/codecs/music_opus.cmake +index 61fb32e7ec1bcb4e21cb77607399f1f36317c481..44e0b5da00146492a2b34a65ab0c16846b1aeb84 100644 +--- a/src/codecs/music_opus.cmake ++++ b/src/codecs/music_opus.cmake +@@ -3,7 +3,10 @@ if(USE_OPUS) + option(USE_OPUS_DYNAMIC "Use dynamical loading of Opus" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(Opus QUIET) ++ find_package(OpusFile CONFIG REQUIRED) ++ get_target_property(Opus_INCLUDE_DIRS OpusFile::opusfile INTERFACE_INCLUDE_DIRECTORIES) ++ set(Opus_LIBRARIES OpusFile::opusfile) ++ set(Opus_FOUND 1) + message("Opus: [${Opus_FOUND}] ${Opus_INCLUDE_DIRS} ${Opus_LIBRARIES} ${LIBOPUS_LIB}") + if(USE_OPUS_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DOPUS_DYNAMIC=\"${OpusFile_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_wavpack.cmake b/src/codecs/music_wavpack.cmake +index ab841b8c8c9720d50ce15534361cc4ba80e6595d..688f7459789eae14df641e53c003daedc1916c12 100644 +--- a/src/codecs/music_wavpack.cmake ++++ b/src/codecs/music_wavpack.cmake +@@ -3,7 +3,10 @@ if(USE_WAVPACK) + option(USE_WAVPACK_DYNAMIC "Use dynamical loading of WAVPACK" OFF) + + if(USE_SYSTEM_AUDIO_LIBRARIES) +- find_package(WavPack QUIET) ++ find_package(WavPack CONFIG REQUIRED) ++ get_target_property(WavPack_INCLUDE_DIRS WavPack::WavPack INTERFACE_INCLUDE_DIRECTORIES) ++ set(WavPack_LIBRARIES WavPack::WavPack) ++ set(WavPack_FOUND 1) + message("WavPack: [${WavPack_FOUND}] ${WavPack_INCLUDE_DIRS} ${WavPack_LIBRARIES}") + if(USE_WAVPACK_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DWAVPACK_DYNAMIC=\"${WavPack_DYNAMIC_LIBRARY}\") +diff --git a/src/codecs/music_xmp.cmake b/src/codecs/music_xmp.cmake +index 2b41037b9cdb4160515982eb8511500baf9961ce..698c34fa2dc8fb8175d8b1ab61255bd0aa7c9d9f 100644 +--- a/src/codecs/music_xmp.cmake ++++ b/src/codecs/music_xmp.cmake +@@ -19,7 +19,15 @@ if(USE_XMP) + set(XMP_LIBRARIES ${XMPLITE_LIBRARIES}) + set(XMP_FOUND ${XMPLITE_FOUND}) + else() +- find_package(XMP) ++ find_package(libxmp CONFIG REQUIRED) ++ if(SDL_MIXER_X_STATIC) ++ set(_xmp libxmp::xmp_static) ++ else() ++ set(_xmp libxmp::xmp_shared) ++ endif() ++ get_target_property(XMP_INCLUDE_DIRS ${_xmp} INTERFACE_INCLUDE_DIRECTORIES) ++ set(XMP_LIBRARIES ${_xmp}) ++ set(XMP_FOUND 1) + message("XMP: [${XMP_FOUND}] ${XMP_INCLUDE_DIRS} ${XMP_LIBRARIES}") + if(USE_XMP_DYNAMIC) + list(APPEND SDL_MIXER_DEFINITIONS -DXMP_DYNAMIC=\"${XMP_DYNAMIC_LIBRARY}\") +diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in +index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644 +--- a/SDL2_mixer_extConfig.cmake.in ++++ b/SDL2_mixer_extConfig.cmake.in +@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES + + @PACKAGE_INIT@ + ++set(SDL_MIXER_X_USE_OGG_VORBIS @USE_OGG_VORBIS@) ++set(SDL_MIXER_X_USE_OPUS @USE_OPUS@) ++set(SDL_MIXER_X_USE_USE_FLAC @USE_FLAC@) ++set(SDL_MIXER_X_USE_USE_WAVPACK @USE_WAVPACK@) ++set(SDL_MIXER_X_USE_MP3_MPG123 @USE_MP3_MPG123@) ++set(SDL_MIXER_X_USE_XMP @USE_XMP@) ++set(SDL_MIXER_X_USE_MIDI_ADLMIDI @USE_MIDI_ADLMIDI@) ++set(SDL_MIXER_X_USE_MIDI_OPNMIDI @USE_MIDI_OPNMIDI@) ++set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH @USE_MIDI_FLUIDSYNTH@) ++ + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") + endif() + + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") ++ include(CMakeFindDependencyMacro) ++ ++ if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile) ++ find_dependency(Vorbis CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile) ++ find_dependency(OpusFile CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC) ++ find_dependency(FLAC CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack) ++ find_dependency(WavPack CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123) ++ find_dependency(MPG123 CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static) ++ find_dependency(libxmp CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static) ++ find_dependency(libADLMIDI CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static) ++ find_dependency(libOPNMIDI CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth) ++ find_dependency(FluidSynth CONFIG) ++ endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") + endif() diff --git a/ports/sdl2-mixer-ext/portfile.cmake b/ports/sdl2-mixer-ext/portfile.cmake new file mode 100644 index 00000000000000..8a1242081bbaba --- /dev/null +++ b/ports/sdl2-mixer-ext/portfile.cmake @@ -0,0 +1,96 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO WohlSoft/SDL-Mixer-X + REF 1bd1111949036645e92cf0f7aa635e904c590318 + SHA512 b3c87580ff639b015d0e3f00d584878f141896ac812ec036945025416019f7849e952a76135095358f427eb2d04ed8f68fd9721e1869dade78517f7372ad2f9c + HEAD_REF master + PATCHES + fix-dependencies.patch +) + +file(REMOVE + "${SOURCE_PATH}/cmake/find/FindOGG.cmake" # Conflicts with official configurations + "${SOURCE_PATH}/cmake/find/FindFFMPEG.cmake" # Using FindFFMPEG.cmake provided by vcpkg +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libvorbis USE_OGG_VORBIS + opusfile USE_OPUS + libflac USE_FLAC + wavpack USE_WAVPACK + mpg123 USE_MP3_MPG123 + libmodplug USE_MODPLUG + libxmp USE_XMP + libgme USE_GME + ffmpeg USE_FFMPEG + cmd USE_CMD + libadlmidi USE_MIDI_ADLMIDI + libopnmidi USE_MIDI_OPNMIDI + timidity USE_MIDI_TIMIDITY + fluidsynth USE_MIDI_FLUIDSYNTH + nativemidi USE_MIDI_NATIVE_ALT + nativemidi USE_MIDI_NATIVE +) + +if("libadlmidi" IN_LIST FEATURES OR + "libopnmidi" IN_LIST FEATURES OR + "timidity" IN_LIST FEATURES OR + "fluidsynth" IN_LIST FEATURES OR + "nativemidi" IN_LIST FEATURES) + set(USE_MIDI ON) +else() + set(USE_MIDI OFF) +endif() + +if("fluidsynth" IN_LIST FEATURES) + vcpkg_find_acquire_program(PKGCONFIG) + list(APPEND EXTRA_OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${EXTRA_OPTIONS} + -DMIXERX_ENABLE_GPL=ON + -DMIXERX_ENABLE_LGPL=ON + -DUSE_SYSTEM_SDL2=ON + -DUSE_SYSTEM_AUDIO_LIBRARIES=ON + -DUSE_OGG_VORBIS_STB=OFF + -DUSE_DRFLAC=OFF + -DUSE_MP3_DRMP3=OFF + -DUSE_FFMPEG_DYNAMIC=OFF + -DUSE_MIDI=${USE_MIDI} + -DUSE_MIDI_EDMIDI=OFF + -DUSE_MIDI_FLUIDLITE=OFF + MAYBE_UNUSED_VARIABLES + USE_FFMPEG_DYNAMIC + USE_CMD + USE_MIDI_NATIVE + USE_MIDI_NATIVE_ALT +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME SDL2_mixer_ext + CONFIG_PATH lib/cmake/SDL2_mixer_ext) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(LICENSE_FILES + "${SOURCE_PATH}/COPYING.txt" + "${SOURCE_PATH}/GPLv2.txt" + "${SOURCE_PATH}/GPLv3.txt" + "${SOURCE_PATH}/SDL2_mixer_ext.License.txt" +) +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/sdl2-mixer-ext/usage b/ports/sdl2-mixer-ext/usage new file mode 100644 index 00000000000000..4655035fac6963 --- /dev/null +++ b/ports/sdl2-mixer-ext/usage @@ -0,0 +1,4 @@ +sdl2-mixer-ext provides CMake targets: + + find_package(SDL2_mixer_ext CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_mixer_ext::SDL2_mixer_ext,SDL2_mixer_ext::SDL2_mixer_ext_Static>) diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json new file mode 100644 index 00000000000000..dd18c5a5d74eb3 --- /dev/null +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -0,0 +1,121 @@ +{ + "name": "sdl2-mixer-ext", + "version-date": "2023-05-04", + "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", + "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", + "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", + "dependencies": [ + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cmd": { + "description": "Use external command for playing music (Linux only).", + "supports": "linux" + }, + "ffmpeg": { + "description": "Use FFMPEG to play WMA and AAC audio formats.", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false + } + ] + }, + "fluidsynth": { + "description": "Use FluidSynth to play MIDI audio format.", + "dependencies": [ + { + "name": "fluidsynth", + "default-features": false + } + ] + }, + "libadlmidi": { + "description": "Use libADLMIDI to play XMI, MUS, IMF and regular MIDI audio format with OPL3 (YMF262) emulator.", + "dependencies": [ + { + "name": "libadlmidi", + "default-features": false + } + ] + }, + "libflac": { + "description": "Use libflac to play FLAC audio format.", + "dependencies": [ + "libflac" + ] + }, + "libgme": { + "description": "Use libgme to play chip music (AY, GBS, GYM, HES, KSS, NSF/NSFE, SAP, SPC, VGM/VGZ).", + "dependencies": [ + { + "name": "libgme", + "default-features": false + } + ] + }, + "libmodplug": { + "description": "Use libmodplug to play tracker music including exclusive formats (AMS, DMF, DSM, MT2).", + "dependencies": [ + "libmodplug" + ] + }, + "libopnmidi": { + "description": "Use libOPNMIDI to play MIDI and RMI audio format with OPN2 (YM2612) emulator.", + "dependencies": [ + { + "name": "libopnmidi", + "default-features": false + } + ] + }, + "libvorbis": { + "description": "Use libvorbis to play OGG audio format.", + "dependencies": [ + "libvorbis" + ] + }, + "libxmp": { + "description": "Use libxmp to play tracker music including exclusive formats (ABK, DIGI, DTM, EMOD, FLX, FNK, GDM, IMF, J2B, LIQ, M15, MFP, MGT, MMDC, MTN, RTM, SFX, SPM, STIM, STX, WOW).", + "dependencies": [ + { + "name": "libxmp", + "default-features": false + } + ] + }, + "mpg123": { + "description": "Use mpg123 to play MP3 audio format.", + "dependencies": [ + "mpg123" + ] + }, + "nativemidi": { + "description": "Use Native MIDI Player to play MIDI audio format.", + "supports": "windows | osx" + }, + "opusfile": { + "description": "Use opusfile to play Opus audio format.", + "dependencies": [ + "opusfile" + ] + }, + "timidity": { + "description": "Use Timidity to play MIDI audio format." + }, + "wavpack": { + "description": "Use wavpack to play VW audio format.", + "dependencies": [ + "wavpack" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index ee83724ee44aea..246496ec101ebd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7264,6 +7264,10 @@ "baseline": "2.6.3", "port-version": 1 }, + "sdl2-mixer-ext": { + "baseline": "2023-05-04", + "port-version": 0 + }, "sdl2-net": { "baseline": "2.2.0", "port-version": 1 diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json new file mode 100644 index 00000000000000..f12db451ffa7ff --- /dev/null +++ b/versions/s-/sdl2-mixer-ext.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "04312072ef4ea392cb39c240e579f06b4d62b955", + "version-date": "2023-05-04", + "port-version": 0 + } + ] +} From 76fb3e5930e7d96fd0a7d6cc4350cce2c9114aa2 Mon Sep 17 00:00:00 2001 From: robbert-ef Date: Tue, 9 May 2023 23:48:09 +0200 Subject: [PATCH 029/533] [gmp] Fix building for linux x86 (#31339) --- ports/gmp/portfile.cmake | 4 ++++ ports/gmp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 127bbda073a724..09ebd530456b4b 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -65,6 +65,10 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") elseif(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # not exporting asm functions set(disable_assembly ON) +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + vcpkg_list(APPEND OPTIONS "ABI=32") + string(APPEND asmflags " -m32") else() set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") endif() diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 463ba1de211322..2960c09f35f648 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 17, + "port-version": 18, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "license": "LGPL-3.0-only OR GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 246496ec101ebd..c7bb26a4a8761f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2870,7 +2870,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 17 + "port-version": 18 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index ff76049a795e91..0b5fa719d94f14 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efae5abe8271dc5c25bfa47b9cc146a29e02dc05", + "version": "6.2.1", + "port-version": 18 + }, { "git-tree": "82d0d40ea6ffa93a17c696a2c2fac9a436d67958", "version": "6.2.1", From a41e8d1294ab874706bd32dca5fbc44c8b669586 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 9 May 2023 23:49:41 +0200 Subject: [PATCH 030/533] [boinc] Update to 7.22.1 (#31333) Signed-off-by: Vitalii Koshura --- ports/boinc/CMakeLists.txt | 1 + ports/boinc/portfile.cmake | 4 ++-- ports/boinc/vcpkg.json | 2 +- versions/b-/boinc.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/boinc/CMakeLists.txt b/ports/boinc/CMakeLists.txt index f00a67cdf1ef6d..91996a8ab77c79 100644 --- a/ports/boinc/CMakeLists.txt +++ b/ports/boinc/CMakeLists.txt @@ -32,6 +32,7 @@ set(LIBBOINC_HEADERS_APPLE set(LIBBOINC_HEADERS_GENERIC lib/app_ipc.h lib/base64.h + lib/boinc_stdio.h lib/cal_boinc.h lib/cc_config.h lib/cert_sig.h diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index 310146e83c2c75..0de5fb8d3e8626 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.22/7.22.0 - SHA512 f8c87338750605f59f5265fd0bfe2956acfca0c42ef58402df860f0eb9953467ee34286308a916e1d4ee12cbf85c05422558ccdf241ab8f26b86c966f66aec4a + REF client_release/7.22/7.22.1 + SHA512 8b3efc68fe8df8f95a674d9deddbe355da2070a960b1768ee7f9c2afdd8a373e97297715dec5d7daf131d4b5c478afbc4476e152ec516080620f66e1a1f785af HEAD_REF master ) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 362a5b6ad37761..373e06b447a426 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boinc", - "version": "7.22.0", + "version": "7.22.1", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 2b867f4fa95fa3..100cd6a460ae7b 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05fdc41be633efa59debd81ec8a95c584972e54b", + "version": "7.22.1", + "port-version": 0 + }, { "git-tree": "634e281c399c5bdd7f47977241fce65e88faa595", "version": "7.22.0", diff --git a/versions/baseline.json b/versions/baseline.json index c7bb26a4a8761f..c0a1e1dc4fe421 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -609,7 +609,7 @@ "port-version": 0 }, "boinc": { - "baseline": "7.22.0", + "baseline": "7.22.1", "port-version": 0 }, "bond": { From 4d2e253e4290ec234f11b47c23f47a2c1958a24d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 9 May 2023 14:56:22 -0700 Subject: [PATCH 031/533] Avoid recalculating the default msbuild settings. (#31325) * Fix the `vcpkg_install_msbuild` docs to reflect handling of x86==Win32. See: * https://github.com/microsoft/vcpkg/pull/28119#issuecomment-1336270264 * https://github.com/microsoft/vcpkg/issues/28076 * Remove overriding-with-the-default discovered in https://github.com/microsoft/vcpkg/pull/28119#issuecomment-1336270264 hunspell and mp3lame are left alone because they do other things with the resulting variable. * Remove nonexistent reference to `MSBUILD_PLATFORM` variable. * Simplify getting to x86, as discovered in https://github.com/microsoft/vcpkg/pull/28119#issuecomment-1336270264 * Version DB * Whoops patches shouldn't be quoted. * Delete vcpkg_install_msbuild.md Docs changes have been migrated in microsoft/vcpkg-docs#21 * Update ocilib.json * Update ocilib.json --------- Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/3fd/portfile.cmake | 13 ------------- ports/3fd/vcpkg.json | 2 +- ports/ace/portfile.cmake | 8 -------- ports/ace/vcpkg.json | 1 + ports/activemq-cpp/portfile.cmake | 14 +++++--------- ports/activemq-cpp/vcpkg.json | 2 +- ports/easyhook/portfile.cmake | 9 --------- ports/easyhook/vcpkg.json | 2 +- ports/ecsutil/portfile.cmake | 22 +++++++++------------- ports/ecsutil/vcpkg.json | 2 +- ports/ocilib/portfile.cmake | 8 +------- ports/ocilib/vcpkg.json | 1 + ports/rsasynccpp/portfile.cmake | 17 +++++------------ ports/rsasynccpp/vcpkg.json | 2 +- scripts/templates/portfile.in.cmake | 1 - versions/3-/3fd.json | 5 +++++ versions/a-/ace.json | 5 +++++ versions/a-/activemq-cpp.json | 5 +++++ versions/baseline.json | 14 +++++++------- versions/e-/easyhook.json | 5 +++++ versions/e-/ecsutil.json | 5 +++++ versions/o-/ocilib.json | 5 +++++ versions/r-/rsasynccpp.json | 5 +++++ 23 files changed, 69 insertions(+), 84 deletions(-) diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index ae68509292b774..4d467a3c796a75 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -1,14 +1,3 @@ -# Check architecture: -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(BUILD_ARCH "ARM") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - # Check library linkage: vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) @@ -28,14 +17,12 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP: vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj" - PLATFORM ${BUILD_ARCH} USE_VCPKG_INTEGRATION ) elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32: vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "3FD/3FD.vcxproj" - PLATFORM ${BUILD_ARCH} TARGET Build USE_VCPKG_INTEGRATION ) diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json index 5ee8f2d4ecf622..8dbaa3a6708c07 100644 --- a/ports/3fd/vcpkg.json +++ b/ports/3fd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "3fd", "version": "2.6.3", - "port-version": 2, + "port-version": 3, "description": "C++ Framework For Fast Development", "supports": "windows & !static & !arm64", "dependencies": [ diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index c817bc2c256ef4..b2b4af77fca4e1 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -65,12 +65,6 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path("${PERL_PATH}") -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(MSBUILD_PLATFORM "Win32") -else () - set(MSBUILD_PLATFORM "${TRIPLET_SYSTEM_ARCH}") -endif() - # Add ace/config.h file # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html if(VCPKG_TARGET_IS_WINDOWS) @@ -142,7 +136,6 @@ if(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH} LICENSE_SUBPATH COPYING - PLATFORM ${MSBUILD_PLATFORM} SKIP_CLEAN ) @@ -285,7 +278,6 @@ if(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} LICENSE_SUBPATH COPYING - PLATFORM ${MSBUILD_PLATFORM} SKIP_CLEAN ) diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index c0290ba2f2adce..3280d76579ec88 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ace", "version": "7.1.0", + "port-version": 1, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 2950f3fe7b7a2c..2a08698cc66b31 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -1,5 +1,3 @@ -set(VERSION 3.9.5) - set(PATCHES ) if (NOT VCPKG_TARGET_IS_LINUX) set(PATCHES FunctionLevelLinkingOn.diff) @@ -17,7 +15,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES ${PATCHES} ) @@ -65,12 +63,10 @@ else() vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib") endif() - if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") - elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - set(BUILD_ARCH "x64") else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") + set(BUILD_ARCH "${VCPKG_TARGET_ARCHITECTURE}") endif() string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}") @@ -108,13 +104,13 @@ else() endif() endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) - if (ACTIVEMQCPP_SHARED_LIB) + if(ACTIVEMQCPP_SHARED_LIB) file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index 131b974415aea0..54ed5e65c46684 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 11, + "port-version": 12, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", "supports": "!(uwp | osx)", diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index d67dc1d8fd5926..0e4e62c5d2ba11 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -9,14 +9,6 @@ vcpkg_from_github( PATCHES fix-build.patch ) -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" foreach(VCXPROJ IN ITEMS "${SOURCE_PATH}/EasyHookDll/EasyHookDll.vcxproj" @@ -78,7 +70,6 @@ vcpkg_install_msbuild( TARGET EasyHookDll RELEASE_CONFIGURATION "netfx4-Release" DEBUG_CONFIGURATION "netfx4-Debug" - PLATFORM ${BUILD_ARCH} ) # Remove the mismatch rebuild library diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index 0a894137ad4d21..44ba815c74fd98 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyhook", "version": "2.7.7097.0", - "port-version": 5, + "port-version": 6, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", "supports": "windows & !static & !uwp & (x86 | x64)" diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 98f5c2e134500a..438ad5f9e44b1e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) -endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) @@ -24,22 +20,22 @@ vcpkg_from_github( ) vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ECSUtil.sln - PLATFORM ${PLATFORM} + PLATFORM "${TRIPLET_SYSTEM_ARCH}" LICENSE_SUBPATH license.txt TARGET ECSUtil - RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} + RELEASE_CONFIGURATION "${ECSUtil_CONFIGURATION_RELEASE}" + DEBUG_CONFIGURATION "${ECSUtil_CONFIGURATION_DEBUG}" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +file(COPY "${SOURCE_PATH}/ECSUtil" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/ECSUtil/res" "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/ecsutil/vcpkg.json b/ports/ecsutil/vcpkg.json index 9439868dd89237..835190bebb16cd 100644 --- a/ports/ecsutil/vcpkg.json +++ b/ports/ecsutil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ecsutil", "version": "1.0.7.15", - "port-version": 3, + "port-version": 4, "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", "supports": "windows & (x64 | x86) & !uwp", diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index 9636902af9a362..dced1beb25b9ed 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -9,12 +9,6 @@ vcpkg_from_github( if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) - else() - set(PLATFORM x64) - endif() - # There is no debug configuration # As it is a C library, build the release configuration and copy its output to the debug folder set(VCPKG_BUILD_TYPE release) @@ -24,7 +18,7 @@ if(VCPKG_TARGET_IS_WINDOWS) INCLUDES_SUBPATH include LICENSE_SUBPATH LICENSE RELEASE_CONFIGURATION "Release - ANSI" - PLATFORM ${PLATFORM} + PLATFORM "${VCPKG_TARGET_ARCHITECTURE}" USE_VCPKG_INTEGRATION ALLOW_ROOT_INCLUDES) diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 2ed663e6c83684..4dfa2695e7e354 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ocilib", "version": "4.7.5", + "port-version": 1, "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "license": "Apache-2.0", diff --git a/ports/rsasynccpp/portfile.cmake b/ports/rsasynccpp/portfile.cmake index 4fa5cbb8105bc6..db6090c761882e 100644 --- a/ports/rsasynccpp/portfile.cmake +++ b/ports/rsasynccpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO renestein/Rstein.AsyncCpp REF 0.0.7 - SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 + SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 HEAD_REF master ) @@ -26,20 +26,13 @@ else() endif() endif() -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(MSBUILD_PLATFORM "x86") -else () - set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) -endif() - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH RStein.AsyncCppLib.sln LICENSE_SUBPATH LICENSE - PLATFORM ${MSBUILD_PLATFORM} - DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} + PLATFORM "${TRIPLET_SYSTEM_ARCH}" + DEBUG_CONFIGURATION "${DEBUG_CONFIGURATION}" + RELEASE_CONFIGURATION "${RELEASE_CONFIGURATION}" ) file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" diff --git a/ports/rsasynccpp/vcpkg.json b/ports/rsasynccpp/vcpkg.json index b74ead2502a87e..31091d0f92bce9 100644 --- a/ports/rsasynccpp/vcpkg.json +++ b/ports/rsasynccpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsasynccpp", "version": "0.0.7", - "port-version": 1, + "port-version": 2, "maintainers": "Rene Stein ", "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.", "homepage": "https://github.com/renestein/Rstein.AsyncCpp", diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 91b62753b4cd62..2737f91b7ca588 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -13,7 +13,6 @@ # VCPKG_TOOLCHAIN = ON OFF # TRIPLET_SYSTEM_ARCH = arm x86 x64 # BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} # DEBUG_CONFIG = "Debug Static" "Debug Dll" # RELEASE_CONFIG = "Release Static"" "Release DLL" # VCPKG_TARGET_IS_WINDOWS diff --git a/versions/3-/3fd.json b/versions/3-/3fd.json index a4398c8dfd18cc..22d519d54db3d2 100644 --- a/versions/3-/3fd.json +++ b/versions/3-/3fd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bfff492ed0b9ee3f31bb7593443572bc0fcf2d4", + "version": "2.6.3", + "port-version": 3 + }, { "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184", "version": "2.6.3", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index f3bdede54a682d..6f62b3cab5fa46 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df4ee7b5111a86e0bc99f45b39447bff68d102bd", + "version": "7.1.0", + "port-version": 1 + }, { "git-tree": "9a2a1876f2f625494b16da42b27ace343255d691", "version": "7.1.0", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 8ca379d7269dde..8323b6cd772fe8 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8cbff606d12daa3bf08a8fa623c2d524f1e05e5", + "version-semver": "3.9.5", + "port-version": 12 + }, { "git-tree": "8674469ca3e9968a8473861000056e09a190ced4", "version-semver": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index c0a1e1dc4fe421..ad960878341557 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2,7 +2,7 @@ "default": { "3fd": { "baseline": "2.6.3", - "port-version": 2 + "port-version": 3 }, "7zip": { "baseline": "22.01", @@ -26,7 +26,7 @@ }, "ace": { "baseline": "7.1.0", - "port-version": 0 + "port-version": 1 }, "acl": { "baseline": "2.3.1", @@ -34,7 +34,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 11 + "port-version": 12 }, "ade": { "baseline": "0.1.1f", @@ -2230,7 +2230,7 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 5 + "port-version": 6 }, "easyloggingpp": { "baseline": "9.97.0", @@ -2254,7 +2254,7 @@ }, "ecsutil": { "baseline": "1.0.7.15", - "port-version": 3 + "port-version": 4 }, "edflib": { "baseline": "1.24", @@ -5718,7 +5718,7 @@ }, "ocilib": { "baseline": "4.7.5", - "port-version": 0 + "port-version": 1 }, "octomap": { "baseline": "1.9.6", @@ -7082,7 +7082,7 @@ }, "rsasynccpp": { "baseline": "0.0.7", - "port-version": 1 + "port-version": 2 }, "rsig": { "baseline": "0.1.1", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 4c770cc0e6c663..ccd0c73a9d07b9 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8877642f19052e820932928a49049719516ebf9b", + "version": "2.7.7097.0", + "port-version": 6 + }, { "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b", "version": "2.7.7097.0", diff --git a/versions/e-/ecsutil.json b/versions/e-/ecsutil.json index 2ca0f3a19ec636..1b4d83d19db975 100644 --- a/versions/e-/ecsutil.json +++ b/versions/e-/ecsutil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1758edf3915aba62cd6eaf2c70d1401acf663175", + "version": "1.0.7.15", + "port-version": 4 + }, { "git-tree": "9526f049f789b79ac68f8937a9af15da13de53b4", "version": "1.0.7.15", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index b9f09c0c9d61df..2b27bb779176af 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a48c5a6650bc58fdea2fe06d75c3347d89e483a", + "version": "4.7.5", + "port-version": 1 + }, { "git-tree": "e77dfc3008f996ea2defcaf771f46d33d81a4470", "version": "4.7.5", diff --git a/versions/r-/rsasynccpp.json b/versions/r-/rsasynccpp.json index fbd102a5decccb..1a1afbc268bba5 100644 --- a/versions/r-/rsasynccpp.json +++ b/versions/r-/rsasynccpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44c0663e6c7ee48730c4db3336c455e1e45c473a", + "version": "0.0.7", + "port-version": 2 + }, { "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8", "version": "0.0.7", From ff311f676b2eada1504f2fb0529be5ea419c953a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= <70097935+omarhogni@users.noreply.github.com> Date: Tue, 9 May 2023 21:57:10 +0000 Subject: [PATCH 032/533] [Glaze] update (#31319) * Glaze update V1.2.3 * update database * Remove unused flag * update version database --- ports/glaze/portfile.cmake | 4 ++-- ports/glaze/vcpkg.json | 2 +- scripts/ci.baseline.txt | 5 ----- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 80b4dd54d3e844..e487688bf3c525 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,13 +6,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 8016328a347dac7c4826cb5ff944d38b1b32dd2fbfe9080f73e3351d2f3682c06c5500f05b2f2dfda5925af8605469b26f78f2522ff498a2131867edceb7b709 + SHA512 456b49a86dddb5949991050daa8dcfbe47ca55db6746539e14995a19bd2623ab46ac72e08af29f64cb1f3ff79265fb8d824bf9b7744f3cf94e568f27467b6185 ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TESTING=OFF + -Dglaze_DEVELOPER_MODE=OFF ) vcpkg_cmake_install() diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index bbc4d890f501c9..8bbaae3886e3c8 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.2.2", + "version": "1.2.3", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f6b6210154cdaa..e85cb21d0c566c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -500,11 +500,6 @@ gherkin-c:x86-windows = skip gl3w:arm-neon-android=fail gl3w:arm64-android=fail gl3w:x64-android=fail -glaze:arm-neon-android=fail -glaze:arm64-android=fail -glaze:x64-android=fail -glaze:x64-linux=fail -glaze:x64-osx=fail glew:arm-neon-android=fail glew:arm64-android=fail glew:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index ad960878341557..a4f070d04c3a08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2805,7 +2805,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index a5f443606085a4..e015cce5a4348e 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccae5c60306415e7f7bd44e4ebb91b972b550c10", + "version": "1.2.3", + "port-version": 0 + }, { "git-tree": "16c37a75de3f8e60dca6acec5bb868b869cb7e76", "version": "1.2.2", From 602815cba4c4f80f5daa1609e7d346c25aa36194 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 10 May 2023 07:04:38 +0800 Subject: [PATCH 033/533] [uvw] Update to 3.0.0 (#31317) * [uvw] Update to 3.0.0 * update version --- ports/uvw/CMakeLists.txt | 29 ----------------------------- ports/uvw/fix-find-libuv.patch | 19 +++++++++++++++++++ ports/uvw/portfile.cmake | 26 ++++++++++++++++---------- ports/uvw/uvw-config.cmake | 2 -- ports/uvw/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/u-/uvw.json | 5 +++++ 7 files changed, 44 insertions(+), 46 deletions(-) delete mode 100644 ports/uvw/CMakeLists.txt create mode 100644 ports/uvw/fix-find-libuv.patch delete mode 100644 ports/uvw/uvw-config.cmake diff --git a/ports/uvw/CMakeLists.txt b/ports/uvw/CMakeLists.txt deleted file mode 100644 index d768716f7a4ba0..00000000000000 --- a/ports/uvw/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(uvw) - -find_package(libuv CONFIG REQUIRED) - -add_library(uvw INTERFACE) -if (TARGET uv) - target_link_libraries(uvw INTERFACE uv) -else() - target_link_libraries(uvw INTERFACE uv_a) -endif() - -install(TARGETS uvw - EXPORT uvw - INCLUDES DESTINATION include/) - -install(EXPORT uvw - DESTINATION "share/uvw" - FILE uvw-targets.cmake - NAMESPACE uvw::) - -install(DIRECTORY - src/uvw/ - DESTINATION include/uvw/) - -install(FILES - src/uvw.hpp - DESTINATION include/ -) diff --git a/ports/uvw/fix-find-libuv.patch b/ports/uvw/fix-find-libuv.patch new file mode 100644 index 00000000000000..2fc3a91d58c2dc --- /dev/null +++ b/ports/uvw/fix-find-libuv.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 289c006..180383f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -193,6 +193,14 @@ if (BUILD_UVW_LIBS) + SOVERSION ${UVW_VERSION_MAJOR} + ) + endif() ++ ++find_package(libuv CONFIG REQUIRED) ++if (TARGET uv) ++ target_link_libraries(uvw PRIVATE uv) ++else() ++ target_link_libraries(uvw PRIVATE uv_a) ++endif() ++ + install( + EXPORT uvwConfig + NAMESPACE uvw:: diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake index 21145e6f9f1d25..d1802c241c5b3e 100644 --- a/ports/uvw/portfile.cmake +++ b/ports/uvw/portfile.cmake @@ -1,22 +1,28 @@ -#header-only library +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/uvw - REF 3db9e8f75a4351325e1ea00e17586af2b00cf1ea # v2.12.1_libuv_v1.44 - SHA512 35e799fe877abc26ae44d20c9b5b292497d1468d9f89c0fc19b96a0b0712e35084480100e2fe7324353e2c3805c2f018e89192357d974bfd009af9b58bfcb7ec + REF "v${VERSION}_libuv_v1.44" + SHA512 6794d71f88888e58d53fbea18eecb8e43a01f9965012a4b0f3c29bd5dd1280aac8dfe735d3df7f401d309e182fa7ed4e2e0b4aff49beaa1973dcd61153bbb1af + PATCHES + fix-find-libuv.patch ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_UVW_LIBS=${BUILD_STATIC} + -DFETCH_LIBUV=OFF + -DFIND_LIBUV=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/uvw/") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/uvw) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright/readme/package files -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/uvw/uvw-config.cmake b/ports/uvw/uvw-config.cmake deleted file mode 100644 index 3a6d792f9a68ba..00000000000000 --- a/ports/uvw/uvw-config.cmake +++ /dev/null @@ -1,2 +0,0 @@ -find_package(libuv CONFIG REQUIRED) -include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake") diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json index ea974cfb14223a..b499b2ebcf6f45 100644 --- a/ports/uvw/vcpkg.json +++ b/ports/uvw/vcpkg.json @@ -1,8 +1,7 @@ { "name": "uvw", - "version": "2.12.1", - "port-version": 2, - "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", + "version": "3.0.0", + "description": "A compilable static library, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", "license": "MIT", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a4f070d04c3a08..fb6dbb7d4bda3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8241,8 +8241,8 @@ "port-version": 0 }, "uvw": { - "baseline": "2.12.1", - "port-version": 2 + "baseline": "3.0.0", + "port-version": 0 }, "uwebsockets": { "baseline": "20.40.0", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index 048053fbcfbeb1..a6fc4153db01e4 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffc751aa641f583e42aad836b6bd7766661f789a", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "c36c66a8d5f4a6eed4aa9fe4399f32a516d3883c", "version": "2.12.1", From 8ffcb2a78c631e7372a32dfdaae0e02a883e6cc8 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Wed, 10 May 2023 02:34:59 +0300 Subject: [PATCH 034/533] [qt5-declarative] Add d3d12 feature (#31291) --- ports/qt5-declarative/portfile.cmake | 11 +++++++++-- ports/qt5-declarative/vcpkg.json | 24 +++++++++++++++++++++++- versions/baseline.json | 2 +- versions/q-/qt5-declarative.json | 5 +++++ 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index b813567f98ec1b..7ab4aeb3578b24 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -1,5 +1,12 @@ -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH) +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") + +if("d3d12" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS -d3d12) +else() + list(APPEND CORE_OPTIONS -no-d3d12) +endif() + +qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH BUILD_OPTIONS ${CORE_OPTIONS}) if(NOT QT_UPDATE_VERSION) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 3e4c5794b3fa61..ef52ef3c70241c 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-declarative", "version": "5.15.9", + "port-version": 1, "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ @@ -10,5 +11,26 @@ }, "qt5-imageformats", "qt5-svg" - ] + ], + "default-features": [ + "platform-default-features" + ], + "features": { + "d3d12": { + "description": "Provides a Direct3D 12 backend for the scenegraph.", + "supports": "windows" + }, + "platform-default-features": { + "description": "Enable platform-dependent default features", + "dependencies": [ + { + "name": "qt5-declarative", + "features": [ + "d3d12" + ], + "platform": "windows" + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index fb6dbb7d4bda3d..1d9b6a1394c568 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6502,7 +6502,7 @@ }, "qt5-declarative": { "baseline": "5.15.9", - "port-version": 0 + "port-version": 1 }, "qt5-doc": { "baseline": "5.15.9", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index 785bc098b86af5..d178b2371d962f 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3485a7652a098831fc278dd06952308704ed906", + "version": "5.15.9", + "port-version": 1 + }, { "git-tree": "c1e284599a1003dcb722972309215a0e13155f7b", "version": "5.15.9", From 8e591a9cf02867f947f0cbc2dc1eaaa7812d2513 Mon Sep 17 00:00:00 2001 From: freestriker <37498703+freestriker@users.noreply.github.com> Date: Wed, 10 May 2023 07:44:20 +0800 Subject: [PATCH 035/533] [vk-bootstrap] Update to v0.7 (#31285) * Update portfile.cmake use the latest v0.7 tag of package vk-bootstrap * update baseline update to v0.7 tag * Update baseline.json change port-version * Update version and git-tree * ${VERSION} * version --------- Co-authored-by: FrankXie --- ports/vk-bootstrap/portfile.cmake | 4 ++-- ports/vk-bootstrap/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/v-/vk-bootstrap.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/vk-bootstrap/portfile.cmake b/ports/vk-bootstrap/portfile.cmake index c7e041abd3fdb2..fee8029a976af3 100644 --- a/ports/vk-bootstrap/portfile.cmake +++ b/ports/vk-bootstrap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO charles-lunarg/vk-bootstrap - REF 142986cdb767037118b687387b097ff6b3e7fe7d - SHA512 1dc32f09f4548ffaf71d39d5200d60a9bd58971327039f2adb4327fdb885f984bbd91409d28dbfc24e5fdac8c241824e141a2558cddc1b86b84cf2376e7d7567 + REF "v${VERSION}" + SHA512 357ce69b080c6abcef7764652f5ab5e5fc744a9d0308bf457787f27c3c14a911480a7f9caf304ee92c33519bfbc977fb320fa3ef4a329716d0bd1b03135dd98e HEAD_REF master ) diff --git a/ports/vk-bootstrap/vcpkg.json b/ports/vk-bootstrap/vcpkg.json index f0f717701315e2..9b4db0ed7c3e6d 100644 --- a/ports/vk-bootstrap/vcpkg.json +++ b/ports/vk-bootstrap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vk-bootstrap", - "version": "0.5", - "port-version": 1, + "version": "0.7", "description": "Vulkan bootstraping library", "homepage": "https://github.com/charles-lunarg/vk-bootstrap", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1d9b6a1394c568..7827520e46d89d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8365,8 +8365,8 @@ "port-version": 0 }, "vk-bootstrap": { - "baseline": "0.5", - "port-version": 1 + "baseline": "0.7", + "port-version": 0 }, "vkfft": { "baseline": "1.2.31", diff --git a/versions/v-/vk-bootstrap.json b/versions/v-/vk-bootstrap.json index 1eddc88c0abb3b..c4a5b579b29045 100644 --- a/versions/v-/vk-bootstrap.json +++ b/versions/v-/vk-bootstrap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76afd9e4fb4d1ac5c3329b5f2db845a3923d4aa6", + "version": "0.7", + "port-version": 0 + }, { "git-tree": "5b4e562582567c73a3bad2120a3b23e0b6b32dde", "version": "0.5", From e7250fea9fc4a8828a4cdb196f39f286df3204a3 Mon Sep 17 00:00:00 2001 From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com> Date: Tue, 9 May 2023 23:56:27 +0000 Subject: [PATCH 036/533] [libzim]add package (#30758) * libzim: add package update libzim versions libzim:meson ignore xapian * Update ports/libzim/vcpkg.json Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> * Update ports/libzim/portfile.cmake Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> * support both static and dynamic library * modify according to review Update ports/libzim/portfile.cmake Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> add version * only enable release library * make xapian does not support on windows * disable android platform --------- Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> --- ports/libzim/0001-build-share-library.patch | 26 +++++++++++++++ ports/libzim/portfile.cmake | 37 +++++++++++++++++++++ ports/libzim/vcpkg.json | 26 +++++++++++++++ versions/baseline.json | 4 +++ versions/l-/libzim.json | 9 +++++ 5 files changed, 102 insertions(+) create mode 100644 ports/libzim/0001-build-share-library.patch create mode 100644 ports/libzim/portfile.cmake create mode 100644 ports/libzim/vcpkg.json create mode 100644 versions/l-/libzim.json diff --git a/ports/libzim/0001-build-share-library.patch b/ports/libzim/0001-build-share-library.patch new file mode 100644 index 00000000000000..b25326b9715cac --- /dev/null +++ b/ports/libzim/0001-build-share-library.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 6862f75..d887f9a 100644 +--- a/meson.build ++++ b/meson.build +@@ -37,8 +37,6 @@ static_linkage = static_linkage or get_option('default_library')=='static' + lzma_dep = dependency('liblzma', static:static_linkage) + if static_linkage + add_project_arguments('-DLZMA_API_STATIC', language: 'cpp') +-else +- private_conf.set('LIBZIM_EXPORT_DLL', true) + endif + + zstd_dep = dependency('libzstd', static:static_linkage) +@@ -59,6 +57,9 @@ pkg_requires = ['liblzma', 'libzstd'] + if build_machine.system() == 'windows' + extra_link_args = ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-licuuc', '-licuin'] + extra_cpp_args = ['-DSORTPP_PASS'] ++ if not static_linkage ++ extra_cpp_args += ['-DLIBZIM_EXPORT_DLL'] ++ endif + else + extra_link_args = [] + extra_cpp_args = [] +-- +2.37.3.windows.1 + diff --git a/ports/libzim/portfile.cmake b/ports/libzim/portfile.cmake new file mode 100644 index 00000000000000..83bfd7fc3b5703 --- /dev/null +++ b/ports/libzim/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openzim/libzim + REF ${VERSION} + SHA512 4554a9237f5167f6f94aad76ef0e847e949c47c6ee2a89bbd6e587da3b3a3e2d0a8b2d03f7a0fbde0e0dc96fb61bf8c115b3ef3cbd7eff5e880f152bee9b29f0 + HEAD_REF main + PATCHES + 0001-build-share-library.patch +) + +set(EXTRA_OPTIONS "") + +if(NOT "xapian" IN_LIST FEATURES) + list(APPEND EXTRA_OPTIONS "-Dwith_xapian=false") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + list(APPEND EXTRA_OPTIONS "-Dstatic-linkage=false") +else() + list(APPEND EXTRA_OPTIONS "-Dstatic-linkage=true") +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dexamples=false + ${EXTRA_OPTIONS} +) + +vcpkg_install_meson(ADD_BIN_TO_PATH) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libzim/vcpkg.json b/ports/libzim/vcpkg.json new file mode 100644 index 00000000000000..c949aaf4fd0d5d --- /dev/null +++ b/ports/libzim/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libzim", + "version": "8.2.0", + "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.", + "homepage": "https://github.com/openzim/libzim", + "license": "GPL-2.0-or-later", + "supports": "!android", + "dependencies": [ + "icu", + "liblzma", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "zstd" + ], + "features": { + "xapian": { + "description": "Enable xapian support", + "supports": "!(windows & !mingw)", + "dependencies": [ + "xapian" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 7827520e46d89d..736c570b80cdee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4836,6 +4836,10 @@ "baseline": "0.4.41", "port-version": 0 }, + "libzim": { + "baseline": "8.2.0", + "port-version": 0 + }, "libzip": { "baseline": "1.9.2", "port-version": 1 diff --git a/versions/l-/libzim.json b/versions/l-/libzim.json new file mode 100644 index 00000000000000..a0f5cc6ba622b3 --- /dev/null +++ b/versions/l-/libzim.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "93b2790850e120148daf03563e24e6ed3ee9e02e", + "version": "8.2.0", + "port-version": 0 + } + ] +} From f35ba0c785fb34011d3b9b3210630f383dc40543 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 10 May 2023 01:57:10 +0200 Subject: [PATCH 037/533] [luajit] Use common build functions (#30608) * [luajit] Use nmake build setup [skip actions] * [luajit] Use vcpkg_configure/install_make [skip actions] * Cross build with host tools * Host tools must match target bitness * Cleanup * WIP * Don't touch CI baseline now * Less osx quirks * Move msvc header installation to nmake * Simplify MSVC * Add arm and x86 cross build support --- .../004-fix-build-path-and-crt-linkage.patch | 139 -------------- ports/luajit/Makefile.nmake | 20 ++ ports/luajit/configure | 86 +++++++++ ports/luajit/luajit.pc.win.in | 2 +- ports/luajit/msvcbuild.patch | 31 +++ ports/luajit/portfile.cmake | 178 ++++++++---------- ports/luajit/vcpkg.json | 35 +++- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 + 9 files changed, 251 insertions(+), 247 deletions(-) delete mode 100644 ports/luajit/004-fix-build-path-and-crt-linkage.patch create mode 100644 ports/luajit/Makefile.nmake create mode 100755 ports/luajit/configure create mode 100644 ports/luajit/msvcbuild.patch diff --git a/ports/luajit/004-fix-build-path-and-crt-linkage.patch b/ports/luajit/004-fix-build-path-and-crt-linkage.patch deleted file mode 100644 index 5d3aaeaaeb4e3b..00000000000000 --- a/ports/luajit/004-fix-build-path-and-crt-linkage.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index d323d8d..6e61150 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -15,19 +15,20 @@ - @setlocal - @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK - @set DEBUGCFLAGS= --@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline -+@set SOURCEDIR=%1 -+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR% - @set LJLINK=link /nologo - @set LJMT=mt /nologo - @set LJLIB=lib /nologo /nodefaultlib --@set DASMDIR=..\dynasm -+@set DASMDIR=%SOURCEDIR%\..\dynasm - @set DASM=%DASMDIR%\dynasm.lua --@set DASC=vm_x64.dasc -+@set DASC=%SOURCEDIR%\vm_x64.dasc - @set LJDLLNAME=lua51.dll - @set LJLIBNAME=lua51.lib - @set BUILDTYPE=release --@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c -+@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c %SOURCEDIR%\lib_buffer.c - --%LJCOMPILE% host\minilua.c -+%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:minilua.exe minilua.obj - @if errorlevel 1 goto :BAD -@@ -38,20 +39,20 @@ if exist minilua.exe.manifest^ - @set LJARCH=x64 - @minilua - @if errorlevel 8 goto :X64 --@set DASC=vm_x86.dasc -+@set DASC=%SOURCEDIR%\vm_x86.dasc - @set DASMFLAGS=-D WIN -D JIT -D FFI - @set LJARCH=x86 - @set LJCOMPILE=%LJCOMPILE% /arch:SSE2 - :X64 - @if "%1" neq "nogc64" goto :GC64 - @shift --@set DASC=vm_x86.dasc -+@set DASC=%SOURCEDIR%\vm_x86.dasc - @set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64 - :GC64 --minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% -+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %DASC% - @if errorlevel 1 goto :BAD - --%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c -+%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:buildvm.exe buildvm*.obj - @if errorlevel 1 goto :BAD -@@ -60,41 +61,44 @@ if exist buildvm.exe.manifest^ - - buildvm -m peobj -o lj_vm.obj - @if errorlevel 1 goto :BAD --buildvm -m bcdef -o lj_bcdef.h %ALL_LIB% -+buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m ffdef -o lj_ffdef.h %ALL_LIB% -+buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m libdef -o lj_libdef.h %ALL_LIB% -+buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m recdef -o lj_recdef.h %ALL_LIB% -+buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB% -+buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% - @if errorlevel 1 goto :BAD --buildvm -m folddef -o lj_folddef.h lj_opt_fold.c -+buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c - @if errorlevel 1 goto :BAD - --@if "%1" neq "debug" goto :NODEBUG -+@if "%2"=="static" set CRT_LINKAGE=/MT -+@if "%2"=="dynamic" set CRT_LINKAGE=/MD -+@set LJLINK=%LJLINK% /debug -+@if "%3" neq "debug" goto :NODEBUG - @shift - @set BUILDTYPE=debug - @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% --@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no -+@set CRT_LINKAGE=%CRT_LINKAGE%d - :NODEBUG - @set LJLINK=%LJLINK% /%BUILDTYPE% --@if "%1"=="amalg" goto :AMALGDLL --@if "%1"=="static" goto :STATIC --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c -+@if "%3"=="amalg" goto :AMALGDLL -+@if "%3"=="static" goto :STATIC -+%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :STATIC --%LJCOMPILE% lj_*.c lib_*.c -+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :AMALGDLL --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c -+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj - @if errorlevel 1 goto :BAD -@@ -102,7 +106,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c - if exist %LJDLLNAME%.manifest^ - %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 - --%LJCOMPILE% luajit.c -+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% - @if errorlevel 1 goto :BAD -@@ -110,8 +114,8 @@ if exist luajit.exe.manifest^ - %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe - - @del *.obj *.manifest minilua.exe buildvm.exe --@del host\buildvm_arch.h --@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h -+@del %SOURCEDIR%\host\buildvm_arch.h -+@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h - @echo. - @echo === Successfully built LuaJIT for Windows/%LJARCH% === - -@@ -124,4 +128,5 @@ if exist luajit.exe.manifest^ - @goto :END - :FAIL - @echo You must open a "Visual Studio Command Prompt" to run this script -+exit 1 - :END diff --git a/ports/luajit/Makefile.nmake b/ports/luajit/Makefile.nmake new file mode 100644 index 00000000000000..5dadd97351ca76 --- /dev/null +++ b/ports/luajit/Makefile.nmake @@ -0,0 +1,20 @@ +all: + @echo _CL_ = $(_CL_) + @echo _LINK_ = $(_LINK_) + cd src && .\msvcbuild.bat $(MSVCBUILD_OPTIONS) + +install: src/luajit.exe + -mkdir "$(INSTALLDIR)" + -mkdir "$(INSTALLDIR)\bin" + copy src\luajit.exe "$(INSTALLDIR)\bin\" + if exist src\lua51.dll copy src\lua51.dll "$(INSTALLDIR)\bin\" + -mkdir "$(INSTALLDIR)\lib" + copy src\lua51.lib "$(INSTALLDIR)\lib\" + -mkdir "$(INSTALLDIR)\include" + -mkdir "$(INSTALLDIR)\include\luajit" + copy src/lua.h "$(INSTALLDIR)\include\luajit\" + copy src/luajit.h "$(INSTALLDIR)\include\luajit\" + copy src/luaconf.h "$(INSTALLDIR)\include\luajit\" + copy src/lualib.h "$(INSTALLDIR)\include\luajit\" + copy src/lauxlib.h "$(INSTALLDIR)\include\luajit\" + copy src/lua.hpp "$(INSTALLDIR)\include\luajit\" diff --git a/ports/luajit/configure b/ports/luajit/configure new file mode 100755 index 00000000000000..49171aa39f652d --- /dev/null +++ b/ports/luajit/configure @@ -0,0 +1,86 @@ +#!/bin/sh + +set -e + +LJARCH= +LUAJIT_BUILDMODE= +LUAJIT_BUILDVM_X= +LUAJIT_DASM_ARCHS= +LUAJIT_PREFIX= +for OPTION; do + case "${OPTION}" in + --prefix=*) + LUAJIT_PREFIX="${OPTION#--prefix=}" + ;; + BUILDMODE=*) + LUAJIT_BUILDMODE="${OPTION#BUILDMODE=}" + ;; + BUILDVM_X=*) + LUAJIT_BUILDVM_X="${OPTION#BUILDVM_X=}" + ;; + DASM_ARCHS=*) + LUAJIT_DASM_ARCHS="${OPTION#DASM_ARCHS=}" + ;; + LJARCH=*) + LJARCH="${OPTION#LJARCH=}" + ;; + esac +done + +cat > Makefile.vcpkg < [-m32] -E src/lj_arch.h -dM' +TARGET_TESTARCH_COMMON += 'LJ_LE 1' 'LJ_HASJIT 1' 'LJ_HASFFI 1' 'LJ_ARCH_HASFPU 1' 'LJ_ABI_SOFTFP 0' +TARGET_TESTARCH_COMMON_32 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 32' +TARGET_TESTARCH_COMMON_64 += \$(TARGET_TESTARCH_COMMON) 'LJ_ARCH_BITS 64' 'LJ_TARGET_GC64 1' +TARGET_TESTARCH_arm = \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_ARM +TARGET_TESTARCH_arm64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_ARM64 'LJ_ARCH_VERSION 80' +TARGET_TESTARCH_x86 = \$(TARGET_TESTARCH_COMMON_32) LJ_TARGET_X86 +TARGET_TESTARCH_x64 = \$(TARGET_TESTARCH_COMMON_64) LJ_TARGET_X64 'LJ_DUALNUM 1' 'LJ_FR2 1' + +all: + \$(MAKE) clean \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) + \$(MAKE) all \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) + for DA in \$(DASM_ARCHS); do \\ + rm -f src/host/buildvm_arch.h src/host/*.o; \\ + case "\$\$DA" in \\ + arm) TARGET_TESTARCH="\$(TARGET_TESTARCH_arm)" ;; \\ + arm64) TARGET_TESTARCH="\$(TARGET_TESTARCH_arm64)" ;; \\ + x86) TARGET_TESTARCH="\$(TARGET_TESTARCH_x86)" ;; \\ + x64) TARGET_TESTARCH="\$(TARGET_TESTARCH_x64)" ;; \\ + esac ; \\ + \$(MAKE) -C src host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX) \$(COMMON_OPTIONS) \$(BUILD_OPTIONS) \\ + BUILDVM_T=host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX) "TARGET_TESTARCH=\$\${TARGET_TESTARCH}" \\ + || exit 1; \\ + done + +install: + \$(MAKE) install \$(COMMON_OPTIONS) + for DA in \$(DASM_ARCHS); do \\ + mkdir -p "\$\${DESTDIR}\$(BUILDVM_PREFIX)"; \\ + install -m 0755 "src/host/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX)" "\$\${DESTDIR}\$(BUILDVM_PREFIX)/buildvm-\$\$DA\$(EXECUTABLE_SUFFIX)" || exit 1 ; \\ + done + +END_MAKEFILE diff --git a/ports/luajit/luajit.pc.win.in b/ports/luajit/luajit.pc.win.in index 56c0c5783af24b..b90d065426b03a 100644 --- a/ports/luajit/luajit.pc.win.in +++ b/ports/luajit/luajit.pc.win.in @@ -6,7 +6,7 @@ version=${majver}.${minver}.${relver}-beta3 abiver=51 prefix=@PREFIX@ -multilib=@LJIT_LIBDIR@ +multilib=lib exec_prefix=${prefix} libdir=${exec_prefix}/${multilib} libname=lua${abiver} diff --git a/ports/luajit/msvcbuild.patch b/ports/luajit/msvcbuild.patch new file mode 100644 index 00000000000000..8e2e756d8bcd6b --- /dev/null +++ b/ports/luajit/msvcbuild.patch @@ -0,0 +1,31 @@ +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat +index aab4ef1..e92c486 100644 +--- a/src/msvcbuild.bat ++++ b/src/msvcbuild.bat +@@ -79,10 +79,9 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c + @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% + @set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no + :NODEBUG +-@set LJLINK=%LJLINK% /%BUILDTYPE% + @if "%1"=="amalg" goto :AMALGDLL + @if "%1"=="static" goto :STATIC +-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c ++%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c /Fdlua51.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj + @if errorlevel 1 goto :BAD +@@ -102,7 +101,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c + if exist %LJDLLNAME%.manifest^ + %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 + +-%LJCOMPILE% luajit.c ++%LJCOMPILE% luajit.c /Fdluajit.pdb + @if errorlevel 1 goto :BAD + %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% + @if errorlevel 1 goto :BAD +@@ -124,4 +123,5 @@ if exist luajit.exe.manifest^ + @goto :END + :FAIL + @echo You must open a "Visual Studio Command Prompt" to run this script ++@exit 1 + :END diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index c272e9b1e93bfe..4688fcb2983e50 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -1,7 +1,6 @@ +set(extra_patches "") if (VCPKG_TARGET_IS_OSX) - set (LJIT_PATCHES 005-do-not-pass-ld-e-macosx.patch) -else() - set (LJIT_PATCHES "") + list(APPEND extra_patches 005-do-not-pass-ld-e-macosx.patch) endif() vcpkg_from_github( @@ -11,124 +10,95 @@ vcpkg_from_github( SHA512 e4111b2d7eeb05676c62d69da13a380a51d98f082c0be575a414c09ee27ff17d101b5b4a95e1b8a1bad14d55a4d2b305718a11878fbf36e0d3d48e62ba03407f HEAD_REF master PATCHES + msvcbuild.patch 003-do-not-set-macosx-deployment-target.patch - 004-fix-build-path-and-crt-linkage.patch - ${LJIT_PATCHES} + ${extra_patches} ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set (LJIT_STATIC "") - set (LJIT_MSVC_PC_CFLAGS "/DLUA_BUILD_AS_DLL=1") -else() - set (LJIT_STATIC "static") - set (LJIT_MSVC_PC_CFLAGS "") -endif() +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") -if(VCPKG_TARGET_IS_OSX) - set(MACOSX_DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}") - set(TARGET_ARCHITECTURE "${VCPKG_TARGET_ARCHITECTURE}") - if(TARGET_ARCHITECTURE STREQUAL x64) - set(TARGET_ARCHITECTURE x86_64) +if(VCPKG_DETECTED_MSVC) + # Due to lack of better MSVC cross-build support, just always build the host + # minilua tool with the target toolchain. This will work for native builds and + # for targeting x86 from x64 hosts. (UWP and ARM64 is unsupported.) + vcpkg_list(SET options) + set(PKGCONFIG_CFLAGS "") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND options "MSVCBUILD_OPTIONS=static") + else() + set(PKGCONFIG_CFLAGS "/DLUA_BUILD_AS_DLL=1") endif() - list(APPEND MACOSX_ARCHITECTURES "TARGET_CFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin") - list(APPEND MACOSX_ARCHITECTURES "TARGET_LDFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin") -endif() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - LOGNAME build-${TARGET_TRIPLET}-dbg - ) + vcpkg_install_nmake(SOURCE_PATH "${SOURCE_PATH}" + PROJECT_NAME "${CMAKE_CURRENT_LIST_DIR}/Makefile.nmake" + OPTIONS + ${options} + ) - # Note that luajit's build system responds to failure by producing no output; in particular a likely outcome is - # only 'minilua.exe' being produced. This resulted in: - # https://github.com/microsoft/vcpkg/pull/25856#issuecomment-1214285736 - # Please ensure luajit.exe is actually produced when making future changes. - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - set(LJIT_LIBDIR "debug/lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY) + if(NOT VCPKG_BUILD_TYPE) configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" @ONLY) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") - endif() - vcpkg_copy_pdbs() - else() - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clean-${TARGET_TRIPLET}-debug - ) - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-debug - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" "multilib=lib" "multilib=debug/lib") endif() -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - message(STATUS "Building ${TARGET_TRIPLET}-rel") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - - if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_execute_required_process_repeat( - COUNT 1 - COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - LOGNAME build-${TARGET_TRIPLET}-rel + vcpkg_copy_pdbs() +else() + vcpkg_list(SET options) + if(VCPKG_CROSSCOMPILING) + list(APPEND options + "LJARCH=${VCPKG_TARGET_ARCHITECTURE}" + "BUILDVM_X=${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/buildvm-${VCPKG_TARGET_ARCHITECTURE}${VCPKG_HOST_EXECUTABLE_SUFFIX}" ) + endif() - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - set(LJIT_LIBDIR "lib") - configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY) + vcpkg_list(SET make_options "EXECUTABLE_SUFFIX=${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_IS_OSX) + vcpkg_list(APPEND make_options "TARGET_SYS=Darwin") + elseif(VCPKG_TARGET_IS_IOS) + vcpkg_list(APPEND make_options "TARGET_SYS=iOS") + elseif(VCPKG_TARGET_IS_LINUX) + vcpkg_list(APPEND make_options "TARGET_SYS=Linux") + elseif(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND make_options "TARGET_SYS=Windows") + endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - vcpkg_copy_tools(TOOL_NAMES luajit SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools AUTO_CLEAN) - endif() - vcpkg_copy_pdbs() - else() - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME clean-${TARGET_TRIPLET}-rel - ) - vcpkg_execute_build_process( - COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}-rel - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua") + set(dasm_archs "") + if("buildvm-32" IN_LIST FEATURES) + string(APPEND dasm_archs " arm x86") + endif() + if("buildvm-64" IN_LIST FEATURES) + string(APPEND dasm_archs " arm64 x64") endif() -endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" + COPY_SOURCE + OPTIONS + "BUILDMODE=${VCPKG_LIBRARY_LINKAGE}" + ${options} + OPTIONS_RELEASE + "DASM_ARCHS=${dasm_archs}" + ) + vcpkg_install_make( + MAKEFILE "Makefile.vcpkg" + OPTIONS + ${make_options} + "TARGET_AR=${VCPKG_DETECTED_CMAKE_AR} rcus" + "TARGET_STRIP=${VCPKG_DETECTED_CMAKE_STRIP}" + ) endif() -file(INSTALL "${SOURCE_PATH}/src/lua.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/luajit.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/luaconf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/lualib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/lauxlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/src/lua.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/lua" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/lua" + "${CURRENT_PACKAGES_DIR}/share/lua" + "${CURRENT_PACKAGES_DIR}/share/man" +) + +vcpkg_copy_tools(TOOL_NAMES luajit AUTO_CLEAN) vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT") diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 91f54602f04930..6eb2ddc091b305 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,11 +1,28 @@ { "name": "luajit", "version-date": "2023-01-04", + "port-version": 1, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", - "supports": "!uwp", + "supports": "!uwp & !(arm64 & windows)", "dependencies": [ + { + "name": "luajit", + "host": true, + "features": [ + "buildvm-64" + ], + "platform": "!native & (arm64 | x64) & (!windows | mingw)" + }, + { + "name": "luajit", + "host": true, + "features": [ + "buildvm-32" + ], + "platform": "!native & ((arm & !arm64) | x86) & (!windows | mingw)" + }, { "name": "vcpkg-cmake", "host": true @@ -13,6 +30,20 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ], + "features": { + "buildvm-32": { + "description": "Install host tools for 32 bit targets", + "supports": "native & ((arm & !arm64) | x86) & (!windows | mingw)" + }, + "buildvm-64": { + "description": "Install host tools for 64 bit targets", + "supports": "native & (arm64 | x64) & (!windows | mingw)" } - ] + } } diff --git a/versions/baseline.json b/versions/baseline.json index 736c570b80cdee..e4e22d302edd1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4954,7 +4954,7 @@ }, "luajit": { "baseline": "2023-01-04", - "port-version": 0 + "port-version": 1 }, "luasec": { "baseline": "1.3.1", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 88937b7053a4e1..b1e59fa1a56b1a 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a564decc9569af8e940353cab9623b6f93f3a4b", + "version-date": "2023-01-04", + "port-version": 1 + }, { "git-tree": "3c7f639efd41b49e93c61ae54fd99bb332d80bf9", "version-date": "2023-01-04", From e1cdda71f61c57bd615eb82217652dc7a55d7d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 10 May 2023 01:58:41 +0200 Subject: [PATCH 038/533] [qttools] copy traget tools only if they exists. (#30442) They do not exist if you crosscompile qt --- ports/qttools/portfile.cmake | 9 ++++++--- ports/qttools/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qttools.json | 5 +++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index e42f50ef463fbc..bb46599a62d529 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -98,9 +98,12 @@ if(VCPKG_TARGET_IS_OSX) list(APPEND OSX_APP_FOLDERS qdbusviewer.app) endif() foreach(_appfolder IN LISTS OSX_APP_FOLDERS) - message(STATUS "Moving: ${_appfolder}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") + # Folders are only existing in case of native builds + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}") + message(STATUS "Moving: ${_appfolder}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") + endif() endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 849875d76b2224..4d3aba05510f60 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qttools", "version": "6.5.0", + "port-version": 1, "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e4e22d302edd1d..b58292a28d6fca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6798,7 +6798,7 @@ }, "qttools": { "baseline": "6.5.0", - "port-version": 0 + "port-version": 1 }, "qttranslations": { "baseline": "6.5.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 08e13092e4fd79..02c8cfb38dee56 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98c6a3ef4410b89a77895592986355c43674a881", + "version": "6.5.0", + "port-version": 1 + }, { "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347", "version": "6.5.0", From 512d62f7ee117ccf3176a8acf96a0a6ce7a22dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= Date: Wed, 10 May 2023 02:08:28 +0200 Subject: [PATCH 039/533] [vcpkg.cmake] Fix CMP0126 warnings (#23784) (#29969) When running CMake 3.21 or newer in trace or debug mode, vcpkg.cmake would trigger the CMP0126 warning for VCPKG_MANIFEST_DIR and VCPKG_INSTALLED_DIR. The regular variable was used to set the initial value of the cache variable of the same name. This patch adds the regular variables Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE and Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE that are used to initialize their respective cache variables. --- scripts/buildsystems/vcpkg.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 15496ce45a5f11..739495fb7ef069 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -56,12 +56,13 @@ if(VCPKG_PREFER_SYSTEM_LIBS) endif() # Manifest options and settings +set(Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE "${VCPKG_MANIFEST_DIR}") if(NOT DEFINED VCPKG_MANIFEST_DIR) if(EXISTS "${CMAKE_SOURCE_DIR}/vcpkg.json") - set(VCPKG_MANIFEST_DIR "${CMAKE_SOURCE_DIR}") + set(Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE "${CMAKE_SOURCE_DIR}") endif() endif() -set(VCPKG_MANIFEST_DIR "${VCPKG_MANIFEST_DIR}" +set(VCPKG_MANIFEST_DIR "${Z_VCPKG_MANIFEST_DIR_INITIAL_VALUE}" CACHE PATH "The path to the vcpkg manifest directory." FORCE) if(DEFINED VCPKG_MANIFEST_DIR AND NOT VCPKG_MANIFEST_DIR STREQUAL "") @@ -392,16 +393,16 @@ if(NOT Z_VCPKG_ROOT_DIR) endif() if(DEFINED VCPKG_INSTALLED_DIR) - # do nothing + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${VCPKG_INSTALLED_DIR}") elseif(DEFINED _VCPKG_INSTALLED_DIR) - set(VCPKG_INSTALLED_DIR "${_VCPKG_INSTALLED_DIR}") + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${_VCPKG_INSTALLED_DIR}") elseif(VCPKG_MANIFEST_MODE) - set(VCPKG_INSTALLED_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed") + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${CMAKE_BINARY_DIR}/vcpkg_installed") else() - set(VCPKG_INSTALLED_DIR "${Z_VCPKG_ROOT_DIR}/installed") + set(Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE "${Z_VCPKG_ROOT_DIR}/installed") endif() -set(VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" +set(VCPKG_INSTALLED_DIR "${Z_VCPKG_INSTALLED_DIR_INITIAL_VALUE}" CACHE PATH "The directory which contains the installed libraries for each triplet" FORCE) set(_VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" From dad60afdaa65aa9cf4347d99cf5619c06b0041f9 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 11 May 2023 02:09:36 +0800 Subject: [PATCH 040/533] [uwebsockets] update to 20.41.0 (#31371) --- ports/uwebsockets/portfile.cmake | 2 +- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 13da419e021f2f..4648282d84ad12 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 2fa0172d262e5c5e4333cee92c34f01f97441960753a19c9f91806ce3b412622292372b6f5401416033695dbb094ba19f61c316856e8ddff0cb02c4c12458f93 + SHA512 55e4643fa61da40a872c94731b3e057eea107d09ac0b9affa032f1abdecc169dc64fcfebbfffb111bb2ffc2bdd91f6a118856a1af33eb2c93c605913a151465c HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 0dee479976dbbc..ab2f326f600319 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.40.0", + "version-semver": "20.41.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b58292a28d6fca..2c7ac46506d3a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8249,7 +8249,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "20.40.0", + "baseline": "20.41.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index aee5a0b4dbd0b1..762bc7fc705254 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b0f3943b2e6e8260c638dc75c430d4975b87999", + "version-semver": "20.41.0", + "port-version": 0 + }, { "git-tree": "93461a35ff4e9611909379c0e64a1b22213a1c57", "version-semver": "20.40.0", From 75144f581dc479eaf241312275387eae6bb1244c Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 11 May 2023 02:11:05 +0800 Subject: [PATCH 041/533] [xtensor] update to 0.24.6 (#31369) --- ports/xsimd/portfile.cmake | 6 ++-- ports/xsimd/vcpkg.json | 2 +- ...fix-find-tbb-and-install-destination.patch | 33 +++++++++++++++++++ ports/xtensor/portfile.cmake | 8 +++-- ports/xtensor/vcpkg.json | 2 +- ports/xtl/portfile.cmake | 6 ++-- ports/xtl/vcpkg.json | 4 +-- versions/baseline.json | 8 ++--- versions/x-/xsimd.json | 5 +++ versions/x-/xtensor.json | 5 +++ versions/x-/xtl.json | 5 +++ 11 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 ports/xtensor/fix-find-tbb-and-install-destination.patch diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index cc72510dacb38b..521152764059f6 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd - REF 9.0.1 - SHA512 ed56287f608ccdf5bc5d5fc2918e313e7c4cecdd9ef2c9993a72ea900d9ff662c57ac5326c7a809eb11505c6f39d4599f3f161b97b6e03c65783b824b8d700d2 + REF "${VERSION}" + SHA512 bd7a363bbebc9196954c8c87271f14f05ca177569fcf080dac91be06ad2801c43fccbb385afd700b80d58c83d77f26ba199a7105672e4a1e55c517d15dd6e8e3 HEAD_REF master ) @@ -28,4 +28,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json index 898f22f99b1c4a..3f91ddc618956d 100644 --- a/ports/xsimd/vcpkg.json +++ b/ports/xsimd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xsimd", - "version": "9.0.1", + "version": "10.0.0", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", "license": "BSD-3-Clause", diff --git a/ports/xtensor/fix-find-tbb-and-install-destination.patch b/ports/xtensor/fix-find-tbb-and-install-destination.patch new file mode 100644 index 00000000000000..51ac35e1e90e33 --- /dev/null +++ b/ports/xtensor/fix-find-tbb-and-install-destination.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7535649..5c93655 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,8 +75,8 @@ if(XTENSOR_USE_XSIMD) + endif() + + if(XTENSOR_USE_TBB) +- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") +- find_package(TBB REQUIRED) ++ #set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") ++ find_package(TBB CONFIG REQUIRED) + message(STATUS "Found intel TBB: ${TBB_INCLUDE_DIRS}") + endif() + +@@ -261,7 +261,7 @@ export(EXPORT ${PROJECT_NAME}-targets + install(FILES ${XTENSOR_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor) + +-set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE ++set(XTENSOR_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE + STRING "install path for xtensorConfig.cmake") + + configure_package_config_file(${PROJECT_NAME}Config.cmake.in +@@ -288,7 +288,7 @@ configure_file(${PROJECT_NAME}.pc.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" + @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + # Write single include + # ==================== diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index 2cd7a14dfb4989..77f102032ff6fe 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor - REF 0.24.3 - SHA512 3519541ce659d800dca386cdbb4c7aa5331e5297779239230cbfb78b22c541af22a98aae30a9e8604ee855378fa8e67be720dab1e0005135575d9738e64797c8 + REF "${VERSION}" + SHA512 6284fb5de5d61c87a8599baad86b6c8c95d06d3753698a3a49efe9a87c291965e4a2439c84abf0722ce97ca7e48c5fdb0b64141f1bc8de7a7d06b7de9ec06cb6 HEAD_REF master + PATCHES + fix-find-tbb-and-install-destination.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -34,4 +36,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json index 4185f4cc93ee88..91edd794842934 100644 --- a/ports/xtensor/vcpkg.json +++ b/ports/xtensor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xtensor", - "version": "0.24.3", + "version": "0.24.6", "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", "license": "BSD-3-Clause", diff --git a/ports/xtl/portfile.cmake b/ports/xtl/portfile.cmake index 92805da5739413..2c131853159261 100644 --- a/ports/xtl/portfile.cmake +++ b/ports/xtl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtl - REF e0f00666d90086bb245ae73abb6123d0e2c1b30b # 0.7.2 - SHA512 d7a552dc4e43a3270a56c57fde8fdc48a108909d4fa1e3fdd7ab12b178b3e271ed4d89aac9fd184e2739ddacfb3b5cb248538ed50a0ba56e740875c0faf5aa62 + REF "${VERSION}" + SHA512 fb447334f68f255d7d28c9202eee2cec70d007c1031f3756a6acd0cc019c0d95ed1d12ec63f2e9fb3df184f9ec305e6a3c808bb88c1e3eb922916ad059d2e856 HEAD_REF master PATCHES fix-fixup-cmake.patch @@ -25,4 +25,4 @@ vcpkg_fixup_pkgconfig() 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") diff --git a/ports/xtl/vcpkg.json b/ports/xtl/vcpkg.json index 852ce3427b8568..29d3dadc0d541d 100644 --- a/ports/xtl/vcpkg.json +++ b/ports/xtl/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xtl", - "version": "0.7.2", - "port-version": 1, + "version": "0.7.5", "description": "The x template library", "homepage": "https://github.com/xtensor-stack/xtl", + "license": "BSD-3-Clause", "dependencies": [ "nlohmann-json", { diff --git a/versions/baseline.json b/versions/baseline.json index 2c7ac46506d3a2..e4ad688bc7283b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8705,11 +8705,11 @@ "port-version": 2 }, "xsimd": { - "baseline": "9.0.1", + "baseline": "10.0.0", "port-version": 0 }, "xtensor": { - "baseline": "0.24.3", + "baseline": "0.24.6", "port-version": 0 }, "xtensor-blas": { @@ -8725,8 +8725,8 @@ "port-version": 1 }, "xtl": { - "baseline": "0.7.2", - "port-version": 1 + "baseline": "0.7.5", + "port-version": 0 }, "xtrans": { "baseline": "1.4.0", diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 9059dbc12ab543..4392a23c2e84fc 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c67f06803f30a45e0dc0db77378869d4c3067a0", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "be6cd49ae57f84d0d66692b388c2ee0ce25cd0e0", "version": "9.0.1", diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json index 8871db52b84662..3a836ce093d90b 100644 --- a/versions/x-/xtensor.json +++ b/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeb0efc2bdf326191f5dff18bb2506690902b162", + "version": "0.24.6", + "port-version": 0 + }, { "git-tree": "474191556a342fc77b9defef9ba63a4dcf2205c4", "version": "0.24.3", diff --git a/versions/x-/xtl.json b/versions/x-/xtl.json index 06d85fb16a1f4e..978bdc9b90b2fd 100644 --- a/versions/x-/xtl.json +++ b/versions/x-/xtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5cad9625b1b7459135265c4f8647b2bcae0e252", + "version": "0.7.5", + "port-version": 0 + }, { "git-tree": "8255a333f114b449c2578ec70e91970eace40598", "version": "0.7.2", From 5cbbfb9e81edafdfeb580a9bd5929033ca13073f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 May 2023 20:12:07 +0200 Subject: [PATCH 042/533] [libgit2] fix support expressions (#31365) --- ports/libgit2/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libgit2.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index beba21e29cd365..4bd677a567bf34 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgit2", "version-semver": "1.4.2", - "port-version": 1, + "port-version": 2, "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", @@ -49,7 +49,7 @@ }, "sectransp": { "description": "SSL support (sectransp)", - "supports": "!osx" + "supports": "osx" }, "ssh": { "description": "SSH support via libssh2", diff --git a/versions/baseline.json b/versions/baseline.json index e4ad688bc7283b..93f248e9277ecc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4034,7 +4034,7 @@ }, "libgit2": { "baseline": "1.4.2", - "port-version": 1 + "port-version": 2 }, "libgme": { "baseline": "0.6.3", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 472f701a485b3e..89d46278aaabaf 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5c636f8eb77d7d68c2a4b41fcd7d68759fb9ad0", + "version-semver": "1.4.2", + "port-version": 2 + }, { "git-tree": "53a1a7485857995d3b4cc5a2b6eaa22d6c6b036c", "version-semver": "1.4.2", From 7402bdc4c287d7b7d43ddca726de475d5d37d4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Wed, 10 May 2023 20:14:42 +0200 Subject: [PATCH 043/533] [benchmark] Update Google Benchmark to v1.8.0 (#31356) --- ports/benchmark/portfile.cmake | 6 +++--- ports/benchmark/vcpkg.json | 2 +- versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 8e8cef31422b29..c0391f7e1fcbcb 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.7.1 - SHA512 396af1c1d3eaa2b78c6d23b1472f6088db85a294056ae1c2366dc5c0becdc8f141ba8fc3a235033324ab0a41c2298f5d242ef09b9b6f69d9877de6bcb2062efd - HEAD_REF master + REF v1.8.0 + SHA512 ae8df163ca1319752a03497a259800dc33c71164e7def2feeadcf18d018c64eaf846ea2a562183e3d3cde0af58291de0b091ec6d9c025076f469c403b2ab0d51 + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 279c2663daf72f..2cc12d063a787f 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.7.1", + "version-semver": "1.8.0", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "license": "Apache-2.0", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 61e53ffd237dfc..a398f90189caa2 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faeb0b56e68483860ab8cc468a6c594ac361167f", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "2b8e34d5f083c7c674469078f5e80521e3b77d58", "version-semver": "1.7.1", diff --git a/versions/baseline.json b/versions/baseline.json index 93f248e9277ecc..ba880197e0c75e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -505,7 +505,7 @@ "port-version": 3 }, "benchmark": { - "baseline": "1.7.1", + "baseline": "1.8.0", "port-version": 0 }, "bento4": { From 7f7ac83c24c8cc4fbf2de767675678c791b47f8f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 10 May 2023 11:15:16 -0700 Subject: [PATCH 044/533] [azure-security-keyvault-*-cpp] Update to May Release (#31353) * [azure-security-keyvault-certificates-cpp] Update to 4.2.0 ## 4.2.0 (2023-05-09) ### Features Added - Added support for challenge-based and multi-tenant authentication. * [azure-security-keyvault-secrets-cpp] Update to 4.2.0 ## 4.2.0 (2023-05-09) ### Features Added - Added support for challenge-based and multi-tenant authentication. * [azure-security-keyvault-keys-cpp] Update to 4.4.0 ## 4.4.0 (2023-05-09) ### Features Added - Added support for challenge-based and multi-tenant authentication. ### Bugs Fixed - [3366](https://github.com/Azure/azure-sdk-for-cpp/issues/4466) Fixed the user-agent string sent to the service to include the "keys" suffix in the value, when using `CryptographyClient`. --- .../azure-security-keyvault-certificates-cpp/portfile.cmake | 6 +++--- ports/azure-security-keyvault-certificates-cpp/vcpkg.json | 4 ++-- ports/azure-security-keyvault-keys-cpp/portfile.cmake | 6 +++--- ports/azure-security-keyvault-keys-cpp/vcpkg.json | 4 ++-- ports/azure-security-keyvault-secrets-cpp/portfile.cmake | 6 +++--- ports/azure-security-keyvault-secrets-cpp/vcpkg.json | 4 ++-- versions/a-/azure-security-keyvault-certificates-cpp.json | 5 +++++ versions/a-/azure-security-keyvault-keys-cpp.json | 5 +++++ versions/a-/azure-security-keyvault-secrets-cpp.json | 5 +++++ versions/baseline.json | 6 +++--- 10 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index cd0d8c43820f2a..2c8d0408e3e774 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.1.0 - SHA512 fc07f48d82d0475b28a62ce9de386433908d94b00678cd89c8310cdb6f8dd3e0e973936191f10be08af7b0293b7b434223c3682de4a06f0b4b067baf37e8e0b3 + REF azure-security-keyvault-certificates_4.2.0 + SHA512 bcfbeb47bbf0871113be3a7704b519af2b3209304be8f9c29874325e8efd3e4e440706aae1f86139076097b31e3777b85e3c9b01861bc5ace9113645d8a97260 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index dc1aec87a7e9ba..0b69efb1caa348 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.1.0", + "version-semver": "4.2.0", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 9c8413d7fdb01e..b33975db40bb3b 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.3.0 - SHA512 e2c6555d5c89c73c015356de1fbda3274186000710ba75d85b233a3b00bd50b7ee9ea0c527aa408503ba9781dffe7b849a5c3e6e239d41187e7752663e43b9ea + REF azure-security-keyvault-keys_4.4.0 + SHA512 00fc21a1ecf4b40543a1a381777970739579f3384392cdb9a2eb44563d05a5ac648f797cb5198df27f74cd4b45d341b06e45f552ed2a878f2cfd50f3461ad4fd ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index 2d1ae6215534b5..c754a70e6bf75e 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.3.0", + "version-semver": "4.4.0", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index d5e16e3435c410..5f5b3bf01dd933 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.1.0 - SHA512 82deeda461aaac3d38adcf1080ecd0b8883dfb6c5e9db6b86deaac2e6d683dac3e97998afeb9a1657da715f9e46f25f9b9a6c4938ade0a1979b1136291d66e7f + REF azure-security-keyvault-secrets_4.2.0 + SHA512 1f464e60f9cb234bb28c3daa5abb0a27fdb9c75327f7eb84b3d5215524457aae9b6c64617a35175341afcaf0da39373190c867fb1d5a1780b9395062a7420aaa ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/ + SOURCE_PATH "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index 95bfc889e0737c..943a299cfedade 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.1.0", + "version-semver": "4.2.0", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" + "version>=": "1.9.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index b12d34b709e207..d5da42e8d65de5 100644 --- a/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f480f2686c90dc9985e9c827ecc2f3c086985f0", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "4f575471af05af66923fe548074d30f1aa0fdc2c", "version-semver": "4.1.0", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index f21e164fed2b2a..0e151e398859f8 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "404efdca4682f39039fe7e76541db56b6cab3e3e", + "version-semver": "4.4.0", + "port-version": 0 + }, { "git-tree": "f4d8db5aff7d24803e3a2605d3bf3051343fb9a0", "version-semver": "4.3.0", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index d985aa4e378d1c..c15689d0f38243 100644 --- a/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a795e3eddbe6ced53ba732f9793679e78d79d359", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "7b5d805e78f564ff27138c6f005175979b6740c6", "version-semver": "4.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index ba880197e0c75e..8b7d5881aef9c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -421,15 +421,15 @@ "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.3.0", + "baseline": "4.4.0", "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "azure-storage-blobs-cpp": { From 2270334cdf1d1ef6fb77c5d178627f9c0a361380 Mon Sep 17 00:00:00 2001 From: Michael <73815580+michaelmigliore@users.noreply.github.com> Date: Wed, 10 May 2023 20:16:12 +0200 Subject: [PATCH 045/533] [usd] update to v23.05 (#31344) --- ports/usd/portfile.cmake | 13 ++++--------- ports/usd/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/u-/usd.json | 5 +++++ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index 60439d3ba258e3..7ba53a44444b27 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -1,5 +1,5 @@ # Don't file if the bin folder exists. We need exe and custom files. -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) message(STATUS [=[ The usd port does not work the the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines, @@ -16,20 +16,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/USD REF "v${USD_VERSION}" - SHA512 2529aec788cab3ff4c47041f5bc0043fde81dcef8ca313f6390f2e5fb7a10b1b0b1dd47fd6c86e3b4cfc0a1b27bff4d9b94b96bfba6bec3d5ff8f6e2fccb9e11 + SHA512 fd3e7a90f837a5d016d94be34747b2c1daed3f01f252e4b1aa5cb195f32acaecca9373b8f5c7be9c235148f04b0afa47da9462b357ef1dd1e11cf20a7225ae66 HEAD_REF master PATCHES fix_build-location.patch ) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") - -IF (VCPKG_TARGET_IS_WINDOWS) -ELSE() +if(NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE ${SOURCE_PATH}/cmake/modules/FindTBB.cmake) -ENDIF() +endif() vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index b90d7f9adb6296..aa10eaf5a8121e 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "usd", - "version": "23.2", - "port-version": 1, + "version": "23.5", "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 8b7d5881aef9c8..70b5023eb5e872 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8205,8 +8205,8 @@ "port-version": 3 }, "usd": { - "baseline": "23.2", - "port-version": 1 + "baseline": "23.5", + "port-version": 0 }, "usockets": { "baseline": "0.8.5", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 507b91d7961c10..1b163da1cea196 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9", + "version": "23.5", + "port-version": 0 + }, { "git-tree": "9db13a48bde68c5107143c6a68fb50b6b71b8483", "version": "23.2", From c74f727971c17c6cdf42b40a9256d3809a1e67e7 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 11 May 2023 02:17:14 +0800 Subject: [PATCH 046/533] [taskflow] Update version to 3.6.0 (#31342) * [taskflow] Update version to 3.6.0 * version --- ports/taskflow/portfile.cmake | 6 +++--- ports/taskflow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/taskflow.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index fc38b85886f02b..2455b5db01a793 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF v3.5.0 - SHA512 0e80a96eacce05cb09eb3e75634ba9f27c86d84b56903897e954e04fa68cadc3c2fe69857f8dc60da330c9abd5e4c7e1164f3c5f695ad8bb38a1ccbc001f8652 + REF "v${VERSION}" + SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8 HEAD_REF master ) @@ -25,4 +25,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Taskflow) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/taskflow/vcpkg.json b/ports/taskflow/vcpkg.json index 05a196997aea3d..bc1d048345281f 100644 --- a/ports/taskflow/vcpkg.json +++ b/ports/taskflow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "taskflow", - "version": "3.5.0", + "version": "3.6.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", "homepage": "https://github.com/taskflow/taskflow", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 70b5023eb5e872..495d35b4882585 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7805,7 +7805,7 @@ "port-version": 2 }, "taskflow": { - "baseline": "3.5.0", + "baseline": "3.6.0", "port-version": 0 }, "tbb": { diff --git a/versions/t-/taskflow.json b/versions/t-/taskflow.json index 38343bf24aeb53..52f470e421d81c 100644 --- a/versions/t-/taskflow.json +++ b/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce89c70566c24ddbcaf7ddb1ee9dc3101c3c30e0", + "version": "3.6.0", + "port-version": 0 + }, { "git-tree": "fd5f9c87cc440939ef97da59cbd47bd044851751", "version": "3.5.0", From 11cbc119f371384e0f168c538a1e7d79e30f82b1 Mon Sep 17 00:00:00 2001 From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com> Date: Thu, 11 May 2023 02:18:34 +0800 Subject: [PATCH 047/533] [xapian] update version to 1.4.22 (#31338) --- ports/xapian/portfile.cmake | 15 +++++++-------- ports/xapian/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/x-/xapian.json | 5 +++++ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ports/xapian/portfile.cmake b/ports/xapian/portfile.cmake index bd41b1b97f4ae1..0e647ffbd399e9 100644 --- a/ports/xapian/portfile.cmake +++ b/ports/xapian/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz - FILENAME xapian-core-1.4.21.tar.xz - SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a + URLS https://oligarchy.co.uk/xapian/1.4.22/xapian-core-1.4.22.tar.xz + FILENAME xapian-core-1.4.22.tar.xz + SHA512 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29 ) vcpkg_extract_source_archive( @@ -12,11 +12,10 @@ vcpkg_extract_source_archive( if(WIN32) vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "z zlib zdll" "z zlib zdll zlibd") - # xapian does not support debug lib on Windows - # if use `set(VCPKG_BUILD_TYPE release)` ，the vcpkg post check can not passed， - # it will throw exception "Mismatching number of debug and release binaries. Found 0 for debug but 1 for release." - # that means the `set(VCPKG_BUILD_TYPE release)` can not be used in the WIN32 environment. - if(VCPKG_BUILD_TYPE STREQUAL "release") + if(MSVC) + # xapian.h has _DEBUG macro detection which will make the vcpkg check fail,replace #error with #warning + vcpkg_replace_string("${SOURCE_PATH}/include/xapian/version_h.cc" "#error" "#warning") + set(OPTIONS "CXXFLAGS=-EHsc") endif() endif() diff --git a/ports/xapian/vcpkg.json b/ports/xapian/vcpkg.json index d185f263b95d0b..68ede6530915c3 100644 --- a/ports/xapian/vcpkg.json +++ b/ports/xapian/vcpkg.json @@ -1,9 +1,8 @@ { "name": "xapian", - "version": "1.4.21", - "port-version": 1, + "version": "1.4.22", "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)", - "homepage": "https://github.com/xapian/xapian", + "homepage": "https://xapian.org/", "license": "GPL-2.0-or-later", "supports": "!(windows & arm) & !uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 495d35b4882585..0c3af37c664334 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8601,8 +8601,8 @@ "port-version": 0 }, "xapian": { - "baseline": "1.4.21", - "port-version": 1 + "baseline": "1.4.22", + "port-version": 0 }, "xaudio2redist": { "baseline": "1.2.11", diff --git a/versions/x-/xapian.json b/versions/x-/xapian.json index 31672ba282450c..e74f6ae9efc7cb 100644 --- a/versions/x-/xapian.json +++ b/versions/x-/xapian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2da71ae6ceb7c0d2317c1d06f11a302f48f89dd", + "version": "1.4.22", + "port-version": 0 + }, { "git-tree": "88d78609c12312fdd2b7260e1c4c1fb3838373b7", "version": "1.4.21", From 2f1d20a769be58f1d10288cecf9fa62ec4e1dfc9 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 11 May 2023 02:27:54 +0800 Subject: [PATCH 048/533] [numcpp] update to 2.10.1 (#26482) * [NumCpp] update to 2.8.0 * update version * [numcpp] update to 2.10.1 * update vcpkg.json * update version --- ports/numcpp/portfile.cmake | 6 +++--- ports/numcpp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/n-/numcpp.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/numcpp/portfile.cmake b/ports/numcpp/portfile.cmake index e2dce207f88e81..da4b7c30fd6a9f 100644 --- a/ports/numcpp/portfile.cmake +++ b/ports/numcpp/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dpilger26/NumCpp - REF Version_2.6.0 - SHA512 4D057941F4CB541CFAA56E4188C865DFC1804CA1B2203422B9EB7D7E8EE43CCB15DC5109DA5C932234E6055B6A5554D877347FA7CAEC5EA619A2975A56D2B16C + REF "Version_${VERSION}" + SHA512 8474e38b2522b52235b38abb556c60284b7c44861b450f310bfa1a66938053006e47dde9106c73dad843bf049a2dd8988cbe2d2ba747a86f548c1f356f39e081 HEAD_REF master ) @@ -17,4 +17,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME NumCpp CONFIG_PATH share/NumCpp/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/numcpp/vcpkg.json b/ports/numcpp/vcpkg.json index d93591882171e7..900d372ae78889 100644 --- a/ports/numcpp/vcpkg.json +++ b/ports/numcpp/vcpkg.json @@ -1,11 +1,12 @@ { "name": "numcpp", - "version": "2.6.0", + "version": "2.10.1", "description": "C++ implementation of the Python Numpy library", "homepage": "https://dpilger26.github.io/NumCpp", "license": "MIT", "dependencies": [ "boost-algorithm", + "boost-date-time", "boost-endian", "boost-integer", "boost-math", diff --git a/versions/baseline.json b/versions/baseline.json index 0c3af37c664334..2456fba907241b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5653,7 +5653,7 @@ "port-version": 1 }, "numcpp": { - "baseline": "2.6.0", + "baseline": "2.10.1", "port-version": 0 }, "nuspell": { diff --git a/versions/n-/numcpp.json b/versions/n-/numcpp.json index 6d168e28a70f67..11c11ca2614eed 100644 --- a/versions/n-/numcpp.json +++ b/versions/n-/numcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99f0dc5efa2ee18b46af92901b34426516cf3390", + "version": "2.10.1", + "port-version": 0 + }, { "git-tree": "648047125e8e78a10fec23ab02b10037197206a6", "version": "2.6.0", From b049e49516585e90dc347612048c78da3198cf9e Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 11 May 2023 02:40:02 +0800 Subject: [PATCH 049/533] [libsbml] Update to 5.20.0 (#31149) * [libsbml] Update to 5.20.0 * update version * fix incorrect option * update version * install usage * update version * apply suggestions * update version * fix depends libxml2 * update version --- ports/libsbml/fix-deps-libxml.patch | 38 +++++++++++++++++++++++++++++ ports/libsbml/libsbml-config.cmake | 6 +++++ ports/libsbml/portfile.cmake | 18 +++++++++++--- ports/libsbml/usage | 4 +++ ports/libsbml/vcpkg.json | 6 ++--- versions/baseline.json | 4 +-- versions/l-/libsbml.json | 5 ++++ 7 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 ports/libsbml/fix-deps-libxml.patch create mode 100644 ports/libsbml/libsbml-config.cmake create mode 100644 ports/libsbml/usage diff --git a/ports/libsbml/fix-deps-libxml.patch b/ports/libsbml/fix-deps-libxml.patch new file mode 100644 index 00000000000000..1b30586d26eb1c --- /dev/null +++ b/ports/libsbml/fix-deps-libxml.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42b3bd6..34e9a4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -442,17 +442,15 @@ endif(WITH_EXPAT) + set(USE_LIBXML OFF) + if(WITH_LIBXML) + +- find_package(LIBXML REQUIRED) ++ find_package(LibXml2 REQUIRED) + + add_definitions( -DUSE_LIBXML ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML) + set(USE_LIBXML ON) + +- set(LIBSBML_XML_LIBRARY "libxml2") +- set(LIBSBML_XML_LIBRARY_INCLUDE ${LIBXML_INCLUDE_DIR}) +- set(LIBSBML_XML_LIBRARY_LIBS ${LIBXML_LIBRARY}) ++ set(LIBSBML_XML_LIBRARY "LibXml2::LibXml2") ++ set(LIBSBML_XML_LIBRARY_LIBS ${LIBSBML_XML_LIBRARY}) + +- list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindLIBXML.cmake") + + endif(WITH_LIBXML) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 79301a6..985f6cb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -423,7 +423,7 @@ if(WITH_LIBXML) + sbml/xml/LibXMLParser.h + sbml/xml/LibXMLTranscode.h + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2) + + endif(WITH_LIBXML) + diff --git a/ports/libsbml/libsbml-config.cmake b/ports/libsbml/libsbml-config.cmake new file mode 100644 index 00000000000000..76a1cf6372ce8a --- /dev/null +++ b/ports/libsbml/libsbml-config.cmake @@ -0,0 +1,6 @@ +include(CMakeFindDependencyMacro) +find_dependency(libsbml-static CONFIG) +if(NOT TARGET libsbml) + add_library(libsbml INTERFACE IMPORTED) + target_link_libraries(libsbml INTERFACE libsbml-static) +endif() diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index e4961abb2b2c2a..8bfe6c8e964d49 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -1,13 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sbmlteam/libsbml - REF 118ffbf11f1a5245cc544c1eac71019d979ecb20 #libSBML-5.19.0 - SHA512 7fe8b4d594876c6408e01c646187cb1587d0b4e12707a43286150d4e4646841e547bde971de917de1cdfbbb9365172aeac43c8e02f7d354400f9166f0f1c2c3d + REF "v${VERSION}" + SHA512 c40f164ebd05a36f140ce2684dedb4bbccc51a2732383d3935fca1258738a9b9ba5bc1be2061f3b113b213e5cbb7fe22e9dca43ff78d91964c79cad093e55466 HEAD_REF development + PATCHES + fix-deps-libxml.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LIBRARY) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -53,11 +56,17 @@ vcpkg_cmake_configure( -DENABLE_L3V2EXTENDEDMATH:BOOL=ON -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME} -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY} + -DLIBSBML_SKIP_STATIC_LIBRARY=${DYNAMIC_LIBRARY} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME libsbml-static CONFIG_PATH lib/cmake) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libsbml-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endif() vcpkg_copy_pdbs() @@ -84,5 +93,6 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.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") vcpkg_fixup_pkgconfig() diff --git a/ports/libsbml/usage b/ports/libsbml/usage new file mode 100644 index 00000000000000..a9e155c1a1ae70 --- /dev/null +++ b/ports/libsbml/usage @@ -0,0 +1,4 @@ +libsbml provides CMake targets: + + find_package(libsbml CONFIG REQUIRED) + target_link_libraries(main PRIVATE libsbml) diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index 4d63730231f081..42281404d53910 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsbml", - "version": "5.19.0", - "port-version": 2, + "version": "5.20.0", "description": "A library for reading / writing SBML files", + "homepage": "https://github.com/sbmlteam/libsbml", + "license": "LGPL-2.1", "supports": "!uwp", "dependencies": [ { @@ -16,7 +17,6 @@ ], "default-features": [ "comp", - "expat", "fbc", "groups", "layout", diff --git a/versions/baseline.json b/versions/baseline.json index 2456fba907241b..47bdd5a82df955 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4461,8 +4461,8 @@ "port-version": 1 }, "libsbml": { - "baseline": "5.19.0", - "port-version": 2 + "baseline": "5.20.0", + "port-version": 0 }, "libsbsms": { "baseline": "2.3.0", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 2f488b14479334..544d754823acf5 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b592087185a6576e30cc29e129bec77d12c4aeb", + "version": "5.20.0", + "port-version": 0 + }, { "git-tree": "9793402aaa4679187a9a703f189239544e3daf77", "version": "5.19.0", From 281cfd338c8c82ca9dcfc9ce1d4871aa3c4b85a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 10 May 2023 21:31:11 +0200 Subject: [PATCH 050/533] [arrow] Update to 12.0.0 (#31321) * [arrow] Update to 12.0.0 * Update versions --- ports/arrow/portfile.cmake | 8 ++------ ports/arrow/vcpkg.json | 9 ++++----- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 76050129c88f17..63d340228f5d36 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 46df4fb5a703d38d0a74fde9838e9f9702b24b442cb225517516c335a5ab18955699000bf0b2fc7d1698ada6d2e890ba3860933b6280f5160b0fce8a07484d0e + SHA512 f815be4fb20b6001ba5525270765fe239b5468708a7be34b93b60ee0ce63464727d183c9756fbc33bffd199019e1f06a7fddd306ce8388435cea7771070a2ca9 ) vcpkg_extract_source_archive( SOURCE_PATH @@ -15,6 +15,7 @@ vcpkg_extract_source_archive( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + acero ARROW_ACERO csv ARROW_CSV cuda ARROW_CUDA dataset ARROW_DATASET @@ -27,7 +28,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS orc ARROW_ORC parquet ARROW_PARQUET parquet PARQUET_REQUIRE_ENCRYPTION - plasma ARROW_PLASMA s3 ARROW_S3 ) @@ -98,10 +98,6 @@ if("example" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") endif() -if("plasma" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 1f571e8cdf06b1..262203f3e67d58 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "11.0.0", + "version": "12.0.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -37,6 +37,9 @@ "parquet" ], "features": { + "acero": { + "description": "Acero support" + }, "csv": { "description": "CSV support" }, @@ -102,10 +105,6 @@ "rapidjson" ] }, - "plasma": { - "description": "Plasma support", - "supports": "!windows" - }, "s3": { "description": "S3 support", "dependencies": [ diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 07c7ef67cb27c1..f7bbe94b4f9145 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "881bfaaab349dae46929b36e5b84e7036a009ad3", + "version": "12.0.0", + "port-version": 0 + }, { "git-tree": "21fea47a1e9c7bf68e6c088ad5a6b7b6e33c2fcb", "version": "11.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 47bdd5a82df955..5785f60378cb4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -217,7 +217,7 @@ "port-version": 4 }, "arrow": { - "baseline": "11.0.0", + "baseline": "12.0.0", "port-version": 0 }, "arsenalgear": { From d163f9d5f55bac7743abf89c86b7ab3ce26e3175 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Wed, 10 May 2023 21:36:01 +0200 Subject: [PATCH 051/533] [hnswlib] backport CMake targets (#31305) * [hnswlib] backport CMake targets * download cmake changes as patch * add patch file --- ports/hnswlib/cmake.patch | 44 ++++++++++++++++++++++++++++++++++++ ports/hnswlib/portfile.cmake | 20 ++++++++++++---- ports/hnswlib/usage | 4 ---- ports/hnswlib/vcpkg.json | 13 ++++++++++- versions/baseline.json | 2 +- versions/h-/hnswlib.json | 5 ++++ 6 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 ports/hnswlib/cmake.patch delete mode 100644 ports/hnswlib/usage diff --git a/ports/hnswlib/cmake.patch b/ports/hnswlib/cmake.patch new file mode 100644 index 00000000000000..7e5be49eec08e2 --- /dev/null +++ b/ports/hnswlib/cmake.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7cebe60..b2aecc8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,36 @@ +-cmake_minimum_required (VERSION 2.6) +-project(hnsw_lib ++cmake_minimum_required(VERSION 3.0...3.26) ++ ++project(hnswlib + LANGUAGES CXX) + ++include(GNUInstallDirs) ++ + add_library(hnswlib INTERFACE) +-target_include_directories(hnswlib INTERFACE .) ++add_library(hnswlib::hnswlib ALIAS hnswlib) ++ ++target_include_directories(hnswlib INTERFACE ++ $ ++ $) ++ ++# Install ++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hnswlib ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + ++install(TARGETS hnswlib ++ EXPORT hnswlibTargets) ++ ++install(EXPORT hnswlibTargets ++ FILE hnswlibConfig.cmake ++ NAMESPACE hnswlib:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hnswlib) ++ ++# Examples and tests + if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ++ option(HNSWLIB_EXAMPLES "Build examples and tests." ON) ++else() ++ option(HNSWLIB_EXAMPLES "Build examples and tests." OFF) ++endif() ++if(HNSWLIB_EXAMPLES) + set(CMAKE_CXX_STANDARD 11) + + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/ports/hnswlib/portfile.cmake b/ports/hnswlib/portfile.cmake index cf150d766bc9f9..4d1379ef4fe1ca 100644 --- a/ports/hnswlib/portfile.cmake +++ b/ports/hnswlib/portfile.cmake @@ -1,12 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nmslib/hnswlib - REF 359b2ba87358224963986f709e593d799064ace6 # v0.7.0 - SHA512 59a0c02bbe8f7389a2ecad9188a76eb3847b719a213d306093753c04e4eeb11d95e8e310aa03888364be475a2f2e6e7976bd81117517eef81eff2983379ac743 + REF "v${VERSION}" + SHA512 fd74c23040598973d7e0b5a6af73eb884ee2d30703187d1702fdd48eaf8f7f96d8fbb125d3763f90111d9fb7c5ab3434ebdb818da8717d35c5571e99083c812b HEAD_REF master + PATCHES + cmake.patch # Backport CMake targets from nmslib/hnswlib #446 to 0.7.0 release. ) -file(COPY "${SOURCE_PATH}/hnswlib" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DHNSWLIB_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hnswlib) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/hnswlib/usage b/ports/hnswlib/usage deleted file mode 100644 index 3ef3d72f9ba64e..00000000000000 --- a/ports/hnswlib/usage +++ /dev/null @@ -1,4 +0,0 @@ -hnswlib is header-only and can be used from CMake via: - - find_path(HNSWLIB_INCLUDE_DIRS "hnswlib/hnswlib.h") - target_include_directories(main PRIVATE ${HNSWLIB_INCLUDE_DIRS}) diff --git a/ports/hnswlib/vcpkg.json b/ports/hnswlib/vcpkg.json index 94e35819276942..72b6c82932af74 100644 --- a/ports/hnswlib/vcpkg.json +++ b/ports/hnswlib/vcpkg.json @@ -1,7 +1,18 @@ { "name": "hnswlib", "version": "0.7.0", + "port-version": 1, "description": "Header-only library for fast approximate nearest neighbors", "homepage": "https://github.com/nmslib/hnswlib", - "license": "Apache-2.0" + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5785f60378cb4a..e5d7fd9cb9e316 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3130,7 +3130,7 @@ }, "hnswlib": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "hps": { "baseline": "2022-01-18", diff --git a/versions/h-/hnswlib.json b/versions/h-/hnswlib.json index 1ed277d6806819..7bc1c41cc35de5 100644 --- a/versions/h-/hnswlib.json +++ b/versions/h-/hnswlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "497030f03d37d63ff86c9e99d24d9e8f048ea067", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "7053d263445d46410589894d921fa6c85fbf107c", "version": "0.7.0", From 222409d3a457abfad0e643d1c0108bfabde968df Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 12 May 2023 01:03:00 +0800 Subject: [PATCH 052/533] [sfml] Support for Release-only build (#31372) * support release-only * update version * update portfile.cmake * update git-tree * update sfml * update version * undo previous step * update verison --------- Co-authored-by: Monica --- ports/sfml/portfile.cmake | 14 ++++++++------ ports/sfml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sfml.json | 5 +++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index f3379806d730a1..c187321e0e18ab 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML - REF 2.5.1 + REF "${VERSION}" HEAD_REF master SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 PATCHES @@ -32,17 +32,19 @@ vcpkg_copy_pdbs() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") file(GLOB FILES "${CURRENT_PACKAGES_DIR}/share/sfml/SFML*Targets-*.cmake") foreach(FILE ${FILES}) vcpkg_replace_string("${FILE}" "/lib/sfml-main" "/lib/manual-link/sfml-main") endforeach() endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/sfml-main-d.lib") +endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) -configure_file("${SOURCE_PATH}/license.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.md") diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index ba297ad701c105..3dc5a482414f08 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 14, + "port-version": 15, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index e5d7fd9cb9e316..f997a4ca733182 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7338,7 +7338,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 14 + "port-version": 15 }, "sfsexp": { "baseline": "1.3.1", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index dc814d0bfec3f3..f7de9517b8c81f 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477c029a9588d5f24c19fd0b6dbc82813fdc2150", + "version": "2.5.1", + "port-version": 15 + }, { "git-tree": "8ab010b7ce899203149c75197c19380506984683", "version": "2.5.1", From 2c7ca69fb1ab04fe0476481bbfb108820466ad40 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 12 May 2023 01:04:04 +0800 Subject: [PATCH 053/533] [openblas] Update version to 0.3.23 (#31367) * [openblas] Update version to 0.3.23 * version * remove patch * version * new function * version * end line * v db --- ports/openblas/fix-space-path.patch | 43 ----------------------------- ports/openblas/portfile.cmake | 7 ++--- ports/openblas/uwp.patch | 16 +++++------ ports/openblas/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/o-/openblas.json | 5 ++++ 6 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 ports/openblas/fix-space-path.patch diff --git a/ports/openblas/fix-space-path.patch b/ports/openblas/fix-space-path.patch deleted file mode 100644 index e0944fadd6f59c..00000000000000 --- a/ports/openblas/fix-space-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake -index 60b7637..a8b34ef 100644 ---- a/cmake/prebuild.cmake -+++ b/cmake/prebuild.cmake -@@ -1322,14 +1322,14 @@ else(NOT CMAKE_CROSSCOMPILING) - - set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build") - set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}") -- file(MAKE_DIRECTORY ${GETARCH_DIR}) -- configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY) -+ file(MAKE_DIRECTORY "${GETARCH_DIR}") -+ configure_file(${TARGET_CONF_TEMP} "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY) - if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") -- try_compile(GETARCH_RESULT ${GETARCH_DIR} -+ try_compile(GETARCH_RESULT "${GETARCH_DIR}" - SOURCES ${GETARCH_SRC} - COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" - OUTPUT_VARIABLE GETARCH_LOG -- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} -+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" - ) - - if (NOT ${GETARCH_RESULT}) -@@ -1367,14 +1367,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA - - set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build") - set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}") -- file(MAKE_DIRECTORY ${GETARCH2_DIR}) -- configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY) -+ file(MAKE_DIRECTORY "${GETARCH2_DIR}") -+ configure_file(${TARGET_CONF_TEMP} "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY) - if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") -- try_compile(GETARCH2_RESULT ${GETARCH2_DIR} -- SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c -+ try_compile(GETARCH2_RESULT "${GETARCH2_DIR}" -+ SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c" - COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" - OUTPUT_VARIABLE GETARCH2_LOG -- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} -+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" - ) - - if (NOT ${GETARCH2_RESULT}) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 24da7a0124dad5..98f892756447fa 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF b89fb708caa5a5a32de8f4306c4ff132e0228e9a # v0.3.21 - SHA512 495e885409f0c6178332cddd685f3c002dc92e7af251c4e4eb3da6935ef6e81565c2505d436245b9bf53ce58649764e0471dc43b7f5f30b6ed092366cbbc2d5c + REF 394a9fbafe9010b76a2615c562204277a956eb52 # v0.3.23 + SHA512 d79ae7ba4f9146f0bcacdef9b9cf4cd287e5eb2e3891f7deb4b3992b742a557ca094ac2f258420a16cfe6bbda7ca82addf415aecd7ced425a02374847c0b6013 HEAD_REF develop PATCHES uwp.patch - fix-space-path.patch fix-redefinition-function.patch fix-uwp-build.patch install-tools.patch @@ -112,4 +111,4 @@ vcpkg_replace_string( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/openblas/uwp.patch b/ports/openblas/uwp.patch index 50a8e9b299832a..002410db3b7c59 100644 --- a/ports/openblas/uwp.patch +++ b/ports/openblas/uwp.patch @@ -1,7 +1,8 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake ---- a/cmake/prebuild.cmake 2019-01-28 03:05:58.422245700 -0600 -+++ b/cmake/prebuild.cmake 2019-01-28 03:07:02.885495800 -0600 -@@ -37,6 +37,9 @@ +index a33acbb..451422d 100644 +--- a/cmake/prebuild.cmake ++++ b/cmake/prebuild.cmake +@@ -39,6 +39,9 @@ # CPUIDEMU = ../../cpuid/table.o @@ -11,7 +12,7 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake if (DEFINED CPUIDEMU) set(EXFLAGS "-DCPUIDEMU -DVENDOR=99") -@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING) +@@ -1399,8 +1402,8 @@ else(NOT CMAKE_CROSSCOMPILING) message(STATUS "Running getarch") # use the cmake binary w/ the -E param to run a shell command in a cross-platform way @@ -22,7 +23,7 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") -@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR +@@ -1426,8 +1429,8 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE endif () # use the cmake binary w/ the -E param to run a shell command in a cross-platform way @@ -32,10 +33,9 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake +execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) # append config data from getarch_2nd to the TARGET file and read in CMake vars - file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT}) - + file(APPEND "${TARGET_CONF_TEMP}" ${GETARCH2_CONF_OUT}) diff --git a/cmake/system.cmake b/cmake/system.cmake -index a060d98..52ffa5a 100644 +index 631e7fe..83220ce 100644 --- a/cmake/system.cmake +++ b/cmake/system.cmake @@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 8c9bb556606842..0ce043ea35cd36 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openblas", - "version": "0.3.21", - "port-version": 2, + "version": "0.3.23", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f997a4ca733182..da9d754ef3b0d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5801,8 +5801,8 @@ "port-version": 0 }, "openblas": { - "baseline": "0.3.21", - "port-version": 2 + "baseline": "0.3.23", + "port-version": 0 }, "opencascade": { "baseline": "7.6.2", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 1d49726fa50302..1fd4534c1157de 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "716c00140c032ec22773130b006af542e011f00e", + "version": "0.3.23", + "port-version": 0 + }, { "git-tree": "ad5694adc46ca2974329e57896d0097e80d65c7d", "version": "0.3.21", From 49ad465adb07f86ec2ef23c4a4366c11f7491ae3 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 11 May 2023 20:09:03 +0300 Subject: [PATCH 054/533] update urdfdom (#31335) --- ports/urdfdom/0006-pc_file_for_windows.patch | 17 +++++++++++++++++ ports/urdfdom/portfile.cmake | 5 +++-- ports/urdfdom/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/urdfdom.json | 5 +++++ 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 ports/urdfdom/0006-pc_file_for_windows.patch diff --git a/ports/urdfdom/0006-pc_file_for_windows.patch b/ports/urdfdom/0006-pc_file_for_windows.patch new file mode 100644 index 00000000000000..83471eedfb6d9b --- /dev/null +++ b/ports/urdfdom/0006-pc_file_for_windows.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,11 +89,11 @@ + # Make the package config file +-if (NOT MSVC) ++ + set(PKG_DESC "Unified Robot Description Format") + set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ; + set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world") + set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig) +-endif() ++ + diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 5a2e8a0aef8070..fdafe4f62d3293 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom - REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0 - SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276 + REF ${VERSION} + SHA512 6386954bc7883e82d9db7c785ae074b47ca31efb7cc2686101e7813768824bed5b46a774a1296453c39ff76673a9dc77305bb2ac96b86ecf93fab22062ef2258 HEAD_REF master PATCHES 0001_use_math_defines.patch 0005-fix-config-and-install.patch + 0006-pc_file_for_windows.patch ) vcpkg_cmake_configure( diff --git a/ports/urdfdom/vcpkg.json b/ports/urdfdom/vcpkg.json index 97764859ed28ed..f9ef20c91b9621 100644 --- a/ports/urdfdom/vcpkg.json +++ b/ports/urdfdom/vcpkg.json @@ -1,6 +1,6 @@ { "name": "urdfdom", - "version": "3.1.0", + "version": "3.1.1", "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", "homepage": "https://github.com/ros/urdfdom", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index da9d754ef3b0d5..ea145d95b38d38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8185,7 +8185,7 @@ "port-version": 0 }, "urdfdom": { - "baseline": "3.1.0", + "baseline": "3.1.1", "port-version": 0 }, "urdfdom-headers": { diff --git a/versions/u-/urdfdom.json b/versions/u-/urdfdom.json index 391d13c438c248..d31d83fab704c0 100644 --- a/versions/u-/urdfdom.json +++ b/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb1c1a30329b850ac4450d3b1a72166697058bb8", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "35eed492633e8ac2b137093a51d13ad325d9e7c5", "version": "3.1.0", From 35ffca6eca8c3e91ce16998e1797a7d7275076c6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 May 2023 19:11:19 +0200 Subject: [PATCH 055/533] [ocilib] does support non windows arm (#31295) --- ports/ocilib/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/o-/ocilib.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 4dfa2695e7e354..7185fea52b4427 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ocilib", "version": "4.7.5", - "port-version": 1, + "port-version": 2, "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "license": "Apache-2.0", - "supports": "!(arm | uwp)" + "supports": "!uwp & !(arm & windows)" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e85cb21d0c566c..55f9f2346dcc28 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1067,9 +1067,6 @@ numactl:x64-windows-static-md=fail numactl:x86-windows=fail nvtt:x64-android=fail oatpp-libressl:x64-android=fail -ocilib:arm-uwp=fail -ocilib:arm64-windows=fail -ocilib:x64-uwp=fail ocilib:x64-windows-static-md=fail octomap:arm-uwp=fail octomap:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index ea145d95b38d38..685681762af31f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5722,7 +5722,7 @@ }, "ocilib": { "baseline": "4.7.5", - "port-version": 1 + "port-version": 2 }, "octomap": { "baseline": "1.9.6", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index 2b27bb779176af..cf3f6492720781 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e11027c9b427b4c46e47227da9ce270119f6ea1", + "version": "4.7.5", + "port-version": 2 + }, { "git-tree": "9a48c5a6650bc58fdea2fe06d75c3347d89e483a", "version": "4.7.5", From 3256b183d05cf03837711dd224dfb0b3bbabcd2b Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 12 May 2023 01:32:00 +0800 Subject: [PATCH 056/533] [behaviortree-cpp] Update to 4.1.1 (#31287) * update behaviortree-cpp * update version --------- Co-authored-by: Monica --- ports/behaviortree-cpp/001_port_fixes.patch | 13 ------- .../002_fix_dependencies.patch | 34 ------------------ ports/behaviortree-cpp/fix-x86_build.patch | 35 +++++++++++++++++++ ports/behaviortree-cpp/portfile.cmake | 35 ++++++++++--------- ports/behaviortree-cpp/vcpkg.json | 3 +- versions/b-/behaviortree-cpp.json | 5 +++ versions/baseline.json | 4 +-- 7 files changed, 61 insertions(+), 68 deletions(-) delete mode 100644 ports/behaviortree-cpp/001_port_fixes.patch delete mode 100644 ports/behaviortree-cpp/002_fix_dependencies.patch create mode 100644 ports/behaviortree-cpp/fix-x86_build.patch diff --git a/ports/behaviortree-cpp/001_port_fixes.patch b/ports/behaviortree-cpp/001_port_fixes.patch deleted file mode 100644 index 9897caa1881e74..00000000000000 --- a/ports/behaviortree-cpp/001_port_fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a390aed..658f994 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -233,7 +233,7 @@ if( ZMQ_FOUND ) - endif() - - if(MSVC) -- target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /WX) -+ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W3 /wd4702) - else() - target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE - -Wall -Wextra -Werror=return-type) diff --git a/ports/behaviortree-cpp/002_fix_dependencies.patch b/ports/behaviortree-cpp/002_fix_dependencies.patch deleted file mode 100644 index d554e37ce549ff..00000000000000 --- a/ports/behaviortree-cpp/002_fix_dependencies.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 658f994..a04cf27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ if(MSVC) - endif() - - #---- Include boost to add coroutines ---- --find_package(Boost COMPONENTS coroutine QUIET) -+find_package(Boost REQUIRED) # coroutine2 is header-only - - if(Boost_FOUND) - string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION}) -@@ -46,17 +46,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) - - #---- Find other packages ---- - find_package(Threads) --find_package(ZMQ) -+find_package(cppzmq) - - list(APPEND BEHAVIOR_TREE_PUBLIC_LIBRARIES - ${CMAKE_THREAD_LIBS_INIT} - ${CMAKE_DL_LIBS} - ) - --if( ZMQ_FOUND ) -+if( ZMQ_FOUND OR ON ) - message(STATUS "ZeroMQ found.") - add_definitions( -DZMQ_FOUND ) - list(APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp) -+ list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES cppzmq) - else() - message(WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder].") - endif() diff --git a/ports/behaviortree-cpp/fix-x86_build.patch b/ports/behaviortree-cpp/fix-x86_build.patch new file mode 100644 index 00000000000000..164e9dff03d166 --- /dev/null +++ b/ports/behaviortree-cpp/fix-x86_build.patch @@ -0,0 +1,35 @@ +diff --git a/3rdparty/lexy/include/lexy/_detail/swar.hpp b/3rdparty/lexy/include/lexy/_detail/swar.hpp +index a268abb..d31bdaa 100644 +--- a/3rdparty/lexy/include/lexy/_detail/swar.hpp ++++ b/3rdparty/lexy/include/lexy/_detail/swar.hpp +@@ -141,8 +141,13 @@ constexpr std::size_t swar_find_difference(swar_int lhs, swar_int rhs) + auto bit_idx = __builtin_ctzll(mask); + #elif defined(_MSC_VER) + unsigned long bit_idx; +- if (!_BitScanForward64(&bit_idx, mask)) +- bit_idx = 64; ++ #if defined(_WIN64) ++ if (!_BitScanForward64(&bit_idx, mask)) ++ bit_idx = 64; ++ #elif defined(_WIN32) ++ if (!_BitScanForward(&bit_idx, mask)) ++ bit_idx = 32; ++ #endif + #else + # error "unsupported compiler; please file an issue" + #endif +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 295b317..0f1cd5c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -154,6 +154,10 @@ else() + add_library(${BTCPP_LIBRARY} STATIC ${BT_SOURCE}) + endif() + ++if (MSVC) ++ target_compile_definitions(${BTCPP_LIBRARY} PRIVATE NOMINMAX) ++endif () ++ + message(STATUS "BTCPP_EXTRA_LIBRARIES: ${BTCPP_EXTRA_LIBRARIES}") + + target_link_libraries(${BTCPP_LIBRARY} diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 7b77e10c52bd5f..a15d5c9c1937c9 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -1,17 +1,14 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.6.tar.gz" - FILENAME "BehaviorTree.CPP.3.5.6.tar.gz" - SHA512 cd3b15eb7c5bab68239b697da166220b4df8dd7e6cf5e831f316d411e24be56c9ed74e54a3e3dd332164d740159eaf9ce62d005601fd65133809dab29430c9b7 + URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/${VERSION}.tar.gz" + FILENAME "BehaviorTree.CPP.${VERSION}.tar.gz" + SHA512 4505c4c8798ccbbc02f58320810eb86e791fb6ef57d8c85882e62bd2b509b41e0549dc311ed61926a873b5b956eda979efda488f01d00746e1e8db559f60253c ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - 001_port_fixes.patch - 002_fix_dependencies.patch + fix-x86_build.patch ) vcpkg_cmake_configure( @@ -19,19 +16,23 @@ vcpkg_cmake_configure( OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1 -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1 - -DBUILD_EXAMPLES=OFF - -DBUILD_UNIT_TESTS=OFF - -DBUILD_TOOLS=OFF + -DBTCPP_EXAMPLES=OFF + -DBTCPP_UNIT_TESTS=OFF + -DBTCPP_BUILD_TOOLS=OFF + -DBTCPP_GROOT_INTERFACE=OFF + -DBTCPP_SQLITE_LOGGING=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Curses ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/BehaviorTreeV3/cmake PACKAGE_NAME behaviortreev3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/behaviortree_cpp PACKAGE_NAME behaviortree_cpp) vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3" - "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3" -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index d99f0e5215fab6..7305ae8c9ef05d 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "behaviortree-cpp", - "version": "3.5.6", - "port-version": 3, + "version": "4.1.1", "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index bc7a1610b60ca4..b434fa52ae2982 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66a97129b31a5e70e45a40c767ea96b1e0477a93", + "version": "4.1.1", + "port-version": 0 + }, { "git-tree": "7518e59f9f1e994e3af289b8de87115834dcb758", "version": "3.5.6", diff --git a/versions/baseline.json b/versions/baseline.json index 685681762af31f..34d46a369964aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -501,8 +501,8 @@ "port-version": 2 }, "behaviortree-cpp": { - "baseline": "3.5.6", - "port-version": 3 + "baseline": "4.1.1", + "port-version": 0 }, "benchmark": { "baseline": "1.8.0", From acdc823534b93ba0c40fb5c63ef9155fecf653e0 Mon Sep 17 00:00:00 2001 From: d10sfan <4337981+d10sfan@users.noreply.github.com> Date: Thu, 11 May 2023 13:16:10 -0500 Subject: [PATCH 057/533] [libmad] Add dynamic support (#31350) * [libmad] Add dynamic building * Update version * Fix version * Fixes to use vcpkg concepts * Update version * change to mad * Update version * PR fixes * Update version * Add version * Update version --- ports/libmad/CMakeLists.txt | 5 +++++ ports/libmad/mad.pc.in | 10 ++++++++++ ports/libmad/portfile.cmake | 9 ++++++++- ports/libmad/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmad.json | 5 +++++ 6 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 ports/libmad/mad.pc.in diff --git a/ports/libmad/CMakeLists.txt b/ports/libmad/CMakeLists.txt index 47db84c419fd47..2a692a41316467 100644 --- a/ports/libmad/CMakeLists.txt +++ b/ports/libmad/CMakeLists.txt @@ -30,6 +30,11 @@ set(SOURCES version.h ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mad.pc.in" "${PROJECT_BINARY_DIR}/mad.pc" @ONLY) +install( + FILES "${PROJECT_BINARY_DIR}/mad.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" +) add_library( mad ${SOURCES} diff --git a/ports/libmad/mad.pc.in b/ports/libmad/mad.pc.in new file mode 100644 index 00000000000000..6dd5792ff29d5e --- /dev/null +++ b/ports/libmad/mad.pc.in @@ -0,0 +1,10 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: mad +Description: MPEG audio decoder library +Version: @VERSION@ +Libs: -L${libdir} -lmad +Cflags: -I${includedir} diff --git a/ports/libmad/portfile.cmake b/ports/libmad/portfile.cmake index 5981c3598a87fa..7dc03c1deca9c9 100644 --- a/ports/libmad/portfile.cmake +++ b/ports/libmad/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -12,14 +14,19 @@ vcpkg_from_sourceforge( #The archive only contains a Visual Studio 6.0 era DSP project file, so use a custom CMakeLists.txt file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/mad.pc.in" DESTINATION "${SOURCE_PATH}") + #Use the msvc++ config.h header file(COPY "${SOURCE_PATH}/msvc++/config.h" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmad/vcpkg.json b/ports/libmad/vcpkg.json index a05d3a7ca5baa5..5595b6a687d495 100644 --- a/ports/libmad/vcpkg.json +++ b/ports/libmad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmad", "version": "0.15.1", - "port-version": 11, + "port-version": 12, "description": "high-quality MPEG audio decoder", "homepage": "http://www.mars.org/home/rob/proj/mpeg/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 34d46a369964aa..2023755d3bd80b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4202,7 +4202,7 @@ }, "libmad": { "baseline": "0.15.1", - "port-version": 11 + "port-version": 12 }, "libmagic": { "baseline": "5.40", diff --git a/versions/l-/libmad.json b/versions/l-/libmad.json index 644f9e7237cf56..d2174b16ac02af 100644 --- a/versions/l-/libmad.json +++ b/versions/l-/libmad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaed142825775ca972204c5c2d7720043eef3c2b", + "version": "0.15.1", + "port-version": 12 + }, { "git-tree": "c4393712733ce1f3078a4ec0a042736e5862efa7", "version": "0.15.1", From 5d0e5a34439aa828ab3b19e0472aa9c7e816fa23 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 11 May 2023 14:30:17 -0400 Subject: [PATCH 058/533] [Jsonifier] Updating to version v0.9.1 (#31315) * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. * Updating the required files. --------- Co-authored-by: Javier Matos Denizac --- ports/jsonifier/portfile.cmake | 5 ++--- ports/jsonifier/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/j-/jsonifier.json | 5 +++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 309aa991f8d9e8..51d002104af052 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - # Auto-generated by release CI action at realtimechris/Jsonifier - SHA512 146a2c899e8280a9a0ad7dfb51f4446c864b0c0a7b3f74685f02d3bfd8fce6a51e0a24dc31cfe47d7f8a6633319515da947be130cdf0afed3382a1528141e2b0 - HEAD_REF main + SHA512 919446d8b0f5bb726dcfd91667a0733cfda04956e8c844716e9fe90a50dc5409db5344346131b4e8830cdfbf90ead6b7e1906097b069d83e7b78934571cbc060 + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 4a689f3f0ed461..f6fb08d4274fae 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,9 +1,8 @@ { "name": "jsonifier", - "version": "0.9.0", - "port-version": 1, + "version": "0.9.1", "description": "A few classes for parsing and serializing json - very rapidly.", - "homepage": "https://github.com/RealTimeChris/Jsonifier", + "homepage": "https://github.com/realtimechris/jsonifier", "license": "LGPL-2.1-or-later", "supports": "(windows & x64 & !uwp) | (linux & x64) | (osx & x64)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2023755d3bd80b..24d19c08594b05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3465,8 +3465,8 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.9.1", + "port-version": 0 }, "jsonnet": { "baseline": "0.18.0", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index a4d06cc6f4ae6a..eca1741d56dcd2 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "990249b807aba05002ba2ac406e0bebc9af26a64", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "61f861161144679903d44d5bf7de6aa29f159140", "version": "0.9.0", From 9411949cbcba474c7e0fa6601de2c49bfdaa343e Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 11 May 2023 20:34:06 +0200 Subject: [PATCH 059/533] [boinc] fix build error. (#31364) Ref: https://github.com/BOINC/boinc/pull/5232 Signed-off-by: Vitalii Koshura --- ports/boinc/fix-build.patch | 49 +++++++++++++++++++++++++++++++++++++ ports/boinc/portfile.cmake | 8 ++++++ ports/boinc/vcpkg.json | 1 + versions/b-/boinc.json | 5 ++++ versions/baseline.json | 2 +- 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 ports/boinc/fix-build.patch diff --git a/ports/boinc/fix-build.patch b/ports/boinc/fix-build.patch new file mode 100644 index 00000000000000..c8a7751df9c0a7 --- /dev/null +++ b/ports/boinc/fix-build.patch @@ -0,0 +1,49 @@ +diff --git a/lib/filesys.cpp b/lib/filesys.cpp +index c258a0f8d1..76530fb432 100644 +--- a/lib/filesys.cpp ++++ b/lib/filesys.cpp +@@ -63,6 +63,7 @@ + + #include "error_numbers.h" + #include "filesys.h" ++#include "str_replace.h" + #include "str_util.h" + #include "util.h" + +diff --git a/lib/str_util.h b/lib/str_util.h +index 0e2d5f179a..22908d8568 100644 +--- a/lib/str_util.h ++++ b/lib/str_util.h +@@ -22,8 +22,6 @@ + #include + #include + +-#include "str_replace.h" +- + #define safe_strcpy(x, y) strlcpy(x, y, sizeof(x)) + #define safe_strcat(x, y) strlcat(x, y, sizeof(x)) + +diff --git a/lib/util.cpp b/lib/util.cpp +index cfa495a6f9..2af4b0fb94 100644 +--- a/lib/util.cpp ++++ b/lib/util.cpp +@@ -17,6 +17,7 @@ + + #if defined(_WIN32) + #include "boinc_win.h" ++#include "str_replace.h" + #include "str_util.h" + #include "win_util.h" + #endif +diff --git a/lib/win_util.cpp b/lib/win_util.cpp +index 86289e0ce7..82b17f4425 100644 +--- a/lib/win_util.cpp ++++ b/lib/win_util.cpp +@@ -23,6 +23,7 @@ + #include "util.h" + #include "filesys.h" + #include "win_util.h" ++#include "str_replace.h" + #include "str_util.h" + + /** diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index 0de5fb8d3e8626..e5e0a163bf318c 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF client_release/7.22/7.22.1 SHA512 8b3efc68fe8df8f95a674d9deddbe355da2070a960b1768ee7f9c2afdd8a373e97297715dec5d7daf131d4b5c478afbc4476e152ec516080620f66e1a1f785af HEAD_REF master + PATCHES + fix-build.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -37,6 +39,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup() +file(READ "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" BOINC_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/boinc/boinc-config.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +${BOINC_CONFIG} +") vcpkg_copy_pdbs() diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 373e06b447a426..0ae2169e7e4e2d 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boinc", "version": "7.22.1", + "port-version": 1, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 100cd6a460ae7b..5eef22b21e24e8 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d3f7220d72e02720ad44a15cfc46ebc1a6c26b4", + "version": "7.22.1", + "port-version": 1 + }, { "git-tree": "05fdc41be633efa59debd81ec8a95c584972e54b", "version": "7.22.1", diff --git a/versions/baseline.json b/versions/baseline.json index 24d19c08594b05..cf012710422e21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -610,7 +610,7 @@ }, "boinc": { "baseline": "7.22.1", - "port-version": 0 + "port-version": 1 }, "bond": { "baseline": "10.0.0", From d54600af13be09bf23d48071e8835bddfa03df00 Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 11 May 2023 21:37:21 +0300 Subject: [PATCH 060/533] Create JIT as a feature (#31294) --- ports/pcre2/portfile.cmake | 11 ++++++----- ports/pcre2/vcpkg.json | 25 +++++++++++++++++++++++-- versions/baseline.json | 2 +- versions/p-/pcre2.json | 5 +++++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 8f5ac8c855d093..6287bc7c9dd2d8 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -13,20 +13,21 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" INSTALL_PDB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_STATIC_CRT) -set(JIT ON) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(JIT OFF) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + jit PCRE2_SUPPORT_JIT +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DPCRE2_STATIC_RUNTIME=${BUILD_STATIC_CRT} -DPCRE2_BUILD_PCRE2_8=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON - -DPCRE2_SUPPORT_JIT=${JIT} -DPCRE2_SUPPORT_UNICODE=ON -DPCRE2_BUILD_TESTS=OFF -DPCRE2_BUILD_PCRE2GREP=OFF diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index df88f3c5c73618..8b6338038f9fdc 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre2", "version": "10.40", - "port-version": 1, + "port-version": 2, "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", "homepage": "https://github.com/PCRE2Project/pcre2", "license": "BSD-3-Clause", @@ -19,5 +19,26 @@ "host": true }, "zlib" - ] + ], + "default-features": [ + "platform-default-features" + ], + "features": { + "jit": { + "description": "Build JIT support", + "supports": "!emscripten" + }, + "platform-default-features": { + "description": "Enable default features", + "dependencies": [ + { + "name": "pcre2", + "features": [ + "jit" + ], + "platform": "!emscripten" + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index cf012710422e21..f20ad87e80363e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6110,7 +6110,7 @@ }, "pcre2": { "baseline": "10.40", - "port-version": 1 + "port-version": 2 }, "pdal": { "baseline": "2.5.3", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index 46b57427e92710..a9ce1fd02b295c 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "533fc8ada3da33f695eb499fe8190a5e9b24a5c8", + "version": "10.40", + "port-version": 2 + }, { "git-tree": "941f187c16a9385815fd353a9b79abf55bd2a7ec", "version": "10.40", From 9f358ceb5c7d9486a18809648461ce051b1c1af3 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 12 May 2023 02:37:33 +0800 Subject: [PATCH 061/533] [microsoft-signalr] Fix find jsoncpp (#31384) * [microsoft-signalr] Fix find jsoncpp * update version * apply suggestion * update version * fix quoting * version --------- Co-authored-by: Javier Matos Denizac --- ports/microsoft-signalr/portfile.cmake | 4 +++- ports/microsoft-signalr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/microsoft-signalr.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index 6b54407b2dcef8..5830591618837c 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -4,7 +4,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 b87c94e8bc81781c1cfb4292f1fe3ce046a5f192a25c02104f454b533349c1c0ed965570bd749b496bb316ccb89ae51c5e7461ffa06055e71dac659fbde79456 HEAD_REF main - PATCHES find-msgpack.patch + PATCHES + find-msgpack.patch ) vcpkg_check_features( @@ -24,6 +25,7 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} -DWALL=OFF + "-DJSONCPP_LIB=JsonCpp::JsonCpp" ) vcpkg_cmake_install() diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index 085cf5ddb4d548..112a3e72fa9227 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "microsoft-signalr", "version": "0.1.0-alpha4", - "port-version": 5, + "port-version": 6, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f20ad87e80363e..93bab462e1b494 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5178,7 +5178,7 @@ }, "microsoft-signalr": { "baseline": "0.1.0-alpha4", - "port-version": 5 + "port-version": 6 }, "mikktspace": { "baseline": "2020-10-06", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index 6034938ec990ae..c269ad6d88a9a4 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a366b0a8f7b8177b0c91de00d652dfac38ed927", + "version": "0.1.0-alpha4", + "port-version": 6 + }, { "git-tree": "4d404283aa7fbee588db56cbe0a470d82c1f9258", "version": "0.1.0-alpha4", From c43c0076773fb0b72c6703254653788fc8238026 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 12 May 2023 02:42:13 +0800 Subject: [PATCH 062/533] [gstreamer] Add a ges feature (#31267) * add feature ges * update * fix port version * update version --- ports/gstreamer/portfile.cmake | 3 ++- ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 9cbe522b25b360..4727201beba745 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -424,7 +424,7 @@ vcpkg_configure_meson( -Dlibav=${LIBAV} -Dlibnice=disabled -Ddevtools=disabled - -Dges=disabled + -Dges=enabled -Drtsp_server=disabled -Domx=disabled -Dvaapi=disabled @@ -644,6 +644,7 @@ list(APPEND GST_BIN_TOOLS gst-launch-1.0 gst-stats-1.0 gst-typefind-1.0 + ges-launch-1.0 ) list(APPEND GST_LIBEXEC_TOOLS gst-plugin-scanner diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 8885f357361cf6..3b968ad524efa8 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.20.5", - "port-version": 7, + "port-version": 8, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 93bab462e1b494..b01b816f1d3f5e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2970,7 +2970,7 @@ }, "gstreamer": { "baseline": "1.20.5", - "port-version": 7 + "port-version": 8 }, "gtest": { "baseline": "1.13.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c9d4aa5bf2191b..7dc1235b990ab8 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4fa840c6345c1b7bf4c35e2977ed3f680d6584a", + "version": "1.20.5", + "port-version": 8 + }, { "git-tree": "877a4687de4ef7b958624b55a558f91b4b34c32b", "version": "1.20.5", From ed8fb07a8bd19568c8594c6f1a04955242f82d35 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 11 May 2023 21:39:22 +0200 Subject: [PATCH 063/533] [intel-mkl] Overhaul, install osx (#30483) * [intel-mkl] Install osx * Do less work for --only-downloads * Try harder to ensure DMG unmount * Adjust port warning * Always install usage * Fix log names * Merge copyright * Revise pc file handling * Cleanup * More uniform staging and variables * Update messages * Update versions * Typo * More cleanup * Do nothing for unsupported targets The old code was already broken. * Fix and simplify copy-from-dmg * Change extract_0_dir * Mount to tmp dir --- ports/intel-mkl/copy-from-dmg.cmake | 53 +++ ports/intel-mkl/portfile.cmake | 390 ++++++++++------------ ports/intel-mkl/vcpkg-cmake-wrapper.cmake | 6 - ports/intel-mkl/vcpkg-port-config.cmake | 1 - ports/intel-mkl/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/i-/intel-mkl.json | 5 + 7 files changed, 244 insertions(+), 216 deletions(-) create mode 100644 ports/intel-mkl/copy-from-dmg.cmake delete mode 100644 ports/intel-mkl/vcpkg-cmake-wrapper.cmake delete mode 100644 ports/intel-mkl/vcpkg-port-config.cmake diff --git a/ports/intel-mkl/copy-from-dmg.cmake b/ports/intel-mkl/copy-from-dmg.cmake new file mode 100644 index 00000000000000..a5aa67cdea9e55 --- /dev/null +++ b/ports/intel-mkl/copy-from-dmg.cmake @@ -0,0 +1,53 @@ +find_program(HDIUTIL NAMES hdiutil REQUIRED) +set(dmg_path "NOTFOUND" CACHE FILEPATH "Where to find the DMG") +set(output_dir "output_dir" CACHE FILEPATH "Where to put the packages") + +if(NOT EXISTS "${dmg_path}") + message(FATAL_ERROR "'dmg_path' (${dmg_path}) does not exist.") +endif() +if(NOT IS_DIRECTORY "${output_dir}") + message(FATAL_ERROR "'output_dir' (${output_dir}) is not a directory.") +endif() + +execute_process( + COMMAND mktemp -d + RESULT_VARIABLE mktemp_result + OUTPUT_VARIABLE mount_point + OUTPUT_STRIP_TRAILING_WHITESPACE +) +if(NOT mktemp_result STREQUAL "0") + message(FATAL_ERROR "mktemp -d failed: ${mktemp_result}") +elseif(NOT IS_DIRECTORY "${mount_point}") + message(FATAL_ERROR "'mount_point' (${mount_point}) is not a directory.") +endif() + +execute_process( + COMMAND "${HDIUTIL}" attach "${dmg_path}" -mountpoint "${mount_point}" -readonly + RESULT_VARIABLE mount_result +) +if(mount_result STREQUAL "0") + set(dmg_packages_dir "${mount_point}/bootstrapper.app/Contents/Resources/packages") + file(GLOB packages + "${dmg_packages_dir}/intel.oneapi.mac.mkl.devel,*" + "${dmg_packages_dir}/intel.oneapi.mac.mkl.runtime,*" + "${dmg_packages_dir}/intel.oneapi.mac.mkl.product,*" + "${dmg_packages_dir}/intel.oneapi.mac.openmp,*" + ) + # Using execute_process to avoid direct errors + execute_process( + COMMAND cp -R ${packages} "${output_dir}/" + RESULT_VARIABLE copy_result + ) +endif() +execute_process( + COMMAND "${HDIUTIL}" detach "${mount_point}" + RESULT_VARIABLE unmount_result +) + +if(NOT mount_result STREQUAL "0") + message(FATAL_ERROR "Mounting ${dmg_path} failed: ${mount_result}") +elseif(NOT copy_result STREQUAL "0") + message(FATAL_ERROR "Coyping packages failed: ${copy_result}") +elseif(NOT unmount_result STREQUAL "0") + message(FATAL_ERROR "Unounting ${dmg_path} failed: ${unmount_result}") +endif() diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 949431e79428e2..0e76f77ecc5a77 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -1,88 +1,83 @@ -# This package installs Intel MKL on Linux and Windows for x64 and on other platforms tries to search for it. -# The installation for the platforms are: -# - Windows: ilp64, intel_thread (!static_crt), sequential(static_crt) -# - Linux: ilp64, intel_thread +# This package installs Intel MKL on Linux, macOS and Windows for x64. +# Configuration: +# - ilp64 +# - dynamic CRT: intel_thread, static CRT: sequential set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(MKL_REQUIRED_VERSION "20200000") - # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19150/w_onemkl_p_2023.0.0.25930_offline.exe # windows # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19116/m_onemkl_p_2023.0.0.25376_offline.dmg # macos # https://registrationcenter-download.intel.com/akdlm/irc_nas/19138/l_onemkl_p_2023.0.0.25398_offline.sh # linux set(sha "") -if(VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + # nop +elseif(VCPKG_TARGET_IS_WINDOWS) set(filename w_onemkl_p_2023.0.0.25930_offline.exe) set(magic_number 19150) set(sha a3eb6b75241a2eccb73ed73035ff111172c55d3fa51f545c7542277a155df84ff72fc826621711153e683f84058e64cb549c030968f9f964531db76ca8a3ed46) -elseif(VCPKG_TARGET_IS_OSX AND 0) + set(package_infix "win") +elseif(VCPKG_TARGET_IS_OSX) set(filename m_onemkl_p_2023.0.0.25376_offline.dmg) set(magic_number 19116) set(sha 7b9b8c004054603e6830fb9b9c049d5a4cfc0990c224cb182ac5262ab9f1863775a67491413040e3349c590e2cca58edcfc704db9f3b9f9faa8b5b09022cd2af) - # This is a disk image: If somebody knows how to extract it please do so. + set(package_infix "mac") + set(package_libdir "lib") + set(compiler_libdir "mac/compiler/lib") elseif(VCPKG_TARGET_IS_LINUX) set(filename l_onemkl_p_2023.0.0.25398_offline.sh) set(magic_number 19138) set(sha b5f2f464675f0fd969dde2faf2e622b834eb1cc406c4a867148116f6c24ba5c709d98b678840f4a89a1778e12cde0ff70ce2ef59faeef3d3f3aa1d0329c71af1) -else() - set(ProgramFilesx86 "ProgramFiles(x86)") - set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows) - set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest) - - find_path(MKL_ROOT include/mkl.h - PATHS - $ENV{MKLROOT} - ${INTEL_ROOT}/mkl - $ENV{ONEAPI_ROOT}/mkl/latest - ${ONEMKL_ROOT} - DOC - "Folder contains MKL") - - if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND") - message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL (${MKL_REQUIRED_VERSION} or higher) from:" - "\n https://registrationcenter.intel.com/en/products/download/3178/\n" - "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)") - endif() + set(package_infix "lin") + set(package_libdir "lib/intel64") + set(compiler_libdir "linux/compiler/lib/intel64_lin") +endif() - file(STRINGS "${MKL_ROOT}/include/mkl_version.h" MKL_VERSION_DEFINITION REGEX "INTEL_MKL_VERSION") - string(REGEX MATCH "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION}) +if(NOT sha) + message(WARNING "${PORT} is empty for ${TARGET_TRIPLET}.") + return() +endif() - if (MKL_VERSION LESS MKL_REQUIRED_VERSION) - message(FATAL_ERROR "MKL ${MKL_VERSION} is found but ${MKL_REQUIRED_VERSION} is required. Please download and install a more recent version of MKL from:" - "\n https://registrationcenter.intel.com/en/products/download/3178/\n") - endif() +vcpkg_download_distfile(installer_path + URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}" + FILENAME "${filename}" + SHA512 "${sha}" +) + +# Note: intel_thread and lp64 are the defaults. +set(interface "ilp64") # or ilp64; ilp == 64 bit int api +#https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread +else() + set(threading "sequential") +endif() +if(threading STREQUAL "intel_thread") + set(short_thread "iomp") +else() + string(SUBSTRING "${threading}" "0" "3" short_thread) endif() +set(main_pc_file "mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc") -if(sha) - vcpkg_download_distfile(archive_path - URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}" - FILENAME "${filename}" - SHA512 ${sha} - ) +# First extraction level: packages (from offline installer) +set(extract_0_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-extract") +file(REMOVE_RECURSE "${extract_0_dir}") +file(MAKE_DIRECTORY "${extract_0_dir}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") +# Second extraction level: actual files (from packages) +set(extract_1_dir "${CURRENT_PACKAGES_DIR}/intel-extract") +file(REMOVE_RECURSE "${extract_1_dir}") +file(MAKE_DIRECTORY "${extract_1_dir}") - # Note: intel_thread and lp64 are the defaults. - set(interface "ilp64") # or ilp64; ilp == 64 bit int api - #https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread - else() - set(threading "sequential") - endif() - if(threading STREQUAL "intel_thread") - set(short_thread "iomp") - else() - string(SUBSTRING "${threading}" "0" "3" short_thread) - endif() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") - if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(7Z) - vcpkg_execute_in_download_mode( - COMMAND "${7Z}" x "${archive_path}" "-o${CURRENT_PACKAGES_DIR}/intel-extract" "-y" "-bso0" "-bsp0" - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" - ) - + message(STATUS "Extracting offline installer") + vcpkg_execute_required_process( + COMMAND "${7Z}" x "${installer_path}" "-o${extract_0_dir}" "-y" "-bso0" "-bsp0" + WORKING_DIRECTORY "${extract_0_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-0" + ) set(packages "intel.oneapi.win.mkl.devel,v=2023.0.0-25930/oneapi-mkl-devel-for-installer_p_2023.0.0.25930.msi" # has the required libs. @@ -92,186 +87,167 @@ if(sha) #"intel.oneapi.win.tbb.runtime,v=2021.8.0-25874" #TBB ) - set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired - file(MAKE_DIRECTORY "${output_path}") foreach(pack IN LISTS packages) - set(archive_path "${CURRENT_PACKAGES_DIR}/intel-extract/packages/${pack}") + set(package_path "${extract_0_dir}/packages/${pack}") cmake_path(GET pack STEM LAST_ONLY packstem) - cmake_path(NATIVE_PATH archive_path archive_path_native) - vcpkg_execute_in_download_mode( - COMMAND "${LESSMSI}" x "${archive_path_native}" # Using output_path here does not work in bash - WORKING_DIRECTORY "${output_path}" - OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log" - ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log" - RESULT_VARIABLE error_code - ) - file(COPY "${output_path}/${packstem}/SourceDir/" DESTINATION "${output_path}") - file(REMOVE_RECURSE "${output_path}/${packstem}") + cmake_path(NATIVE_PATH package_path package_path_native) + vcpkg_execute_required_process( + COMMAND "${LESSMSI}" x "${package_path_native}" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + file(COPY "${extract_1_dir}/${packstem}/SourceDir/" DESTINATION "${extract_1_dir}") + file(REMOVE_RECURSE "${extract_1_dir}/${packstem}") endforeach() - set(basepath "${output_path}/Intel/Compiler/12.0/mkl/2023.0.0/") - set(basepath2 "${output_path}/Intel/Compiler/12.0/compiler/2023.0.0/") - file(REMOVE_RECURSE "${output_path}/Intel/shared files" - "${output_path}/Intel/Compiler/12.0/conda_channel" - "${basepath}tools" - "${basepath}interfaces" - "${basepath}examples" - "${basepath}bin" - "${basepath}benchmarks" - ) - - file(COPY "${basepath}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + set(mkl_dir "${extract_1_dir}/Intel/Compiler/12.0/mkl/2023.0.0") + file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # see https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl-link-line-advisor.html for linking if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(files "mkl_core_dll.lib" "mkl_${threading}_dll.lib" "mkl_intel_${interface}_dll.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") # "mkl_rt.lib" single dynamic lib with dynamic dispatch - file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all + file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all if(NOT VCPKG_BUILD_TYPE) - file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() else() set(files "mkl_core.lib" "mkl_${threading}.lib" "mkl_intel_${interface}.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") endif() - foreach(file ${files}) - file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure + foreach(file IN LISTS files) + file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure if(NOT VCPKG_BUILD_TYPE) - file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") + file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") endif() endforeach() + file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}") - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") - endif() - + set(compiler_dir "${extract_1_dir}/Intel/Compiler/12.0/compiler/2023.0.0") if(threading STREQUAL "intel_thread") - file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY) + file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") + file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5") if(NOT VCPKG_BUILD_TYPE) - file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") - endif() - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") + file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64") endif() endif() - - - file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") - #TODO: Hardcode settings from portfile in config.cmake - #TODO. Give lapack/blas information about the correct BLA_VENDOR depending on settings. - - file(INSTALL "${CURRENT_PACKAGES_DIR}/intel-extract/packages/intel.oneapi.win.mkl.product,v=2023.0.0-25930/licenses/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - elseif(VCPKG_TARGET_IS_LINUX) - message(WARNING "This port is still a work on progress on linux. E.g. it is not correctly filtering the libraries in accordance with VCPKG_LIBRARY_LINKAGE. Furthermore it is using the default threading which is Intel OpenMP which is known to segfault if GNU OpenMP is also used elsewhere!") - #./l_onemkl_p_2023.0.0.25398_offline.sh --extract-only -a -s - # cmake -E tar -xf - - set(output_path "${CURRENT_PACKAGES_DIR}/intel-extract") - message(STATUS "${archive_path}") - file(MAKE_DIRECTORY "${output_path}") - vcpkg_execute_in_download_mode( - COMMAND "bash" "--verbose" "--noprofile" "${archive_path}" "--extract-only" "--extract-folder" "${output_path}" - WORKING_DIRECTORY "${output_path}" - OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-out.log" - ERROR_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-err.log" - ) - set(packages - "intel.oneapi.lin.mkl.devel,v=2023.0.0-25398" # has the required staic libs. - "intel.oneapi.lin.mkl.runtime,v=2023.0.0-25398" # has the required dynamic so. - "intel.oneapi.lin.openmp,v=2023.0.0-25370" #OpenMP +else() + message(STATUS "Warning: This port is still a work on progress. + E.g. it is not correctly filtering the libraries in accordance with + VCPKG_LIBRARY_LINKAGE. It is using the default threading (Intel OpenMP) + which is known to segfault when used together with GNU OpenMP. +") + + message(STATUS "Extracting offline installer") + if(VCPKG_TARGET_IS_LINUX) + vcpkg_execute_required_process( + COMMAND "bash" "--verbose" "--noprofile" "${installer_path}" "--extract-only" "--extract-folder" "${extract_0_dir}" + WORKING_DIRECTORY "${extract_0_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-0" ) + file(RENAME "${extract_0_dir}/l_onemkl_p_2023.0.0.25398_offline/packages" "${extract_0_dir}/packages") + elseif(VCPKG_TARGET_IS_OSX) + find_program(HDIUTIL NAMES hdiutil REQUIRED) + file(MAKE_DIRECTORY "${extract_0_dir}/packages") + message(STATUS "... Don't interrupt.") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-Ddmg_path=${installer_path}" + "-Doutput_dir=${extract_0_dir}/packages" + "-DHDIUTIL=${HDIUTIL}" + -P "${CMAKE_CURRENT_LIST_DIR}/copy-from-dmg.cmake" + WORKING_DIRECTORY "${extract_0_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-0" + ) + message(STATUS "... Done.") + endif() - foreach(pack IN LISTS packages) - set(archive_path "${output_path}/l_onemkl_p_2023.0.0.25398_offline/packages/${pack}") - vcpkg_execute_in_download_mode( - COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${archive_path}/cupPayload.cup" - WORKING_DIRECTORY "${output_path}" - OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-out.log" - ERROR_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-err.log" - ) - endforeach() - - set(basepath "${output_path}/_installdir/mkl/2023.0.0/") - set(basepath2 "${output_path}/_installdir/compiler/2023.0.0/") - file(REMOVE_RECURSE "${basepath}../../conda_channel/" - "${basepath}tools" - "${basepath}interfaces" - "${basepath}examples" - "${basepath}bin" - "${basepath}benchmarks" - "${basepath}env" - "${basepath}modulefiles" - ) - - file(COPY "${basepath}include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(COPY "${basepath}lib/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") - + file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.runtime,v=2023.0.0-*") + cmake_path(GET package_path STEM LAST_ONLY packstem) + message(STATUS "Extracting ${packstem}") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup" + "_installdir/mkl/2023.0.0/lib" + "_installdir/mkl/2023.0.0/licensing" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.devel,v=2023.0.0-*") + cmake_path(GET package_path STEM LAST_ONLY packstem) + message(STATUS "Extracting ${packstem}") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup" + "_installdir/mkl/2023.0.0/bin" + "_installdir/mkl/2023.0.0/include" + "_installdir/mkl/2023.0.0/lib" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.openmp,v=2023.0.0-*") + cmake_path(GET package_path STEM LAST_ONLY packstem) + message(STATUS "Extracting ${packstem}") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup" + "_installdir/compiler/2023.0.0" + WORKING_DIRECTORY "${extract_1_dir}" + LOGNAME "extract-${TARGET_TRIPLET}-${packstem}" + ) + + set(mkl_dir "${extract_1_dir}/_installdir/mkl/2023.0.0") + file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${mkl_dir}/${package_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(to_remove_suffix .a) + elseif(VCPKG_TARGET_IS_OSX) + set(to_remove_suffix .dylib) else() set(to_remove_suffix .so) endif() - file(GLOB_RECURSE files_to_remove "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?") + file(GLOB_RECURSE files_to_remove + "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" + "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?" + ) file(REMOVE ${files_to_remove}) - - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/lib/intel64" "/../lib/intel64") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") + file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\${exec_prefix}/${package_libdir}" "\${exec_prefix}/lib/intel64") + + set(compiler_dir "${extract_1_dir}/_installdir/compiler/2023.0.0") + if(threading STREQUAL "intel_thread") + file(COPY "${compiler_dir}/${compiler_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") + file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/${compiler_libdir}/" "/lib/intel64/") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5") endif() +endif() - if(threading STREQUAL "intel_thread") - file(COPY "${basepath2}linux/compiler/lib/intel64_lin/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/../lib/intel64/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "") +file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(GLOB pc_files RELATIVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + foreach(file IN LISTS pc_files) + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${file}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/include" "/../include") + if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/lib/intel64" "/../lib/intel64") endif() - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - if(NOT VCPKG_BUILD_TYPE) - configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include") - endif() - endif() + endforeach() +endif() - file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") - #TODO: Hardcode settings from portfile in config.cmake +file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin") +#TODO: Hardcode settings from portfile in config.cmake +#TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. - file(INSTALL "${basepath}licensing/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - endif() +file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.product,v=2023.0.0-*") +vcpkg_install_copyright(FILE_LIST "${package_path}/licenses/license.htm") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/intel-extract" - "${CURRENT_PACKAGES_DIR}/manual-tools" - ) -endif() +file(REMOVE_RECURSE + "${extract_0_dir}" + "${extract_1_dir}" + "${CURRENT_PACKAGES_DIR}/lib/intel64/cmake" + "${CURRENT_PACKAGES_DIR}/lib/intel64/pkgconfig" +) -if(NOT sha) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/mkl/vcpkg-cmake-wrapper.cmake" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "bin\${MKL_DLL_GLOB" "bin/\${MKL_DLL_GLOB") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" [["../bincompiler" "../compiler/lib"]] [["bin" "../bincompiler" "../compiler/lib"]]) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/intel-mkl/vcpkg-cmake-wrapper.cmake b/ports/intel-mkl/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 76592b33d3804a..00000000000000 --- a/ports/intel-mkl/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(MKL_THREADING "@threading@") -if("@VCPKG_TARGET_ARCHITECTURE@" STREQUAL "x64") - set(MKL_INTERFACE "@interface@") -endif() - -_find_package(${ARGS}) \ No newline at end of file diff --git a/ports/intel-mkl/vcpkg-port-config.cmake b/ports/intel-mkl/vcpkg-port-config.cmake deleted file mode 100644 index 09954ce075e36e..00000000000000 --- a/ports/intel-mkl/vcpkg-port-config.cmake +++ /dev/null @@ -1 +0,0 @@ -set(ENV{MKLROOT} "${CURRENT_INSTALLED_DIR}") \ No newline at end of file diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json index 59f36f41807eb6..0773404897ae4b 100644 --- a/ports/intel-mkl/vcpkg.json +++ b/ports/intel-mkl/vcpkg.json @@ -1,10 +1,11 @@ { "name": "intel-mkl", "version": "2023.0.0", + "port-version": 1, "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.", "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html", "license": null, - "supports": "(windows | linux) & x64", + "supports": "(windows | linux | osx) & x64", "dependencies": [ { "name": "vcpkg-tool-lessmsi", diff --git a/versions/baseline.json b/versions/baseline.json index b01b816f1d3f5e..dd0b82fec4c991 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3350,7 +3350,7 @@ }, "intel-mkl": { "baseline": "2023.0.0", - "port-version": 0 + "port-version": 1 }, "intelrdfpmathlib": { "baseline": "20U2", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index c0d958ef49c6f7..6b71917ac97597 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "285fa0de9d6f05022ce06e53f7c8c21048ff586f", + "version": "2023.0.0", + "port-version": 1 + }, { "git-tree": "e5a15d03509e3eaf676a2e3ec935acff7fbb9285", "version": "2023.0.0", From 43150d9aa44735eb34ab5230c96557c601bf013c Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sun, 14 May 2023 00:33:38 +0800 Subject: [PATCH 064/533] [libde265] update to v1.0.11 (#31413) * update to 1.0.11 * fix usage issue * fix patch * remove useless patch --- ports/libde265/fix-interface-include.patch | 13 +++++++++++++ ports/libde265/fix-libde265-headers.patch | 21 --------------------- ports/libde265/portfile.cmake | 12 +++++------- ports/libde265/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libde265.json | 5 +++++ 6 files changed, 26 insertions(+), 32 deletions(-) create mode 100644 ports/libde265/fix-interface-include.patch delete mode 100644 ports/libde265/fix-libde265-headers.patch diff --git a/ports/libde265/fix-interface-include.patch b/ports/libde265/fix-interface-include.patch new file mode 100644 index 00000000000000..1e252c5040b7c9 --- /dev/null +++ b/ports/libde265/fix-interface-include.patch @@ -0,0 +1,13 @@ +diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt +index d0d6762..06e1660 100644 +--- a/libde265/CMakeLists.txt ++++ b/libde265/CMakeLists.txt +@@ -114,7 +114,7 @@ endif() + + add_library(de265 ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS}) + target_link_libraries(de265 PRIVATE Threads::Threads) +-target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) ++target_include_directories(de265 PRIVATE $ PUBLIC $) + + write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion) + diff --git a/ports/libde265/fix-libde265-headers.patch b/ports/libde265/fix-libde265-headers.patch deleted file mode 100644 index fac2e35a862c2b..00000000000000 --- a/ports/libde265/fix-libde265-headers.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt -index 749c7fb..45e7419 100644 ---- a/libde265/CMakeLists.txt -+++ b/libde265/CMakeLists.txt -@@ -43,7 +43,7 @@ set (libde265_headers - bitstream.h - cabac.h - configparam.h -- de265-version.h -+ ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h - contextmodel.h - de265.h - deblock.h -@@ -119,7 +119,6 @@ install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config - ) - - install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) - - install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") - diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 87418395ba5425..38ab301905d288 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -1,13 +1,11 @@ -# Used for .pc file -set(VERSION "1.0.8") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 - REF 8aed7472df0af25b811828fa14f2f169dc34d35a # v1.0.8 - SHA512 e2da1436e5b0d8a3841087e879fbbff5a92de4ebb69d097959972ec8c9407305bc2a17020cb46139fbacc84f91ff8cfb4d9547308074ba213e002ee36bb2e006 + REF "v${VERSION}" + SHA512 aa744c521fb15e68940956f70997ab969094aee1c129d404ee9a52f318248353bb8d53250b575b4040402645e44701086b78143f1e1122b61a925e9b6cd07566 HEAD_REF master PATCHES - fix-libde265-headers.patch + fix-interface-include.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -24,7 +22,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265) -vcpkg_copy_tools(TOOL_NAMES dec265 enc265 AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN) set(prefix "") set(exec_prefix [[${prefix}]]) @@ -51,4 +49,4 @@ else() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index f0882e20270860..940bd7d347822f 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libde265", - "version": "1.0.8", - "port-version": 7, + "version": "1.0.11", "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index dd0b82fec4c991..a99b30b238267d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3921,8 +3921,8 @@ "port-version": 1 }, "libde265": { - "baseline": "1.0.8", - "port-version": 7 + "baseline": "1.0.11", + "port-version": 0 }, "libdeflate": { "baseline": "1.17", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index c7bb6e85276b8a..a20109b7e0d7a9 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550", + "version": "1.0.11", + "port-version": 0 + }, { "git-tree": "bba9b6bf501c046f81f7335d1efff23ed0845ed4", "version": "1.0.8", From 72116f0cdc21baa187a2526f2cdfd5c8d38e3ed7 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sun, 14 May 2023 00:34:48 +0800 Subject: [PATCH 065/533] [vcpkg baseline][binlog] disable performance tests (#31410) * [binlog] disable performance tests * update version * disable find benchmark * version --- ports/binlog/portfile.cmake | 1 + ports/binlog/vcpkg.json | 1 + versions/b-/binlog.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/binlog/portfile.cmake b/ports/binlog/portfile.cmake index 1d0a4479596e99..8322e1b2263b43 100644 --- a/ports/binlog/portfile.cmake +++ b/ports/binlog/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_cmake_configure( -DBINLOG_BUILD_EXAMPLES=OFF -DBINLOG_BUILD_UNIT_TESTS=OFF -DBINLOG_BUILD_INTEGRATION_TESTS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_benchmark=ON ) vcpkg_cmake_install() diff --git a/ports/binlog/vcpkg.json b/ports/binlog/vcpkg.json index 98de2e834bcd89..a11da3a0aedd1f 100644 --- a/ports/binlog/vcpkg.json +++ b/ports/binlog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "binlog", "version-date": "2021-04-16", + "port-version": 1, "description": "Binlog is a high performance C++ log library to produce structured binary logs.", "homepage": "http://opensource.morganstanley.com/binlog/", "license": "Apache-2.0", diff --git a/versions/b-/binlog.json b/versions/b-/binlog.json index f6d3cc586df678..966905acd5e548 100644 --- a/versions/b-/binlog.json +++ b/versions/b-/binlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53449cd8c7572c72137ace92720d632b671f2d17", + "version-date": "2021-04-16", + "port-version": 1 + }, { "git-tree": "eb0ae943fc2b0c1c19ad62308d1f321439967fd4", "version-date": "2021-04-16", diff --git a/versions/baseline.json b/versions/baseline.json index a99b30b238267d..01abdd8f42cbb2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -546,7 +546,7 @@ }, "binlog": { "baseline": "2021-04-16", - "port-version": 0 + "port-version": 1 }, "binn": { "baseline": "3.0", From 7657ac10771824ecdb14daba4ebcc64463f4dcef Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Sat, 13 May 2023 18:35:10 +0200 Subject: [PATCH 066/533] nghttp3: update to 0.11.0 (#31405) --- ports/nghttp3/portfile.cmake | 2 +- ports/nghttp3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index cd3e9b872d29b4..15d76e51acf56d 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 44dd4f4bb807a4d9f2c85399e83e3146ca8e18b4d4e9bca0b1a9a626daf1f9ca2892bfa55552267a3f43af7e6c6090ec662782936a45bada6faca822d1a31638 + SHA512 2f90bfe983370a10b513991d42304dc4200f28d309e7877e7f112dd6363c6ad4b3a9b348f9dc4263a5f8e216c75b662a8cbc7c4f31e75b5bbb2c99fd6e238c86 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index a9109b544165a8..bd3e81a2c03259 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.10.0", + "version": "0.11.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 01abdd8f42cbb2..16fdcf362cbba6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5553,7 +5553,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "0.10.0", + "baseline": "0.11.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 3340e073f44187..7bcca795650b9f 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8139cb08a1dea31b13af01d3027129cf7874acab", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "b490beccb519c1faa3bfbfae0bb6e8e873aed843", "version": "0.10.0", From 445385e1ae5105ff6afe1589c702bad55446126d Mon Sep 17 00:00:00 2001 From: rinechran Date: Sun, 14 May 2023 01:36:02 +0900 Subject: [PATCH 067/533] [Thorvg] Update to 0.9.0 (#31401) * feat : update thorvg 0.9.0 * doc : update baseline --- ports/thorvg/install-tools.patch | 12 ++++++------ ports/thorvg/portfile.cmake | 4 ++-- ports/thorvg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/thorvg.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/thorvg/install-tools.patch b/ports/thorvg/install-tools.patch index 207d6ee1237df5..266598002be38b 100644 --- a/ports/thorvg/install-tools.patch +++ b/ports/thorvg/install-tools.patch @@ -1,22 +1,22 @@ diff --git a/src/bin/svg2png/meson.build b/src/bin/svg2png/meson.build -index 8011410..40cf3f9 100644 +index ed21489e..c3fb3188 100644 --- a/src/bin/svg2png/meson.build +++ b/src/bin/svg2png/meson.build -@@ -3,4 +3,5 @@ svg2png_src = files('svg2png.cpp', 'lodepng.cpp') - executable('svg2png', +@@ -4,4 +4,5 @@ executable('svg2png', svg2png_src, include_directories : headers, + cpp_args: compiler_flags, - link_with : thorvg_lib) + link_with : thorvg_lib, + install : true, install_dir : get_option('bindir')) diff --git a/src/bin/svg2tvg/meson.build b/src/bin/svg2tvg/meson.build -index 2df9fac..ffd5a20 100644 +index a40111aa..a02f4b8a 100644 --- a/src/bin/svg2tvg/meson.build +++ b/src/bin/svg2tvg/meson.build -@@ -3,4 +3,5 @@ svg2tvg_src = files('svg2tvg.cpp') - executable('svg2tvg', +@@ -4,4 +4,5 @@ executable('svg2tvg', svg2tvg_src, include_directories : headers, + cpp_args: compiler_flags, - link_with : thorvg_lib) + link_with : thorvg_lib, + install : true, install_dir : get_option('bindir')) diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index f2338c23664df0..9296715cd62e82 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg - REF v0.8.4 - SHA512 8e885a8c56efb129fb3ab90b9a7b765b84f5f520a9c7a5c92af4ffe61bac1b928165801b64ebc7db77046e1aaf2918ed0ffdf98cb9572dc6d46ed6de3f96b9b7 + REF v0.9.0 + SHA512 c0294a60f0b2e432bec62e1c44f0cb632420ec5c9390df210c8b8db5507fa8f5946bdc8a7879007e4e54865dc4538f4bf1e26d76f90a324cc5edd5cdf61c0fc0 HEAD_REF master PATCHES install-tools.patch diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index 228ec70b592fd3..32d91a7dcb4e00 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "thorvg", - "version": "0.8.4", + "version": "0.9.0", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 16fdcf362cbba6..479e9a13cebb12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7889,7 +7889,7 @@ "port-version": 6 }, "thorvg": { - "baseline": "0.8.4", + "baseline": "0.9.0", "port-version": 0 }, "threadpool": { diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 12671bba96af19..c768020af7f105 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e0dd9030c6e211cbf558dae00ea87e9591a09f8", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "09d722c7f2cb784d571af9a6f46abb83aa907d2b", "version": "0.8.4", From 3e235d6817d953bc0744d7d78538bc4d520c9e95 Mon Sep 17 00:00:00 2001 From: Vollate Date: Sun, 14 May 2023 00:38:05 +0800 Subject: [PATCH 068/533] [caf] update to 0.19.1 (#31347) (#31394) --- ports/caf/portfile.cmake | 4 ++-- ports/caf/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/caf.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index c186a2272c4e30..245e17fee2bd79 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6 - SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76 + REF bac5b8b24a62ff2a818de1b08f6f31f897e42222 # 0.19.1 + SHA512 c61f3cce4d4707f19db8c1b1a8b2c4655335a7a29c77a0c9692775c9fcdc90d6dce75d3122804c31cf66c47f37d3a3674ad18df67d1204c7f52eb4740ff766af HEAD_REF master PATCHES fix_dependency.patch diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index 5d89216c3c37ec..f0f6c8088189f1 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "caf", - "version": "0.18.6", - "port-version": 1, + "version": "0.19.1", "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 479e9a13cebb12..24678ee6879985 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1341,8 +1341,8 @@ "port-version": 0 }, "caf": { - "baseline": "0.18.6", - "port-version": 1 + "baseline": "0.19.1", + "port-version": 0 }, "caffe2": { "baseline": "0.8.1", diff --git a/versions/c-/caf.json b/versions/c-/caf.json index b2ef7f0a4143ce..44b4a548632e8c 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0561defb72007b054cede4fed6ef5950f8c2e2bc", + "version": "0.19.1", + "port-version": 0 + }, { "git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1", "version": "0.18.6", From 49381cbd45469826bb6fc96f3e4ef35482240af5 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sun, 14 May 2023 00:39:45 +0800 Subject: [PATCH 069/533] [qt-advanced-docking-system] Update to 4.0.3 (#31390) * [qt-advanced-docking-system] Update to 4.0.3 * update version * fix find_dependency * update version --- .../config_changes.patch | 13 ------------- .../qt-advanced-docking-system/portfile.cmake | 18 ++++++++---------- ports/qt-advanced-docking-system/qt.patch | 4 ++-- ports/qt-advanced-docking-system/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/q-/qt-advanced-docking-system.json | 5 +++++ 6 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 ports/qt-advanced-docking-system/config_changes.patch diff --git a/ports/qt-advanced-docking-system/config_changes.patch b/ports/qt-advanced-docking-system/config_changes.patch deleted file mode 100644 index 106ba1c8e66508..00000000000000 --- a/ports/qt-advanced-docking-system/config_changes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 49cd799..6535465 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -54,7 +54,7 @@ if (UNIX AND NOT APPLE) - set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) - set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS}) - endif() --if(BUILD_STATIC) -+if(NOT BUILD_SHARED_LIBS) - add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS}) - target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) - else() diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index ae300ba026f247..2f404860a994a0 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF d5fefaa35fb53e299b7f39b0d8f541954c710d94 - SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22 + REF "${VERSION}" + SHA512 d7b1501cd8d15aead7eca38172f3335d5a5f3165f948658df09016b773a870f024d16bf472ed7a65cb178408177a6af9db647892942818e53d044f67648e3435 HEAD_REF master PATCHES - config_changes.patch qt.patch ) @@ -23,19 +21,19 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DADS_VERSION=${VERSION} -DQT_VERSION_MAJOR=6 - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE -DBUILD_STATIC=${BUILD_STATIC} - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Qt5 ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "qtadvanceddocking" CONFIG_PATH "lib/cmake/qtadvanceddocking") +vcpkg_cmake_config_fixup(PACKAGE_NAME "qt6advanceddocking" CONFIG_PATH "lib/cmake/qt6advanceddocking") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/qt6advanceddocking/qt6advanceddockingConfig.cmake" +"include(CMakeFindDependencyMacro)" +[[include(CMakeFindDependencyMacro) +find_dependency(Qt6 COMPONENTS Core Gui Widgets)]]) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/license") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/license") file(INSTALL "${SOURCE_PATH}/gnu-lgpl-v2.1.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/qt-advanced-docking-system/qt.patch b/ports/qt-advanced-docking-system/qt.patch index 08d5062ea14b19..29643835b14ab4 100644 --- a/ports/qt-advanced-docking-system/qt.patch +++ b/ports/qt-advanced-docking-system/qt.patch @@ -1,11 +1,11 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 653546544..2091bce16 100644 +index 2ec56aa..054ea73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.5) project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT}) -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) - find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED) if (UNIX AND NOT APPLE) include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS}) diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index 4ce52db41dc703..50ec23d894ec26 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt-advanced-docking-system", - "version": "3.8.2", - "port-version": 2, + "version": "4.0.3", "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 24678ee6879985..6e1ae3dcb40d33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6461,8 +6461,8 @@ "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "3.8.2", - "port-version": 2 + "baseline": "4.0.3", + "port-version": 0 }, "qt3d": { "baseline": "6.5.0", diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index db37199fb36dfc..1712819963e317 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "152f31d925c8f0d75f41ad9f656abbe8f30c1b44", + "version": "4.0.3", + "port-version": 0 + }, { "git-tree": "0e2298c569112e322898697b9680723c35a55cd5", "version": "3.8.2", From 3880056be47c74f1ebe709c8671062ad18ef2292 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 13 May 2023 18:45:03 +0200 Subject: [PATCH 070/533] [baseline][libzim][xapian] Disable gtest, fix mingw and windows builds (#31383) * [libzim] WIP * Control gtest * More fixes, test xapian * [xapian] Fix windows and mingw * dllexport * Finish PR * CI baseline * [xapian] Update supports * Fix arm64 --- ports/libzim/0001-build-share-library.patch | 26 ----------- ports/libzim/cross-builds.diff | 42 +++++++++++++++++ ports/libzim/disable-gtest.diff | 13 ++++++ ports/libzim/dllexport.diff | 52 +++++++++++++++++++++ ports/libzim/portfile.cmake | 14 ++---- ports/libzim/vcpkg.json | 2 +- ports/xapian/configure.diff | 23 +++++++++ ports/xapian/msvc-no-debug.diff | 13 ++++++ ports/xapian/portfile.cmake | 29 ++++++------ ports/xapian/vcpkg.json | 3 +- scripts/ci.baseline.txt | 3 -- versions/baseline.json | 4 +- versions/l-/libzim.json | 5 ++ versions/x-/xapian.json | 5 ++ 14 files changed, 178 insertions(+), 56 deletions(-) delete mode 100644 ports/libzim/0001-build-share-library.patch create mode 100644 ports/libzim/cross-builds.diff create mode 100644 ports/libzim/disable-gtest.diff create mode 100644 ports/libzim/dllexport.diff create mode 100644 ports/xapian/configure.diff create mode 100644 ports/xapian/msvc-no-debug.diff diff --git a/ports/libzim/0001-build-share-library.patch b/ports/libzim/0001-build-share-library.patch deleted file mode 100644 index b25326b9715cac..00000000000000 --- a/ports/libzim/0001-build-share-library.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/meson.build b/meson.build -index 6862f75..d887f9a 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,8 +37,6 @@ static_linkage = static_linkage or get_option('default_library')=='static' - lzma_dep = dependency('liblzma', static:static_linkage) - if static_linkage - add_project_arguments('-DLZMA_API_STATIC', language: 'cpp') --else -- private_conf.set('LIBZIM_EXPORT_DLL', true) - endif - - zstd_dep = dependency('libzstd', static:static_linkage) -@@ -59,6 +57,9 @@ pkg_requires = ['liblzma', 'libzstd'] - if build_machine.system() == 'windows' - extra_link_args = ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-licuuc', '-licuin'] - extra_cpp_args = ['-DSORTPP_PASS'] -+ if not static_linkage -+ extra_cpp_args += ['-DLIBZIM_EXPORT_DLL'] -+ endif - else - extra_link_args = [] - extra_cpp_args = [] --- -2.37.3.windows.1 - diff --git a/ports/libzim/cross-builds.diff b/ports/libzim/cross-builds.diff new file mode 100644 index 00000000000000..0916513f91de73 --- /dev/null +++ b/ports/libzim/cross-builds.diff @@ -0,0 +1,42 @@ +diff --git a/meson.build b/meson.build +index 85d8da7..7f97dbc 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,7 +3,7 @@ project('libzim', ['c', 'cpp'], + license : 'GPL2', + default_options : ['c_std=c11', 'cpp_std=c++11']) + +-if build_machine.system() != 'windows' ++if host_machine.system() != 'windows' or meson.get_compiler('cpp').get_id() == 'gcc' + add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp') + endif + +@@ -56,8 +56,8 @@ private_conf.set('ENABLE_XAPIAN', xapian_dep.found()) + public_conf.set('LIBZIM_WITH_XAPIAN', xapian_dep.found()) + + pkg_requires = ['liblzma', 'libzstd'] +-if build_machine.system() == 'windows' +- extra_link_args = ['-lRpcrt4', '-lWs2_32', '-lwinmm', '-licuuc', '-licuin'] ++if host_machine.system() == 'windows' ++ extra_link_args = ['-lrpcrt4', '-lws2_32', '-lwinmm'] + extra_cpp_args = ['-DSORTPP_PASS'] + else + extra_link_args = [] +@@ -65,7 +65,7 @@ else + endif + + compiler = meson.get_compiler('cpp') +-if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd' ++if (compiler.get_id() == 'gcc' and host_machine.system() == 'linux') or host_machine.system() == 'freebsd' + # C++ std::thread is implemented using pthread on linux by gcc + thread_dep = dependency('threads') + else +@@ -74,6 +74,8 @@ endif + + if xapian_dep.found() + pkg_requires += ['xapian-core'] ++endif ++if true + icu_dep = dependency('icu-i18n', static:static_linkage) + pkg_requires += ['icu-i18n'] + else diff --git a/ports/libzim/disable-gtest.diff b/ports/libzim/disable-gtest.diff new file mode 100644 index 00000000000000..7609c09c832ed1 --- /dev/null +++ b/ports/libzim/disable-gtest.diff @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index d887f9a..270413d 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,7 @@ else + icu_dep = dependency('icu-i18n', required:false, static:static_linkage) + endif + +-gtest_dep = dependency('gtest', main:true, fallback:['gtest', 'gtest_main_dep'], required:false) ++gtest_dep = dependency('', required:false) + + inc = include_directories('include') + diff --git a/ports/libzim/dllexport.diff b/ports/libzim/dllexport.diff new file mode 100644 index 00000000000000..d643f4110237b5 --- /dev/null +++ b/ports/libzim/dllexport.diff @@ -0,0 +1,52 @@ +diff --git a/include/zim/zim.h b/include/zim/zim.h +index 5d1af80..6171f56 100644 +--- a/include/zim/zim.h ++++ b/include/zim/zim.h +@@ -33,14 +33,16 @@ + #define DEPRECATED + #endif + +-#if (defined _WIN32 || defined __CYGWIN__) && defined LIBZIM_EXPORT_DLL ++#include ++ ++#if defined(LIBZIM_DLL) && defined(LIBZIM_BUILDING_LIBRARY) + #define LIBZIM_API __declspec(dllexport) ++#elif defined(LIBZIM_DLL) ++ #define LIBZIM_API __declspec(dllimport) + #else + #define LIBZIM_API + #endif + +-#include +- + namespace zim + { + // An index of an entry (in a zim file) +diff --git a/meson.build b/meson.build +index 7f97dbc..8fd13d7 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,6 +14,10 @@ sizeof_size_t = cpp.sizeof('size_t') + private_conf = configuration_data() + public_conf = configuration_data() + ++if host_machine.system() == 'windows' and get_option('default_library') == 'shared' ++ public_conf.set('LIBZIM_DLL', true) ++endif ++ + private_conf.set('VERSION', '"@0@"'.format(meson.project_version())) + public_conf.set('LIBZIM_VERSION', '"@0@"'.format(meson.project_version())) + private_conf.set('DIRENT_CACHE_SIZE', get_option('DIRENT_CACHE_SIZE')) +diff --git a/src/meson.build b/src/meson.build +index 4529b7c..956b145 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -75,7 +75,7 @@ libzim = library('zim', + include_directories : inc, + dependencies : deps, + link_args : extra_link_args, +- cpp_args : extra_cpp_args, ++ cpp_args : extra_cpp_args + '-DLIBZIM_BUILDING_LIBRARY', + version: meson.project_version(), + install : true) + libzim_dep = declare_dependency(link_with: libzim, diff --git a/ports/libzim/portfile.cmake b/ports/libzim/portfile.cmake index 83bfd7fc3b5703..85b0bf595a10d0 100644 --- a/ports/libzim/portfile.cmake +++ b/ports/libzim/portfile.cmake @@ -1,11 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openzim/libzim - REF ${VERSION} + REF "${VERSION}" SHA512 4554a9237f5167f6f94aad76ef0e847e949c47c6ee2a89bbd6e587da3b3a3e2d0a8b2d03f7a0fbde0e0dc96fb61bf8c115b3ef3cbd7eff5e880f152bee9b29f0 HEAD_REF main PATCHES - 0001-build-share-library.patch + cross-builds.diff + dllexport.diff + disable-gtest.diff ) set(EXTRA_OPTIONS "") @@ -14,12 +16,6 @@ if(NOT "xapian" IN_LIST FEATURES) list(APPEND EXTRA_OPTIONS "-Dwith_xapian=false") endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - list(APPEND EXTRA_OPTIONS "-Dstatic-linkage=false") -else() - list(APPEND EXTRA_OPTIONS "-Dstatic-linkage=true") -endif() - vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -27,7 +23,7 @@ vcpkg_configure_meson( ${EXTRA_OPTIONS} ) -vcpkg_install_meson(ADD_BIN_TO_PATH) +vcpkg_install_meson() vcpkg_copy_pdbs() diff --git a/ports/libzim/vcpkg.json b/ports/libzim/vcpkg.json index c949aaf4fd0d5d..9df7dd355e7c24 100644 --- a/ports/libzim/vcpkg.json +++ b/ports/libzim/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libzim", "version": "8.2.0", + "port-version": 1, "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.", "homepage": "https://github.com/openzim/libzim", "license": "GPL-2.0-or-later", @@ -17,7 +18,6 @@ "features": { "xapian": { "description": "Enable xapian support", - "supports": "!(windows & !mingw)", "dependencies": [ "xapian" ] diff --git a/ports/xapian/configure.diff b/ports/xapian/configure.diff new file mode 100644 index 00000000000000..9c2ce041af6b6b --- /dev/null +++ b/ports/xapian/configure.diff @@ -0,0 +1,23 @@ +diff --git a/configure.ac b/configure.ac +index ca5b7b2..b059402 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -870,6 +870,7 @@ case $enable_backend_chert$enable_backend_glass in + dnl + dnl Similarly for uuid support. + ++ if false; then + dnl Check for zlib.h. + AC_CHECK_HEADERS([zlib.h], [], [ + AC_MSG_ERROR([zlib.h not found - required for chert and glass (you may need to install the zlib1g-dev or zlib-devel package)]) +@@ -879,6 +880,10 @@ case $enable_backend_chert$enable_backend_glass in + AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [ + AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll - required for chert and glass (you may need to install the zlib1g-dev or zlib-devel package)]) + ]) ++ fi ++ PKG_CHECK_MODULES([ZLIB], [zlib], [],[AC_MSG_ERROR([zlib library not found])]) ++ CFLAGS="$LIBS $ZLIB_CFLAGS" ++ LIBS="$ZLIB_LIBS $LIBS" + + dnl Find a way to generate UUIDs. + diff --git a/ports/xapian/msvc-no-debug.diff b/ports/xapian/msvc-no-debug.diff new file mode 100644 index 00000000000000..1d41a3201a292b --- /dev/null +++ b/ports/xapian/msvc-no-debug.diff @@ -0,0 +1,13 @@ +diff --git a/include/xapian/version_h.cc b/include/xapian/version_h.cc +index b36ae4d..c61e31a 100644 +--- a/include/xapian/version_h.cc ++++ b/include/xapian/version_h.cc +@@ -75,7 +75,7 @@ const char * dummy[] = { + "#endif", + "#endif", + "", +-#elif defined _MSC_VER ++#elif 0 + // When building the library with MSVC, generate preprocessor code to check + // that the same setting of _DEBUG is used for building applications as was + // used for building the library. diff --git a/ports/xapian/portfile.cmake b/ports/xapian/portfile.cmake index 0e647ffbd399e9..2d432e81dfc0e9 100644 --- a/ports/xapian/portfile.cmake +++ b/ports/xapian/portfile.cmake @@ -1,30 +1,31 @@ vcpkg_download_distfile(ARCHIVE - URLS https://oligarchy.co.uk/xapian/1.4.22/xapian-core-1.4.22.tar.xz - FILENAME xapian-core-1.4.22.tar.xz + URLS "https://oligarchy.co.uk/xapian/${VERSION}/xapian-core-${VERSION}.tar.xz" + FILENAME "xapian-core-${VERSION}.tar.xz" SHA512 60d66adbacbd59622d25e392060984bd1dc6c870f9031765f54cb335fb29f72f6d006d27af82a50c8da2cfbebd08dac4503a8afa8ad51bc4e6fa9cb367a59d29 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + configure.diff + msvc-no-debug.diff ) -if(WIN32) - vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "z zlib zdll" "z zlib zdll zlibd") - - if(MSVC) - # xapian.h has _DEBUG macro detection which will make the vcpkg check fail,replace #error with #warning - vcpkg_replace_string("${SOURCE_PATH}/include/xapian/version_h.cc" "#error" "#warning") - - set(OPTIONS "CXXFLAGS=-EHsc") - endif() +set(OPTIONS "") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS + ac_cv_have_decl___popcnt=no + ac_cv_have_decl___popcnt64=no + ) endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG USE_WRAPPERS - OPTIONS ${OPTIONS} + OPTIONS + ${OPTIONS} ) vcpkg_install_make() @@ -32,7 +33,7 @@ vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xapian) -if (NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/xapian-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../../debug") @@ -40,4 +41,4 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/xapian/vcpkg.json b/ports/xapian/vcpkg.json index 68ede6530915c3..42071590a0b225 100644 --- a/ports/xapian/vcpkg.json +++ b/ports/xapian/vcpkg.json @@ -1,10 +1,11 @@ { "name": "xapian", "version": "1.4.22", + "port-version": 1, "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)", "homepage": "https://xapian.org/", "license": "GPL-2.0-or-later", - "supports": "!(windows & arm) & !uwp", + "supports": "(!arm | arm64) & !uwp", "dependencies": [ { "name": "vcpkg-cmake-config", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 55f9f2346dcc28..f4a6e01192f374 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1710,10 +1710,7 @@ x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-android=fail x265:x64-uwp=fail -xalan-c:x64-windows-static=fail -xalan-c:arm64-windows=fail # No xorg-macros available on osx -xapian:arm-neon-android=fail xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail xbitmaps:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 6e1ae3dcb40d33..1555e8a69c1707 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4838,7 +4838,7 @@ }, "libzim": { "baseline": "8.2.0", - "port-version": 0 + "port-version": 1 }, "libzip": { "baseline": "1.9.2", @@ -8602,7 +8602,7 @@ }, "xapian": { "baseline": "1.4.22", - "port-version": 0 + "port-version": 1 }, "xaudio2redist": { "baseline": "1.2.11", diff --git a/versions/l-/libzim.json b/versions/l-/libzim.json index a0f5cc6ba622b3..52f4ea9bc578df 100644 --- a/versions/l-/libzim.json +++ b/versions/l-/libzim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1488a183ad98b3610343e68c207554492b1e8c8e", + "version": "8.2.0", + "port-version": 1 + }, { "git-tree": "93b2790850e120148daf03563e24e6ed3ee9e02e", "version": "8.2.0", diff --git a/versions/x-/xapian.json b/versions/x-/xapian.json index e74f6ae9efc7cb..1e183f3ba05045 100644 --- a/versions/x-/xapian.json +++ b/versions/x-/xapian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a050725d62e180539040589c1691a5ec3974a30", + "version": "1.4.22", + "port-version": 1 + }, { "git-tree": "f2da71ae6ceb7c0d2317c1d06f11a302f48f89dd", "version": "1.4.22", From 5fee480e662f050574d38dc4d61d13d0e08e6392 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Sat, 13 May 2023 09:45:45 -0700 Subject: [PATCH 071/533] [Azure Storage] Update to May Release (#31345) * [azure-storage-common-cpp] Update to 12.3.2 ## 12.3.2 (2023-05-09) ### Features Added - Bumped up Account SAS version to `2022-11-02`. * [azure-storage-files-datalake-cpp] Update to 12.6.0 ## 12.6.0 (2023-05-09) - New features in `12.6.0-beta.1` are now generally available. * [azure-storage-files-shares-cpp] Update to 12.5.0 ## 12.5.0 (2023-05-09) ### Features Added - New features in `12.5.0-beta.1` are now generally available. ### Bugs Fixed - Fixed a bug where `ShareFileClient::ListHandles` and `ShareDirectoryClient::ListHandles` always return empty list. --- ports/azure-storage-common-cpp/portfile.cmake | 6 +++--- ports/azure-storage-common-cpp/vcpkg.json | 4 ++-- ports/azure-storage-files-datalake-cpp/portfile.cmake | 6 +++--- ports/azure-storage-files-datalake-cpp/vcpkg.json | 4 ++-- ports/azure-storage-files-shares-cpp/portfile.cmake | 6 +++--- ports/azure-storage-files-shares-cpp/vcpkg.json | 4 ++-- versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 6 +++--- 10 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 91c474ecad3970..9ef991aeb312ea 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.3.1 - SHA512 4c062c23637ed94b7688292649d02fb0c67d6402ec682b7a077f3a2aa7dc322cf01e979c5042407876b8c1407cba339252c0c1dde2b7e7aa6727ecfcbe9633ca + REF azure-storage-common_12.3.2 + SHA512 e437c12ba1056838a1d68257522f412f709b4bcbd3e58d4f7fc47768f125a61258667e0f4fcb93927522da9ab2a9495c3d8c53d81f01a86feb142a7025b1ee4c ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 802869816e7797..24dfb910a93c91 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.3.1", + "version-semver": "12.3.2", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.8.0" + "version>=": "1.9.0" }, { "name": "libxml2", diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 6b4fd14d1f1de2..d1f39b7bad4922 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.5.0 - SHA512 fe6b7ffe6efa24c273e3151fdeadb4b981e277bf9aa7b19b23759d5070bfc0c65c365296add83fb4f364b0653a651be31d9ccbd06bfc4c6ac62cf0c5330a66dc + REF azure-storage-files-datalake_12.6.0 + SHA512 29f1f929abdb7a013593679143ad7a90b52af10f630832c15c133c11925c27528d9221c73ad1b53aad59d7017c82347a4d06bfaf96aaa9ae60ea5a23d8355fcc ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index a0bff61355efc1..4ca085dc661f12 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.5.0", + "version-semver": "12.6.0", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.6.2" + "version>=": "12.7.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 5b82217a1bce55..19be8c992e0b07 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.4.0 - SHA512 e064d808b92de3ec32d4328ce274c9a67ea03f106f71afe311182ed9eff3adad1dfb00ade83da98b10a8e6a7d3b6082d965a1af4b495fd92879d21b669c55ba0 + REF azure-storage-files-shares_12.5.0 + SHA512 e56a3af0df71f9887248fdf48274345b236a56a7556235d1c3bab61668fee0c1163e86339c080166445c6b66dfbbba1938204592ca6f6a2b232303836317d7f6 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/" OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index e5c76e20ccd210..c42fe1433482a1 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.4.0", + "version-semver": "12.5.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.3.1" + "version>=": "12.3.2" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index ef5e077ab8ab06..8c8539dcb5d5f1 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13de7bf9db0ab19424dcbf7413c3bf2aa5798653", + "version-semver": "12.3.2", + "port-version": 0 + }, { "git-tree": "934133a1c7576ddd824292411199b9bc8f4629f9", "version-semver": "12.3.1", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index ae63987d252f4b..90e7f41a82ab9b 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c8ba7dabf8011127712dc95628ca1029b0c92c3", + "version-semver": "12.6.0", + "port-version": 0 + }, { "git-tree": "12acf62b792b5b9b406eea20f8b3b25e30a32eca", "version-semver": "12.5.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 50113d2adf50e7..24ca95ae667855 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f264428685ea6f882d9c58a9915c83665d428456", + "version-semver": "12.5.0", + "port-version": 0 + }, { "git-tree": "10d67bcd4301e8b3fa5d89b9f8e6eecd835b276f", "version-semver": "12.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1555e8a69c1707..cc9a472a47fd70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -437,7 +437,7 @@ "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.3.1", + "baseline": "12.3.2", "port-version": 0 }, "azure-storage-cpp": { @@ -445,11 +445,11 @@ "port-version": 5 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.5.0", + "baseline": "12.6.0", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.4.0", + "baseline": "12.5.0", "port-version": 0 }, "azure-storage-queues-cpp": { From acf66d284e432e63f286610504b31e1700d2e124 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 13 May 2023 18:46:59 +0200 Subject: [PATCH 072/533] [minizip] Enable uwp (#31261) * [minizip] Enable uwp * Test tools * baseline * Add IOWIN32_USING_WINRT_API [skip actions] * Finish PR --- ports/minizip/CMakeLists.txt | 4 ++++ ports/minizip/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/m-/minizip.json | 5 +++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index bcf284b4e5686a..6826b5847da58f 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -45,6 +45,10 @@ if(ANDROID) target_compile_definitions(minizip PRIVATE IOAPI_NO_64) endif() +if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + target_compile_definitions(minizip PRIVATE -DIOWIN32_USING_WINRT_API) +endif() + if(NOT DISABLE_INSTALL_TOOLS) add_executable(minizip_bin minizip.c) add_executable(miniunz_bin miniunz.c) diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index c9fca5c565c895..6bbf27021d17da 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,11 +1,10 @@ { "name": "minizip", "version-semver": "1.2.13", - "port-version": 1, + "port-version": 2, "description": "Minizip zip file manipulation library", "homepage": "https://github.com/madler/zlib", "license": "Zlib", - "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4a6e01192f374..d6816451fb4141 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -949,8 +949,6 @@ minio-cpp:arm-neon-android=fail miniply:arm-neon-android=fail miniupnpc:arm-uwp=fail miniupnpc:x64-uwp=fail -minizip:arm-uwp=fail -minizip:x64-uwp=fail # Conflicts with signalrclient microsoft-signalr:arm64-windows=skip microsoft-signalr:arm-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index cc9a472a47fd70..08e0ff5dc34edd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5238,7 +5238,7 @@ }, "minizip": { "baseline": "1.2.13", - "port-version": 1 + "port-version": 2 }, "minizip-ng": { "baseline": "3.0.7", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index e404bec6ac833b..c9eeb9d1d78c6a 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48d519ab0025623c54756c482453f8405d2646bd", + "version-semver": "1.2.13", + "port-version": 2 + }, { "git-tree": "c8831fffa825d9fafc38f1e3587046c49051ecba", "version-semver": "1.2.13", From 721328e357cd5d2dab6402f0e5e5c0ceb76ba919 Mon Sep 17 00:00:00 2001 From: bjornthirud <42637660+bjornthirud@users.noreply.github.com> Date: Sat, 13 May 2023 21:32:59 +0200 Subject: [PATCH 073/533] [easyloggingpp] Features to support multithreading (#31396) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ports/easyloggingpp features to support multi-threaded applications * New version of ports/easyloggingpp --------- Co-authored-by: Bjørn Thirud --- .../0001_add_cmake_options.patch | 34 +++++++++++++++++++ ports/easyloggingpp/portfile.cmake | 10 ++++++ ports/easyloggingpp/vcpkg.json | 15 ++++++-- versions/baseline.json | 2 +- versions/e-/easyloggingpp.json | 5 +++ 5 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 ports/easyloggingpp/0001_add_cmake_options.patch diff --git a/ports/easyloggingpp/0001_add_cmake_options.patch b/ports/easyloggingpp/0001_add_cmake_options.patch new file mode 100644 index 00000000000000..b20745f1d49b2d --- /dev/null +++ b/ports/easyloggingpp/0001_add_cmake_options.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 538cc8a..9221dab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,10 @@ option(test "Build all tests" OFF) + option(build_static_lib "Build easyloggingpp as a static library" OFF) + option(lib_utc_datetime "Build library with UTC date/time logging" OFF) + ++option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF) ++option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF) ++option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF) ++ + set(ELPP_MAJOR_VERSION "9") + set(ELPP_MINOR_VERSION "96") + set(ELPP_PATCH_VERSION "7") +@@ -57,6 +61,18 @@ if (build_static_lib) + add_definitions(-DELPP_UTC_DATETIME) + endif() + ++ if (no_default_logfile) ++ add_definitions(-DELPP_NO_DEFAULT_LOG_FILE) ++ endif() ++ ++ if (thread_safe) ++ add_definitions(-DELPP_THREAD_SAFE) ++ endif() ++ ++ if (use_std_threads) ++ add_definitions(-DELPP_FORCE_USE_STD_THREAD) ++ endif() ++ + require_cpp11() + add_library(easyloggingpp STATIC src/easylogging++.cc) + set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index 22f8b5ab9f3ecc..1e84b372483ea7 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -6,11 +6,21 @@ vcpkg_from_github( REF v9.97.0 SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d HEAD_REF master + PATCHES + 0001_add_cmake_options.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + std-locking use_std_threads + thread-safe thread_safe + no-defaultfile no_default_logfile ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -Dbuild_static_lib=ON ) vcpkg_cmake_install() diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json index 8a5e5bbe1d965a..4ebffddaf3799a 100644 --- a/ports/easyloggingpp/vcpkg.json +++ b/ports/easyloggingpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyloggingpp", "version": "9.97.0", - "port-version": 2, + "port-version": 3, "description": "Easylogging++ is a single header efficient logging library for C++ applications.", "homepage": "https://github.com/amrayn/easyloggingpp", "dependencies": [ @@ -13,5 +13,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "no-defaultfile": { + "description": "Do not write to default log file \"myeasylog.log\" (compile with ELPP_NO_DEFAULT_LOG_FILE)" + }, + "std-locking": { + "description": "Use std::mutex for thread synchronization (compile with ELPP_FORCE_USE_STD_THREAD)" + }, + "thread-safe": { + "description": "Make easyloggingpp thread safe (compile with ELPP_THREAD_SAFE)" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 08e0ff5dc34edd..c9189bb17a4c70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2234,7 +2234,7 @@ }, "easyloggingpp": { "baseline": "9.97.0", - "port-version": 2 + "port-version": 3 }, "eathread": { "baseline": "1.32.09", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index a6e90e0aa8ce5a..535209398505dd 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69f6b238899967e671f818a164f21de0219546bc", + "version": "9.97.0", + "port-version": 3 + }, { "git-tree": "40ca985ab8030ca0daf7c902e413423801d3e3d4", "version": "9.97.0", From 304a45c544bcc3223b9e9ca2a7ddc6db6fddf1f2 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sun, 14 May 2023 03:35:42 +0800 Subject: [PATCH 074/533] [libproxy] Fix the issue that the proxy cannot run (#31391) * Fix the issue that the proxy cannot run * update version * fix build error * update version * fix build error on osx * update version * fix does not support android * update version --- ports/libproxy/fix-install-py.patch | 6 +++--- ports/libproxy/fix-tools-path.patch | 27 --------------------------- ports/libproxy/portfile.cmake | 14 ++++++++++---- ports/libproxy/support-windows.patch | 10 ++++++++++ ports/libproxy/usage | 2 +- ports/libproxy/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libproxy.json | 5 +++++ 8 files changed, 32 insertions(+), 38 deletions(-) delete mode 100644 ports/libproxy/fix-tools-path.patch diff --git a/ports/libproxy/fix-install-py.patch b/ports/libproxy/fix-install-py.patch index c4a630b97c275d..6c03602fbc936f 100644 --- a/ports/libproxy/fix-install-py.patch +++ b/ports/libproxy/fix-install-py.patch @@ -6,11 +6,11 @@ index 7c36e51..ee2c5bc 100644 add_custom_target(PMlibproxy ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.pm ${CMAKE_BINARY_DIR}/perl/Net/Libproxy.pm) -install( FILES Libproxy.pm DESTINATION ${PX_PERL_ARCH}/Net ) diff --git a/bindings/perl/src/CMakeLists.txt b/bindings/perl/src/CMakeLists.txt -index 2800a85..c5d8e0f 100644 +index 29e656d..dec5799 100644 --- a/bindings/perl/src/CMakeLists.txt +++ b/bindings/perl/src/CMakeLists.txt -@@ -21,5 +21,3 @@ target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) - target_compile_options(PLlibproxy PRIVATE ${PX_PERL_CCFLAGS}) +@@ -20,5 +20,3 @@ endif() + target_link_libraries(PLlibproxy ${PLlibproxy_LIB_DEPENDENCIES}) set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy") set_target_properties(PLlibproxy PROPERTIES PREFIX "") - diff --git a/ports/libproxy/fix-tools-path.patch b/ports/libproxy/fix-tools-path.patch deleted file mode 100644 index ba506117077c53..00000000000000 --- a/ports/libproxy/fix-tools-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk -index bbbd989..956948a 100644 ---- a/libproxy/cmake/pxmodule.cmk -+++ b/libproxy/cmake/pxmodule.cmk -@@ -20,7 +20,7 @@ function(px_module name build builtin) - add_library(${name} MODULE modules/${name}.cpp) - target_link_libraries(${name} libproxy) - set_target_properties(${name} PROPERTIES PREFIX "") -- install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR}) -+ install(TARGETS ${name} LIBRARY DESTINATION tools) - if(${ARGC} GREATER 3) - target_link_libraries(${name} ${ARGN}) - endif() -diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt -index 52010c6..0a3f4b5 100644 ---- a/utils/CMakeLists.txt -+++ b/utils/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories("../libproxy") - -+if (BUILD_TOOLS) - add_executable(proxy proxy.c) - target_link_libraries(proxy libproxy) --install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) -+install(TARGETS proxy RUNTIME DESTINATION tools) -+endif() -\ No newline at end of file diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 6764256007f362..e1540a676a7819 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libproxy/libproxy - REF 8fec01ed4b95afc71bf7710bf5b736a5de03b343 #0.4.18 - SHA512 6367d21b8816d7e5e3c75ee124c230ec89abbffa09538b6700c9ae61be33629f864617f51a2317e18d2fb960b09e26cae0e3503d747112f23921d1910856b109 + REF "${VERSION}" + SHA512 1148d688a9f070273a1a2b110a788561789799089660292bbba59fbf0a9caf7d28cb039a9ccdcb935f752e1e34739b2d2f4c784b1bb3bbaa03d108e7b38a4754 HEAD_REF master PATCHES - fix-tools-path.patch support-windows.patch fix-install-py.patch fix-module-lib-name.patch @@ -38,6 +37,8 @@ vcpkg_cmake_configure( WITH_PYTHON3 WITH_VALA MSVC_STATIC + BUILD_TOOLS + WITH_GNOME3 ) vcpkg_cmake_install() @@ -45,9 +46,14 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES proxy AUTO_CLEAN) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libproxy/support-windows.patch b/ports/libproxy/support-windows.patch index 1cad01ff412fe2..d49fa2c0af256c 100644 --- a/ports/libproxy/support-windows.patch +++ b/ports/libproxy/support-windows.patch @@ -29,3 +29,13 @@ index de68e5c..9356486 100644 -install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) +diff --git a/libproxy/cmake/pkgconfig.cmk b/libproxy/cmake/pkgconfig.cmk +index 89bfc62..ffa0897 100644 +--- a/libproxy/cmake/pkgconfig.cmk ++++ b/libproxy/cmake/pkgconfig.cmk +@@ -1,4 +1,4 @@ +-if(NOT WIN32 AND NOT APPLE) ++if(NOT WIN32) + find_package(PkgConfig) + + # Define our magical px_check_modules function diff --git a/ports/libproxy/usage b/ports/libproxy/usage index a37b13c5ada3dc..2a8d884866f413 100644 --- a/ports/libproxy/usage +++ b/ports/libproxy/usage @@ -1,5 +1,5 @@ The package libproxy provides CMake targets: - find_package(libproxy CONFIG REQUIRED) + find_package(libproxy REQUIRED) target_include_directories(main PRIVATE ${LIBPROXY_INCLUDE_DIR}) target_link_libraries(main PRIVATE ${LIBPROXY_LIBRARIES}) diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index 75752ab39a6f2b..fcd0b5d494b8f6 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libproxy", "version": "0.4.18", - "port-version": 1, + "port-version": 2, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", - "supports": "!uwp", + "supports": "!(uwp | android)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c9189bb17a4c70..dc5363acf16e61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4398,7 +4398,7 @@ }, "libproxy": { "baseline": "0.4.18", - "port-version": 1 + "port-version": 2 }, "libqcow": { "baseline": "20221124", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index b82123c976cadd..78403134351cbc 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "190bb3f2c7dcb0e36636bbed1e4619f1072c86f2", + "version": "0.4.18", + "port-version": 2 + }, { "git-tree": "74ecff4623774abaa9333489e644bdbc881e268f", "version": "0.4.18", From 9f0d3d4f21da7161845703dffef71d8bb0d93a06 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Sat, 13 May 2023 21:45:36 +0200 Subject: [PATCH 075/533] ltla-umappp (#31397) --- ports/ltla-aarand/portfile.cmake | 25 +++++++++++++++++++++++++ ports/ltla-aarand/vcpkg.json | 17 +++++++++++++++++ ports/ltla-cppirlba/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ltla-cppirlba/vcpkg.json | 19 +++++++++++++++++++ ports/ltla-cppkmeans/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ltla-cppkmeans/vcpkg.json | 19 +++++++++++++++++++ ports/ltla-knncolle/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ltla-knncolle/vcpkg.json | 20 ++++++++++++++++++++ ports/ltla-powerit/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ltla-powerit/vcpkg.json | 18 ++++++++++++++++++ ports/ltla-umappp/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ltla-umappp/vcpkg.json | 20 ++++++++++++++++++++ versions/baseline.json | 24 ++++++++++++++++++++++++ versions/l-/ltla-aarand.json | 9 +++++++++ versions/l-/ltla-cppirlba.json | 9 +++++++++ versions/l-/ltla-cppkmeans.json | 9 +++++++++ versions/l-/ltla-knncolle.json | 9 +++++++++ versions/l-/ltla-powerit.json | 9 +++++++++ versions/l-/ltla-umappp.json | 9 +++++++++ 19 files changed, 346 insertions(+) create mode 100644 ports/ltla-aarand/portfile.cmake create mode 100644 ports/ltla-aarand/vcpkg.json create mode 100644 ports/ltla-cppirlba/portfile.cmake create mode 100644 ports/ltla-cppirlba/vcpkg.json create mode 100644 ports/ltla-cppkmeans/portfile.cmake create mode 100644 ports/ltla-cppkmeans/vcpkg.json create mode 100644 ports/ltla-knncolle/portfile.cmake create mode 100644 ports/ltla-knncolle/vcpkg.json create mode 100644 ports/ltla-powerit/portfile.cmake create mode 100644 ports/ltla-powerit/vcpkg.json create mode 100644 ports/ltla-umappp/portfile.cmake create mode 100644 ports/ltla-umappp/vcpkg.json create mode 100644 versions/l-/ltla-aarand.json create mode 100644 versions/l-/ltla-cppirlba.json create mode 100644 versions/l-/ltla-cppkmeans.json create mode 100644 versions/l-/ltla-knncolle.json create mode 100644 versions/l-/ltla-powerit.json create mode 100644 versions/l-/ltla-umappp.json diff --git a/ports/ltla-aarand/portfile.cmake b/ports/ltla-aarand/portfile.cmake new file mode 100644 index 00000000000000..cf569bd65e836e --- /dev/null +++ b/ports/ltla-aarand/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/aarand + REF 84d48b65d49ce8b844398f11aff3015b86e17197 + SHA512 78b175055768dd8b0abab421b66d0d16ad9bc23f1d1406d774874d4ea12b11e199554ccf6a6ef02d10ef96ad5f652863e403aa3ec9522211958c78d243821ee5 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DAARAND_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_aarand + CONFIG_PATH lib/cmake/ltla_aarand +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-aarand/vcpkg.json b/ports/ltla-aarand/vcpkg.json new file mode 100644 index 00000000000000..60c5c7cf8fb618 --- /dev/null +++ b/ports/ltla-aarand/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ltla-aarand", + "version-date": "2023-03-19", + "description": "Aaron's random distributions for C++", + "homepage": "https://github.com/LTLA/aarand", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-cppirlba/portfile.cmake b/ports/ltla-cppirlba/portfile.cmake new file mode 100644 index 00000000000000..7a71588401d1ba --- /dev/null +++ b/ports/ltla-cppirlba/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/CppIrlba + REF d23a4c12b95563907cf8ca7584b7bb6625ff886b + SHA512 1fdc9552ab00c7c541b4cd34326075f257a30ebcf73dd633dd088b20a20cb0dd704be0c3295ab96d5a573cb1a783c19f34a3e5d860c719e413c098fd9df4cb3a + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DIRLBA_FETCH_EXTERN=OFF + -DIRLBA_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_irlba + CONFIG_PATH lib/cmake/ltla_irlba +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-cppirlba/vcpkg.json b/ports/ltla-cppirlba/vcpkg.json new file mode 100644 index 00000000000000..eaafa717bbef97 --- /dev/null +++ b/ports/ltla-cppirlba/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ltla-cppirlba", + "version-date": "2023-04-07", + "description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.", + "homepage": "https://github.com/LTLA/CppIrlba", + "license": "MIT", + "dependencies": [ + "eigen3", + "ltla-aarand", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-cppkmeans/portfile.cmake b/ports/ltla-cppkmeans/portfile.cmake new file mode 100644 index 00000000000000..f98a4b2f7438bf --- /dev/null +++ b/ports/ltla-cppkmeans/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/CppKmeans + REF 4c5aca44bffd8ed7d7243b2451105b572028e9d4 + SHA512 c56147bc89ab50aa4d738c1392dffcf32771ad4995cbb206a83af05294dbfe640a1da265d46e108816486374fe0e6fa45c1b1da770cdc4367a69195c3510ecd4 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKMEANS_FETCH_EXTERN=OFF + -DKMEANS_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_kmeans + CONFIG_PATH lib/cmake/ltla_kmeans +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-cppkmeans/vcpkg.json b/ports/ltla-cppkmeans/vcpkg.json new file mode 100644 index 00000000000000..d3a3902ba0a82a --- /dev/null +++ b/ports/ltla-cppkmeans/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ltla-cppkmeans", + "version-date": "2023-03-20", + "description": "C++ port of R's Hartigan-Wong implementation", + "homepage": "https://github.com/LTLA/CppKmeans", + "license": "MIT", + "dependencies": [ + "ltla-aarand", + "ltla-powerit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-knncolle/portfile.cmake b/ports/ltla-knncolle/portfile.cmake new file mode 100644 index 00000000000000..98855cdb83925e --- /dev/null +++ b/ports/ltla-knncolle/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/knncolle + REF 3ad6b8cdbd281d78c77390d5a6ded4513bdf3860 + SHA512 c6e66d8ea5501cb511fd88155d18b57b31661ad0e20f3289d9a7ec8fc558f91dd409487b53d41171111fdaa2baa11fe9548f01daf307a90121d17dc398203676 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKNNCOLLE_FETCH_EXTERN=OFF + -DKNNCOLLE_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_knncolle + CONFIG_PATH lib/cmake/ltla_knncolle +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-knncolle/vcpkg.json b/ports/ltla-knncolle/vcpkg.json new file mode 100644 index 00000000000000..f6655c6642c76d --- /dev/null +++ b/ports/ltla-knncolle/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ltla-knncolle", + "version-date": "2023-05-09", + "description": "Collection of KNN algorithms in C++", + "homepage": "https://github.com/LTLA/knncolle", + "license": "MIT", + "dependencies": [ + "annoy", + "hnswlib", + "ltla-cppkmeans", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-powerit/portfile.cmake b/ports/ltla-powerit/portfile.cmake new file mode 100644 index 00000000000000..6843077ee34a6f --- /dev/null +++ b/ports/ltla-powerit/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/powerit + REF 705c4a6209baeaf4a246c8a61c46ecd0d3473511 + SHA512 e45172baf90fe2e76152a53feb2a3b613a355482b657e5bc71f0eca4199dff947da70b44edd87efbdc4929eb39ec4455300edaf8f95eb394f61213657c97c321 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPOWERIT_FETCH_EXTERN=OFF + -DPOWERIT_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_powerit + CONFIG_PATH lib/cmake/ltla_powerit +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-powerit/vcpkg.json b/ports/ltla-powerit/vcpkg.json new file mode 100644 index 00000000000000..363288278eb957 --- /dev/null +++ b/ports/ltla-powerit/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ltla-powerit", + "version-date": "2023-03-19", + "description": "Lightweight C++ library for power iterations", + "homepage": "https://github.com/LTLA/powerit", + "license": "MIT", + "dependencies": [ + "ltla-aarand", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ltla-umappp/portfile.cmake b/ports/ltla-umappp/portfile.cmake new file mode 100644 index 00000000000000..3d08dd6e17cfb1 --- /dev/null +++ b/ports/ltla-umappp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LTLA/umappp + REF d18095ea8b6d62aa740a566411e439eaab16b71f + SHA512 5f05c9cd7eeac2c16e8dbb0e747c84bc5209e91e37cf8a120273b01f681e19afa69d52e03a6862386c75d9f4d62d925135087c69b835257764aa1f490d92ef3d + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE "release") # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUMAPPP_FETCH_EXTERN=OFF + -DUMAPPP_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME ltla_umappp + CONFIG_PATH lib/cmake/ltla_umappp +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ltla-umappp/vcpkg.json b/ports/ltla-umappp/vcpkg.json new file mode 100644 index 00000000000000..5184116d9f399a --- /dev/null +++ b/ports/ltla-umappp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ltla-umappp", + "version-date": "2023-05-11", + "description": "UMAP C++ implementation", + "homepage": "https://github.com/LTLA/umappp", + "license": "BSD-2-Clause", + "dependencies": [ + "ltla-aarand", + "ltla-cppirlba", + "ltla-knncolle", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index dc5363acf16e61..ada0f2d06ee0b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4932,6 +4932,30 @@ "baseline": "1.0.2", "port-version": 4 }, + "ltla-aarand": { + "baseline": "2023-03-19", + "port-version": 0 + }, + "ltla-cppirlba": { + "baseline": "2023-04-07", + "port-version": 0 + }, + "ltla-cppkmeans": { + "baseline": "2023-03-20", + "port-version": 0 + }, + "ltla-knncolle": { + "baseline": "2023-05-09", + "port-version": 0 + }, + "ltla-powerit": { + "baseline": "2023-03-19", + "port-version": 0 + }, + "ltla-umappp": { + "baseline": "2023-05-11", + "port-version": 0 + }, "lua": { "baseline": "5.4.4", "port-version": 7 diff --git a/versions/l-/ltla-aarand.json b/versions/l-/ltla-aarand.json new file mode 100644 index 00000000000000..9a6bf9a8e61c70 --- /dev/null +++ b/versions/l-/ltla-aarand.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "78cd0fcfb69b096fb2f4261e02c0b0dbaa85b89a", + "version-date": "2023-03-19", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-cppirlba.json b/versions/l-/ltla-cppirlba.json new file mode 100644 index 00000000000000..df091854bf8f85 --- /dev/null +++ b/versions/l-/ltla-cppirlba.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a1a4fe3742a5fecbadcb34155df9230a279a3e1c", + "version-date": "2023-04-07", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-cppkmeans.json b/versions/l-/ltla-cppkmeans.json new file mode 100644 index 00000000000000..2342a0fd71f9d1 --- /dev/null +++ b/versions/l-/ltla-cppkmeans.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "98167fd1d30ddefc1bbb44a321af164cf59aee31", + "version-date": "2023-03-20", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-knncolle.json b/versions/l-/ltla-knncolle.json new file mode 100644 index 00000000000000..844029f746e009 --- /dev/null +++ b/versions/l-/ltla-knncolle.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "543f312cf96c53b41e8501bf473e5e8a336d8b12", + "version-date": "2023-05-09", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-powerit.json b/versions/l-/ltla-powerit.json new file mode 100644 index 00000000000000..af8b6d92f1ffe8 --- /dev/null +++ b/versions/l-/ltla-powerit.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "522b483967df42ac83d0876893d81becf3e88ab6", + "version-date": "2023-03-19", + "port-version": 0 + } + ] +} diff --git a/versions/l-/ltla-umappp.json b/versions/l-/ltla-umappp.json new file mode 100644 index 00000000000000..db0c44c68671a7 --- /dev/null +++ b/versions/l-/ltla-umappp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b96e4bc54041c787e0c15d884c0968aade97cfae", + "version-date": "2023-05-11", + "port-version": 0 + } + ] +} From 7f52deab66689f912da6d04de105c457d8ba671e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Sun, 14 May 2023 01:54:42 -0700 Subject: [PATCH 076/533] Update VMs for Patch Tuesday May 2023 (#31358) * Update PowerShell Core to not vulnerable versions. * Fix Android create-image relative paths. * Update pools and add docs. * Get android create-vmss to setup managed identity. --- .../azure-pipelines/android/create-image.ps1 | 2 +- .../azure-pipelines/android/create-vmss.ps1 | 2 +- .../android/setup-managed-identity.ps1 | 17 --------------- scripts/azure-pipelines/azure-pipelines.yml | 6 +++--- scripts/azure-pipelines/linux/create-vmss.ps1 | 20 +++++++++++++++--- .../patch-tuesday-checklist.md | 21 +++++++++++++++++++ .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- scripts/vcpkgTools.xml | 8 +++---- 8 files changed, 48 insertions(+), 30 deletions(-) delete mode 100644 scripts/azure-pipelines/android/setup-managed-identity.ps1 create mode 100644 scripts/azure-pipelines/patch-tuesday-checklist.md diff --git a/scripts/azure-pipelines/android/create-image.ps1 b/scripts/azure-pipelines/android/create-image.ps1 index ca767fd25e5cb1..08b264c635ad70 100644 --- a/scripts/azure-pipelines/android/create-image.ps1 +++ b/scripts/azure-pipelines/android/create-image.ps1 @@ -1 +1 @@ -../linux/create-image.ps1 -Prefix "And-" -ProvisionScript (Get-ChildItem .\provision-image.sh).fullname \ No newline at end of file +& "$PSScriptRoot/../linux/create-image.ps1" -Prefix "And-" -ProvisionScript "$PSScriptRoot/provision-image.sh" \ No newline at end of file diff --git a/scripts/azure-pipelines/android/create-vmss.ps1 b/scripts/azure-pipelines/android/create-vmss.ps1 index c589db19b99777..d5ca2654f3f132 100644 --- a/scripts/azure-pipelines/android/create-vmss.ps1 +++ b/scripts/azure-pipelines/android/create-vmss.ps1 @@ -3,4 +3,4 @@ Param( [parameter(Mandatory=$true)] [string]$ImageName ) -../linux/create-vmss.ps1 -ImageName $ImageName -Prefix "PrAnd-" \ No newline at end of file +& "$PSScriptRoot/../linux/create-vmss.ps1" -ImageName $ImageName -Prefix "PrAnd-" -AddAndroidContainerRegistryPermissions diff --git a/scripts/azure-pipelines/android/setup-managed-identity.ps1 b/scripts/azure-pipelines/android/setup-managed-identity.ps1 deleted file mode 100644 index 79c5ae3b49989c..00000000000000 --- a/scripts/azure-pipelines/android/setup-managed-identity.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -# Create a system managed identity -# Adding to existing Scale set -$scaleSetResourceGroup = "PrAnd-2023-04-17" -$scaleSetName = "PrAnd-2023-04-17Vmss" - -$vm = Get-AzVMss -ResourceGroupName $scaleSetResourceGroup -Name $scaleSetName -Update-AzVMss -ResourceGroupName $scaleSetResourceGroup -VMScaleSetName $scaleSetName -IdentityType SystemAssigned - -$spID = $vm.Identity.PrincipalId - -$acrGroup = "And-Registry" -$acrName = "AndContainerRegistry" - -$resourceID = (Get-AzContainerRegistry -ResourceGroupName $acrGroup -Name $acrName).Id - -# needs admin privileges -New-AzRoleAssignment -ObjectId $spID -Scope $resourceID -RoleDefinitionName AcrPull \ No newline at end of file diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index e5ba113f9304f4..7ebeb3c9edf0fa 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,10 +2,10 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2023-04-12' - linux-pool: 'PrLin-2023-04-12' + android-pool: 'PrAnd-2023-05-09' + linux-pool: 'PrLin-2023-05-09' + windows-pool: 'PrWin-2023-05-09' osx-pool: 'PrOsx-2022-02-04' - android-pool: 'PrAnd-2023-04-17' linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20' parameters: diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 0c1a5fe6542e44..a4217fe811c500 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -27,7 +27,8 @@ Param( [parameter(Mandatory=$true)] [string]$ImageName, [parameter(Mandatory=$false)] - [string]$Prefix = "PrLin-" + [string]$Prefix = "PrLin-", + [switch]$AddAndroidContainerRegistryPermissions ) $Location = 'eastasia' @@ -65,7 +66,8 @@ $Vmss = New-AzVmssConfig ` -UpgradePolicyMode Manual ` -EvictionPolicy Delete ` -Priority Spot ` - -MaxPrice -1 + -MaxPrice -1 ` + -IdentityType SystemAssigned $NicName = $ResourceGroupName + 'NIC' New-AzNetworkInterface ` @@ -103,11 +105,23 @@ $Vmss = Set-AzVmssBootDiagnostic ` -VirtualMachineScaleSet $Vmss ` -Enabled $true -New-AzVmss ` +$VmssCreated = New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` -VirtualMachineScaleSet $Vmss +if ($AddAndroidContainerRegistryPermissions) { + $spID = $VmssCreated.Identity.PrincipalId + + $acrGroup = "And-Registry" + $acrName = "AndContainerRegistry" + + $resourceID = (Get-AzContainerRegistry -ResourceGroupName $acrGroup -Name $acrName).Id + + # needs admin privileges + New-AzRoleAssignment -ObjectId $spID -Scope $resourceID -RoleDefinitionName AcrPull +} + Write-Host "Location: $Location" Write-Host "Resource group name: $ResourceGroupName" Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md new file mode 100644 index 00000000000000..9b1adcbadf752d --- /dev/null +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -0,0 +1,21 @@ +## First time machine setup: +* [ ] Install Azure PowerShell: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps + +## Each Patch Tuesday: +* [ ] Check for depends:vm-update PRs and make relevant changes if possible. +* [ ] Check for Service 360 alerts about vulnerable software we are installing in the VMs and + update that. (Most often PowerShell needs to be updated to the current 7.2.x release) +* [ ] Run android/create-image.ps1 +* [ ] Run linux/create-image.ps1 +* [ ] Run windows/create-image.ps1 +* [ ] Run android/create-vmss.ps1 +* [ ] Run linux/create-vmss.ps1 +* [ ] Run windows/create-vmss.ps1 +* [ ] Create new pools for all 3 of these in Azure DevOps: https://dev.azure.com/vcpkg/public/_settings/agentqueues + * Android: 4 agents + * Linux: 4 agents + * Windows: 22 agents +* [ ] Update azure-pipelines.yml to point to the new pools. +* [ ] Submit PR with those changes. +* [ ] Submit a full CI rebuild with those changes: https://dev.azure.com/vcpkg/public/_build?definitionId=29 + refs/pull/NUMBER/head diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 75970784f132f7..17c23f168d4a4d 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.3/PowerShell-7.3.3-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.4/PowerShell-7.3.4-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 32778c73379c27..831c9be01c2f1c 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -194,11 +194,11 @@ ninja-freebsd-1.8.2.zip - 7.2.8 + 7.2.11 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.8/PowerShell-7.2.8-win-x86.zip - b91ad901837099b34f689ae654b238a1171141adce8be6fc52f48373a7e79117072e84ab38e427c1ac66647dd86a19f1c6c6cba2b8e365d656c65c8447069c72 - PowerShell-7.2.8-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.11/PowerShell-7.2.11-win-x86.zip + e9581122101ad161ad628a6feb63e61d3ef8f064a3f325465e8a1a4a6cfc1affbc9bf63146efae0aa65ff9ea5c93018af2c413dc0940f0d162edef805659ec84 + PowerShell-7.2.11-win-x86.zip 16.15.1 From c081319f6dcd8112f6ac6ac77976fe07a40f914f Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Mon, 15 May 2023 16:16:44 -0400 Subject: [PATCH 077/533] [jsoncons] Update to version 0.170.2 (#31419) * [jsoncons] Update to 0.170.1 * Update baseline * [jsoncons] Update to 0.170.2 * [jsoncons] Update baseline --- ports/jsoncons/portfile.cmake | 2 +- ports/jsoncons/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jsoncons.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index d50aab56cd11ee..811fddc0e4fa09 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons REF v${VERSION} - SHA512 f292e5034ad1d39ae3d6887bd59b92a7211b9de05b46229ad021514acb11965c33fd16b6bb264becd08e40f287cee76c15339ccefce2d80b7a43747319bbc93d + SHA512 0166b6dbfeb427a07afd74807bc48a0853f3a2f52f9e9415dd7e392cafeed8047f274295663e799ba4808e8c6ea4d79278cce6a5948034009858ed16e63bd27d HEAD_REF master ) diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json index 07e441d1bfdb0b..cefc84b4ff261c 100644 --- a/ports/jsoncons/vcpkg.json +++ b/ports/jsoncons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsoncons", - "version": "0.170.1", + "version": "0.170.2", "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", diff --git a/versions/baseline.json b/versions/baseline.json index ada0f2d06ee0b2..4190d8addf62dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3457,7 +3457,7 @@ "port-version": 5 }, "jsoncons": { - "baseline": "0.170.1", + "baseline": "0.170.2", "port-version": 0 }, "jsoncpp": { diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index fba857e3b3d262..69c66685769454 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "281de10de972059292e2850f6f509eb6cb9b2c40", + "version": "0.170.2", + "port-version": 0 + }, { "git-tree": "a5e66f5d2ae477089e3f87c432bdfdb7a7929da9", "version": "0.170.1", From c18e2eb83104a90c6342b8100b3b106993cb0e59 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 16 May 2023 02:17:31 +0600 Subject: [PATCH 078/533] [wasmedge] Update to 0.12.1 (#31414) * [wasmedge] Add new port * . * Update ports/wasmedge/vcpkg.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update wasmedge.json * revert version * update version * new function * version --------- Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: FrankXie --- ports/wasmedge/portfile.cmake | 8 +++----- ports/wasmedge/quotes.patch | 19 ------------------- ports/wasmedge/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wasmedge.json | 5 +++++ 5 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 ports/wasmedge/quotes.patch diff --git a/ports/wasmedge/portfile.cmake b/ports/wasmedge/portfile.cmake index 9d6b44be93cda8..bd87b2831958c6 100644 --- a/ports/wasmedge/portfile.cmake +++ b/ports/wasmedge/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO WasmEdge/WasmEdge - REF 0.12.0-alpha.1 - SHA512 4218ecb6fba34b4ae94fc8c63b7da03c37f9dd2e404a9a6008be972a799b981929ada0ef213d8fababa25d10e27b777df66d22e1e61c92ff8e60b5e1caf97562 + REF "${VERSION}" + SHA512 040eabea8ad7885b95fb3bdb97687e63412c027d853da0b37cc15b8b7e51c02f10286281c57d03a71d6d5a7bf7d4a5e627e31d6fd5ba560b80da675d1f1edbad HEAD_REF master - PATCHES - quotes.patch ) set(WASMEDGE_CMAKE_OPTIONS "") @@ -64,6 +62,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/wasmedge/quotes.patch b/ports/wasmedge/quotes.patch deleted file mode 100644 index 856dd0a2d5808d..00000000000000 --- a/ports/wasmedge/quotes.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/cmake/Helper.cmake b/cmake/Helper.cmake -index 47dc2be..a9c84ff 100644 ---- a/cmake/Helper.cmake -+++ b/cmake/Helper.cmake -@@ -140,10 +140,10 @@ if((WASMEDGE_LINK_LLVM_STATIC OR WASMEDGE_BUILD_STATIC_LIB) AND WASMEDGE_BUILD_A - core lto native nativecodegen option passes support transformutils all-targets - OUTPUT_VARIABLE WASMEDGE_LLVM_LINK_LIBS_NAME - ) -- string(REPLACE "-l" "" WASMEDGE_LLVM_LINK_LIBS_NAME ${WASMEDGE_LLVM_LINK_LIBS_NAME}) -- string(REGEX REPLACE "[\r\n]" "" WASMEDGE_LLVM_LINK_LIBS_NAME ${WASMEDGE_LLVM_LINK_LIBS_NAME}) -- string(REPLACE " " "\;" WASMEDGE_LLVM_LINK_LIBS_NAME ${WASMEDGE_LLVM_LINK_LIBS_NAME}) -- set(WASMEDGE_LLVM_LINK_LIBS_NAME ${WASMEDGE_LLVM_LINK_LIBS_NAME}) -+ string(REPLACE "-l" "" WASMEDGE_LLVM_LINK_LIBS_NAME "${WASMEDGE_LLVM_LINK_LIBS_NAME}") -+ string(REGEX REPLACE "[\r\n]" "" WASMEDGE_LLVM_LINK_LIBS_NAME "${WASMEDGE_LLVM_LINK_LIBS_NAME}") -+ string(REPLACE " " "\;" WASMEDGE_LLVM_LINK_LIBS_NAME "${WASMEDGE_LLVM_LINK_LIBS_NAME}") -+ set(WASMEDGE_LLVM_LINK_LIBS_NAME "${WASMEDGE_LLVM_LINK_LIBS_NAME}") - - - list(APPEND WASMEDGE_LLVM_LINK_STATIC_COMPONENTS diff --git a/ports/wasmedge/vcpkg.json b/ports/wasmedge/vcpkg.json index 3c1c5bbd2290d5..c74f15e658f217 100644 --- a/ports/wasmedge/vcpkg.json +++ b/ports/wasmedge/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wasmedge", - "version-semver": "0.12.0-alpha.1", - "port-version": 1, + "version": "0.12.1", "description": "WasmEdge is a high-performance WebAssembly runtime for edge computing.", "homepage": "https://WasmEdge.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4190d8addf62dc..61e9ac3637ae10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8473,8 +8473,8 @@ "port-version": 1 }, "wasmedge": { - "baseline": "0.12.0-alpha.1", - "port-version": 1 + "baseline": "0.12.1", + "port-version": 0 }, "wavelib": { "baseline": "2021-11-26", diff --git a/versions/w-/wasmedge.json b/versions/w-/wasmedge.json index 28049cdb6d0fc8..8f71ee73fb7128 100644 --- a/versions/w-/wasmedge.json +++ b/versions/w-/wasmedge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "053400dd62ab5a02842f107aaad7dff7fdeb0a40", + "version": "0.12.1", + "port-version": 0 + }, { "git-tree": "a13dbbe58cedd77daae5f42016df4f74101c34b0", "version-semver": "0.12.0-alpha.1", From b6dd2d87ffb4842cad87b07b0dbfa7addb15b230 Mon Sep 17 00:00:00 2001 From: Daniel Johansson <1911831+djohansson@users.noreply.github.com> Date: Mon, 15 May 2023 22:18:18 +0200 Subject: [PATCH 079/533] [shader-slang] Update to v0.27.20 (#31398) * Updated shader-slang version to 0.27.20 * Ran ./vcpkg x-add-version --all * Update ports/shader-slang/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update ports/shader-slang/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * ./vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/shader-slang/portfile.cmake | 13 ++++++------- ports/shader-slang/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/shader-slang.json | 5 +++++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ports/shader-slang/portfile.cmake b/ports/shader-slang/portfile.cmake index 256c1ebae26330..943f6c67d77c13 100644 --- a/ports/shader-slang/portfile.cmake +++ b/ports/shader-slang/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) if (VCPKG_TARGET_IS_WINDOWS) @@ -11,7 +10,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win64.zip" FILENAME "slang-${VERSION}-win64.zip" - SHA512 a3f9f1a30468588fc5706eacd3a4c2dc41b014a949b34fe8a16dc1a9a2cb3e85edfcabb46473a3599fe9cd95a2ca8cbae5ab39fdf626e6b5b614a94be48e6d4d + SHA512 db8404de1e1aa7b4deac258f1d3aed4287d6babc37538c76914da87e1bfcc5919d8013cf9054ae1c0aa32a5a14a25a668fd7f6fb23b8b2e1275bcfc9fe256eac ) set(SLANG_BIN_PATH "bin/windows-x64/release") elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -19,7 +18,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win32.zip" FILENAME "slang-${VERSION}-win32.zip" - SHA512 06012d3d7004f0565cda01b11fd7236e6828a8ea79ca93ad05e3e1a3e35571daf2cd6558e096dfd97c46c23ce74b802d71287e02eec5d7951c18e16c6c635da6 + SHA512 1045f37b02ae93c2b8a7b9a7b8c98cd5b7c2d1a86704888c778ae12bc5bd701284d356685010ba4405893c9c0bfec2e117b329c00d8c218e08df578d607a9f80 ) set(SLANG_BIN_PATH "bin/windows-x86/release") else() @@ -35,7 +34,7 @@ elseif (VCPKG_TARGET_IS_OSX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-x64.zip" FILENAME "slang-${VERSION}-macos-x64.zip" - SHA512 5914caa4ab9867fbceed6f0bb4f83f3b5400c05872baff40456460655efbdccb34b3590663f8ee80e953f3e584d0e729bc1da34ab8f80be33d1233ca4b043d71 + SHA512 627d77d83eef56e25815c30d0e99ae472c9189c760d1a620daebf49407c97e5e4da4b7880781c7788e85c5ccfba3a9e938e50ede2be0e93c0635050b11ad22a0 ) set(SLANG_BIN_PATH "bin/macos-x64/release") elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") @@ -43,7 +42,7 @@ elseif (VCPKG_TARGET_IS_OSX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-aarch64.zip" FILENAME "slang-${VERSION}-macos-aarch64.zip" - SHA512 9e792ba0dec87a892df566b48f4553691f20d48c74c7d111b93c6f55c83790a8857bd82c461746190d8507b4aef440aeadb267da9558692a6113cfda52d12c80 + SHA512 e898c20c60b4f3e8bbb262fef4cad88fba35b66dafb4784eec8b1603d8ee0293a71faeac1f84a9df96f33e206503ed717f7a068370e40a49bac90c009bbe4336 ) set(SLANG_BIN_PATH "bin/macos-aarch64/release") else() @@ -59,7 +58,7 @@ elseif(VCPKG_TARGET_IS_LINUX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-linux-x86_64.tar.gz" FILENAME "slang-${VERSION}-linux-x86_64.tar.gz" - SHA512 f6e3d49ddfdb79e0dc8183bd915ee4e2975428f1a6020498062cb54b0f078c86bcdc50d274c8ed22ba2f3ae823cb0b95d719a1067321fb0400c329f8c34149dd + SHA512 2291e7ee0e1998eb8cf3725154bade4ebd2873f18ba2dc04e598ffee63298780e6906a6257762a84ba4d81f32b1fb4548b1aaea4a79852f4fc6827faeba4426f ) set(SLANG_BIN_PATH "bin/linux-x64/release") else() @@ -99,7 +98,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO shader-slang/slang REF v${VERSION} - SHA512 ddb50eb59bebbb826844c4831f721bb40e28edb64d37d7463afb68cd27b653d7d8e1776000eaf70f4b5a882182ac06fa233dfe51167c2a3d170df89987da2cc2 + SHA512 cc89a8a8eeab494c2558d2699bad75520cb44640d17881b0e35f618df68090a7fcee03e812e77998fe953206790d284fdfa084a0d30d0b4fca33991fe9ec8775 HEAD_REF master ) diff --git a/ports/shader-slang/vcpkg.json b/ports/shader-slang/vcpkg.json index d0d16ce8f386a7..990f384cea8b78 100644 --- a/ports/shader-slang/vcpkg.json +++ b/ports/shader-slang/vcpkg.json @@ -1,7 +1,6 @@ { "name": "shader-slang", - "version": "0.24.43", - "port-version": 1, + "version": "0.27.20", "description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.", "homepage": "https://github.com/shader-slang/slang", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 61e9ac3637ae10..a85eb2727a221d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7369,8 +7369,8 @@ "port-version": 1 }, "shader-slang": { - "baseline": "0.24.43", - "port-version": 1 + "baseline": "0.27.20", + "port-version": 0 }, "shaderc": { "baseline": "2021.1", diff --git a/versions/s-/shader-slang.json b/versions/s-/shader-slang.json index 19bbeef97b58c8..aded3cbcb4e222 100644 --- a/versions/s-/shader-slang.json +++ b/versions/s-/shader-slang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a21463df58c9c2fb4af01bc6c9197ddb98804db", + "version": "0.27.20", + "port-version": 0 + }, { "git-tree": "b03b5bc45ef502e0ce522ce6fb71eba994348cf2", "version": "0.24.43", From e99d61570bc67c1f28091ea2c86c0a056734d3e2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 15 May 2023 22:19:14 +0200 Subject: [PATCH 080/533] [gdal] Update to 3.7.0 (#31381) * [gdal] Update to 3.7.0 * [pdal] Fix build with gdal 3.7 --- ports/gdal/portfile.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- ports/pdal/gdal-3.7.patch | 22 ++++++++++++++++++++++ ports/pdal/mingw.patch | 13 +++++++++++++ ports/pdal/portfile.cmake | 2 ++ ports/pdal/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ versions/p-/pdal.json | 5 +++++ 9 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 ports/pdal/gdal-3.7.patch create mode 100644 ports/pdal/mingw.patch diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3961b0a5e45720..723fd52ed3a294 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 e2e01c1181ab604766119be63449239000314a3042a4a30f2b8d2794f23ec4b1d1f255699d7d723238a8b5bed25d0dcfd63c37066a03188be02c8e2f5e9b0853 + SHA512 dfc7ccf5c1a3184fa93be762a880b7631faa4cd178cd72df8f5fd8a6296edafc56de2594617bebcb75ddf19ed4471dafcb574b22d7e9217dedfd7ea72c9247f2 HEAD_REF master PATCHES find-link-libraries.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 2b36f1d3a8c0cc..ee25a2732919f9 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdal", - "version-semver": "3.6.4", + "version-semver": "3.7.0", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/ports/pdal/gdal-3.7.patch b/ports/pdal/gdal-3.7.patch new file mode 100644 index 00000000000000..4d3944e0a92870 --- /dev/null +++ b/ports/pdal/gdal-3.7.patch @@ -0,0 +1,22 @@ +diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp +index 608bf86..8b010d3 100644 +--- a/pdal/Geometry.cpp ++++ b/pdal/Geometry.cpp +@@ -153,7 +153,7 @@ Geometry& Geometry::operator=(const Geometry& input) + + bool Geometry::srsValid() const + { +- OGRSpatialReference *srs = m_geom->getSpatialReference(); ++ const OGRSpatialReference *srs = m_geom->getSpatialReference(); + return srs && srs->GetRoot(); + } + +@@ -172,7 +172,7 @@ Utils::StatusWithReason Geometry::transform(SpatialReference out) + return StatusWithReason(-2, + "Geometry::transform() failed. NULL target SRS."); + +- OGRSpatialReference *inSrs = m_geom->getSpatialReference(); ++ const OGRSpatialReference *inSrs = m_geom->getSpatialReference(); + SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data())); + if (m_geom->transform(transform.get()) != OGRERR_NONE) + return StatusWithReason(-1, "Geometry::transform() failed."); diff --git a/ports/pdal/mingw.patch b/ports/pdal/mingw.patch new file mode 100644 index 00000000000000..3f6cb229bc9d7b --- /dev/null +++ b/ports/pdal/mingw.patch @@ -0,0 +1,13 @@ +diff --git a/io/OptechReader.cpp b/io/OptechReader.cpp +index bd12e70..2b7846b 100644 +--- a/io/OptechReader.cpp ++++ b/io/OptechReader.cpp +@@ -60,7 +60,7 @@ std::string OptechReader::getName() const + return s_info.name; + } + +-#ifndef _WIN32 ++#ifndef _MSC_VER + const size_t OptechReader::MaximumNumberOfReturns; + const size_t OptechReader::MaxNumRecordsInBuffer; + const size_t OptechReader::NumBytesInRecord; diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index f48b7d06a5c795..c2b330354c7c10 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -13,6 +13,8 @@ vcpkg_from_github( no-pkgconfig-requires.patch no-rpath.patch fix-gcc-13-build.patch #upstream PR: https://github.com/PDAL/PDAL/pull/4039 + gdal-3.7.patch + mingw.patch ) # Prefer pristine CMake find modules + wrappers and config files from vcpkg. diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 66ef0317526d12..1736914d96302e 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pdal", "version": "2.5.3", + "port-version": 1, "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a85eb2727a221d..72cd3538ad86af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2709,7 +2709,7 @@ "port-version": 0 }, "gdal": { - "baseline": "3.6.4", + "baseline": "3.7.0", "port-version": 0 }, "gdcm": { @@ -6138,7 +6138,7 @@ }, "pdal": { "baseline": "2.5.3", - "port-version": 0 + "port-version": 1 }, "pdal-c": { "baseline": "2.2.0", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 137e9a79262c48..60f2d6c3b4b02f 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "befcd2fe67a87498bfdaea5601b58f120e984038", + "version-semver": "3.7.0", + "port-version": 0 + }, { "git-tree": "f83039e70646a59b782781b3c805f276fb4c72be", "version-semver": "3.6.4", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 16bb79fb0ff11d..830157c09d4473 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8618eb3877634f95eb6edbbba64f3e4cccb1d58", + "version": "2.5.3", + "port-version": 1 + }, { "git-tree": "36cec2be04df8ba1771c374ccc8ae3c8a0cc96f3", "version": "2.5.3", From 1c5636cbc2f861db05d5c69f1d8a40d1dddc355b Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 16 May 2023 04:37:11 +0800 Subject: [PATCH 081/533] [amqpcpp] Update to 4.3.23 (#31271) * update amqpcpp * update version --------- Co-authored-by: Monica --- ports/amqpcpp/fix-max_min_macros.patch | 31 ++++++++++++++++++++++++++ ports/amqpcpp/portfile.cmake | 3 ++- ports/amqpcpp/vcpkg.json | 2 +- versions/a-/amqpcpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 ports/amqpcpp/fix-max_min_macros.patch diff --git a/ports/amqpcpp/fix-max_min_macros.patch b/ports/amqpcpp/fix-max_min_macros.patch new file mode 100644 index 00000000000000..4d1e2ae205af37 --- /dev/null +++ b/ports/amqpcpp/fix-max_min_macros.patch @@ -0,0 +1,31 @@ +diff --git a/include/amqpcpp/message.h b/include/amqpcpp/message.h +index 0a35838..96b43e1 100644 +--- a/include/amqpcpp/message.h ++++ b/include/amqpcpp/message.h +@@ -80,7 +80,7 @@ protected: + // safety-check: on 32-bit platforms size_t is obviously also a 32-bit dword + // in which case casting the uint64_t to a size_t could result in truncation + // here we check whether the given size fits inside a size_t +- if (std::numeric_limits::max() < size) throw std::runtime_error("message is too big for this system"); ++ if ((std::numeric_limits::max)() < size) throw std::runtime_error("message is too big for this system"); + + // store the new size + _bodySize = size; +@@ -98,7 +98,7 @@ protected: + if (_mutableBody) + { + // prevent overflow +- size = std::min(size, _bodySize - _filled); ++ size = (std::min)(size, _bodySize - _filled); + + // append more data + memcpy(_mutableBody + _filled, buffer, (size_t)size); +@@ -121,7 +121,7 @@ protected: + _body = _mutableBody; + + // store the initial data +- _filled = std::min((size_t)size, (size_t)_bodySize); ++ _filled = (std::min)((size_t)size, (size_t)_bodySize); + memcpy(_mutableBody, buffer, _filled); + } + diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index 4e01b1141fe6c1..c02df71d35d222 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -4,10 +4,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CopernicaMarketingSoftware/AMQP-CPP REF "v${VERSION}" - SHA512 6220d6cdd3114cf02f08f1d8599d1f6de94df204384f9da7db1c18f74732a5c23063cd50066b7d32906af0a968d600daf0d59f1649d9674fa67446197c6e4988 + SHA512 3af0c0a9aeb98e349cedc7144bfc4ef1b63270d3b20d240b98b990c048402d5d4ea3a2ba28a468aab24ad45544b111809a0692716dc33af493ea5160f132834b HEAD_REF master PATCHES find-openssl.patch + fix-max_min_macros.patch ) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json index ff7ce61a5b32b9..2a6c97a385e18e 100644 --- a/ports/amqpcpp/vcpkg.json +++ b/ports/amqpcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "amqpcpp", - "version": "4.3.19", + "version": "4.3.23", "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", diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json index 237a7fd9f83b75..85d72391e18fea 100644 --- a/versions/a-/amqpcpp.json +++ b/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0661ec390526889afac4ba693c92ab00a4937c", + "version": "4.3.23", + "port-version": 0 + }, { "git-tree": "cdf5751364452365ad13aeecc8a74bc6ab15076a", "version": "4.3.19", diff --git a/versions/baseline.json b/versions/baseline.json index 72cd3538ad86af..76307dadb9ffad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -105,7 +105,7 @@ "port-version": 4 }, "amqpcpp": { - "baseline": "4.3.19", + "baseline": "4.3.23", "port-version": 0 }, "anax": { From e288d7bddbecc6036de442b9c42766bc30da4b8b Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 15 May 2023 13:39:23 -0700 Subject: [PATCH 082/533] Toolchain update to remove /MP when using clang-cl custom triplets (#31428) Co-authored-by: Billy Robert O'Neal III --- scripts/toolchains/uwp.cmake | 7 ++++++- scripts/toolchains/windows.cmake | 9 +++++++-- scripts/toolchains/xbox.cmake | 7 ++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 4656108782b8d1..6628f28e567d0e 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -41,8 +41,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CHARSET_FLAG) endif() + set(MP_BUILD_FLAG "") + if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) + set(MP_BUILD_FLAG "/MP") + endif() + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; - set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD set(_vcpkg_winmd_flag "") file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 03a142bab35aea..7f4886815433b5 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -51,8 +51,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(CHARSET_FLAG) endif() - set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "") - set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "") + set(MP_BUILD_FLAG "") + if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) + set(MP_BUILD_FLAG "/MP") + endif() + + set(CMAKE_CXX_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc ${MP_BUILD_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS " /nologo /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} ${MP_BUILD_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64ec") string(APPEND CMAKE_CXX_FLAGS " /arm64EC /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC") diff --git a/scripts/toolchains/xbox.cmake b/scripts/toolchains/xbox.cmake index f79d7b3434676a..adcf71a14ce359 100644 --- a/scripts/toolchains/xbox.cmake +++ b/scripts/toolchains/xbox.cmake @@ -64,8 +64,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(_vcpkg_core_libs onecore_apiset.lib) set(_vcpkg_default_lib onecore_apiset.lib) + set(MP_BUILD_FLAG "") + if(NOT (CMAKE_CXX_COMPILER MATCHES "clang-cl.exe")) + set(MP_BUILD_FLAG "/MP") + endif() + set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_GAMES /D_WIN32_WINNT=0x0A00 /D_ATL_NO_DEFAULT_LIBS /D__WRL_NO_DEFAULT_LIB__ /D__WRL_CLASSIC_COM_STRICT__ /D_UITHREADCTXT_SUPPORT=0 /D_CRT_USE_WINAPI_PARTITION_APP") - set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc /utf-8") + set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc /utf-8") # Add the Microsoft GDK if present if (DEFINED _vcpkg_grdk) From 0f63ba5458c95f42ae9c3ce11226e528bb6183d5 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 15 May 2023 13:41:35 -0700 Subject: [PATCH 083/533] xbox toolchain update to ensure CHECK_INCLUDE_FILES macro works in all cases (#31426) --- scripts/toolchains/xbox.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/toolchains/xbox.cmake b/scripts/toolchains/xbox.cmake index adcf71a14ce359..f96c8586ccb9eb 100644 --- a/scripts/toolchains/xbox.cmake +++ b/scripts/toolchains/xbox.cmake @@ -24,6 +24,7 @@ endif() if (DEFINED ENV{GRDKLatest}) cmake_path(SET _vcpkg_grdk "$ENV{GRDKLatest}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_grdk}/gameKit/Include") include_directories(BEFORE SYSTEM "${_vcpkg_grdk}/gameKit/Include") cmake_path(CONVERT "${_vcpkg_grdk}/gameKit/Include" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE) @@ -36,12 +37,14 @@ if (DEFINED ENV{GXDKLatest}) cmake_path(SET _vcpkg_gxdk "$ENV{GXDKLatest}") if(XBOX_CONSOLE_TARGET STREQUAL "scarlett") + list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/Scarlett") include_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/Scarlett") cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Include;${_vcpkg_gxdk}/gameKit/Include/Scarlett" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE) link_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Lib/amd64" "${_vcpkg_gxdk}/gameKit/Include/Lib/amd64/Scarlett") cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Lib/amd64;${_vcpkg_gxdk}/gameKit/Include/Lib/amd64/Scarlett" TO_NATIVE_PATH_LIST _vcpkg_lib NORMALIZE) elseif(XBOX_CONSOLE_TARGET STREQUAL "xboxone") + list(APPEND CMAKE_REQUIRED_INCLUDES "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/XboxOne") include_directories(BEFORE SYSTEM "${_vcpkg_gxdk}/gameKit/Include" "${_vcpkg_gxdk}/gameKit/Include/XboxOne") cmake_path(CONVERT "${_vcpkg_gxdk}/gameKit/Include;${_vcpkg_gxdk}/gameKit/Include/XboxOne" TO_NATIVE_PATH_LIST _vcpkg_inc NORMALIZE) From e8a229a233d29119cd70261c05401e5bc1d52ce6 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 16 May 2023 04:54:54 +0800 Subject: [PATCH 084/533] [libgit2] Add GIT_OPENSSL OPTION to fix setting certificate location fail (#31392) * [libgit2] defined GIT_OPENSSL option * update version * update version * update version * update portfile.cmake * update version * remove unix restrictions * update version --- ports/libgit2/portfile.cmake | 5 +++++ ports/libgit2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libgit2.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 626f6385ca2630..66e488c4e46604 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -29,6 +29,10 @@ function(set_tls_backend VALUE) set(USE_HTTPS ${VALUE} PARENT_SCOPE) endfunction() +if("openssl" IN_LIST FEATURES) + list(APPEND GIT_OPTIONS "-DGIT_OPENSSL=1") +endif() + foreach(GIT2_FEATURE ${FEATURES}) if(GIT2_FEATURE STREQUAL "pcre") set_regex_backend("pcre") @@ -64,6 +68,7 @@ vcpkg_cmake_configure( -DREGEX_BACKEND=${REGEX_BACKEND} -DSTATIC_CRT=${STATIC_CRT} ${GIT2_FEATURES} + ${GIT_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 4bd677a567bf34..ddb3487815d1bd 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgit2", "version-semver": "1.4.2", - "port-version": 2, + "port-version": 3, "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 76307dadb9ffad..020b12662f27bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4034,7 +4034,7 @@ }, "libgit2": { "baseline": "1.4.2", - "port-version": 2 + "port-version": 3 }, "libgme": { "baseline": "0.6.3", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 89d46278aaabaf..fa214bea8cc691 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c2173f86743e6e3c6759d5c781f236c08adbec4", + "version-semver": "1.4.2", + "port-version": 3 + }, { "git-tree": "d5c636f8eb77d7d68c2a4b41fcd7d68759fb9ad0", "version-semver": "1.4.2", From 3d04b3819bac21e51d3087e6f098c53b554f3fde Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 15 May 2023 23:09:58 +0200 Subject: [PATCH 085/533] [vcpkg baseline][infoware][pciids] Update infoware and add new port pciids (#31388) * [infoware] Update * Fix cross builds * Update 'supports' * [pciids] New helper port * Remove obsolete comment --- ports/infoware/cross-build.diff | 31 +++++++++++++++++++++++ ports/infoware/portfile.cmake | 35 +++++++++++++++---------- ports/infoware/vcpkg.json | 38 ++++++++++++++++++++++------ ports/pciids/acquire_pciids.cmake | 9 +++++++ ports/pciids/portfile.cmake | 15 +++++++++++ ports/pciids/vcpkg-port-config.cmake | 1 + ports/pciids/vcpkg.json | 8 ++++++ versions/baseline.json | 8 ++++-- versions/i-/infoware.json | 5 ++++ versions/p-/pciids.json | 9 +++++++ 10 files changed, 135 insertions(+), 24 deletions(-) create mode 100644 ports/infoware/cross-build.diff create mode 100644 ports/pciids/acquire_pciids.cmake create mode 100644 ports/pciids/portfile.cmake create mode 100644 ports/pciids/vcpkg-port-config.cmake create mode 100644 ports/pciids/vcpkg.json create mode 100644 versions/p-/pciids.json diff --git a/ports/infoware/cross-build.diff b/ports/infoware/cross-build.diff new file mode 100644 index 00000000000000..bfff45b6c46e6f --- /dev/null +++ b/ports/infoware/cross-build.diff @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 580df83..ac89904 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,6 +93,8 @@ if(INFOWARE_PCI_IDS_PATH) + message(WARNING "The specified pci.ids file INFOWARE_PCI_IDS_PATH=${INFOWARE_PCI_IDS_PATH} doesn't seem to exist.") + endif() + set(infoware_pci_ids_file "${INFOWARE_PCI_IDS_PATH}") ++elseif(HOST_PCI_DATA) ++ # git unused + elseif(NOT Git_FOUND) + message(SEND_ERROR "Couldn't find a usable git executable in the environment, and the CMake variable INFOWARE_PCI_IDS_PATH is empty.\n${infoware_pci_ids_error}") + else() +@@ -122,11 +124,17 @@ set_target_properties(infoware_pci_generator PROPERTIES CXX_STANDARD 14 + set(INFOWARE_PCI_DATA_HPP pci_data.hpp) + set(INFOWARE_PCI_DATA_GEN "infoware_generated/${INFOWARE_PCI_DATA_HPP}") + ++if(HOST_PCI_DATA) ++ set_target_properties(infoware_pci_generator PROPERTIES EXCLUDE_FROM_ALL 1) ++ configure_file("${HOST_PCI_DATA}" "${CMAKE_CURRENT_BINARY_DIR}/${INFOWARE_PCI_DATA_GEN}" COPYONLY) ++else() ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${INFOWARE_PCI_DATA_GEN}" DESTINATION "share/infoware") + add_custom_command(OUTPUT ${INFOWARE_PCI_DATA_GEN} + COMMAND ${CMAKE_COMMAND} -E make_directory infoware_generated/ + COMMAND $ "${infoware_pci_ids_file}" > "infoware_generated/pci_data.hpp" + DEPENDS "${infoware_pci_ids_file}" + COMMENT "Generating ${INFOWARE_PCI_DATA_HPP}") ++endif() + + add_custom_target(infoware_generate_pcis DEPENDS "${INFOWARE_PCI_DATA_GEN}") + add_dependencies(infoware infoware_generate_pcis) diff --git a/ports/infoware/portfile.cmake b/ports/infoware/portfile.cmake index 2e0d4bdaba3d98..7b36bd1074ad49 100644 --- a/ports/infoware/portfile.cmake +++ b/ports/infoware/portfile.cmake @@ -1,36 +1,43 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/infoware - REF 50cb0982aceb32c8eb57aa6bc5011aced2c379df - SHA512 fe8182998a9e9dbed3dc3985a1161da11b340562628a71da8840aa4d4c56382ddc3ddef3d094e5d9c7c06481a2076dcff7fdb561bd169dd9d1849da4b4c6a064 + REF d64a0c948593c0555115f60c79225c0b9ae09510 + SHA512 3794cb78a1422bfc065037abbae81259e6061ba7b12ebd7b88581118e8eeebaf92d80cf7793b0f9f1da6754baf52835a6891663593dd0b0a38009a9cb141082b HEAD_REF master + PATCHES + cross-build.diff ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - x11 INFOWARE_USE_X11 - d3d INFOWARE_USE_D3D - opencl INFOWARE_USE_OPENCL - opengl INFOWARE_USE_OPENGL + d3d INFOWARE_USE_D3D + opencl INFOWARE_USE_OPENCL + opengl INFOWARE_USE_OPENGL + x11 INFOWARE_USE_X11 ) -# git must be injected, because vcpkg isolates the build -# from the environment entirely to have reproducible builds -vcpkg_find_acquire_program(GIT) +if(VCPKG_CROSSCOMPILING) + list(APPEND FEATURE_OPTIONS "-DHOST_PCI_DATA=${CURRENT_HOST_INSTALLED_DIR}/share/${PORT}/pci_data.hpp") +else() + acquire_pciids(pciids_path) + list(APPEND FEATURE_OPTIONS "-DINFOWARE_PCI_IDS_PATH=${pciids_path}") +endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DINFOWARE_EXAMPLES=OFF -DINFOWARE_TESTS=OFF - -DGIT_EXECUTABLE=${GIT} - -DGIT_FOUND=true + -DCMAKE_DISABLE_FIND_PACKAGE_Git=1 ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/infoware/vcpkg.json b/ports/infoware/vcpkg.json index 1836379c9344fb..db5414359351fe 100644 --- a/ports/infoware/vcpkg.json +++ b/ports/infoware/vcpkg.json @@ -1,12 +1,19 @@ { - "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", "name": "infoware", - "version-date": "2021-06-16", - "port-version": 1, + "version-date": "2023-04-12", "description": "C++ Library for pulling system and hardware information, without hitting the command line.", "homepage": "https://github.com/ThePhD/infoware", - "supports": "!(arm | uwp)", + "license": "CC0-1.0", + "supports": "!android & !uwp & !(windows & arm)", "dependencies": [ + { + "name": "infoware", + "host": true + }, + { + "name": "pciids", + "platform": "native" + }, { "name": "vcpkg-cmake", "host": true @@ -18,16 +25,31 @@ ], "features": { "d3d": { - "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)." + "description": [ + "Use Direct3D for GPU detection.", + "This choice has priority over opencl and opengl." + ], + "supports": "windows" }, "opencl": { - "description": "Prefer usage of OpenCL to find graphical capabilities of the system." + "description": [ + "Use OpenCL for GPU detection.", + "This choice has priority over opengl." + ], + "dependencies": [ + "opencl" + ] }, "opengl": { - "description": "Prefer usage of OpenGL to find graphical capabilities (may require additional libraries to be available for linking depending on the system)." + "description": "Use OpenGL for GPU detection.", + "supports": "!osx & !ios", + "dependencies": [ + "opengl" + ] }, "x11": { - "description": "Prefer usage of X11 to find graphical capabilities." + "description": "Use X11 for display detection.", + "supports": "!windows" } } } diff --git a/ports/pciids/acquire_pciids.cmake b/ports/pciids/acquire_pciids.cmake new file mode 100644 index 00000000000000..6f8e8ec2b72c53 --- /dev/null +++ b/ports/pciids/acquire_pciids.cmake @@ -0,0 +1,9 @@ +function(acquire_pciids out_var) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pciutils/pciids + REF 4e3f51b4b7ba7ffd3cca463d6a19daf0f4270252 + SHA512 952b56affffdf9ecf78f6125cf4216bd01d85c55e49ec4b2dfb3a77bae2258dec6b4e2d28824d6408f072667480ef7e5f7279fd69bae65c071b7b3816fe9f504 + ) + set(${out_var} "${SOURCE_PATH}/pci.ids" PARENT_SCOPE) +endfunction() diff --git a/ports/pciids/portfile.cmake b/ports/pciids/portfile.cmake new file mode 100644 index 00000000000000..200ee48c0263c0 --- /dev/null +++ b/ports/pciids/portfile.cmake @@ -0,0 +1,15 @@ +# This package doesn't "install" the pciids data file but +# provides a maintainer function which does the download. + +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + +include("${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake") +acquire_pciids(pciids_path) +cmake_path(GET pciids_path PARENT_PATH pciids_dir) + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +vcpkg_install_copyright(FILE_LIST "${pciids_dir}/README") diff --git a/ports/pciids/vcpkg-port-config.cmake b/ports/pciids/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..9945df984cce5f --- /dev/null +++ b/ports/pciids/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/acquire_pciids.cmake") diff --git a/ports/pciids/vcpkg.json b/ports/pciids/vcpkg.json new file mode 100644 index 00000000000000..edcb67c193b456 --- /dev/null +++ b/ports/pciids/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "pciids", + "version-date": "2023-04-11", + "description": "Maintainer function to acquire a PCI ID Repository database snapshot", + "homepage": "https://pci-ids.ucw.cz/", + "license": "GPL-2.0-or-later OR BSD-3-Clause", + "supports": "native" +} diff --git a/versions/baseline.json b/versions/baseline.json index 020b12662f27bd..e2aac72b7a3a81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3325,8 +3325,8 @@ "port-version": 0 }, "infoware": { - "baseline": "2021-06-16", - "port-version": 1 + "baseline": "2023-04-12", + "port-version": 0 }, "inih": { "baseline": "56", @@ -6124,6 +6124,10 @@ "baseline": "2021-04-06", "port-version": 2 }, + "pciids": { + "baseline": "2023-04-11", + "port-version": 0 + }, "pcl": { "baseline": "1.13.0", "port-version": 3 diff --git a/versions/i-/infoware.json b/versions/i-/infoware.json index 7c148d6b7332f6..1adf69d0776b65 100644 --- a/versions/i-/infoware.json +++ b/versions/i-/infoware.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10ceed518afc0c84b79aa36c1263a034b320511e", + "version-date": "2023-04-12", + "port-version": 0 + }, { "git-tree": "5501ab1b5d5391ca168856f073f6a46d5ea83268", "version-date": "2021-06-16", diff --git a/versions/p-/pciids.json b/versions/p-/pciids.json new file mode 100644 index 00000000000000..970dd93e6a342d --- /dev/null +++ b/versions/p-/pciids.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ffc7c82fb249347c25b294b6c8131e1f3b2156c2", + "version-date": "2023-04-11", + "port-version": 0 + } + ] +} From e98d2f26b77e4fe616328797827e3d79f83595ff Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 16 May 2023 05:11:20 +0800 Subject: [PATCH 086/533] [libmysql] Fix libmysql export static library error (#31368) * fix no found libmysql * update version * fix export patch * update version * fix export patch * update version --- ports/libmysql/export-cmake-targets.patch | 25 ++++++++++++----------- ports/libmysql/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmysql.json | 5 +++++ 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ports/libmysql/export-cmake-targets.patch b/ports/libmysql/export-cmake-targets.patch index 81b21783b283e4..81d0d23e9fcb08 100644 --- a/ports/libmysql/export-cmake-targets.patch +++ b/ports/libmysql/export-cmake-targets.patch @@ -38,29 +38,30 @@ index 870c9f13732..98bc3ea15e4 100644 INSTALL_DEBUG_SYMBOLS(${target}) SET(INSTALL_LOCATION) diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index ae13a63dfdc..ee9462c4c90 100644 +index 23e60ad..cc969a8 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake -@@ -297,8 +297,7 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) +@@ -298,8 +298,9 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) IF(ARG_NAMELINK_SKIP) SET(INSTALL_ARGS NAMELINK_SKIP) ENDIF() - MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} - ${INSTALL_ARGS}) -+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ IF(NOT INSTALL_STATIC_LIBRARIES) ++ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ ENDIF() ENDIF() - + IF(WIN32) -@@ -545,8 +544,7 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG) - ELSE() - SET(COMP COMPONENT SharedLibraries) +@@ -464,7 +465,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() + IF(INSTALL_STATIC_LIBRARIES) +- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ENDIF() -- MYSQL_INSTALL_TARGET( -- ${TARGET} DESTINATION "${DESTINATION}" ${COMP}) -+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ENDIF() - - IF(ARG_COMPILE_DEFINITIONS) + ENDMACRO(MERGE_CONVENIENCE_LIBRARIES) diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 2ee26bfa284..46583f4f0a3 100644 --- a/libmysql/CMakeLists.txt diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index f879d480ca74d0..41e3fa65a7e2ce 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.32", - "port-version": 3, + "port-version": 4, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index e2aac72b7a3a81..bc457324203d8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4274,7 +4274,7 @@ }, "libmysql": { "baseline": "8.0.32", - "port-version": 3 + "port-version": 4 }, "libnice": { "baseline": "0.1.21", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 9165e5a94b297c..616fc6f76dbea6 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95618ed8c0e55195ee395eaf7bb230cc61776b33", + "version": "8.0.32", + "port-version": 4 + }, { "git-tree": "79e48f5efa358526cd1cd290fd477f366863129e", "version": "8.0.32", From d4d39d71b3e6dd7536592c36ab2f7e84a8a64942 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 15 May 2023 15:18:00 -0700 Subject: [PATCH 087/533] UWP toolchain switch to disable use of deprecated C++/CX extensions (#31427) --- scripts/toolchains/uwp.cmake | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 6628f28e567d0e..8820bfbde46a3f 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -27,6 +27,10 @@ endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) + if(NOT (DEFINED VCPKG_MSVC_CXX_WINRT_EXTENSIONS)) + set(VCPKG_MSVC_CXX_WINRT_EXTENSIONS ON) + endif() + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") elseif(VCPKG_CRT_LINKAGE STREQUAL "static") @@ -48,12 +52,15 @@ if(NOT _CMAKE_IN_TRY_COMPILE) set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs; set(_vcpkg_common_flags "/nologo /Z7 ${MP_BUILD_FLAG} /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc") + #/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD set(_vcpkg_winmd_flag "") - file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) - set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") - # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars - #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS) + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools) + set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}") + # CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars + #set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps + endif() set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_CXX_FLAGS}" CACHE STRING "") set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${CHARSET_FLAG} ${VCPKG_C_FLAGS}" CACHE STRING "") @@ -72,10 +79,13 @@ if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT " /nologo ") # VS adds /LTCG - if(CMAKE_GENERATOR MATCHES "Ninja") - set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + if(VCPKG_MSVC_CXX_WINRT_EXTENSIONS) + set(additional_dll_flags "/WINMD:NO") + if(CMAKE_GENERATOR MATCHES "Ninja") + set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection + endif() endif() - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_dll_flags} /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") # VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS}") From 3a32348aa02a47a9510ada08c8209fb7ff5621b8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 16 May 2023 18:43:55 +0200 Subject: [PATCH 088/533] [botan] Fix osx cross builds (#31437) --- ports/botan/portfile.cmake | 1 + ports/botan/vcpkg.json | 1 + versions/b-/botan.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 85ffa7dbe9194a..fe71f942239e34 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -32,6 +32,7 @@ endif() vcpkg_list(SET configure_arguments "--distribution-info=vcpkg ${TARGET_TRIPLET}" + --disable-cc-tests --with-pkg-config --link-method=copy --with-debug-info diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index a042b64d001851..db28c4df05176e 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,6 +1,7 @@ { "name": "botan", "version": "2.19.3", + "port-version": 1, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 5fc78b921df904..9d2996c2a47324 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b9240ee18f12e8acaedf11613aa6bc1d7aad9d5", + "version": "2.19.3", + "port-version": 1 + }, { "git-tree": "1ad976f3e650d7188414a0c2c62ec7290bed64e8", "version": "2.19.3", diff --git a/versions/baseline.json b/versions/baseline.json index bc457324203d8f..6f3fb5480e2313 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1238,7 +1238,7 @@ }, "botan": { "baseline": "2.19.3", - "port-version": 0 + "port-version": 1 }, "box2d": { "baseline": "2.4.1", From 429c605af8dde2d1e4ec61728ce810361fa62263 Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Tue, 16 May 2023 13:00:33 -0400 Subject: [PATCH 089/533] [bshoshany-thread-pool] Updated to v3.4.0 (#31418) * [bshoshany-thread-pool] Updated to v3.4.0 * [bshoshany-thread-pool] Updated to v3.4.0 --- ports/bshoshany-thread-pool/portfile.cmake | 4 ++-- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index b0ebdd28f63b28..8143da5e035a5a 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v3.3.0 - SHA512 980c8dfe90e04cbc622ee4ae2ce67444069311619f0dc5d7ac3b3a3ea59ead42d4c867e669e8ce9c71cdc2a4bae431402a8f5032ab29fdfc1ca507b0e7102d8f + REF v3.4.0 + SHA512 4eea216422ea7fd6df52589e84fefb34248fe56fd0bbdcc5c33ae21c0ba6b950ec74a31eeea144edfc22444f6777dc09f668fd3ed5236604e0c7de62e45381a7 HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index f13c66749cfc69..8c69c8efac619e 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "3.3.0", + "version": "3.4.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 0ccb4edefb2641..c43dd8be092894 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7d60a5fc41c5f4aa283aeb1527a4bc8b55e934c", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "dbe9095cfdb6128d117003b2495f84e50653c220", "version": "3.3.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6f3fb5480e2313..32f7e47b3cf2d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1273,7 +1273,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "bsio": { From 338d300d3e99dea2c40c7c555437a6ff5a5005b3 Mon Sep 17 00:00:00 2001 From: Adolfo Solis Date: Tue, 16 May 2023 11:37:37 -0600 Subject: [PATCH 090/533] [fineftp] add new port fineftp-v1.3.4 (#31435) * [fineftp] Add package v1.3.4 * [fineftp] Updated license * [fineftp] database updated * [fineftp] Fix git tree * [fineftp] Disable Android platform * [fineftp] Updated database * Update ports/fineftp/portfile.cmake Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> * Update ports/fineftp/portfile.cmake Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> * [fineftp] Add EOF * [fineftp] Update database * [fineftp] Remove white line * [fineftp] Update database * [fineftp] Remove empty line * [fineftp] Update database --------- Co-authored-by: Mengna Li <95600143+Adela0814@users.noreply.github.com> --- ports/fineftp/asio.patch | 13 +++++++++++++ ports/fineftp/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/fineftp/vcpkg.json | 20 ++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/f-/fineftp.json | 9 +++++++++ 5 files changed, 72 insertions(+) create mode 100644 ports/fineftp/asio.patch create mode 100644 ports/fineftp/portfile.cmake create mode 100644 ports/fineftp/vcpkg.json create mode 100644 versions/f-/fineftp.json diff --git a/ports/fineftp/asio.patch b/ports/fineftp/asio.patch new file mode 100644 index 00000000000000..a5d008f4be62f6 --- /dev/null +++ b/ports/fineftp/asio.patch @@ -0,0 +1,13 @@ +diff --git a/fineftp-server/CMakeLists.txt b/fineftp-server/CMakeLists.txt +index e4e3152..9e609d9 100644 +--- a/fineftp-server/CMakeLists.txt ++++ b/fineftp-server/CMakeLists.txt +@@ -10,7 +10,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) + set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + + find_package(Threads REQUIRED) +-find_package(asio REQUIRED) ++find_package(asio CONFIG REQUIRED) + + # Include GenerateExportHeader that will create export macros for us + include(GenerateExportHeader) diff --git a/ports/fineftp/portfile.cmake b/ports/fineftp/portfile.cmake new file mode 100644 index 00000000000000..c8738520fc87e4 --- /dev/null +++ b/ports/fineftp/portfile.cmake @@ -0,0 +1,26 @@ +#Get release from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eclipse-ecal/fineftp-server + REF "v${VERSION}" + SHA512 dcced2cf743434a55314ad661ca729efc1c4883ae0c0883335f43a12ed47568ebcb50d233dab8a1410bb526587b24f1cf19938241bf649cfe54b11ffe264124b + HEAD_REF master + PATCHES + asio.patch +) + +# Configure +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME fineftp + CONFIG_PATH lib/cmake/fineftp +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fineftp/vcpkg.json b/ports/fineftp/vcpkg.json new file mode 100644 index 00000000000000..60b9832f29905e --- /dev/null +++ b/ports/fineftp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "fineftp", + "version": "1.3.4", + "description": "FineFTP is a minimal FTP server library for Windows and Unix flavors.", + "homepage": "https://github.com/eclipse-ecal/fineftp-server", + "license": "MIT", + "supports": "!uwp & !android", + "dependencies": [ + "asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 32f7e47b3cf2d4..5f1599d10524ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2480,6 +2480,10 @@ "baseline": "2019-12-19", "port-version": 2 }, + "fineftp": { + "baseline": "1.3.4", + "port-version": 0 + }, "fixed-string": { "baseline": "0.1.1", "port-version": 0 diff --git a/versions/f-/fineftp.json b/versions/f-/fineftp.json new file mode 100644 index 00000000000000..44056b036ad197 --- /dev/null +++ b/versions/f-/fineftp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "379dd5cfe0c3cad96197e14aa9782daf51daca3d", + "version": "1.3.4", + "port-version": 0 + } + ] +} From 4a45104152ed103c4e0c7afdee4c7e666b15c1c3 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 16 May 2023 19:45:18 +0200 Subject: [PATCH 091/533] [wcslib] Add wcslib port (#31320) * Initial commit * Add usage and install * Correct library name * Try configure install * Disable more features * Remove redundant lines * Remove CMakeLists.txt * --without-cfitsio * Clean up vcpkg.json and disable windows * Format the manifest * Add versions * Update homepage and download URL * Fix version * Update usage * Update version --- ports/wcslib/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/wcslib/usage | 6 ++++++ ports/wcslib/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/w-/wcslib.json | 9 +++++++++ 5 files changed, 53 insertions(+) create mode 100644 ports/wcslib/portfile.cmake create mode 100644 ports/wcslib/usage create mode 100644 ports/wcslib/vcpkg.json create mode 100644 versions/w-/wcslib.json diff --git a/ports/wcslib/portfile.cmake b/ports/wcslib/portfile.cmake new file mode 100644 index 00000000000000..009f449d2cac1c --- /dev/null +++ b/ports/wcslib/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_download_distfile(archive + URLS "https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-7.12.tar.bz2" + FILENAME "wcslib-7.12.tar.bz2" + SHA512 7f38f725992d3c4bd3c1b908d494ac361c17f6b60f091d987fda596211423bb7396b3a5e2f1f6dd6215835016d302083472a7ad0822f17cdfe230c8f556b3e23 +) + +vcpkg_extract_source_archive( + src + ARCHIVE "${archive}" +) + +vcpkg_configure_make( + SOURCE_PATH ${src} + COPY_SOURCE + OPTIONS + --disable-flex + --disable-fortran + --without-pgplot + --without-cfitsio) + +vcpkg_install_make(MAKEFILE GNUmakefile) +vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${src}/COPYING") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/wcslib/usage b/ports/wcslib/usage new file mode 100644 index 00000000000000..00db7980589a79 --- /dev/null +++ b/ports/wcslib/usage @@ -0,0 +1,6 @@ +wcslib can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(wcslib REQUIRED IMPORTED_TARGET wcslib) + target_include_directories(main PRIVATE PkgConfig::wcslib) + target_link_libraries(main PRIVATE PkgConfig::wcslib) diff --git a/ports/wcslib/vcpkg.json b/ports/wcslib/vcpkg.json new file mode 100644 index 00000000000000..cbcfa896ed4779 --- /dev/null +++ b/ports/wcslib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wcslib", + "version": "7.12", + "description": "World Coordinate System (WCS) (Library)", + "homepage": "https://www.atnf.csiro.au/people/mcalabre/WCS/", + "supports": "!windows" +} diff --git a/versions/baseline.json b/versions/baseline.json index 5f1599d10524ec..bf5ce2ddea9b2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8500,6 +8500,10 @@ "baseline": "1.31", "port-version": 1 }, + "wcslib": { + "baseline": "7.12", + "port-version": 0 + }, "websocketpp": { "baseline": "0.8.2", "port-version": 2 diff --git a/versions/w-/wcslib.json b/versions/w-/wcslib.json new file mode 100644 index 00000000000000..988a5185fb3ec4 --- /dev/null +++ b/versions/w-/wcslib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2e33104b54c3db79012234ded4db319a3464885b", + "version": "7.12", + "port-version": 0 + } + ] +} From a618637937298060bdbe5fbcfb628eabd1082c8a Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 16 May 2023 23:47:59 +0600 Subject: [PATCH 092/533] [lexbor] Add new port (#31415) * [lexbor] Add new port * . * addver * addver * ver * Update ports/lexbor/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/lexbor/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update lexbor.json --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/lexbor/portfile.cmake | 25 +++++++++++++++++++++++++ ports/lexbor/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lexbor.json | 9 +++++++++ 4 files changed, 55 insertions(+) create mode 100644 ports/lexbor/portfile.cmake create mode 100644 ports/lexbor/vcpkg.json create mode 100644 versions/l-/lexbor.json diff --git a/ports/lexbor/portfile.cmake b/ports/lexbor/portfile.cmake new file mode 100644 index 00000000000000..14127bc6c794dd --- /dev/null +++ b/ports/lexbor/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lexbor/lexbor + REF v${VERSION} + SHA512 26bbca3b41a417cbc59ba8cf736e1611966fc2202de85aabf621b840565d835e7e5ffc1b0294defc16ec883f9fb94e802bd19ed704be35fa79b41566acc05cbc +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLEXBOR_BUILD_SHARED=${BUILD_SHARED} + -DLEXBOR_BUILD_STATIC=${BUILD_STATIC} +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/lexbor/html/tree/insertion_mode" + "${CURRENT_PACKAGES_DIR}/debug/include/lexbor/html/tree/insertion_mode" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/lexbor/vcpkg.json b/ports/lexbor/vcpkg.json new file mode 100644 index 00000000000000..f8d522edea611a --- /dev/null +++ b/ports/lexbor/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lexbor", + "version": "2.2.0", + "description": "Lexbor is development of an open source HTML Renderer library.", + "homepage": "https://github.com/lexbor/lexbor", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bf5ce2ddea9b2d..959f0eaa22e0f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3792,6 +3792,10 @@ "baseline": "2.6", "port-version": 3 }, + "lexbor": { + "baseline": "2.2.0", + "port-version": 0 + }, "libaaplus": { "baseline": "2.36", "port-version": 1 diff --git a/versions/l-/lexbor.json b/versions/l-/lexbor.json new file mode 100644 index 00000000000000..10962ee2b67dbd --- /dev/null +++ b/versions/l-/lexbor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f5c7890c5fb34ec0622b01dfdff10f11e8dccdbd", + "version": "2.2.0", + "port-version": 0 + } + ] +} From 08e86f83af173a3861958587a6080fbcc634e4ba Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 17 May 2023 17:38:57 +0200 Subject: [PATCH 093/533] nghttp2: update to 1.53.0 (#31406) and remove unnecessary cmake options --- ports/nghttp2/portfile.cmake | 10 ++-------- ports/nghttp2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index fedb9a6e070fb1..bfe68aa02f5c8f 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF v1.51.0 - SHA512 801a6625edefadf348f3c50132f00ce7ad2b15a77d8addca2dd68f0006e69649d35ea3b649000103c85d959680e4159bdda9c437679cbcd6417d8516a5f2fac1 + REF v${VERSION} + SHA512 7cd9bd2c1e3b0b97fd9c1a57559a91faa10ad046a38e65bc040cb7b31f2c65a92941125364c52c84f79cbb0be460795e8f067761598be0ae0e7ad7f17c3cd243 HEAD_REF master ) @@ -14,11 +14,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_LIB_ONLY=ON - -DENABLE_ASIO_LIB=OFF "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" - -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libcares=ON @@ -26,17 +24,13 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Libbpf=ON -DCMAKE_DISABLE_FIND_PACKAGE_Systemd=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jansson=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libevent=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Cython=ON - -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON -DCMAKE_DISABLE_FIND_PACKAGE_Threads=ON -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index a5785fa80cd61a..b630bd0bc25832 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nghttp2", - "version": "1.51.0", - "port-version": 1, + "version": "1.53.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 959f0eaa22e0f6..da9d3589b17283 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5577,8 +5577,8 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.51.0", - "port-version": 1 + "baseline": "1.53.0", + "port-version": 0 }, "nghttp2-asio": { "baseline": "2022-08-11", diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 684b4bc53c9002..1056bec407c52a 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eb9ce7e6486785e3b3581274097e4d0e34ad828", + "version": "1.53.0", + "port-version": 0 + }, { "git-tree": "74c421607d322d652065b5414ddd4d7f0989c0bf", "version": "1.51.0", From aaf629c0954d7c1465aa5fa1899a54d499df6272 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 17 May 2023 23:39:49 +0800 Subject: [PATCH 094/533] [influxdb-cxx] Update to v0.7.1 (#31145) * update influxdb-cxx * update version --------- Co-authored-by: Monica --- ports/influxdb-cxx/fix-dllexports.patch | 15 +++++++++++++++ ports/influxdb-cxx/portfile.cmake | 7 ++++--- ports/influxdb-cxx/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/i-/influxdb-cxx.json | 5 +++++ 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 ports/influxdb-cxx/fix-dllexports.patch diff --git a/ports/influxdb-cxx/fix-dllexports.patch b/ports/influxdb-cxx/fix-dllexports.patch new file mode 100644 index 00000000000000..59ec8ec8070776 --- /dev/null +++ b/ports/influxdb-cxx/fix-dllexports.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df7e7a3..4879802 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,6 +26,10 @@ project(influxdb-cxx + LANGUAGES CXX + ) + ++if (BUILD_SHARED_LIBS) ++ add_definitions(-DInfluxDB_EXPORTS) ++endif() ++ + message(STATUS "~~~ ${PROJECT_NAME} v${PROJECT_VERSION} ~~~") + + diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index 41c61daf9aa447..c004ed94a4816d 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offa/influxdb-cxx - REF 141ef6c3f9ee933262a35abe3ac5900da821078a #Commit on 2022-08-20 - SHA512 d19a7dfd410375a47e5fcb425045732878b09ec6b5eb01740696d57064c739cebcf4a4141c8f592d0c985f10cd8b05c538cef32193cb7226d74bc3462754b8fa + REF "v${VERSION}" + SHA512 3be45353635df28803bd57927db292fc93db28fbec56007bbf694badcbfa277672b168c3b41cd228c9570a8b8f56212369ce7eabedca581307f4c8488a69ef27 HEAD_REF master + PATCHES fix-dllexports.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,4 +26,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(PACKAGE_NAME InfluxDB CONFIG_PATH lib/cmake/InfluxDB) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index cb5377dbe3521b..0227bc6617cf87 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,11 +1,11 @@ { "name": "influxdb-cxx", - "version-date": "2022-09-02", + "version": "0.7.1", "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "license": "MIT", "dependencies": [ - "curl", + "cpr", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index da9d3589b17283..8e633c0fddf9cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3325,7 +3325,7 @@ "port-version": 0 }, "influxdb-cxx": { - "baseline": "2022-09-02", + "baseline": "0.7.1", "port-version": 0 }, "infoware": { diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index 0318e65bea9907..378898183f2eaf 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d03720b58912770380a8101fdbb729a57598a904", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "4eba82142d2afb448bc5295fe22e0849cd0f8ca7", "version-date": "2022-09-02", From 2d18711ce21896aaf1cefc031d426e4483cb0f7d Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 17 May 2023 23:51:07 +0800 Subject: [PATCH 095/533] [ccfits] Support for Release-only build (#31473) * support release only * update version * update portfile.cmake * update version --------- Co-authored-by: Monica --- ports/ccfits/portfile.cmake | 8 +++++--- ports/ccfits/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/ccfits.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake index 2c973d07ec3fd0..3a2c71ce5f8267 100644 --- a/ports/ccfits/portfile.cmake +++ b/ports/ccfits/portfile.cmake @@ -20,9 +20,11 @@ vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/bin/CCfits.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll") + endif() endif() # Remove duplicate include files @@ -38,4 +40,4 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\"" ) -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json index a30253680556c4..1bc37f2eedca82 100644 --- a/ports/ccfits/vcpkg.json +++ b/ports/ccfits/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ccfits", "version": "2.5", - "port-version": 10, + "port-version": 11, "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/", "license": "NASA-1.3", diff --git a/versions/baseline.json b/versions/baseline.json index 8e633c0fddf9cf..412324947ce1ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1406,7 +1406,7 @@ }, "ccfits": { "baseline": "2.5", - "port-version": 10 + "port-version": 11 }, "cctag": { "baseline": "1.0.2", diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json index 43c00fa80f1e3f..e7d066a886377f 100644 --- a/versions/c-/ccfits.json +++ b/versions/c-/ccfits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69b00d0813b3ec9b7b963f07cf570cca5a8e2fd5", + "version": "2.5", + "port-version": 11 + }, { "git-tree": "77b570d63ebf64b4110d2555ce945144cc695364", "version": "2.5", From b49c204b9338562136b639063b59c5301bd50457 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 17 May 2023 23:57:42 +0800 Subject: [PATCH 096/533] [opencascade] Fix the paths in target files for static build (#31460) * [opencascade] Fix paths in target files for static build * update version * apply suggestion * update version --- ports/opencascade/portfile.cmake | 23 +++++++++++++---------- ports/opencascade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 +++++ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index d73ab347a79d4f..1c1984bbe52f34 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( fix-depend-freetype.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(BUILD_TYPE "Shared") else() set(BUILD_TYPE "Static") @@ -77,11 +77,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - # debug creates libd and bind directories that need moving - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") - +if (NOT VCPKG_BUILD_TYPE) # fix paths in target files list(APPEND TARGET_FILES "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake" @@ -92,14 +88,21 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake" "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake" ) - + foreach(TARGET_FILE IN LISTS TARGET_FILES) file(READ "${TARGET_FILE}" filedata) - string(REGEX REPLACE "libd" "lib" filedata "${filedata}") - string(REGEX REPLACE "bind" "bin" filedata "${filedata}") + string(REGEX REPLACE "/libd" "/lib" filedata "${filedata}") + string(REGEX REPLACE "/bind" "/bin" filedata "${filedata}") file(WRITE "${TARGET_FILE}" "${filedata}") endforeach() +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # debug creates libd and bind directories that need moving + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") + # the bin directory ends up with bat files that are noise, let's clean that up file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat") file(REMOVE_RECURSE ${BATS}) @@ -108,4 +111,4 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index 004161988fc873..b44e8d573d54e3 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencascade", "version": "7.6.2", - "port-version": 2, + "port-version": 3, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 412324947ce1ef..03bd8a55caf6e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5838,7 +5838,7 @@ }, "opencascade": { "baseline": "7.6.2", - "port-version": 2 + "port-version": 3 }, "opencc": { "baseline": "1.1.6", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index c600b6cf95ec5d..481908454808d7 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bf7c68565ee022f685f20eb18bb2e38cfdffb17", + "version": "7.6.2", + "port-version": 3 + }, { "git-tree": "58939d51b0f33a014e48f1d7100ab8888d068c2d", "version": "7.6.2", From ed3afc99e24923913a326a16934acaf75863d5c9 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 17 May 2023 19:13:51 +0300 Subject: [PATCH 097/533] [flecs] update to 3.2.2 (#31432) * [flecs] update to 3.2.2 * [flecs] update version database --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 99103524dae423..02b69f41e84e23 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 dbbf4cfc3d24624c804c6dcc27c76ebc07ed58e757a0b7a5a529200ecf4f58d72b7a0061fb1ec0d41c7ea610accfd8fa1eb2944e261aacc22a3b9566cabbac22 + SHA512 18d55e58187840170d7ec11aea7711e854c53dd3d2bdcf458661c92178f5091231f97d869c8719f2b4713db53fd7e25917508288038f2be9edb91ff17606f62b HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 506dc3f8157ca3..92acd532926774 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.1", + "version": "3.2.2", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 03bd8a55caf6e8..801ec94a005a36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2517,7 +2517,7 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.1", + "baseline": "3.2.2", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index dabe79a2fbb48a..1e984f71f54ce7 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "912f444db03f6f652a404608a75df8fed734a701", + "version": "3.2.2", + "port-version": 0 + }, { "git-tree": "800db7e769bc8e59e56d9e7aeac0b5e48ab928f8", "version": "3.2.1", From 0e79ac5be550b1bf26d0a0c179b51fa4d479f4c6 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 18 May 2023 00:15:39 +0800 Subject: [PATCH 098/533] [freetype-gl] Add feature glad (#31436) * [freetype-gl] Add feature glad * format vcpkg.json * update version * update rependences * update version --- ports/freetype-gl/portfile.cmake | 10 ++++++++-- ports/freetype-gl/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/f-/freetype-gl.json | 5 +++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 36c0282bc104cd..6632f01f6c2992 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -14,6 +14,12 @@ vcpkg_from_github( 0005-add-version.patch ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "glad" freetype-gl_WITH_GLAD +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -21,6 +27,7 @@ vcpkg_cmake_configure( -Dfreetype-gl_BUILD_DEMOS=OFF -Dfreetype-gl_BUILD_TESTS=OFF -Dfreetype-gl_BUILD_MAKEFONT=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -32,6 +39,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index 3acfe4cbb6aaff..80d4541f7be1dc 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype-gl", "version-date": "2022-01-17", - "port-version": 1, + "port-version": 2, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ @@ -15,5 +15,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "glad": { + "description": "Use the GLAD gl loader", + "dependencies": [ + "glad" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 801ec94a005a36..3354d15302f8c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2626,7 +2626,7 @@ }, "freetype-gl": { "baseline": "2022-01-17", - "port-version": 1 + "port-version": 2 }, "freexl": { "baseline": "1.0.6", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index 0e74040b060124..bd11fbff9fd5fe 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a356f56c15dd0a66094c00cc35670791c545027e", + "version-date": "2022-01-17", + "port-version": 2 + }, { "git-tree": "c966935c663878c91381818cae1b87590be48191", "version-date": "2022-01-17", From 221670ac58c33336cfd3e09668cc4f59485e65d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabien=20P=C3=A9an?= Date: Wed, 17 May 2023 18:18:26 +0200 Subject: [PATCH 099/533] [libigl] Fix libigl features (#31420) * [libigl] Fix feature installation * [libigl] Update license * [libigl] update port version * [libigl] update patch * [libigl] update patch * [libigl] update patch * [libigl] update patch * [libigl] update patch * [libigl] v db * [libigl] Fix license * [libigl] v db --- ports/libigl/install-extra-targets.patch | 164 +++++++++++++++++++++++ ports/libigl/portfile.cmake | 8 +- ports/libigl/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/l-/libigl.json | 5 + 5 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 ports/libigl/install-extra-targets.patch diff --git a/ports/libigl/install-extra-targets.patch b/ports/libigl/install-extra-targets.patch new file mode 100644 index 00000000000000..f68ffe60d29965 --- /dev/null +++ b/ports/libigl/install-extra-targets.patch @@ -0,0 +1,164 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8143963..784ac50 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,7 +157,7 @@ if(LIBIGL_INSTALL) + set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/LibiglConfigVersion.cmake") + set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/igl") + +- foreach(suffix IN ITEMS "") #"_restricted" "_copyleft") ++ foreach(suffix IN ITEMS "" "_copyleft") # "_restricted" + install(EXPORT LibiglTargets${suffix} + DESTINATION ${export_dest_dir} + NAMESPACE igl${suffix}:: +diff --git a/cmake/igl/libigl-config.cmake.in b/cmake/igl/libigl-config.cmake.in +index 629896d..0b05692 100644 +--- a/cmake/igl/libigl-config.cmake.in ++++ b/cmake/igl/libigl-config.cmake.in +@@ -4,5 +4,30 @@ include(CMakeFindDependencyMacro) + find_dependency(Eigen3) + find_dependency(Threads) + include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets.cmake") ++if(TARGET igl::igl_embree) ++ find_dependency(embree 3) ++endif() ++if(TARGET igl::igl_glfw) ++ find_dependency(glfw3) ++endif() ++if(TARGET igl::igl_imgui) ++ find_dependency(imgui) ++ find_dependency(imguizmo) ++endif() ++if(TARGET igl::igl_opengl) ++ find_dependency(OpenGL) ++ find_dependency(glad) ++endif() ++if(TARGET igl::igl_png) ++ find_dependency(Stb) ++endif() ++if(TARGET igl::igl_xml) ++ find_dependency(tinyxml2) ++endif() ++ ++include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets_copyleft.cmake" OPTIONAL) ++if(TARGET igl_copyleft::igl_copyleft_cgal) ++ find_dependency(CGAL) ++endif() + + check_required_components(Libigl) +diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake +index 7ee7d84..d06c6ee 100644 +--- a/cmake/igl/modules/copyleft/cgal.cmake ++++ b/cmake/igl/modules/copyleft/cgal.cmake +@@ -9,7 +9,7 @@ target_include_directories(igl_copyleft_cgal ${IGL_SCOPE} + ) + + # 3. Target sources +-file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.h") ++file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.h" "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.hpp") + file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/copyleft/cgal/*.cpp") + igl_target_sources(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES}) + +@@ -22,6 +22,8 @@ target_link_libraries(igl_copyleft_cgal ${IGL_SCOPE} + CGAL::CGAL + ) + ++igl_install(igl_copyleft_cgal ${INC_FILES} ${SRC_FILES}) ++ + # 5. Unit tests + file(GLOB SRC_FILES + "${libigl_SOURCE_DIR}/tests/include/igl/copyleft/boolean/*.cpp" +@@ -31,3 +33,4 @@ igl_add_test(igl_copyleft_cgal ${SRC_FILES}) + if(TARGET test_igl_copyleft_cgal) + igl_copy_dll(test_igl_copyleft_cgal) + endif() ++ +diff --git a/cmake/igl/modules/copyleft/core.cmake b/cmake/igl/modules/copyleft/core.cmake +index 8d03a90..aff8241 100644 +--- a/cmake/igl/modules/copyleft/core.cmake ++++ b/cmake/igl/modules/copyleft/core.cmake +@@ -17,3 +17,5 @@ igl_target_sources(igl_copyleft_core ${INC_FILES} ${SRC_FILES}) + target_link_libraries(igl_copyleft_core ${IGL_SCOPE} + igl::core + ) ++ ++igl_install(igl_copyleft_core ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/core.cmake b/cmake/igl/modules/core.cmake +index 137d30b..597c26b 100644 +--- a/cmake/igl/modules/core.cmake ++++ b/cmake/igl/modules/core.cmake +@@ -12,8 +12,8 @@ target_include_directories(igl_core ${IGL_SCOPE} + ) + + # 3. Target sources +-file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/*.h") +-file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/*.cpp") ++file(GLOB INC_FILES "${libigl_SOURCE_DIR}/include/igl/*.h" "${libigl_SOURCE_DIR}/include/igl/*.hpp") ++file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/*.cpp" "${libigl_SOURCE_DIR}/include/igl/*.c") + igl_target_sources(igl_core ${INC_FILES} ${SRC_FILES}) + + # 4. Install target & headers +diff --git a/cmake/igl/modules/embree.cmake b/cmake/igl/modules/embree.cmake +index de85066..052fc76 100644 +--- a/cmake/igl/modules/embree.cmake ++++ b/cmake/igl/modules/embree.cmake +@@ -20,6 +20,9 @@ target_link_libraries(igl_embree ${IGL_SCOPE} + $ + ) + ++igl_install(igl_embree ${INC_FILES} ${SRC_FILES}) ++ + # 5. Unit tests + file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/tests/include/igl/embree/*.cpp") + igl_add_test(igl_embree ${SRC_FILES}) ++ +diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake +index f42d22a..e9930d8 100644 +--- a/cmake/igl/modules/glfw.cmake ++++ b/cmake/igl/modules/glfw.cmake +@@ -21,3 +21,5 @@ target_link_libraries(igl_glfw ${IGL_SCOPE} + igl::opengl + $ + ) ++ ++igl_install(igl_glfw ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake +index f331854..7ff9738 100644 +--- a/cmake/igl/modules/imgui.cmake ++++ b/cmake/igl/modules/imgui.cmake +@@ -23,3 +23,5 @@ target_link_libraries(igl_imgui ${IGL_SCOPE} + imgui::imgui + imguizmo::imguizmo + ) ++ ++igl_install(igl_imgui ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake +index dfadb38..185494b 100644 +--- a/cmake/igl/modules/opengl.cmake ++++ b/cmake/igl/modules/opengl.cmake +@@ -22,3 +22,5 @@ target_link_libraries(igl_opengl ${IGL_SCOPE} + # Link against OpenGL::OpenGL if available, or fallback to OpenGL::GL + $,OpenGL::OpenGL,OpenGL::GL> + ) ++ ++igl_install(igl_opengl ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/png.cmake b/cmake/igl/modules/png.cmake +index 8d8decc..293da91 100644 +--- a/cmake/igl/modules/png.cmake ++++ b/cmake/igl/modules/png.cmake +@@ -21,3 +21,5 @@ target_link_libraries(igl_png ${IGL_SCOPE} + igl::opengl + stb::stb + ) ++ ++igl_install(igl_png ${INC_FILES} ${SRC_FILES}) +diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake +index 31ab979..815ea62 100644 +--- a/cmake/igl/modules/xml.cmake ++++ b/cmake/igl/modules/xml.cmake +@@ -19,3 +19,5 @@ target_link_libraries(igl_xml ${IGL_SCOPE} + igl::core + tinyxml2::tinyxml2 + ) ++ ++igl_install(igl_xml ${INC_FILES} ${SRC_FILES}) diff --git a/ports/libigl/portfile.cmake b/ports/libigl/portfile.cmake index c28bb9bf47a67b..14cdc319318c3b 100644 --- a/ports/libigl/portfile.cmake +++ b/ports/libigl/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES dependencies.patch upstream_fixes.patch + install-extra-targets.patch ) file(REMOVE "${SOURCE_PATH}/cmake/find/FindGMP.cmake" @@ -65,4 +66,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/igl) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.GPL") + +if(NOT LIBIGL_COPYLEFT_CGAL) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.MPL2") +else() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.MPL2" "${SOURCE_PATH}/LICENSE.GPL" COMMENT "GPL for targets in \"igl_copyleft::\" namespace.") +endif() diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index 3b722930b4d71a..2c4a7d5ac79895 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libigl", "version": "2.4.0", - "port-version": 3, + "port-version": 4, "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", "homepage": "https://github.com/libigl/libigl", - "license": "GPL-3.0-only", + "license": null, "dependencies": [ "eigen3", { diff --git a/versions/baseline.json b/versions/baseline.json index 3354d15302f8c9..fe4446f0b4a522 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4134,7 +4134,7 @@ }, "libigl": { "baseline": "2.4.0", - "port-version": 3 + "port-version": 4 }, "libilbc": { "baseline": "3.0.4", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index edde91e0790749..e84671efffe140 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "260c09078445cfce5ce800b1d3cfa47877f6f783", + "version": "2.4.0", + "port-version": 4 + }, { "git-tree": "4754633723fc5e93c13f54e405ce0b8662bb570b", "version": "2.4.0", From 7b30311f0a79d395bf2d933d82fec1853c6a4e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Wed, 17 May 2023 18:21:23 +0200 Subject: [PATCH 100/533] [boringssl] Fix pkg-config & cmake find module compat (#31387) * [boringssl] Fix find-module compatibility OpenSSL libraries use a "d" postfix to differentiate debug and release binaries. The cmake find-module mistakes the debug binary for the release binary without the postfix. Fix the package config generator logic which was completely broken before: Remove linkage of Windows libraries for non-Windows targets and remove the "lib" prefix only for msvc builds. Harmonize the pkg-configs with the debug postfix. Add usage instructions. * [boringssl] Add new port version to database --- ports/boringssl/install-pc-files.cmake | 14 +++++++++++--- ports/boringssl/portfile.cmake | 8 ++++++-- ports/boringssl/usage | 4 ++++ ports/boringssl/vcpkg.json | 2 +- versions/b-/boringssl.json | 5 +++++ versions/baseline.json | 2 +- 6 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 ports/boringssl/usage diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake index f86652f2720165..262a533a8ba7b8 100644 --- a/ports/boringssl/install-pc-files.cmake +++ b/ports/boringssl/install-pc-files.cmake @@ -1,15 +1,23 @@ function(install_pc_file name pc_data) # fix platform-specific details - if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") - string(REPLACE "-llibcrypt" "-lcrypto" pc_data "${pc_data}") + if (NOT VCPKG_TARGET_IS_WINDOWS) string(REPLACE "-lcrypt32" "" pc_data "${pc_data}") string(REPLACE "-lws2_32" "" pc_data "${pc_data}") + elseif (NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}") + string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}") + else() + string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}") + endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) endif() endfunction() diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index 94c11088653eb8..b241a3635adaf8 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -37,14 +37,18 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DINSTALL_HEADERS=OFF -DINSTALL_TOOLS=OFF + # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install() +vcpkg_copy_pdbs() include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") -if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) +if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/boringssl") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" 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") diff --git a/ports/boringssl/usage b/ports/boringssl/usage new file mode 100644 index 00000000000000..13ef2475767e90 --- /dev/null +++ b/ports/boringssl/usage @@ -0,0 +1,4 @@ +boringssl can be found via the built-in CMake find-module: + + find_package(OpenSSL REQUIRED) + target_link_libraries(main PRIVATE OpenSSL::SSL OpenSSL::Crypto) \ No newline at end of file diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index 40331383875fb9..1bf1fef03436eb 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boringssl", "version-date": "2021-06-23", - "port-version": 3, + "port-version": 4, "description": "BoringSSL is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 893c242e80b68b..8f279f02c2275b 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01164d48fa5667c3e6885d010cb110b84b6f2e78", + "version-date": "2021-06-23", + "port-version": 4 + }, { "git-tree": "cb83700b7bf53177773421dfb803fb8478e6a72d", "version-date": "2021-06-23", diff --git a/versions/baseline.json b/versions/baseline.json index fe4446f0b4a522..18267d59d52022 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1234,7 +1234,7 @@ }, "boringssl": { "baseline": "2021-06-23", - "port-version": 3 + "port-version": 4 }, "botan": { "baseline": "2.19.3", From a9da2edbae9611f5dd8aea3ed98caef3137a4440 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 19 May 2023 02:18:03 +0800 Subject: [PATCH 101/533] [gdcm] Update to 3.0.22 (#31499) * update gdcm * update version --------- Co-authored-by: Monica --- ports/gdcm/fix-dependence-getopt.patch | 7 +++---- ports/gdcm/portfile.cmake | 6 ++++-- ports/gdcm/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/gdcm.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/gdcm/fix-dependence-getopt.patch b/ports/gdcm/fix-dependence-getopt.patch index 556df7350ee230..935be24aefd0eb 100644 --- a/ports/gdcm/fix-dependence-getopt.patch +++ b/ports/gdcm/fix-dependence-getopt.patch @@ -19,11 +19,11 @@ index 4cdc999..c6ede41 100644 # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) diff --git a/Utilities/VTK/Applications/CMakeLists.txt b/Utilities/VTK/Applications/CMakeLists.txt -index c7f1ad9..20883a2 100644 +index a7f7e7e..ab89a73 100644 --- a/Utilities/VTK/Applications/CMakeLists.txt +++ b/Utilities/VTK/Applications/CMakeLists.txt -@@ -45,7 +45,13 @@ foreach(app ${GDCM_VTK_APPS}) - target_link_libraries(${app} ${VTK_LIBRARIES} vtkIOXML) +@@ -60,7 +60,12 @@ foreach(app ${GDCM_VTK_APPS}) + endif() endif() if(WIN32 AND NOT CYGWIN) - target_link_libraries(${app} gdcmgetopt) @@ -33,7 +33,6 @@ index c7f1ad9..20883a2 100644 + else() + target_link_libraries(${app} gdcmgetopt) + endif() -+else() endif() if(NOT GDCM_INSTALL_NO_RUNTIME) install(TARGETS ${app} diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index 0f6b8786624559..cfba4b23c3cd51 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM - REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12 - SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a + REF "v${VERSION}" + SHA512 f4fd81db731b60eebd7d67b8a7f2aa67f44d788f4c0a3f2cef9490fd4f0f1ae9caea1a9a8727619edab6aeda815ae6ace5266b1428b9bea81b7c984deb78bbac HEAD_REF master PATCHES use-openjpeg-config.patch @@ -37,6 +37,8 @@ vcpkg_cmake_configure( -DGDCM_USE_SYSTEM_OPENJPEG=ON -DGDCM_BUILD_TESTING=OFF -DUSE_VCPKG_GETOPT=${USE_VCPKG_GETOPT} + MAYBE_UNUSED_VARIABLES + USE_VCPKG_GETOPT ) vcpkg_cmake_install() diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json index f14294e4b1fc5d..cc17ffc43349ff 100644 --- a/ports/gdcm/vcpkg.json +++ b/ports/gdcm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdcm", - "version": "3.0.12", - "port-version": 1, + "version": "3.0.22", "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 18267d59d52022..64ca40e2831772 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2717,8 +2717,8 @@ "port-version": 0 }, "gdcm": { - "baseline": "3.0.12", - "port-version": 1 + "baseline": "3.0.22", + "port-version": 0 }, "gdcm2": { "baseline": "deprecated", diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index 09eb12e926990e..092b7ba49a5c10 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4083ad5a17c338266c7e0b74adf6126c55112b0d", + "version": "3.0.22", + "port-version": 0 + }, { "git-tree": "cb3870f85a108727ba53c35d59633f9d6fdb4c4e", "version": "3.0.12", From df788a288cbd124394520b25a9d2dfe182488952 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Fri, 19 May 2023 03:18:29 +0900 Subject: [PATCH 102/533] [glib] update to 2.76.2 (#31491) * [glib] update to 2.76.2 (microsoft/vcpkg#31490) * [glib] regenerate version registries (microsoft/vcpkg#31490) --- ports/glib/portfile.cmake | 8 +------- ports/glib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/glib.json | 5 +++++ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 4b74031f0636a8..a2cb255d6fc69d 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,12 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 7ab8740925fa4ed2d860a35544c475ae905df5fa7fc0cc64ffa8c543df6073794e44c8ff39e3e1de1d677016ef9d27e9bc709d2505d13090faa8d6c47cd64bd0 -) -vcpkg_download_distfile(GLIB_MR_3386 - URLS "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3386.diff" - FILENAME "glib-mr-3386.diff" - SHA512 cb67e8908a7cb6f945d019da1bf56f504b9c2131a832bcdfbdc61c973c89efd8e4380d5d67f83e229998da1e8579f3ff87b7695a3318eee9613d1ab1168bd0db + SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -15,7 +10,6 @@ vcpkg_extract_source_archive(SOURCE_PATH PATCHES use-libiconv-on-windows.patch libintl.patch - ${GLIB_MR_3386} ) vcpkg_list(SET OPTIONS) diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 9bd2350f873d60..782e3eaa6aa46a 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.76.1", - "port-version": 1, + "version": "2.76.2", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 64ca40e2831772..a9e587322db48e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2829,8 +2829,8 @@ "port-version": 2 }, "glib": { - "baseline": "2.76.1", - "port-version": 1 + "baseline": "2.76.2", + "port-version": 0 }, "glibmm": { "baseline": "2.76.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 4964168fe324d1..c43230b997fc3b 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "219fb684c85e933ff56764423c86055a7a23ee62", + "version": "2.76.2", + "port-version": 0 + }, { "git-tree": "82258d825872b8c0987fe62b759b7602edbed17b", "version": "2.76.1", From 278f42906961c0abd713aaff14bd800d98a6b9c7 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Thu, 18 May 2023 14:19:03 -0400 Subject: [PATCH 103/533] [openimageio] Update to 2.4.11.1 (#31489) * [openimageio] Update to 2.4.11.1. * [openimageio] Add upstream patch to fix MSVC build * [openimageio] Update baseline. --- ports/openimageio/fix-msvc-build.patch | 13 +++++++++++++ ports/openimageio/portfile.cmake | 3 ++- ports/openimageio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/openimageio.json | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 ports/openimageio/fix-msvc-build.patch diff --git a/ports/openimageio/fix-msvc-build.patch b/ports/openimageio/fix-msvc-build.patch new file mode 100644 index 00000000000000..0643adf94bc477 --- /dev/null +++ b/ports/openimageio/fix-msvc-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/python/py_oiio.cpp b/src/python/py_oiio.cpp +index 6031d2c23..e71105da5 100644 +--- a/src/python/py_oiio.cpp ++++ b/src/python/py_oiio.cpp +@@ -153,7 +153,7 @@ oiio_bufinfo::oiio_bufinfo(const py::buffer_info& pybuf, int nchans, int width, + format = TypeUnknown; // No idea what's going on -- error + error = Strutil::fmt::format( + "Python array shape is [{:,}] but expecting h={}, w={}, ch={}", +- cspan(pybuf.shape), height, width, nchans); ++ cspan(pybuf.shape), height, width, nchans); + } + } else if (pixeldims == 1) { + // Reading a 1D scanline span diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 016d588aeb0cb7..2fb385123181e4 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio REF "v${VERSION}" - SHA512 e7dd7aba8dc0baa9bc50f362c21119bf4008edbd03a0c9f31bb03e01b5b0cc18c39f8a368885a4d756f6b475965138409c7e91eeae90b0ebc18d253ff314f025 + SHA512 e8b232bb3c1bb66cc6c4f023dcf6e29633a1aee64c49a2860c2157c0885960c40114ee3988d4f132e6e55670b8b1e01b5b4cd4462651ae047a89d22de527581c HEAD_REF master PATCHES fix-dependencies.patch @@ -11,6 +11,7 @@ vcpkg_from_github( imath-version-guard.patch fix-openimageio_include_dir.patch fix-openexr-target-missing.patch + fix-msvc-build.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 47ae10f0d8cc42..7283dcbce474fb 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openimageio", - "version": "2.4.9.0", - "port-version": 1, + "version": "2.4.11.1", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a9e587322db48e..c7bbda51a7f83e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5913,8 +5913,8 @@ "port-version": 4 }, "openimageio": { - "baseline": "2.4.9.0", - "port-version": 1 + "baseline": "2.4.11.1", + "port-version": 0 }, "openjpeg": { "baseline": "2.5.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 0f3c9521bbbf53..ccf0a9de9e672b 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c06030b088b87143ff7a85c23af606bbd967496", + "version": "2.4.11.1", + "port-version": 0 + }, { "git-tree": "34493d776df3b1fee4ba5e01c882d1237a135362", "version": "2.4.9.0", From 3f6bfedb80673c85e969a23780155f196055e432 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 19 May 2023 02:19:38 +0800 Subject: [PATCH 104/533] [live555] Update version to 2023.5.10 (#31487) * [live555] Update version to 2023.5.10 * version --- ports/live555/portfile.cmake | 6 +++--- ports/live555/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index a9ba8c76b94ed5..2f3ed3834f7515 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.03.30.tar.gz" - FILENAME "live.2023.03.30.tar.gz" - SHA512 84dcc9af7fcfd565342b913e8420e2cca9b45e9a8ff74c04ef8e32449f6bbf35eb594ba48ae06d93efe6ec4c3d7c6812ce5989d02676398cdbd63f2ec0042b68 + URLS "http://live555.com/liveMedia/public/live.2023.05.10.tar.gz" + FILENAME "live.2023.05.10.tar.gz" + SHA512 2997305d5b338466ba765c2969f7fab59907e6e4cabf5fa6d12b1c2b450f9dd543dc59936717352e9a3fc98d6a9bdf316d3a67fc690eebbf62482c21f21634ea ) vcpkg_extract_source_archive( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index fb83a9680f1f2e..2ab6c7e2978939 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,6 @@ { "name": "live555", - "version-date": "2023-03-30", + "version-date": "2023-05-10", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index c7bbda51a7f83e..dfe720ba76366b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4885,7 +4885,7 @@ "port-version": 2 }, "live555": { - "baseline": "2023-03-30", + "baseline": "2023-05-10", "port-version": 0 }, "llfio": { diff --git a/versions/l-/live555.json b/versions/l-/live555.json index c121998e2fe1f8..2774f145069f25 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4042dde466ab9adcd96e5271751a65a8b67270f7", + "version-date": "2023-05-10", + "port-version": 0 + }, { "git-tree": "0a8b18570460ba3155d5c6cba9f5c05c95d876e2", "version-date": "2023-03-30", From 7e957fda0c1bab8a82aae45c2484d8d0f2a16b9b Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Thu, 18 May 2023 20:21:54 +0200 Subject: [PATCH 105/533] tracy - upgrade to 0.9.1 (#31484) --- ports/tracy/003-fix-imgui-path.patch | 6 ++-- ports/tracy/004-fix-crash-handler.patch | 22 -------------- ports/tracy/004-fix-missing-threads-dep.patch | 30 +++++++++++++++++++ ports/tracy/portfile.cmake | 6 ++-- ports/tracy/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/t-/tracy.json | 5 ++++ 7 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 ports/tracy/004-fix-crash-handler.patch create mode 100644 ports/tracy/004-fix-missing-threads-dep.patch diff --git a/ports/tracy/003-fix-imgui-path.patch b/ports/tracy/003-fix-imgui-path.patch index 9e6d94ef84260a..be1bf9a57d0b43 100644 --- a/ports/tracy/003-fix-imgui-path.patch +++ b/ports/tracy/003-fix-imgui-path.patch @@ -6,8 +6,8 @@ index 24765f1a..dc2923c8 100644 CFLAGS += CXXFLAGS := $(CFLAGS) -std=c++17 DEFINES += -DIMGUI_ENABLE_FREETYPE --INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -+INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) - LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl +-INCLUDES := $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -I../../../imgui ++INCLUDES := -I../../../imgui $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) + LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl PROJECT := Tracy diff --git a/ports/tracy/004-fix-crash-handler.patch b/ports/tracy/004-fix-crash-handler.patch deleted file mode 100644 index cbfd57a59b15b6..00000000000000 --- a/ports/tracy/004-fix-crash-handler.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/public/client/TracyProfiler.cpp b/public/client/TracyProfiler.cpp -index ea168e4f..9287d433 100644 ---- a/public/client/TracyProfiler.cpp -+++ b/public/client/TracyProfiler.cpp -@@ -1454,7 +1454,7 @@ Profiler::~Profiler() - if( m_crashHandlerInstalled ) RemoveVectoredExceptionHandler( m_exceptionHandler ); - #endif - --#ifdef __linux__ -+#if defined __linux__ && !defined TRACY_NO_CRASH_HANDLER - if( m_crashHandlerInstalled ) - { - sigaction( TRACY_CRASH_SIGNAL, &m_prevSignal.pwr, nullptr ); -@@ -1520,7 +1520,7 @@ bool Profiler::ShouldExit() - - void Profiler::Worker() - { --#ifdef __linux__ -+#if defined __linux__ && !defined TRACY_NO_CRASH_HANDLER - s_profilerTid = syscall( SYS_gettid ); - #endif - diff --git a/ports/tracy/004-fix-missing-threads-dep.patch b/ports/tracy/004-fix-missing-threads-dep.patch new file mode 100644 index 00000000000000..76d5eb64c8bf98 --- /dev/null +++ b/ports/tracy/004-fix-missing-threads-dep.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d69f71eb..31429d23 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -143,5 +143,11 @@ install(FILES ${common_includes} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) + install(EXPORT TracyConfig + NAMESPACE Tracy:: +- FILE TracyConfig.cmake ++ FILE TracyTargets.cmake ++ DESTINATION share/Tracy) ++include(CMakePackageConfigHelpers) ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake" ++ INSTALL_DESTINATION share/Tracy) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake + DESTINATION share/Tracy) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 00000000..fc913ab3 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include(CMakeFindDependencyMacro) ++find_dependency(Threads REQUIRED) ++ ++include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake") +\ No newline at end of file diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 1e2403b95f276d..2e1bd15c90b127 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -7,14 +7,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF v0.9 - SHA512 00e8ff6d73d0428eb7a77fc5e0556458285922fbf9d5f0d42ed4f27ff98ffcd96b0f59bbaa3c103fd0903283ded6e7577d2a49362e5803cdbac0f3236af957cb + REF v0.9.1 + SHA512 988f492501e5a449ecc89b98d4e8cb6164b65dfe2b5daf17ccc3035f1a477162b77ce7a2cc4c62d7b8a8d530d80f2b439c779319a6bd15b6d37b4a36406d8f4c HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch 002-fix-capstone-5.patch 003-fix-imgui-path.patch - 004-fix-crash-handler.patch + 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 14642e3d6dd395..0a7ffdbd85be4a 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tracy", - "version-semver": "0.9.0", - "port-version": 3, + "version-semver": "0.9.1", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index dfe720ba76366b..0d9dbe3e5490da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8093,8 +8093,8 @@ "port-version": 4 }, "tracy": { - "baseline": "0.9.0", - "port-version": 3 + "baseline": "0.9.1", + "port-version": 0 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index c08acbbe2b6b5f..380053bc215ac1 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dbe1080d7c00eb3aa76f87c8c62511d9d9671a7", + "version-semver": "0.9.1", + "port-version": 0 + }, { "git-tree": "0866d3457267bff478bd158261b25869adf3e480", "version-semver": "0.9.0", From d707c5575835c703d9ec46473e80fcdfdbe326fd Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 19 May 2023 02:22:21 +0800 Subject: [PATCH 106/533] [simdjson] Update to 3.1.8 (#31479) * [simdjson] Update to 3.1.8 * [simdjson] Bump version --- ports/simdjson/portfile.cmake | 2 +- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index ec489ead4f52cf..b672d179530f91 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO simdjson/simdjson REF "v${VERSION}" HEAD_REF master - SHA512 6b54723720aa83333816e3bbd5cfe8dc71b087ac1d20d8982601563b70146bd63629a9f74cbc460a78ab2c83c689991586ef20a268fc67946b57dcc3f5486bc5 + SHA512 bdddf6a1afbe289fa075cbe05d9f70c29c61fa824be52e414d8344bd1c77117634bf44122629980e69571cf4bad1da5f2b9818ea878290cc360913fb2279d3e5 ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 660732c73408a3..be59b4a4f76a94 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version": "3.1.7", + "version": "3.1.8", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0d9dbe3e5490da..5e6cf6ced13480 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7445,7 +7445,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "3.1.7", + "baseline": "3.1.8", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index d36b05e8882b4e..1fbbc79b371beb 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d62e75a24f4a107faf802fc187d3cf72e0041c51", + "version": "3.1.8", + "port-version": 0 + }, { "git-tree": "9ef276894dacedca108836726f0e37278fb53861", "version": "3.1.7", From cdb77f1b5c82acc1e19d79efe8e946c81bcf21c9 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 19 May 2023 02:23:27 +0800 Subject: [PATCH 107/533] [alembic] update to 1.8.5 (#31456) * alembic update to 1.8.5 * update version * fix line break * update version * fix line break * update version * delete debug patch * update version * fix line break * update version --- ports/alembic/disable-warnings-as-error.patch | 19 ------------------- ports/alembic/fix-runtime-destination.patch | 15 +++++++-------- ports/alembic/portfile.cmake | 8 ++++---- ports/alembic/vcpkg.json | 3 +-- versions/a-/alembic.json | 5 +++++ versions/baseline.json | 4 ++-- 6 files changed, 19 insertions(+), 35 deletions(-) delete mode 100644 ports/alembic/disable-warnings-as-error.patch diff --git a/ports/alembic/disable-warnings-as-error.patch b/ports/alembic/disable-warnings-as-error.patch deleted file mode 100644 index 48ad94b3036e11..00000000000000 --- a/ports/alembic/disable-warnings-as-error.patch +++ /dev/null @@ -1,19 +0,0 @@ -Workaround for https://github.com/alembic/alembic/issues/309 -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -125,14 +125,6 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") - ENDIF() - --# Set some debug vs opt flags --if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND NOT MSVC) -- add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wno-deprecated) -- if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR -- CMAKE_CXX_COMPILER_ID MATCHES "CLANG") -- add_definitions( -Wno-error=implicit-fallthrough) -- endif() --endif() - - IF (NOT ${WINDOWS}) - SET(EXTERNAL_MATH_LIBS "-lm") diff --git a/ports/alembic/fix-runtime-destination.patch b/ports/alembic/fix-runtime-destination.patch index 28a817be20632a..093218644d5c61 100644 --- a/ports/alembic/fix-runtime-destination.patch +++ b/ports/alembic/fix-runtime-destination.patch @@ -1,8 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 860a8be..ee0f4f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ option(DOCS_PATH - +@@ -74,7 +74,7 @@ option(DOCS_PATH + # Set static/dynamic build options SET(LIB_TYPE STATIC) -SET(RUNTIME_INSTALL_DIR lib) @@ -11,13 +12,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt SET(ARCHIVE_INSTALL_DIR lib) IF (ALEMBIC_SHARED_LIBS) diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt +index 25e760c..9acac61 100644 --- a/lib/Alembic/CMakeLists.txt +++ b/lib/Alembic/CMakeLists.txt -@@ -78,12 +78,11 @@ option(DOCS_PATH - ${ZLIB_LIBRARY} - ) - --SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs") +@@ -87,9 +87,9 @@ TARGET_LINK_LIBRARIES(Alembic + SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs") INSTALL(TARGETS Alembic EXPORT AlembicTargets - LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} @@ -26,6 +25,6 @@ diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt + LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} + ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR} + RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}) - + #-****************************************************************************** # PACKAGE EXPORTS diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 2415acdcea46d2..f5c90aaceb7bde 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic - REF 1.8.3 - SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 + REF "${VERSION}" + SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e HEAD_REF master PATCHES fix-runtime-destination.patch - disable-warnings-as-error.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS) @@ -24,6 +23,7 @@ vcpkg_cmake_configure( -DALEMBIC_SHARED_LIBS=${ALEMBIC_SHARED_LIBS} -DUSE_TESTS=OFF ${FEATURE_OPTIONS} + -DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF ) vcpkg_cmake_install() @@ -46,4 +46,4 @@ vcpkg_copy_tools( ) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index cbc9fc27fecbe5..e3d6c17aa24630 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "alembic", - "version": "1.8.3", - "port-version": 1, + "version": "1.8.5", "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", "supports": "!(windows & x86) & !uwp", diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index 8bebb133f7dc2e..dc67d45f6531b8 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cb4b9d32a6098f48e3d0a75ddd7eaae7a7df085", + "version": "1.8.5", + "port-version": 0 + }, { "git-tree": "16bef528ef38e7426a333739878188d9ca909bc5", "version": "1.8.3", diff --git a/versions/baseline.json b/versions/baseline.json index 5e6cf6ced13480..7e5de180e7fe91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -69,8 +69,8 @@ "port-version": 7 }, "alembic": { - "baseline": "1.8.3", - "port-version": 1 + "baseline": "1.8.5", + "port-version": 0 }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", From ba5cf5bba6fe8062f9667d7207426b9c3d6cd7b1 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 19 May 2023 02:24:27 +0800 Subject: [PATCH 108/533] [flecs] Add usage file (#31501) * add usage * update version * remove vcpkg-cmake-wrapper.cmake * update version * undo remove vcpkg-cmake-wrapper.cmake * update version --------- Co-authored-by: Monica --- ports/flecs/portfile.cmake | 1 + ports/flecs/usage | 4 ++++ ports/flecs/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 ports/flecs/usage diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 02b69f41e84e23..365fc63c3af9d1 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -31,6 +31,7 @@ endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/flecs/usage b/ports/flecs/usage new file mode 100644 index 00000000000000..c513e501903f58 --- /dev/null +++ b/ports/flecs/usage @@ -0,0 +1,4 @@ +The package flecs provides CMake targets: + + find_package(flecs CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,flecs::flecs,flecs::flecs_static>) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 92acd532926774..094108e92c0b2b 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "flecs", "version": "3.2.2", + "port-version": 1, "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7e5de180e7fe91..3ae0b052d3637d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2518,7 +2518,7 @@ }, "flecs": { "baseline": "3.2.2", - "port-version": 0 + "port-version": 1 }, "flint": { "baseline": "2.8.0", diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 1e984f71f54ce7..a0441f6f72f3bb 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a59e268b884b19cbc93cb11f25d838af9c09f17", + "version": "3.2.2", + "port-version": 1 + }, { "git-tree": "912f444db03f6f652a404608a75df8fed734a701", "version": "3.2.2", From f2446c13a96f4f98e1882118ad6e285cf2afac28 Mon Sep 17 00:00:00 2001 From: L3nn0x Date: Thu, 18 May 2023 20:26:45 +0200 Subject: [PATCH 109/533] Update discord-game-sdk to 3.2.1 (#31495) * Update discord version * Update patch * Update patch * Update database version * Update port version * Run format * Update database version * Update database version --- ports/discord-game-sdk/include-cstdint.patch | 19 ++++++++----------- ports/discord-game-sdk/portfile.cmake | 6 ++++-- ports/discord-game-sdk/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/d-/discord-game-sdk.json | 5 +++++ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ports/discord-game-sdk/include-cstdint.patch b/ports/discord-game-sdk/include-cstdint.patch index 6e61c4c252d915..05df0232e8109b 100644 --- a/ports/discord-game-sdk/include-cstdint.patch +++ b/ports/discord-game-sdk/include-cstdint.patch @@ -1,6 +1,6 @@ From 91fab7c4b8f7da3182f07f5392ebe9388f979157 Mon Sep 17 00:00:00 2001 -From: Maki -Date: Wed, 3 Jun 2020 01:40:58 +0100 +From: l3nn0x +Date: Wed, 17 Mai 2023 11:40:58 +0100 Subject: [PATCH] Include cstdint --- @@ -11,15 +11,12 @@ diff --git a/cpp/types.h b/cpp/types.h index 8c7cc2b..122dc71 100644 --- a/cpp/types.h +++ b/cpp/types.h -@@ -3,6 +3,8 @@ - #include "ffi.h" - #include "event.h" - -+#include +@@ -6,6 +6,8 @@ + #include + #include + #endif + - namespace discord { ++#include - enum class Result { --- -2.26.2 + namespace discord { diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake index c65e660c7faa2f..b39e770999166f 100644 --- a/ports/discord-game-sdk/portfile.cmake +++ b/ports/discord-game-sdk/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS https://dl-game-sdk.discordapp.net/2.5.6/discord_game_sdk.zip + URLS https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip FILENAME discord_game_sdk.zip - SHA512 4c8f72c7bdf92bc969fb86b96ea0d835e01b9bab1a2cc27ae00bdac1b9733a1303ceadfe138c24a7609b76d61d49999a335dd596cf3f335d894702e2aa23406f + SHA512 4851cb70f428eb391959018aa7206e11232348189f7e47f9b8e15535f02a8b114ef825198b0d772979b77ca47061ee7fa764ca90a1dc39370eb9802e8bf04541 ) vcpkg_extract_source_archive( @@ -20,6 +20,8 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(ARCH_FOLDER "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ARCH_FOLDER "x86_64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(ARCH_FOLDER "aarch64") endif() if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/discord-game-sdk/vcpkg.json b/ports/discord-game-sdk/vcpkg.json index 249c1bab8910d1..2fba2a0d280d08 100644 --- a/ports/discord-game-sdk/vcpkg.json +++ b/ports/discord-game-sdk/vcpkg.json @@ -1,10 +1,9 @@ { "name": "discord-game-sdk", - "version": "2.5.6", - "port-version": 5, + "version": "3.2.1", "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", - "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static", + "supports": "((x64 & (windows | osx | linux)) | (x86 & windows) | (arm64 & osx)) & !uwp & !static", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 3ae0b052d3637d..054635cad48f6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2101,8 +2101,8 @@ "port-version": 2 }, "discord-game-sdk": { - "baseline": "2.5.6", - "port-version": 5 + "baseline": "3.2.1", + "port-version": 0 }, "discord-rpc": { "baseline": "3.4.0", diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index 58f913b5695bb9..c1b4197ba3dc9a 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b81659584b418c89a25dc9c6e68cb8d7d75fee5f", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "87af266946b8e9b9f6ed5b439b3af5e185b84766", "version": "2.5.6", From 14a96b1980a55760ad8f4ff2c54ea71475de8657 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 19 May 2023 02:28:08 +0800 Subject: [PATCH 110/533] [libde265] Fix incorrect pc file (#31477) * [libde265] Fix incorrect pc file * Apply upstream change --- ports/libde265/fix-lib-version.patch | 11 +++++++++++ ports/libde265/portfile.cmake | 17 +---------------- ports/libde265/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libde265.json | 5 +++++ 5 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 ports/libde265/fix-lib-version.patch diff --git a/ports/libde265/fix-lib-version.patch b/ports/libde265/fix-lib-version.patch new file mode 100644 index 00000000000000..98e5a16e38de07 --- /dev/null +++ b/ports/libde265/fix-lib-version.patch @@ -0,0 +1,11 @@ +diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt +index 2856f90..ccbc8b6 100644 +--- a/libde265/CMakeLists.txt ++++ b/libde265/CMakeLists.txt +@@ -147,5 +147,6 @@ else() + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + endif() + ++set(VERSION ${PROJECT_VERSION}) # so that the replacement in libde265.pc will work with both autotools and CMake + configure_file(../libde265.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 38ab301905d288..856d2176fc0621 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-interface-include.patch + fix-lib-version.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,22 +24,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libde265) vcpkg_copy_tools(TOOL_NAMES dec265 AUTO_CLEAN) - -set(prefix "") -set(exec_prefix [[${prefix}]]) -set(libdir [[${prefix}/lib]]) -set(includedir [[${prefix}/include]]) -set(LIBS "") -configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" @ONLY) -# The produced library name is `liblibde265.a` or `libde265.lib` -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265") -# libde265's pc file assumes libstdc++, which isn't always true. -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libde265.pc" " -lstdc++" "") -if(NOT VCPKG_BUILD_TYPE) - configure_file("${SOURCE_PATH}/libde265.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" "-lde265" "-llibde265") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libde265.pc" " -lstdc++" "") -endif() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index 940bd7d347822f..c565b31cf911aa 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libde265", "version": "1.0.11", + "port-version": 1, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 054635cad48f6d..f47ab9c86ab836 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3930,7 +3930,7 @@ }, "libde265": { "baseline": "1.0.11", - "port-version": 0 + "port-version": 1 }, "libdeflate": { "baseline": "1.17", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index a20109b7e0d7a9..89dab1ffce4b06 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35f74e1100615e9ff16d6b05529baf8e7de774aa", + "version": "1.0.11", + "port-version": 1 + }, { "git-tree": "3c0c0eec97e9b7d9a46d6f1f5fb22c5b07aa5550", "version": "1.0.11", From 40619a55c3e76dc4005c8d1b7395071471bb8b96 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 19 May 2023 02:38:34 +0800 Subject: [PATCH 111/533] [pdcurses] Add export CMake config (#31453) * [pdcurses] Add export CMake config and update to latest commit * update version * add judge CMAKE_BUILD_TYPE STREQUAL "Debug" * update version * apply suggestions * update version * Add find binary file * update version * remove CMAKE_BUILD_TYPE * update version --- ports/pdcurses/portfile.cmake | 3 +- .../pdcurses/unofficial-pdcurses-config.cmake | 32 +++++++++++++++++++ ports/pdcurses/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/p-/pdcurses.json | 5 +++ 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 ports/pdcurses/unofficial-pdcurses-config.cmake diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 7869f2185a6e18..4ecc39a21ac049 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -39,4 +39,5 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pdcurses-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") +vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE") diff --git a/ports/pdcurses/unofficial-pdcurses-config.cmake b/ports/pdcurses/unofficial-pdcurses-config.cmake new file mode 100644 index 00000000000000..07fb8ce1f25317 --- /dev/null +++ b/ports/pdcurses/unofficial-pdcurses-config.cmake @@ -0,0 +1,32 @@ +if(NOT TARGET unofficial::pdcurses::pdcurses) + add_library(unofficial::pdcurses::pdcurses UNKNOWN IMPORTED) + get_filename_component(z_vcpkg_pdcurses_root "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH) + get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH) + + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_pdcurses_root}/include" + ) + + find_library(Z_VCPKG_PDCURSES_LIBRARY_RELEASE NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/lib" NO_DEFAULT_PATH) + find_file(Z_VCPKG_PDCURSES_DLL_RELEASE NAMES pdcurses.dll PATHS "${z_vcpkg_pdcurses_root}/bin" NO_DEFAULT_PATH) + if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") + set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_IMPLIB_RELEASE "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Z_VCPKG_PDCURSES_DLL_RELEASE}") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_PDCURSES_DLL_RELEASE}") + endif() + + find_library(Z_VCPKG_PDCURSES_LIBRARY_DEBUG NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/debug/lib" NO_DEFAULT_PATH) + find_file(Z_VCPKG_PDCURSES_DLL_DEBUG NAMES pdcurses.dll PATHS "${z_vcpkg_pdcurses_root}/debug/bin" NO_DEFAULT_PATH) + if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") + set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_IMPLIB_DEBUG "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") + endif() + if(EXISTS "${Z_VCPKG_PDCURSES_DLL_DEBUG}") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_PDCURSES_DLL_DEBUG}") + endif() + + unset(z_vcpkg_pdcurses_root) +endif() diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json index 729547ed43de96..d568179c9a94d0 100644 --- a/ports/pdcurses/vcpkg.json +++ b/ports/pdcurses/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pdcurses", "version": "3.9", - "port-version": 4, + "port-version": 5, "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", "homepage": "https://pdcurses.org/", + "license": null, "supports": "windows & !uwp & !mingw" } diff --git a/versions/baseline.json b/versions/baseline.json index f47ab9c86ab836..95866c4921ea23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6158,7 +6158,7 @@ }, "pdcurses": { "baseline": "3.9", - "port-version": 4 + "port-version": 5 }, "pdqsort": { "baseline": "2019-07-30", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index fee88473521a6b..f6124a65663b06 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a74893fbd7290450958bf2beddbb59486bb8c04f", + "version": "3.9", + "port-version": 5 + }, { "git-tree": "cb1edd90103d19fa2ecf7e6343416a35714ffe43", "version": "3.9", From c140c9516248e6d1b004b78b0446e174b1e5387e Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Mon, 22 May 2023 02:49:01 +0200 Subject: [PATCH 112/533] [glslang] update to 12.2.0 (#31509) --- ports/glslang/portfile.cmake | 2 +- ports/glslang/vcpkg.json | 5 +---- versions/baseline.json | 2 +- versions/g-/glslang.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 8ac7a6fd3c5096..3099574096027f 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang REF "${VERSION}" - SHA512 1d40518d09579eb925b1e4375c9a581736cdb79aaf60d1ca6117e394386a8d2dc1dafd9a4a30d9381f063c1ea1f65fc0d5d9fcbbefa87a85423f87fd925747b0 + SHA512 999ee0a4324263f6c12126b76bb098fc7009ea444be5cb052bd3fd7109589b52180acd8e7a90735ef7dc4be1e29aab5d98845e1aeae874b7d2ccc9279063ab50 HEAD_REF master ) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index c82ff19dc79747..e0989df08aa271 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "12.1.0", + "version": "12.2.0", "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", @@ -14,9 +14,6 @@ "host": true } ], - "default-features": [ - "tools" - ], "features": { "tools": { "description": "Build the glslangValidator and spirv-remap binaries", diff --git a/versions/baseline.json b/versions/baseline.json index 95866c4921ea23..f55543abfef6c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2857,7 +2857,7 @@ "port-version": 1 }, "glslang": { - "baseline": "12.1.0", + "baseline": "12.2.0", "port-version": 0 }, "glui": { diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 12a96cb24f6e22..1f3981a6131ae7 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaa917d7743ac6e466f2d4ecf20b5745cd44fe98", + "version": "12.2.0", + "port-version": 0 + }, { "git-tree": "a2bca93dc0c41e31d464bfed8b2057bdc155abcb", "version": "12.1.0", From 35ad1781910be148885dcd5b8547102ea8047f06 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Mon, 22 May 2023 09:49:15 +0900 Subject: [PATCH 113/533] [harfbuzz] update to 7.2.0 (#31493) * [harfbuzz] update to 7.2.0 (microsoft/vcpkg#31492) * [harfbuzz] regenerate versions repository (microsoft/vcpkg#31492) --- ports/harfbuzz/portfile.cmake | 2 +- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 1db93a57a199a0..e18f5436835708 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 aaef6801c73492624f19dececd956c03fda82a441b81553dfcd0bd47e5120b1d61acfef422a6cd0ded490d16ee4ee9088abdc0faba2a84884905e7cd63fe59d6 + SHA512 da9596b55a12fa5b721947012090018b4676573d8687850617cd67a07af539ddf2a7bb6bdf7245dfcf70547209296f46737600328c096f27f660f0f303fa622c HEAD_REF master ) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index fab91884a40257..5a67f97f438fbc 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "7.1.0", + "version": "7.2.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index f55543abfef6c9..9dc88154ab5572 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3065,7 +3065,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "7.1.0", + "baseline": "7.2.0", "port-version": 0 }, "hash-library": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 2c6f2f49ffd5ba..495a0b63c4b6f6 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6715cbef7e30e10a6888a737e49a3f971b08f24c", + "version": "7.2.0", + "port-version": 0 + }, { "git-tree": "e5129b8eb8c89bcf3564adce7328ed5fd5548794", "version": "7.1.0", From 0fbc24d3961faa04141366494c145d69b7ff29ed Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 22 May 2023 08:51:35 +0800 Subject: [PATCH 114/533] [binlog] fix ci error (#31471) --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d6816451fb4141..23a290d3078941 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -81,7 +81,6 @@ berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail berkeleydb:x64-android=fail binlog:arm-neon-android=fail -binlog:arm64-android=fail bitserializer:arm64-osx=fail blitz:x64-android=fail blitz:x64-uwp=fail From 892fd52dc43fedb074f86b61531d010a0dac00c8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 22 May 2023 08:52:49 +0800 Subject: [PATCH 115/533] [vcpkg baseline][vcpkg-ci-arrow | arrow] Fix ci error (#31439) * [vcpkg-ci-arrow] Fix ci error * update ci baseline * fix arrow ci error * update version * update patch * update version * update patch * update version --- ports/arrow/fix-ci-error.patch | 13 +++++++++++++ ports/arrow/portfile.cmake | 1 + ports/arrow/vcpkg.json | 1 + scripts/ci.baseline.txt | 2 -- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 ports/arrow/fix-ci-error.patch diff --git a/ports/arrow/fix-ci-error.patch b/ports/arrow/fix-ci-error.patch new file mode 100644 index 00000000000000..adbe0f8668365a --- /dev/null +++ b/ports/arrow/fix-ci-error.patch @@ -0,0 +1,13 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index eeda520..f55080e 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -921,7 +921,7 @@ if(WIN32) + list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll") + endif() + +-if(NOT WIN32 AND NOT APPLE) ++if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) + # Pass -lrt on Linux only + list(APPEND ARROW_SYSTEM_LINK_LIBS rt) + endif() diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 63d340228f5d36..7a1bbcb7c3dcb7 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive( msvc-static-name.patch utf8proc.patch thrift.patch + fix-ci-error.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 262203f3e67d58..fd0baed8b0ea93 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrow", "version": "12.0.0", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 23a290d3078941..f4c9dab800c597 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -58,8 +58,6 @@ arrayfire:x64-linux=fail allegro5:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -arrow:arm64-android=fail -arrow:x64-android=fail assimp:arm-neon-android=fail avro-c:arm-neon-android=fail avro-c:arm64-android=fail diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index f7bbe94b4f9145..76d7f7f631bb68 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e29a49e78533ec10e3142ae7ad69fdd12c8d163", + "version": "12.0.0", + "port-version": 1 + }, { "git-tree": "881bfaaab349dae46929b36e5b84e7036a009ad3", "version": "12.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9dc88154ab5572..8d8a9d50856982 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -218,7 +218,7 @@ }, "arrow": { "baseline": "12.0.0", - "port-version": 0 + "port-version": 1 }, "arsenalgear": { "baseline": "2.1.0", From 5b744ed75345a37044016a64d4efb43f3f7b1591 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 22 May 2023 02:56:14 +0200 Subject: [PATCH 116/533] [gettext] Split, fixes, faster build, checked-in config cache (#30429) * [gettext] Preset more MSVC checks * Modify configure to speed up windows builds * Support checked-in config cache * Collect config [skip actions] * Add x64 config * Collect config [skip actions] * Re-use most of windows config.cache [skip actions] * WIP [skip actions] * WIP [skip actions] * WIP [skip actions] * WIP * [mchehab-zbar] Update gettext dependencies * Add missing patch * Don't test find_package(Gettext) * [vcpkg-autotools-cache] Script port for config caching * Add missing file * Remove vcpkg-autoconf-cache --------- Co-authored-by: Monica --- .../0003-Fix-win-unicode-paths.patch | 62 +++++ ports/gettext-libintl/android.patch | 12 + ports/gettext-libintl/bashify.cmake | 16 ++ ports/gettext-libintl/portfile.cmake | 123 +++++++++ ports/gettext-libintl/usage | 4 + ports/gettext-libintl/uwp.patch | 72 +++++ .../vcpkg-cmake-wrapper.cmake | 0 ports/gettext-libintl/vcpkg.json | 13 + ports/gettext/Makefile | 70 ----- ports/gettext/bashify.cmake | 16 ++ ports/gettext/macosx-libs.patch | 13 + ports/gettext/parallel-gettext-tools.patch | 25 ++ ports/gettext/portfile.cmake | 261 ++++++++++-------- ports/gettext/subdirs.patch | 115 ++++++++ ports/gettext/vcpkg.json | 16 +- ports/mchehab-zbar/portfile.cmake | 24 +- ports/mchehab-zbar/vcpkg.json | 10 +- scripts/test_ports/cmake-user/vcpkg.json | 2 +- versions/baseline.json | 6 +- versions/g-/gettext-libintl.json | 9 + versions/g-/gettext.json | 5 + versions/m-/mchehab-zbar.json | 5 + 22 files changed, 666 insertions(+), 213 deletions(-) create mode 100644 ports/gettext-libintl/0003-Fix-win-unicode-paths.patch create mode 100644 ports/gettext-libintl/android.patch create mode 100644 ports/gettext-libintl/bashify.cmake create mode 100644 ports/gettext-libintl/portfile.cmake create mode 100644 ports/gettext-libintl/usage create mode 100644 ports/gettext-libintl/uwp.patch rename ports/{gettext => gettext-libintl}/vcpkg-cmake-wrapper.cmake (100%) create mode 100644 ports/gettext-libintl/vcpkg.json delete mode 100644 ports/gettext/Makefile create mode 100644 ports/gettext/bashify.cmake create mode 100644 ports/gettext/macosx-libs.patch create mode 100644 ports/gettext/parallel-gettext-tools.patch create mode 100644 ports/gettext/subdirs.patch create mode 100644 versions/g-/gettext-libintl.json diff --git a/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch b/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch new file mode 100644 index 00000000000000..e15e08755fa59b --- /dev/null +++ b/ports/gettext-libintl/0003-Fix-win-unicode-paths.patch @@ -0,0 +1,62 @@ +diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c +index d5a5fe1..5c47f48 100644 +--- a/gettext-runtime/intl/loadmsgcat.c ++++ b/gettext-runtime/intl/loadmsgcat.c +@@ -390,9 +390,56 @@ char *alloca (); + # define munmap(addr, len) __munmap (addr, len) + #elif defined _WIN32 && !defined __CYGWIN__ + /* On native Windows, don't require linking with '-loldnames'. */ +-# define open _open ++# define open(name, flags) _open_utf8_windows_wrapper(name, flags) + # define read _read + # define close _close ++ ++/* Provide wrapper of "open" for Windows that supports UTF-8 filenames. */ ++# ifndef WIN32_LEAN_AND_MEAN ++# define WIN32_LEAN_AND_MEAN ++# endif ++# ifndef WIN32_EXTRA_LEAN ++# define WIN32_EXTRA_LEAN ++# endif ++# ifndef NOMINMAX ++# define NOMINMAX ++# endif ++# include // For: MultiByteToWideChar ++# include ++# include ++ ++int _open_utf8_windows_wrapper( ++ const char *filename, ++ int flags ++) ++{ ++ int wstr_len = -1; ++ wchar_t* pUtf16FileName = NULL; ++ int fh = -1; ++ ++ // on Windows, convert the filename from UTF-8 to UTF-16 ++ wstr_len = MultiByteToWideChar(CP_UTF8, 0, filename, -1, NULL, 0); ++ if (wstr_len <= 0) ++ { ++ // MultiByteToWideChar failed ++ errno = ENOENT; ++ return -1; ++ } ++ pUtf16FileName = malloc(wstr_len * sizeof(wchar_t)); ++ if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, pUtf16FileName, wstr_len) == 0) ++ { ++ // MultiByteToWideChar failed ++ free(pUtf16FileName); ++ errno = ENOENT; ++ return -1; ++ } ++ ++ // and call _wopen ++ fh = _wopen(pUtf16FileName, flags); ++ ++ free(pUtf16FileName); ++ return fh; ++} + #endif + + /* For those losing systems which don't have `alloca' we have to add diff --git a/ports/gettext-libintl/android.patch b/ports/gettext-libintl/android.patch new file mode 100644 index 00000000000000..6f2a7d43faf95f --- /dev/null +++ b/ports/gettext-libintl/android.patch @@ -0,0 +1,12 @@ +diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c +--- a/gettext-runtime/intl/dcigettext.c 2021-05-26 16:27:55.420544597 +0200 ++++ src/gettext-runtime/intl/dcigettext.c 2021-05-26 16:29:14.546516701 +0200 +@@ -143,7 +143,7 @@ + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else ++# elif !(defined(__clang__) && defined(__BIONIC_FORTIFY)) + char *getcwd (); + # endif + # endif diff --git a/ports/gettext-libintl/bashify.cmake b/ports/gettext-libintl/bashify.cmake new file mode 100644 index 00000000000000..8b3d87e7b80b50 --- /dev/null +++ b/ports/gettext-libintl/bashify.cmake @@ -0,0 +1,16 @@ +# By using bash builtin expansion, we can avoid +# expensively spawing three sub-processes (bash, echo, sed). +foreach(dir IN LISTS SOURCE_DIRS) + file(READ "${dir}/configure" script) + string(REGEX REPLACE + "(\n[a-zA-Z0-9_]*)='`[\$]ECHO \"[\$]([^\"]*)\" \\| [\$]SED \"[\$]delay_single_quote_subst\"`'" + [[\1='${\2//\\'/\\'\\\\\\'\\'}']] + script "${script}" + ) + string(REPLACE + [[ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in]] + [[ case "\${!var}" in]] + script "${script}" + ) + file(WRITE "${dir}/configure" "${script}") +endforeach() diff --git a/ports/gettext-libintl/portfile.cmake b/ports/gettext-libintl/portfile.cmake new file mode 100644 index 00000000000000..e65edae63d4c60 --- /dev/null +++ b/ports/gettext-libintl/portfile.cmake @@ -0,0 +1,123 @@ +if(VCPKG_TARGET_IS_LINUX) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + if(NOT EXISTS "/usr/include/libintl.h") + message(FATAL_ERROR + "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " + "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." + ) + endif() + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + return() +endif() + +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz" + FILENAME "gettext-${VERSION}.tar.gz" + SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + # Shared with port gettext + android.patch + uwp.patch + 0003-Fix-win-unicode-paths.patch +) + +if(VCPKG_HOST_IS_WINDOWS) + message(STATUS "Modifying 'configure' to use fast bash variable expansion") + set(ENV{CONFIG_SHELL} "/usr/bin/bash") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" + "-DSOURCE_DIRS=gettext-runtime" + -P "${CMAKE_CURRENT_LIST_DIR}/bashify.cmake" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "bashify-${TARGET_TRIPLET}" + ) +endif() + +set(OPTIONS + --no-recursion + --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-acl + --disable-csharp + --disable-curses + --disable-java + --disable-libasprintf + --disable-openmp + --with-included-gettext + --without-libintl-prefix + --disable-dependency-tracking # Faster ? + ac_cv_path_DVIPS=: + ac_cv_path_GMSGFMT=: + ac_cv_path_MSGFMT=: + ac_cv_path_MSGMERGE=: + ac_cv_path_TEXI2PDF=: + ac_cv_path_XGETTEXT=: + ac_cv_prog_INTLBISON=: +) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + # Avoid unnecessary tests. + am_cv_func_iconv_works=yes + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" + ## This is required. For some reason these do not get correctly identified for release builds. + ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + ) + if(NOT VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS + # Don't take from port getopt-win32 + ac_cv_header_getopt_h=no + # Don't take from port pthreads + ac_cv_header_pthread_h=no + # Detected 'no' everywhere except x64-windows-static + ac_cv_func_snprintf=no + # Detected x64 values for gnulib, overriding guesses for cross builds + gl_cv_func_mbrtowc_empty_input=no + # Detected x64 values for gettext, overriding guesses for x86 & x64-uwp + gt_cv_int_divbyzero_sigfpe=no + ) + endif() +endif() + +file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log") +file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log") +vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + ${OPTIONS} + OPTIONS_RELEASE + "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log" + OPTIONS_DEBUG + "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log" + ) + +# This helps with Windows build times, but should work everywhere in vcpkg. +# - Avoid an extra command to move a temporary file, we are building out of source. +# - Avoid a subshell just to add comments, the build dir is temporary. +# - Avoid cygpath -w when other tools handle this for us. +file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/intl/Makefile") +foreach(file IN LISTS makefiles) + file(READ "${file}" rules) + string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}") + string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}") + string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}") + string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}") + file(WRITE "${file}" "${rules}") +endforeach() + +vcpkg_install_make(SUBPATH intl) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/gettext-runtime/intl/COPYING.LIB") diff --git a/ports/gettext-libintl/usage b/ports/gettext-libintl/usage new file mode 100644 index 00000000000000..35472de10fecd0 --- /dev/null +++ b/ports/gettext-libintl/usage @@ -0,0 +1,4 @@ +gettext-libintl is compatible with built-in CMake targets: + + find_package(Intl REQUIRED) + target_link_libraries(main PRIVATE Intl::Intl) # since CMake 3.20 diff --git a/ports/gettext-libintl/uwp.patch b/ports/gettext-libintl/uwp.patch new file mode 100644 index 00000000000000..416e2ea3c5e361 --- /dev/null +++ b/ports/gettext-libintl/uwp.patch @@ -0,0 +1,72 @@ +diff --git a/gettext-runtime/gnulib-lib/fcntl.c b/gettext-runtime/gnulib-lib/fcntl.c +index f9753c4..3a3caee 100644 +--- a/gettext-runtime/gnulib-lib/fcntl.c ++++ b/gettext-runtime/gnulib-lib/fcntl.c +@@ -38,6 +38,12 @@ + # define WIN32_LEAN_AND_MEAN + # include + ++# if defined(WINAPI_FAMILY_PARTITION) ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++# define HANDLE_FLAG_INHERIT 0 ++# endif ++# endif ++ + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW + # include "msvc-nothrow.h" +diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c +index f774ba2..f488b7f 100644 +--- a/gettext-runtime/intl/langprefs.c ++++ b/gettext-runtime/intl/langprefs.c +@@ -38,6 +38,11 @@ extern void _nl_locale_name_canonicalize (char *name); + + #if defined _WIN32 + # define WIN32_NATIVE ++# if defined(WINAPI_FAMILY_PARTITION) ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++# undef WIN32_NATIVE ++# endif ++# endif + #endif + + #ifdef WIN32_NATIVE +diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c +index ec75427..9e063e4 100644 +--- a/gettext-runtime/intl/localcharset.c ++++ b/gettext-runtime/intl/localcharset.c +@@ -34,6 +34,9 @@ + #if defined _WIN32 && !defined __CYGWIN__ + # define WINDOWS_NATIVE + # include ++# if !defined(WINAPI_FAMILY_PARTITION) ++# define WINAPI_FAMILY_PARTITION(x) (0) ++# endif + #endif + + #if defined __EMX__ +@@ -912,6 +915,8 @@ locale_charset (void) + /* The canonical name cannot be determined. */ + codeset = ""; + ++# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++ codeset = ""; + # elif defined WINDOWS_NATIVE + + char buf[2 + 10 + 1]; +diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c +index d77bb81..3c6e055 100644 +--- a/gettext-runtime/intl/localename.c ++++ b/gettext-runtime/intl/localename.c +@@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t); + + #if defined _WIN32 && !defined __CYGWIN__ + # define WINDOWS_NATIVE ++# if defined(WINAPI_FAMILY_PARTITION) ++# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) ++# undef WIN32_NATIVE ++# endif ++# endif + # if !defined IN_LIBINTL + # include "glthread/lock.h" + # endif diff --git a/ports/gettext/vcpkg-cmake-wrapper.cmake b/ports/gettext-libintl/vcpkg-cmake-wrapper.cmake similarity index 100% rename from ports/gettext/vcpkg-cmake-wrapper.cmake rename to ports/gettext-libintl/vcpkg-cmake-wrapper.cmake diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json new file mode 100644 index 00000000000000..810149a54dd050 --- /dev/null +++ b/ports/gettext-libintl/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "gettext-libintl", + "version": "0.21.1", + "description": "The libintl C library from GNU gettext-runtime.", + "homepage": "https://www.gnu.org/software/gettext/", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "libiconv", + "platform": "!linux" + } + ] +} diff --git a/ports/gettext/Makefile b/ports/gettext/Makefile deleted file mode 100644 index b2b36d2ab5658c..00000000000000 --- a/ports/gettext/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -all: build-gettext-runtime-intl build-gettext-runtime-po build-gettext-runtime-src -all: build-gettext-tools build-gettext-tools-gnulib build-gettext-tools-its build-gettext-tools-m4 build-gettext-tools-misc build-gettext-tools-po build-gettext-tools-projects build-gettext-tools-styles -all: build-libtextstyle - -install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext-runtime-src -install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles -install: install-libtextstyle - -build-intl: - $(MAKE) -C intl all -install-intl: - $(MAKE) -C intl install - -build-gettext-runtime-gnulib: build-gettext-runtime-intl - $(MAKE) -C gettext-runtime/gnulib-lib all -build-gettext-runtime-intl: - $(MAKE) -C gettext-runtime/intl all -build-gettext-runtime-po: - $(MAKE) -C gettext-runtime/po all -build-gettext-runtime-src: build-gettext-runtime-intl build-gettext-runtime-gnulib - $(MAKE) -C gettext-runtime/src all -build-gettext-tools: build-gettext-runtime-intl build-libtextstyle build-gettext-tools-gnulib build-gettext-tools-intl build-gettext-tools-libgrep build-gnulib-local - $(MAKE) -C gettext-tools/src all -build-gettext-tools-gnulib: build-gettext-tools-intl - $(MAKE) -C gettext-tools/gnulib-lib all -build-gettext-tools-libgrep: build-gettext-tools-gnulib - $(MAKE) -C gettext-tools/libgrep all -build-gettext-tools-intl: - $(MAKE) -C gettext-tools/intl all -build-gettext-tools-its: - $(MAKE) -C gettext-tools/its all -build-gettext-tools-m4: - $(MAKE) -C gettext-tools/m4 all -build-gettext-tools-misc: - $(MAKE) -C gettext-tools/misc all -build-gettext-tools-po: - $(MAKE) -C gettext-tools/po all -build-gettext-tools-projects: - $(MAKE) -C gettext-tools/projects all -build-gettext-tools-styles: - $(MAKE) -C gettext-tools/styles all -build-gnulib-local: - $(MAKE) -C gnulib-local all -build-libtextstyle: - $(MAKE) -C libtextstyle/lib all - -install-gettext-runtime-intl: - $(MAKE) -C gettext-runtime/intl install -install-gettext-runtime-po: - $(MAKE) -C gettext-runtime/po install -install-gettext-runtime-src: - $(MAKE) -C gettext-runtime/src install -install-gettext-tools: - $(MAKE) -C gettext-tools/src install -install-gettext-tools-gnulib: - $(MAKE) -C gettext-tools/gnulib-lib install -install-gettext-tools-its: - $(MAKE) -C gettext-tools/its install -install-gettext-tools-m4: - $(MAKE) -C gettext-tools/m4 install -install-gettext-tools-misc: - $(MAKE) -C gettext-tools/misc install -install-gettext-tools-po: - $(MAKE) -C gettext-tools/po install -install-gettext-tools-projects: - $(MAKE) -C gettext-tools/projects install -install-gettext-tools-styles: - $(MAKE) -C gettext-tools/styles install -install-libtextstyle: - $(MAKE) -C libtextstyle/lib install diff --git a/ports/gettext/bashify.cmake b/ports/gettext/bashify.cmake new file mode 100644 index 00000000000000..8b3d87e7b80b50 --- /dev/null +++ b/ports/gettext/bashify.cmake @@ -0,0 +1,16 @@ +# By using bash builtin expansion, we can avoid +# expensively spawing three sub-processes (bash, echo, sed). +foreach(dir IN LISTS SOURCE_DIRS) + file(READ "${dir}/configure" script) + string(REGEX REPLACE + "(\n[a-zA-Z0-9_]*)='`[\$]ECHO \"[\$]([^\"]*)\" \\| [\$]SED \"[\$]delay_single_quote_subst\"`'" + [[\1='${\2//\\'/\\'\\\\\\'\\'}']] + script "${script}" + ) + string(REPLACE + [[ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in]] + [[ case "\${!var}" in]] + script "${script}" + ) + file(WRITE "${dir}/configure" "${script}") +endforeach() diff --git a/ports/gettext/macosx-libs.patch b/ports/gettext/macosx-libs.patch new file mode 100644 index 00000000000000..c8936492b40707 --- /dev/null +++ b/ports/gettext/macosx-libs.patch @@ -0,0 +1,13 @@ +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index c21955a..902729a 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -26819,7 +26819,7 @@ else $as_nop + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" +- LIBS="$LIBS $LIBINTL" ++ LIBS="$LIBS $LIBINTL $INTL_MACOSX_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/ports/gettext/parallel-gettext-tools.patch b/ports/gettext/parallel-gettext-tools.patch new file mode 100644 index 00000000000000..65199bc1281da8 --- /dev/null +++ b/ports/gettext/parallel-gettext-tools.patch @@ -0,0 +1,25 @@ +diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in +index 5d60b99..d86232d 100644 +--- a/gettext-tools/src/Makefile.in ++++ b/gettext-tools/src/Makefile.in +@@ -3625,7 +3625,10 @@ USEJAVA_no = 0 + + # Version information according to Woe32 conventions. + @WOE32_TRUE@WOE32_LDADD = gettext.res +-all: $(BUILT_SOURCES) ++@USE_INSTALLED_LIBTEXTSTYLE_FALSE@all: textstyle.h ++all: ++ $(MAKE) $(AM_MAKEFLAGS) all-parallel ++all-parallel: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: +@@ -5045,7 +5048,7 @@ uninstall-tcl: + # namely those which build textstyle.h, po-gram-gen.c, cldr-plural.c. + # See . + # So, turn off parallel execution in this Makefile. +-.NOTPARALLEL: ++# .NOTPARALLEL: + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 3016d982ae111c..b40a2642b95e9d 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -1,10 +1,16 @@ -if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/include/libintl.h") - message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " - "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." - ) -endif() - -set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) +# This port is just to provide gettext tools and build data, not libs. +# The "core" feature depends on port gettext-libintl which provides libintl. +# The "core" feature also installs enough for running autoreconf. +# The actual tools are only enabled by opt-in features. +# These features are typically used as a host dependency. +# For fast builds in particular on Windows, the following choices are made: +# - only release build type +# - namespacing disabled (windows only) +# - configuration cache +# - using preinstalled gettext-libintl +# - skipping some subdirs +set(VCPKG_BUILD_TYPE release) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz" @@ -16,137 +22,168 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES + # shared with port gettext-libintl android.patch uwp.patch - win-gethostname.patch 0003-Fix-win-unicode-paths.patch + # unique to port gettext + win-gethostname.patch rel_path.patch + subdirs.patch + parallel-gettext-tools.patch + macosx-libs.patch ) -vcpkg_find_acquire_program(BISON) -get_filename_component(BISON_PATH "${BISON}" DIRECTORY) -vcpkg_add_to_path("${BISON_PATH}") +set(subdirs "") +if("runtime-tools" IN_LIST FEATURES) + string(APPEND subdirs " gettext-runtime") +endif() +if("tools" IN_LIST FEATURES) + string(APPEND subdirs " libtextstyle gettext-tools") +endif() +if(subdirs) + set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs}") -set(OPTIONS - --enable-relocatable #symbol duplication with glib-init.c? - --enable-c++ - --disable-acl - --disable-csharp - --disable-curses - --disable-java - --disable-openmp -) -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND OPTIONS - # Avoid unnecessary test. + vcpkg_find_acquire_program(BISON) + get_filename_component(BISON_PATH "${BISON}" DIRECTORY) + vcpkg_add_to_path("${BISON_PATH}") + + if(VCPKG_HOST_IS_WINDOWS) + message(STATUS "Modifying build system for less forks") + set(ENV{CONFIG_SHELL} "/usr/bin/bash") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" + "-DSOURCE_DIRS=.;gettext-runtime;libtextstyle;gettext-tools" + -P "${CMAKE_CURRENT_LIST_DIR}/bashify.cmake" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "bashify-${TARGET_TRIPLET}" + ) + endif() + + set(OPTIONS + --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-acl + --disable-csharp + --disable-curses + --disable-java + --disable-openmp + --disable-dependency-tracking + # Avoiding system dependencies and unnecessary tests --with-included-glib - # This is required. For some reason these do not get correctly identified for release builds. - ac_cv_func_wcslen=yes - ac_cv_func_memmove=yes - # The following are required for a full gettext built (libintl and tools). - gl_cv_func_printf_directive_n=no # segfaults otherwise with popup window - ac_cv_func_memset=yes # not detected in release builds - ac_cv_header_pthread_h=no - ac_cv_header_dirent_h=no - ac_cv_header_getopt_h=no + --with-included-libxml # libtextstyle won't use external libxml + --with-included-libunistring + --with-installed-libtextstyle=no + --without-cvs + --without-emacs + --without-git + --without-libcurses-prefix + --without-libncurses-prefix + --without-libtermcap-prefix + --without-libxcurses-prefix ) -endif() - -# These functions scope any changes to VCPKG_BUILD_TYPE -function(build_libintl_and_tools) - cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) - if(DEFINED arg_BUILD_TYPE) - set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + # Faster, but not for export + --disable-namespacing + # Avoid unnecessary tests. + am_cv_func_iconv_works=yes + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" + "--with-libintl-prefix=${CURRENT_INSTALLED_DIR}" + # This is required. For some reason these do not get correctly identified for release builds. + ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + # The following are required for a full gettext built (libintl and tools). + gl_cv_func_printf_directive_n=no # segfaults otherwise with popup window + ac_cv_func_memset=yes # not detected in release builds + ) + if(NOT VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS + # Don't take from port dirent + ac_cv_header_dirent_h=no + # Don't take from port getopt-win32 + ac_cv_header_getopt_h=no + # Don't take from port pthreads + ac_cv_header_pthread_h=no + ac_cv_header_sched_h=no + ac_cv_header_semaphore_h=no + # Detected 'no' everywhere except x64-windows-static + ac_cv_func_snprintf=no + # Detected x64 values for gnulib, overriding guesses for cross builds + gl_cv_func_fopen_mode_x=yes + gl_cv_func_frexpl_works=yes + gl_cv_func_getcwd_null=yes + gl_cv_func_mbrtowc_empty_input=no + gl_cv_func_mbsrtowcs_works=yes + gl_cv_func_printf_flag_zero=yes + gl_cv_func_printf_infinite_long_double=yes + gl_cv_func_printf_precision=yes + gl_cv_func_snprintf_truncation_c99=yes + # Detected x64 values for gettext, overriding guesses for x86 & x64-uwp + gt_cv_int_divbyzero_sigfpe=no + ) + endif() endif() + + file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log") vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" DETERMINE_BUILD_TRIPLET USE_WRAPPERS - ADD_BIN_TO_PATH # So configure can check for working iconv ADDITIONAL_MSYS_PACKAGES gzip OPTIONS ${OPTIONS} + OPTIONS_RELEASE + "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log" ) - vcpkg_install_make(MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") -endfunction() -function(build_libintl_only) - cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) - if(DEFINED arg_BUILD_TYPE) - set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") - endif() - vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS - ADD_BIN_TO_PATH # So configure can check for working iconv - OPTIONS - ${OPTIONS} - ) - vcpkg_install_make( - MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile" - BUILD_TARGET build-intl - INSTALL_TARGET install-intl - ) -endfunction() + # This helps with Windows build times, but should work everywhere in vcpkg. + # - Avoid an extra command to move a temporary file, we are building out of source. + # - Avoid a subshell just to add comments, the build dir is temporary. + # - Avoid cygpath -w when other tools handle this for us. + file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/*Makefile") + foreach(file IN LISTS makefiles) + file(READ "${file}" rules) + string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}") + string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}") + string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}") + string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}") + file(WRITE "${file}" "${rules}") + endforeach() -if("tools" IN_LIST FEATURES) - # Minimization of gettext tools build time by: - # - building tools only for release configuration - # - custom top-level Makefile - # - configuration cache - list(APPEND OPTIONS "--cache-file=../config.cache-${TARGET_TRIPLET}") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}") - build_libintl_and_tools(BUILD_TYPE "release") + vcpkg_install_make() + vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(GLOB tool_libs - LIST_DIRECTORIES false - "${CURRENT_PACKAGES_DIR}/bin/*" - "${CURRENT_PACKAGES_DIR}/lib/*" - ) - list(FILTER tool_libs EXCLUDE REGEX "intl[^/\\\\]*$") - file(REMOVE ${tool_libs}) - file(GLOB tool_includes - LIST_DIRECTORIES true - "${CURRENT_PACKAGES_DIR}/include/*" - ) - list(FILTER tool_includes EXCLUDE REGEX "intl[^/\\\\]*$") - file(REMOVE_RECURSE ${tool_includes}) - if(VCPKG_TARGET_IS_LINUX) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - elseif(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}.release") - file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}.release") - file(READ "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" config_cache) - string(REGEX REPLACE "\nac_cv_env[^\n]*" "" config_cache "${config_cache}") # Eliminate build type flags - file(WRITE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" "${config_cache}") - build_libintl_only(BUILD_TYPE "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}.release/debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}") - file(RENAME "${CURRENT_PACKAGES_DIR}.release" "${CURRENT_PACKAGES_DIR}") - endif() + file(GLOB link_libs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/*" "${CURRENT_PACKAGES_DIR}/bin/*.dll") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include" ${link_libs}) +endif() + +if("tools" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") else() - if(VCPKG_TARGET_IS_LINUX) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - else() - list(APPEND OPTIONS "--config-cache") - build_libintl_only() - endif() - # A fast installation of the autopoint tool and data, needed for autotools + # A fast installation of the autopoint tool and data, needed for autoconfig include("${CMAKE_CURRENT_LIST_DIR}/install-autopoint.cmake") install_autopoint() endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() +# These files can be needed to run `autoreconf`. +# We want to install these files also for fast "core" builds without "tools". +# Cf. PACKAGING for the file list. +file(INSTALL + "${SOURCE_PATH}/gettext-runtime/m4/gettext.m4" + "${SOURCE_PATH}/gettext-runtime/m4/iconv.m4" + "${SOURCE_PATH}/gettext-runtime/m4/intlmacosx.m4" + "${SOURCE_PATH}/gettext-runtime/m4/nls.m4" + "${SOURCE_PATH}/gettext-runtime/m4/po.m4" + "${SOURCE_PATH}/gettext-runtime/m4/progtest.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-ld.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-link.m4" + "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-prefix.m4" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext/aclocal" +) -if(NOT VCPKG_TARGET_IS_LINUX) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl") -endif() -if("tools" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +if(NOT VCPKG_CROSSCOMPILING) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext") endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/gettext-runtime/COPYING" "${SOURCE_PATH}/COPYING") diff --git a/ports/gettext/subdirs.patch b/ports/gettext/subdirs.patch new file mode 100644 index 00000000000000..21964d6e5475c6 --- /dev/null +++ b/ports/gettext/subdirs.patch @@ -0,0 +1,115 @@ +diff --git a/configure b/configure +index 904bdf5..e751ffc 100755 +--- a/configure ++++ b/configure +@@ -2797,7 +2797,7 @@ am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' + + + +-subdirs="$subdirs gettext-runtime libtextstyle gettext-tools" ++subdirs="$subdirs $VCPKG_GETTEXT_SUBDIRS" + + + +diff --git a/Makefile.in b/Makefile.in +index a287d38..075ddc5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -311,7 +311,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools ++SUBDIRS = $(VCPKG_GETTEXT_SUBDIRS) + changelog_etc = \ + gettext-runtime/ChangeLog.0 \ + gettext-runtime/doc/ChangeLog.0 \ +diff --git a/gettext-runtime/Makefile.in b/gettext-runtime/Makefile.in +index 8b8b5bc..bb75447 100644 +--- a/gettext-runtime/Makefile.in ++++ b/gettext-runtime/Makefile.in +@@ -1487,7 +1487,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnulib-m4 + # The list of subdirectories depends on whether --disable-libasprintf was + # specified. + @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf +-SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests ++SUBDIRS = $(VCPKG_INTL) gnulib-lib src po + + # Allow users to use "gnulib-tool --update". + +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index a7594ed..296f3b7 100644 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -26906,7 +26906,7 @@ printf "%s\n" "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ +- && test "$PACKAGE" != gettext-runtime \ ++ && test "$PACKAGE" != pristine-gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else +diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure +--- a/gettext-runtime/libasprintf/configure ++++ b/gettext-runtime/libasprintf/configure +index ff1c212..0c0dbcd 100644 +@@ -11,6 +11,7 @@ + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++exit 0; + ## -------------------- ## + ## M4sh Initialization. ## + ## -------------------- ## +diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in +index 59e81a8..107856d 100644 +--- a/gettext-tools/Makefile.in ++++ b/gettext-tools/Makefile.in +@@ -2872,7 +2872,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 +-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc ++SUBDIRS = intl gnulib-lib libgrep src po its projects styles misc + + # Allow users to use "gnulib-tool --update". + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index 056a830..9abca7e 100644 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -29661,7 +29661,7 @@ printf "%s\n" "$ac_res" >&6; } + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ +- && test "$PACKAGE" != gettext-tools; }; then ++ && test "$PACKAGE" != pristine-gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= +diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure +--- a/gettext-tools/examples/configure ++++ b/gettext-tools/examples/configure +index ff1c212..0c0dbcd 100644 +@@ -11,6 +11,7 @@ + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++exit 0; + ## -------------------- ## + ## M4sh Initialization. ## + ## -------------------- ## +diff --git a/libtextstyle/Makefile.in b/libtextstyle/Makefile.in +index ff1c212..0c0dbcd 100644 +--- a/libtextstyle/Makefile.in ++++ b/libtextstyle/Makefile.in +@@ -1667,7 +1667,7 @@ AUTOMAKE_OPTIONS = 1.13 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4 + + # The list of subdirectories containing Makefiles. +-SUBDIRS = lib tests adhoc-tests doc ++SUBDIRS = lib + + # Allow users to use "gnulib-tool --update". + diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index f4d58963b20253..016286d600e476 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,16 +1,24 @@ { "name": "gettext", "version": "0.21.1", - "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", + "port-version": 1, + "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", - "license": null, + "license": "GPL-3.0-only", "dependencies": [ - "libiconv" + "gettext-libintl" ], "features": { + "runtime-tools": { + "description": "Build runtime tools for internationalization of scripts", + "supports": "!uwp" + }, "tools": { "description": "Build gettext tools", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] } } } diff --git a/ports/mchehab-zbar/portfile.cmake b/ports/mchehab-zbar/portfile.cmake index c2da7714e363a6..9992aaaaf3e420 100644 --- a/ports/mchehab-zbar/portfile.cmake +++ b/ports/mchehab-zbar/portfile.cmake @@ -17,29 +17,9 @@ if("nls" IN_LIST FEATURES) else() vcpkg_list(APPEND options "--disable-nls") set(ENV{AUTOPOINT} true) # true, the program + # Simulate the relevant effects of (interactive) `gettextize`. file(TOUCH "${SOURCE_PATH}/po/Makefile.in.in") - # Get missing build-time m4 files from gettext source - set(gettext_version 0.21.1) - vcpkg_download_distfile(gettext_archive - URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext_version}.tar.gz" - "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${gettext_version}.tar.gz" - FILENAME "gettext-${gettext_version}.tar.gz" - SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 - ) - file(ARCHIVE_EXTRACT INPUT "${gettext_archive}" - DESTINATION "${SOURCE_PATH}/gettext-autoconf" - PATTERNS "*/gettext-runtime/m4/gettext.m4" - "*/gettext-runtime/m4/iconv.m4" - "*/gettext-runtime/m4/intlmacosx.m4" - "*/gettext-runtime/m4/nls.m4" - "*/gettext-runtime/m4/po.m4" - "*/gettext-runtime/m4/progtest.m4" - "*/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4" - "*/gettext-runtime/gnulib-m4/lib-ld.m4" - "*/gettext-runtime/gnulib-m4/lib-link.m4" - "*/gettext-runtime/gnulib-m4/lib-prefix.m4" - ) - file(GLOB_RECURSE m4_files "${SOURCE_PATH}/gettext-autoconf/*/*.m4") + file(GLOB_RECURSE m4_files "${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/*.m4") file(INSTALL ${m4_files} DESTINATION "${SOURCE_PATH}/config") endif() diff --git a/ports/mchehab-zbar/vcpkg.json b/ports/mchehab-zbar/vcpkg.json index cf61794cc387c8..ff07384aee7536 100644 --- a/ports/mchehab-zbar/vcpkg.json +++ b/ports/mchehab-zbar/vcpkg.json @@ -1,26 +1,30 @@ { "name": "mchehab-zbar", "version": "0.23.90", - "port-version": 3, + "port-version": 4, "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.", "homepage": "https://github.com/mchehab/zbar", "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ + { + "name": "gettext", + "host": true + }, "libiconv" ], "features": { "nls": { "description": "Native Language Support", "dependencies": [ - "gettext", { "name": "gettext", "host": true, "features": [ "tools" ] - } + }, + "gettext-libintl" ] } } diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index fc8fde3f53883c..ce2a69ec702345 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -79,7 +79,7 @@ }, { "$package": "Intl", - "name": "gettext" + "name": "gettext-libintl" }, { "$package": "GIF", diff --git a/versions/baseline.json b/versions/baseline.json index 8d8a9d50856982..48c6878759ab1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2765,6 +2765,10 @@ "port-version": 7 }, "gettext": { + "baseline": "0.21.1", + "port-version": 1 + }, + "gettext-libintl": { "baseline": "0.21.1", "port-version": 0 }, @@ -5142,7 +5146,7 @@ }, "mchehab-zbar": { "baseline": "0.23.90", - "port-version": 3 + "port-version": 4 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json new file mode 100644 index 00000000000000..f11756e85221c2 --- /dev/null +++ b/versions/g-/gettext-libintl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "783d7b1a2ddaf29b0f1a2d785ccfbb4a05615667", + "version": "0.21.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index 93a76292efec2f..cfe3eb9fe5d6e6 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cc01d324fb1fc9a461212e5577ec9897d7da345", + "version": "0.21.1", + "port-version": 1 + }, { "git-tree": "4c583e9adc3ab9a044b241466cebedf162cdc410", "version": "0.21.1", diff --git a/versions/m-/mchehab-zbar.json b/versions/m-/mchehab-zbar.json index ac77fde99e37f2..9a02cb4a6360a0 100644 --- a/versions/m-/mchehab-zbar.json +++ b/versions/m-/mchehab-zbar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34932d2a4b1c53aefeed99ef9133f8a307ad9958", + "version": "0.23.90", + "port-version": 4 + }, { "git-tree": "09371ba90d3c31d038bffd54a90203b5b4f7fdc8", "version": "0.23.90", From f632b00a3f23a901526eaf361cf4ee9b1ca6d9f8 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 22 May 2023 08:59:57 +0800 Subject: [PATCH 117/533] [cairomm] Disable test (#31502) --- ports/cairomm/portfile.cmake | 1 + ports/cairomm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cairomm.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index d5ef9a900f909e..3c2afc2b43461b 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_configure_meson( OPTIONS -Dbuild-examples=false -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dbuild-tests=false ) vcpkg_install_meson() diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index 16cd7bfb5bbf93..b5edb25adaa556 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairomm", "version": "1.16.2", - "port-version": 2, + "port-version": 3, "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 48c6878759ab1f..6e836370ed046e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1354,7 +1354,7 @@ }, "cairomm": { "baseline": "1.16.2", - "port-version": 2 + "port-version": 3 }, "calceph": { "baseline": "3.5.2", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 491d7326611a23..f275c2de3f1ba8 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a7e6f9ecf73d0a2ec27e9a70a099746e643ec84", + "version": "1.16.2", + "port-version": 3 + }, { "git-tree": "9e3f77f8b4d02d2a5bd898b0ca96031da57aae12", "version": "1.16.2", From f8b9c6ad1191c6523f1a128b3ab42af679ade04c Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 22 May 2023 03:01:48 +0200 Subject: [PATCH 118/533] [qtpositioning] devendor poly2tri (#31462) * [qtpositioning] devendor poly2tri * Trim patch --- ports/qtpositioning/devendor-poly2tri.patch | 37 +++++++++++++++++++++ ports/qtpositioning/portfile.cmake | 3 ++ ports/qtpositioning/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/q-/qtpositioning.json | 5 +++ 5 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 ports/qtpositioning/devendor-poly2tri.patch diff --git a/ports/qtpositioning/devendor-poly2tri.patch b/ports/qtpositioning/devendor-poly2tri.patch new file mode 100644 index 00000000000000..85e18ca986a910 --- /dev/null +++ b/ports/qtpositioning/devendor-poly2tri.patch @@ -0,0 +1,37 @@ +diff --color -Naur a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt +--- a/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 16:59:42.377052155 +0200 ++++ b/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 23:05:44.950379088 +0200 +@@ -4,6 +4,7 @@ + ## Bundled_Clip2Tri Generic Library: + ##################################################################### + ++find_package(poly2tri) + qt_internal_add_3rdparty_library(Bundled_Clip2Tri + QMAKE_LIB_NAME _clip2tri + STATIC +@@ -13,11 +14,12 @@ + clip2tri.cpp clip2tri.h + INCLUDE_DIRECTORIES + ../clipper +- ../poly2tri + LIBRARIES + Qt::Bundled_Clipper # special case +- Qt::Bundled_Poly2Tri # special case ++ poly2tri::poly2tri + ) ++target_link_libraries(Bundled_Clip2Tri PRIVATE poly2tri::poly2tri) ++set_target_properties(poly2tri::poly2tri PROPERTIES INTERFACE_QT_PACKAGE_NAME poly2tri) + qt_disable_warnings(Bundled_Clip2Tri) + qt_set_symbol_visibility_hidden(Bundled_Clip2Tri) + +diff --color -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2023-05-13 16:59:42.379052157 +0200 ++++ b/src/CMakeLists.txt 2023-05-13 17:00:19.256085781 +0200 +@@ -2,7 +2,6 @@ + # SPDX-License-Identifier: BSD-3-Clause + + # special case begin +-add_subdirectory(3rdparty/poly2tri) + add_subdirectory(3rdparty/clipper) + add_subdirectory(3rdparty/clip2tri) + add_subdirectory(positioning) diff --git a/ports/qtpositioning/portfile.cmake b/ports/qtpositioning/portfile.cmake index 005fe5f33f42a6..dc9da8a1d03215 100644 --- a/ports/qtpositioning/portfile.cmake +++ b/ports/qtpositioning/portfile.cmake @@ -1,6 +1,9 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(${PORT}_PATCHES + devendor-poly2tri.patch) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 7f7c4c33785a53..7f417fa3c8928d 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,10 +1,12 @@ { "name": "qtpositioning", "version": "6.5.0", + "port-version": 1, "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ + "poly2tri", { "name": "qtbase", "default-features": false diff --git a/versions/baseline.json b/versions/baseline.json index 6e836370ed046e..5c7bbfc3a15a56 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6782,7 +6782,7 @@ }, "qtpositioning": { "baseline": "6.5.0", - "port-version": 0 + "port-version": 1 }, "qtquick3d": { "baseline": "6.5.0", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index a02dc9496b15f5..d85d2a56252489 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "440f18e3ab2e18be1de9550ed16ddb7164c5b826", + "version": "6.5.0", + "port-version": 1 + }, { "git-tree": "0da142e2b032f345e88aed41ef444684523be056", "version": "6.5.0", From 656fcc6ab2b05c6d999b7eaca717027ac3738f71 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Sun, 21 May 2023 21:05:01 -0400 Subject: [PATCH 119/533] [fmt] Update to 10.0.0 (#31378) * [fmt] Update to version 10.0.0. * [fmt] Update portfile. - Remove dead code. It is no longer necessary to manually move DLLs and edit CMake configs. - Use vcpkg_install_copyright. * [fmt] Update baseline. * [cachelib] Update to 2023.05.08.00, support fmt 10 * Update to 2023.05.08.00. * Add patch to support fmt 10. * Update baseline. * [spdlog] Add upstream patch for fmt 10. * Add upstream patch to support fmt 10. * Update portfile. * Add usage. * Update baseline. * [seacas] Add upstream patch to support fmt 10.0.0. * Add patch to support fmt 10.0.0. * Update baseline. * [coolprop] Update patch to support fmt 10. * Update patch to support fmt 10.0.0. See CoolProp/CoolProp#2252 * Update baseline. * [wasmedge] Add patch for fmt 10 support. * Add patch to support fmt 10 * Update baseline --- ports/cachelib/fmt-10.patch | 44 ++++++++ ports/cachelib/portfile.cmake | 3 +- ports/cachelib/vcpkg.json | 2 +- ports/coolprop/fmt-fix.patch | 160 ++++++++++++++++++++++++++---- ports/coolprop/vcpkg.json | 2 +- ports/fmt/portfile.cmake | 50 ++-------- ports/fmt/vcpkg.json | 3 +- ports/seacas/fix-fmt-10.patch | 28 ++++++ ports/seacas/portfile.cmake | 1 + ports/seacas/vcpkg.json | 2 +- ports/spdlog/fmt-10-support.patch | 39 ++++++++ ports/spdlog/portfile.cmake | 26 +++-- ports/spdlog/usage | 8 ++ ports/spdlog/vcpkg.json | 1 + ports/wasmedge/fmt-10.patch | 36 +++++++ ports/wasmedge/portfile.cmake | 2 + ports/wasmedge/vcpkg.json | 1 + versions/baseline.json | 14 +-- versions/c-/cachelib.json | 5 + versions/c-/coolprop.json | 5 + versions/f-/fmt.json | 5 + versions/s-/seacas.json | 5 + versions/s-/spdlog.json | 5 + versions/w-/wasmedge.json | 5 + 24 files changed, 364 insertions(+), 88 deletions(-) create mode 100644 ports/cachelib/fmt-10.patch create mode 100644 ports/seacas/fix-fmt-10.patch create mode 100644 ports/spdlog/fmt-10-support.patch create mode 100644 ports/spdlog/usage create mode 100644 ports/wasmedge/fmt-10.patch mode change 100755 => 100644 versions/s-/spdlog.json diff --git a/ports/cachelib/fmt-10.patch b/ports/cachelib/fmt-10.patch new file mode 100644 index 00000000000000..083c00568897c0 --- /dev/null +++ b/ports/cachelib/fmt-10.patch @@ -0,0 +1,44 @@ +diff --git a/cachelib/cachebench/cache/ItemRecords.h b/cachelib/cachebench/cache/ItemRecords.h +index 80fe7489..e581d78e 100644 +--- a/cachelib/cachebench/cache/ItemRecords.h ++++ b/cachelib/cachebench/cache/ItemRecords.h +@@ -102,11 +102,11 @@ class ItemRecords { + } + if (record.destructCount != 0) { + XLOGF(ERR, "unexpected destructCount {} for item {}, context {}|{}", +- record.destructCount, item.getKey(), data.context, record.context); ++ record.destructCount, item.getKey().data(), data.context, record.context); + } + if (record.version != ptr->getVersion()) { + XLOGF(ERR, "unexpected version {}|{} for item {}", record.version, +- ptr->getVersion(), item.getKey()); ++ ptr->getVersion(), item.getKey().data()); + } + ++record.destructCount; + +diff --git a/cachelib/cachebench/runner/FastShutdown.cpp b/cachelib/cachebench/runner/FastShutdown.cpp +index 82c878eb..5ceb342d 100644 +--- a/cachelib/cachebench/runner/FastShutdown.cpp ++++ b/cachelib/cachebench/runner/FastShutdown.cpp +@@ -27,7 +27,7 @@ namespace cachebench { + FastShutdownStressor::FastShutdownStressor(const CacheConfig& cacheConfig, + uint64_t numOps) + : numOps_(numOps), +- cacheDir_{folly::sformat("/tmp/cache_bench_fss_{}", getpid())}, ++ cacheDir_{folly::sformat("/tmp/cache_bench_fss_{}", std::to_string(getpid()))}, + cache_(std::make_unique>( + cacheConfig, nullptr, cacheDir_)) {} + +diff --git a/cachelib/navy/admission_policy/DynamicRandomAP.cpp b/cachelib/navy/admission_policy/DynamicRandomAP.cpp +index 3a8a1aa0..2ab0fa45 100644 +--- a/cachelib/navy/admission_policy/DynamicRandomAP.cpp ++++ b/cachelib/navy/admission_policy/DynamicRandomAP.cpp +@@ -189,7 +189,7 @@ void DynamicRandomAP::updateThrottleParamsLocked(std::chrono::seconds curTime) { + XLOGF(INFO, + "max write rate {} will be used because target current write rate {} " + "exceeds it.", +- maxRate_, curTargetRate); ++ maxRate_.load(std::memory_order_relaxed), curTargetRate); + curTargetRate = maxRate_; + } + writeStats_.curTargetRate = curTargetRate; diff --git a/ports/cachelib/portfile.cmake b/ports/cachelib/portfile.cmake index 01244df653da36..774cd469d72412 100644 --- a/ports/cachelib/portfile.cmake +++ b/ports/cachelib/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/CacheLib REF "v${VERSION}" - SHA512 53f2eb4de0d1c5d4184d7e1d8ceb958625d9426eebaf434227179c9b2a6ed3a3bf063758f86c2e517ca910556230a764bfd54890dc718c2f45aec1d5a806788c + SHA512 fac41a2cb477f252034b932b1499b32b100d164eec4638d387af0487eeb1f84d430cd5908652914e615b188264d2806d6374343938165ebd47dd2494d1e7450d HEAD_REF master PATCHES fix-build.patch + fmt-10.patch ) FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h diff --git a/ports/cachelib/vcpkg.json b/ports/cachelib/vcpkg.json index d941626af23f50..95535128ad6f1a 100644 --- a/ports/cachelib/vcpkg.json +++ b/ports/cachelib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cachelib", - "version-string": "2023.02.27.00", + "version-string": "2023.05.08.00", "description": "facebook cachelib", "homepage": "https://github.com/facebook/CacheLib", "license": "Apache-2.0", diff --git a/ports/coolprop/fmt-fix.patch b/ports/coolprop/fmt-fix.patch index 1d5cc4778b3912..805437741ce712 100644 --- a/ports/coolprop/fmt-fix.patch +++ b/ports/coolprop/fmt-fix.patch @@ -1,5 +1,5 @@ diff --git a/include/CPstrings.h b/include/CPstrings.h -index 711981c..9d379d2 100644 +index 711981cd..fda2f055 100644 --- a/include/CPstrings.h +++ b/include/CPstrings.h @@ -6,6 +6,8 @@ @@ -11,30 +11,146 @@ index 711981c..9d379d2 100644 #if !defined(NO_FMTLIB) # ifndef FMT_HEADER_ONLY -@@ -14,9 +16,6 @@ - # include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib - # include "fmt/printf.h" // For sprintf - # undef FMT_HEADER_ONLY --#else --# include --# include - #endif - - #include "Exceptions.h" -@@ -75,11 +74,12 @@ inline bool endswith(const std::string& s1, const std::string& s2) { +@@ -74,17 +76,16 @@ inline bool endswith(const std::string& s1, const std::string& s2) { + #if defined(NO_FMTLIB) // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks inline std::string format(const char* fmt, ...); ++#elif FMT_VERSION >= 50000 ++template ++inline std::string format(const char* format_str, const Args&... args) { ++ return fmt::sprintf(format_str, args...); ++} #else -// Missing std::string formatting function - provided by the fmtlib library --inline std::string format(const char* format, fmt::ArgList args) { -- return fmt::sprintf(format, args); -+template -+std::string format(const Args & ... args) -+{ -+ return fmt::sprintf(args...); + inline std::string format(const char* format, fmt::ArgList args) { + return fmt::sprintf(format, args); } --FMT_VARIADIC(std::string, format, const char*) + FMT_VARIADIC(std::string, format, const char*) +-// For latest FMTLIB +-/*template +- inline std::string format(const char *format_str, const Args & ... args) { +- return fmt::sprintf(format_str, args); +- }*/ + #endif + + // Missing string split - like in Python +diff --git a/include/CoolPropFluid.h b/include/CoolPropFluid.h +index 80fb9ff3..093bd294 100644 +--- a/include/CoolPropFluid.h ++++ b/include/CoolPropFluid.h +@@ -562,5 +562,19 @@ class CoolPropFluid + }; + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++static int format_as(ViscosityDiluteVariables::ViscosityDiluteType type) { ++ return fmt::underlying(type); ++} ++ ++static int format_as(TransportPropertyData::ViscosityHardcodedEnum viscosity) { ++ return fmt::underlying(viscosity); ++} ++ ++static int format_as(TransportPropertyData::ConductivityHardcodedEnum conductivity) { ++ return fmt::underlying(conductivity); ++} ++#endif ++ + } /* namespace CoolProp */ + #endif /* COOLPROPFLUID_H_ */ +diff --git a/include/DataStructures.h b/include/DataStructures.h +index 0aebc0b4..5265ac82 100644 +--- a/include/DataStructures.h ++++ b/include/DataStructures.h +@@ -473,5 +473,40 @@ void extract_backend_families(std::string backend_string, backend_families& f1, + void extract_backend_families_string(std::string backend_string, backend_families& f1, std::string& f2); + std::string get_backend_string(backends backend); + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++/// Allows enums to be formatted ++static int format_as(parameters parameter) { ++ return fmt::underlying(parameter); ++} ++ ++static int format_as(phases phase) { ++ return fmt::underlying(phase); ++} ++ ++static int format_as(schemes scheme) { ++ return fmt::underlying(scheme); ++} ++ ++static int format_as(composition_types type) { ++ return fmt::underlying(type); ++} ++ ++static int format_as(fluid_types type) { ++ return fmt::underlying(type); ++} ++ ++static int format_as(input_pairs pair) { ++ return fmt::underlying(pair); ++} ++ ++static int format_as(backend_families family) { ++ return fmt::underlying(family); ++} ++ ++static int format_as(backends backend) { ++ return fmt::underlying(backend); ++} ++#endif ++ + } /* namespace CoolProp */ + #endif /* DATASTRUCTURES_H_ */ +diff --git a/include/IncompressibleFluid.h b/include/IncompressibleFluid.h +index 1ea41775..b641d2e0 100644 +--- a/include/IncompressibleFluid.h ++++ b/include/IncompressibleFluid.h +@@ -44,6 +44,12 @@ struct IncompressibleData + }; + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++static int format_as(IncompressibleData::IncompressibleTypeEnum type) { ++ return fmt::underlying(type); ++} ++#endif ++ + /// A property provider for incompressible solutions and pure fluids + /** + This fluid instance is populated using an entry from a JSON file +diff --git a/src/Backends/Helmholtz/VLERoutines.h b/src/Backends/Helmholtz/VLERoutines.h +index e13c0295..c63d0cbc 100644 +--- a/src/Backends/Helmholtz/VLERoutines.h ++++ b/src/Backends/Helmholtz/VLERoutines.h +@@ -97,6 +97,12 @@ struct saturation_PHSU_pure_options + } + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++static int format_as(saturation_PHSU_pure_options::specified_variable_options option) { ++ return fmt::underlying(option); ++} ++#endif ++ + void saturation_PHSU_pure(HelmholtzEOSMixtureBackend& HEOS, CoolPropDbl specified_value, saturation_PHSU_pure_options& options); + + /* \brief This is a backup saturation_p solver for the case where the Newton solver cannot approach closely enough the solution +diff --git a/src/HumidAirProp.cpp b/src/HumidAirProp.cpp +index 640bd843..eb586a63 100644 +--- a/src/HumidAirProp.cpp ++++ b/src/HumidAirProp.cpp +@@ -76,6 +76,12 @@ enum givens + GIVEN_ISENTROPIC_EXPONENT + }; + ++#if !defined(NO_FMTLIB) && FMT_VERSION >= 90000 ++int format_as(givens given) { ++ return fmt::underlying(given); ++} ++#endif + - // For latest FMTLIB - /*template - inline std::string format(const char *format_str, const Args & ... args) { + void _HAPropsSI_inputs(double p, const std::vector& input_keys, const std::vector& input_vals, double& T, double& psi_w); + double _HAPropsSI_outputs(givens OuputType, double p, double T, double psi_w); + double MoleFractionWater(double, double, int, double); diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json index f514ce886f8a04..0b8de2a570576c 100644 --- a/ports/coolprop/vcpkg.json +++ b/ports/coolprop/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coolprop", "version-semver": "6.4.3", - "port-version": 1, + "port-version": 2, "description": "Thermophysical properties for the masses", "homepage": "https://github.com/CoolProp/CoolProp", "license": "MIT", diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index f5f819a01a94f5..d5b73076657f83 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 9.1.0 - SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be + REF "${VERSION}" + SHA512 6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b HEAD_REF master PATCHES fix-write-batch.patch @@ -18,49 +18,21 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll") - endif() - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll") - endif() - endif() - endif() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h "defined(FMT_SHARED)" "1" ) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup() -vcpkg_fixup_pkgconfig() - -if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake - "lib/fmtd.dll" - "bin/fmtd.dll" - ) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake - "lib/fmt.dll" - "bin/fmt.dll" - ) - endif() -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) -# Handle post-build CMake instructions -vcpkg_copy_pdbs() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.rst") diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index a768a4e960d918..71db2116205851 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "9.1.0", - "port-version": 1, + "version": "10.0.0", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/ports/seacas/fix-fmt-10.patch b/ports/seacas/fix-fmt-10.patch new file mode 100644 index 00000000000000..e5623355d0b6de --- /dev/null +++ b/ports/seacas/fix-fmt-10.patch @@ -0,0 +1,28 @@ +From 5a576de57ee1664d845c83f552f2100cc9303a26 Mon Sep 17 00:00:00 2001 +From: Greg Sjaardema +Date: Wed, 10 May 2023 15:28:53 -0600 +Subject: [PATCH] IOSS: Fix enum printing to work with fmt-10 + +--- + .../seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +index b6827aa177..59507085fc 100644 +--- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C ++++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_DatabaseIO.C +@@ -1,4 +1,4 @@ +-// Copyright(C) 1999-2020, 2022 National Technology & Engineering Solutions ++// Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions + // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with + // NTESS, the U.S. Government retains certain rights in this software. + // +@@ -802,7 +802,7 @@ namespace Iotm { + std::ostringstream errmsg; + fmt::print(errmsg, + "Error: Failed to find entity of type {} with name {} for Assembly {}.\n", +- type, members[j], assem->name()); ++ Ioss::Utils::entity_type_to_string(type), members[j], assem->name()); + IOSS_ERROR(errmsg); + } + } diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index 75a778313dc3a7..a5b0bcfb8ce1db 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( deps-and-shared.patch fix-mpi.patch fix-headers.patch + fix-fmt-10.patch ) if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 67c4fc9587ead6..002c91b33838d2 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 3, + "port-version": 4, "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", "homepage": "https://github.com/sandialabs/seacas", "license": null, diff --git a/ports/spdlog/fmt-10-support.patch b/ports/spdlog/fmt-10-support.patch new file mode 100644 index 00000000000000..6717370e4e3c88 --- /dev/null +++ b/ports/spdlog/fmt-10-support.patch @@ -0,0 +1,39 @@ +From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001 +From: H1X4 <10332146+H1X4Dev@users.noreply.github.com> +Date: Fri, 31 Mar 2023 20:39:32 +0300 +Subject: [PATCH] fix build for master fmt (non-bundled) (#2694) + +* fix build for master fmt (non-bundled) + +* update fmt_runtime_string macro + +* fix build of updated macro +--- + include/spdlog/common.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index e69201a81..5f671c5c6 100644 +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string; + template + using remove_cvref_t = typename std::remove_cv::type>::type; + ++template ++#if FMT_VERSION >= 90101 ++using fmt_runtime_string = fmt::runtime_format_string; ++#else ++using fmt_runtime_string = fmt::basic_runtime; ++#endif ++ + // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, + // in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view + template + struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> ++ std::is_convertible>::value || std::is_same, fmt_runtime_string>::value> + {}; + + # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 8d5cd5952d5f9d..1471705790d2a4 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.11.0 + REF "v${VERSION}" SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 HEAD_REF v1.x PATCHES fmt-header.patch # https://github.com/gabime/spdlog/pull/2545 + fmt-10-support.patch # Upstream patch: https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -18,12 +19,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if(NOT DEFINED SPDLOG_WCHAR_FILENAMES) set(SPDLOG_WCHAR_FILENAMES OFF) endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) - if("wchar" IN_LIST FEATURES) - message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.") - elseif(SPDLOG_WCHAR_FILENAMES) - message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") - endif() +if(NOT VCPKG_TARGET_IS_WINDOWS AND SPDLOG_WCHAR_FILENAMES) + message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED) @@ -44,15 +41,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spdlog) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled") - # add support for integration other than cmake vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_FMT_EXTERNAL" "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" ) -if(SPDLOG_WCHAR_SUPPORT AND VCPKG_TARGET_IS_WINDOWS) +if(SPDLOG_WCHAR_SUPPORT) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h "// #define SPDLOG_WCHAR_TO_UTF8_SUPPORT" "#ifndef SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#define SPDLOG_WCHAR_TO_UTF8_SUPPORT\n#endif" @@ -65,7 +59,11 @@ if(SPDLOG_WCHAR_FILENAMES) ) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) -file(INSTALL "${SOURCE_PATH}/LICENSE" 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") diff --git a/ports/spdlog/usage b/ports/spdlog/usage new file mode 100644 index 00000000000000..d0ce6557992d88 --- /dev/null +++ b/ports/spdlog/usage @@ -0,0 +1,8 @@ +The package spdlog provides CMake targets: + + find_package(spdlog CONFIG REQUIRED) + target_link_libraries(main PRIVATE spdlog::spdlog) + + # Or use the header-only version + find_package(spdlog CONFIG REQUIRED) + target_link_libraries(main PRIVATE spdlog::spdlog_header_only) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index a88014f9ad06e6..68704c84c18e8e 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "spdlog", "version-semver": "1.11.0", + "port-version": 1, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/ports/wasmedge/fmt-10.patch b/ports/wasmedge/fmt-10.patch new file mode 100644 index 00000000000000..87577c5ddc8463 --- /dev/null +++ b/ports/wasmedge/fmt-10.patch @@ -0,0 +1,36 @@ +diff --git a/include/common/enum_errcode.hpp b/include/common/enum_errcode.hpp +index bda7d9e2..c075ed74 100644 +--- a/include/common/enum_errcode.hpp ++++ b/include/common/enum_errcode.hpp +@@ -131,4 +131,8 @@ static inline constexpr const auto ErrCodeStr = []() constexpr { + } + (); + ++inline uint32_t format_as(ErrCode code) { ++ return code.getCode(); ++} ++ + } // namespace WasmEdge +diff --git a/thirdparty/wasi/api.hpp b/thirdparty/wasi/api.hpp +index 97d37c83..53fadf1d 100644 +--- a/thirdparty/wasi/api.hpp ++++ b/thirdparty/wasi/api.hpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + using const_uint8_t_ptr = uint32_t; + using uint8_t_ptr = uint32_t; +@@ -562,6 +563,10 @@ enum __wasi_errno_t : uint16_t { + static_assert(sizeof(__wasi_errno_t) == 2, "witx calculated size"); + static_assert(alignof(__wasi_errno_t) == 2, "witx calculated align"); + ++inline uint16_t format_as(__wasi_errno_t error) { ++ return fmt::underlying(error); ++} ++ + /** + * File descriptor rights, determining which actions may be performed. + */ diff --git a/ports/wasmedge/portfile.cmake b/ports/wasmedge/portfile.cmake index bd87b2831958c6..aca46a8ce324ea 100644 --- a/ports/wasmedge/portfile.cmake +++ b/ports/wasmedge/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 040eabea8ad7885b95fb3bdb97687e63412c027d853da0b37cc15b8b7e51c02f10286281c57d03a71d6d5a7bf7d4a5e627e31d6fd5ba560b80da675d1f1edbad HEAD_REF master + PATCHES + fmt-10.patch ) set(WASMEDGE_CMAKE_OPTIONS "") diff --git a/ports/wasmedge/vcpkg.json b/ports/wasmedge/vcpkg.json index c74f15e658f217..7a42c9c36eb4cb 100644 --- a/ports/wasmedge/vcpkg.json +++ b/ports/wasmedge/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wasmedge", "version": "0.12.1", + "port-version": 1, "description": "WasmEdge is a high-performance WebAssembly runtime for edge computing.", "homepage": "https://WasmEdge.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5c7bbfc3a15a56..192ca2d1a3d375 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1337,7 +1337,7 @@ "port-version": 0 }, "cachelib": { - "baseline": "2023.02.27.00", + "baseline": "2023.05.08.00", "port-version": 0 }, "caf": { @@ -1718,7 +1718,7 @@ }, "coolprop": { "baseline": "6.4.3", - "port-version": 1 + "port-version": 2 }, "coroutine": { "baseline": "1.5.0", @@ -2549,8 +2549,8 @@ "port-version": 2 }, "fmt": { - "baseline": "9.1.0", - "port-version": 1 + "baseline": "10.0.0", + "port-version": 0 }, "folly": { "baseline": "2022.10.31.00", @@ -7326,7 +7326,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 3 + "port-version": 4 }, "seal": { "baseline": "4.1.1", @@ -7618,7 +7618,7 @@ }, "spdlog": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "spectra": { "baseline": "1.0.1", @@ -8490,7 +8490,7 @@ }, "wasmedge": { "baseline": "0.12.1", - "port-version": 0 + "port-version": 1 }, "wavelib": { "baseline": "2021-11-26", diff --git a/versions/c-/cachelib.json b/versions/c-/cachelib.json index 7f7598cb2ee16b..804a6f8f80087e 100644 --- a/versions/c-/cachelib.json +++ b/versions/c-/cachelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a22cdb1063bfa706ab5a7085ba8724785eabc53", + "version-string": "2023.05.08.00", + "port-version": 0 + }, { "git-tree": "0311771f0b688e0ff8ffd3c6d297dfbbf43dfd33", "version-string": "2023.02.27.00", diff --git a/versions/c-/coolprop.json b/versions/c-/coolprop.json index c868fc16e88e9d..8c7366b755d5c0 100644 --- a/versions/c-/coolprop.json +++ b/versions/c-/coolprop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f114941efb93eadb6df38f9493de8bdab0b496a", + "version-semver": "6.4.3", + "port-version": 2 + }, { "git-tree": "b0bdc5514d6d96d6767c50a09840b164fbf86d93", "version-semver": "6.4.3", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 5f084dead50d06..ed8f0bb0f2d06c 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eedb31bb1318118ec6a2d1bec60ab12e484092fd", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "3f452404270b508daf355b72031ad3ee7d0d5751", "version": "9.1.0", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 9bc5a89e4318e9..102d0aeb645fdc 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "709e85621b7fe043156154d04e5d9c174e47fab9", + "version-date": "2022-11-22", + "port-version": 4 + }, { "git-tree": "f49bca0bdf21c4b79c80ecefe3d3aa9a75ba49e7", "version-date": "2022-11-22", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json old mode 100755 new mode 100644 index 347c6b18a1b1d0..c37ac8af31ca7b --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67656948712582d93d9096cc08871a3270908d38", + "version-semver": "1.11.0", + "port-version": 1 + }, { "git-tree": "296d78e54c14ce64474b66f60847026ddb1f576e", "version-semver": "1.11.0", diff --git a/versions/w-/wasmedge.json b/versions/w-/wasmedge.json index 8f71ee73fb7128..643d2933167490 100644 --- a/versions/w-/wasmedge.json +++ b/versions/w-/wasmedge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c5d407c35a142f50bf1a79d7a720d8df43b54ec", + "version": "0.12.1", + "port-version": 1 + }, { "git-tree": "053400dd62ab5a02842f107aaad7dff7fdeb0a40", "version": "0.12.1", From 167a402bd4a678e05eb5989a3fe9107ad4f75522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 22 May 2023 20:33:40 +0200 Subject: [PATCH 120/533] [quill] Update to 2.9.0 (#31562) * [quill] Update to 2.9.0 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index a1c8ce442798ac..c432e764cdf778 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 b6843ca1b4332d756e93391fe04edf40794395d1ee489e99473b267eb65dc7cdc7de9f1458f8b47fb4b3b1a63cc3b5ea1a3029e3fe64e7278df4428d5ae53c1a + SHA512 c5ec8e8454736633758fcf91ce27d7747eb99a186371939f5b56deddc5569cae895ebf96692ae301aae2bc0e540431863669c750d4ba32c1b27e8ebc0f919f0e HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 2cae8b9b3afca3..b4e6ddfb08fbd7 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "2.8.0", + "version": "2.9.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 192ca2d1a3d375..f123dfc33e8993 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6893,7 +6893,7 @@ "port-version": 8 }, "quill": { - "baseline": "2.8.0", + "baseline": "2.9.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index a263a1ed4166ac..34382f3481c1c0 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "134b2fe4a72269e7e9be72b882fcf21f37ed1809", + "version": "2.9.0", + "port-version": 0 + }, { "git-tree": "bbf59f883b4fd8de5efdb3401847fa1f8e486a95", "version": "2.8.0", From ded1f63e29fad63087b1e1918a0944ef3cfef37c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 23 May 2023 02:34:06 +0800 Subject: [PATCH 121/533] [charls] update to 2.4.2 (#31561) * [charls] update to 2.4.2 * update version * update function * update version --- ports/charls/portfile.cmake | 6 +++--- ports/charls/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/charls.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index a06a6812d9d1c6..1b62f621d6e390 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF dd9e90d2d2be86194cc3bd164b5cce35abcf2024 #v2.4.1 - SHA512 33690d1647e57dedb22ad5cb75e4b41de41d0c603e0ec8e4b27dc2fa2ce71a97ab07deaa1aa42154369efb609b3954f7db51317f1dafd83d6cf882f2bade59a9 + REF "${VERSION}" + SHA512 4f1b587f008956ab6fb9d2473c37a7b1a842633113245be7f8bb29b8c64304a6d580a29fcfca97ba1ac75adedbaf89e29adc4ac9e4117e1af1aa5949dbd34df9 HEAD_REF master ) @@ -18,7 +18,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/charls) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") vcpkg_copy_pdbs() diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json index 0c13af7d24e181..3cbf30ea608166 100644 --- a/ports/charls/vcpkg.json +++ b/ports/charls/vcpkg.json @@ -1,6 +1,6 @@ { "name": "charls", - "version": "2.4.1", + "version": "2.4.2", "description": "CharLS, a C++ JPEG-LS library implementation.", "homepage": "https://github.com/team-charls/charls", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f123dfc33e8993..7c543540cd038c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1473,7 +1473,7 @@ "port-version": 3 }, "charls": { - "baseline": "2.4.1", + "baseline": "2.4.2", "port-version": 0 }, "chartdir": { diff --git a/versions/c-/charls.json b/versions/c-/charls.json index 77407faf564190..ae697074ce4d13 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9909aaef0219e8727c8f7e22ab93cf3aabbc685", + "version": "2.4.2", + "port-version": 0 + }, { "git-tree": "5459a82cfd650a18a79539aa30a03fa751a8cfcb", "version": "2.4.1", From 4d7e8f0393394fa06ea685f4d62b41608dd17449 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 23 May 2023 02:34:33 +0800 Subject: [PATCH 122/533] [simde] update to 0.7.6 (#31560) * [simde] update to 0.7.6. * update version --- ports/simde/portfile.cmake | 2 +- ports/simde/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simde.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index 86f029646390d5..2901a1fe81e613 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simd-everywhere/simde REF "v${VERSION}" - SHA512 9add192021014f503699dedff8644ad8079a6381302fe56b91950a3b498b58ba7d069a4779007738edfad1ec57dbce02d462bd833a517240e8ff992e3867868a + SHA512 de17fca563c4db6766881e1c73142ad129a57febe55fa8ea1ae780226e60a84891b13d387e75574f2722d77e4013176e3c7dfaf17bccd8682b7d3d3ec8e92a54 HEAD_REF master ) diff --git a/ports/simde/vcpkg.json b/ports/simde/vcpkg.json index 61b94ea0f33738..5d1bb54481268d 100644 --- a/ports/simde/vcpkg.json +++ b/ports/simde/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simde", - "version": "0.7.4", + "version": "0.7.6", "description": "Implementations of SIMD instruction sets for systems which don't natively support them", "homepage": "https://github.com/simd-everywhere/simde", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 7c543540cd038c..5a7ab88c46f60e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7445,7 +7445,7 @@ "port-version": 1 }, "simde": { - "baseline": "0.7.4", + "baseline": "0.7.6", "port-version": 0 }, "simdjson": { diff --git a/versions/s-/simde.json b/versions/s-/simde.json index 67f9b147786015..3f860fd31085e3 100644 --- a/versions/s-/simde.json +++ b/versions/s-/simde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3776be38dc5cf963db0a97cbb5b043488c43b79c", + "version": "0.7.6", + "port-version": 0 + }, { "git-tree": "f46b6e3bc03d59a8f45ae99c0c0d08b8386f230a", "version": "0.7.4", From 690c54515f20a31d8dfc881a65372e62fecb1cfb Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 23 May 2023 02:37:06 +0800 Subject: [PATCH 123/533] [zlib-ng] update to 2.0.7 (#31555) * update version * update version --- ports/zlib-ng/portfile.cmake | 8 +++----- ports/zlib-ng/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/z-/zlib-ng.json | 5 +++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 4b9f595a1d1095..9059e587a64fe9 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -1,10 +1,10 @@ -set(ZLIB_FULL_VERSION 2.0.6) +set(ZLIB_FULL_VERSION 2.0.7) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng REF "${ZLIB_FULL_VERSION}" - SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 + SHA512 1c19a62bb00727ac49049c299fb70060da95b5fafa448144ae4133372ec8c3da15cef6c1303485290f269b23c580696554ca0383dba3e1f9609f65c332981988 HEAD_REF develop ) @@ -24,6 +24,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.md" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright -) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index c36f24e4f51cff..0bb10ad0a2235a 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlib-ng", - "version": "2.0.6", - "port-version": 1, + "version": "2.0.7", "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 5a7ab88c46f60e..aab4b9fd632c2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8861,8 +8861,8 @@ "port-version": 0 }, "zlib-ng": { - "baseline": "2.0.6", - "port-version": 1 + "baseline": "2.0.7", + "port-version": 0 }, "zookeeper": { "baseline": "3.5.6", diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index d69c235c4c094f..ab73c500e03947 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea181bc5e9362185c5d5d85d23bbb15267c82cdb", + "version": "2.0.7", + "port-version": 0 + }, { "git-tree": "60e9a6f12ede4c5e87d2b3077c25e83991a02eea", "version": "2.0.6", From e983fc26302cca430d026dcc20ec863402219219 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 23 May 2023 02:45:57 +0800 Subject: [PATCH 124/533] update to 2.36.1 (#31549) --- ports/angelscript/portfile.cmake | 8 ++++---- ports/angelscript/vcpkg.json | 3 +-- versions/a-/angelscript.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index 510158d25d3466..f8ea42f52edb57 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.0.zip" - FILENAME "angelscript_2.36.0.zip" - SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff + URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.1.zip" + FILENAME "angelscript_2.36.1.zip" + SHA512 d6d213ce72135c89e47e67521f654611ff67673f3decd9db3da4b7bf317a04a3f91c5c6ae36658ec3f2b20498facd069af02a91255a24ec79c96d8c90d6b554e ) vcpkg_extract_source_archive( @@ -26,4 +26,4 @@ if("addons" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") endif() -file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/manual/doc_license.html") diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index f5fca8a4c41b3b..b9662364dda0f1 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,7 +1,6 @@ { "name": "angelscript", - "version": "2.36.0", - "port-version": 1, + "version": "2.36.1", "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", "license": "Zlib", diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index a2b7f73778085b..49745dd32a57bb 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e90e0fe54ab8038226b849471fba169157753c19", + "version": "2.36.1", + "port-version": 0 + }, { "git-tree": "579a4c31ad7d7972339105a9c043a3658af5705d", "version": "2.36.0", diff --git a/versions/baseline.json b/versions/baseline.json index aab4b9fd632c2a..48b293f01bd235 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -113,8 +113,8 @@ "port-version": 8 }, "angelscript": { - "baseline": "2.36.0", - "port-version": 1 + "baseline": "2.36.1", + "port-version": 0 }, "angle": { "baseline": "chromium_5414", From af5d4e9e5bab46197ef341fcdaa8f76a60aedf0c Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Mon, 22 May 2023 20:46:27 +0200 Subject: [PATCH 125/533] Update boinc to 7.22.2 (#31543) Signed-off-by: Vitalii Koshura --- ports/boinc/fix-build.patch | 49 ------------------------------------- ports/boinc/portfile.cmake | 6 ++--- ports/boinc/vcpkg.json | 3 +-- versions/b-/boinc.json | 5 ++++ versions/baseline.json | 4 +-- 5 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 ports/boinc/fix-build.patch diff --git a/ports/boinc/fix-build.patch b/ports/boinc/fix-build.patch deleted file mode 100644 index c8a7751df9c0a7..00000000000000 --- a/ports/boinc/fix-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/lib/filesys.cpp b/lib/filesys.cpp -index c258a0f8d1..76530fb432 100644 ---- a/lib/filesys.cpp -+++ b/lib/filesys.cpp -@@ -63,6 +63,7 @@ - - #include "error_numbers.h" - #include "filesys.h" -+#include "str_replace.h" - #include "str_util.h" - #include "util.h" - -diff --git a/lib/str_util.h b/lib/str_util.h -index 0e2d5f179a..22908d8568 100644 ---- a/lib/str_util.h -+++ b/lib/str_util.h -@@ -22,8 +22,6 @@ - #include - #include - --#include "str_replace.h" -- - #define safe_strcpy(x, y) strlcpy(x, y, sizeof(x)) - #define safe_strcat(x, y) strlcat(x, y, sizeof(x)) - -diff --git a/lib/util.cpp b/lib/util.cpp -index cfa495a6f9..2af4b0fb94 100644 ---- a/lib/util.cpp -+++ b/lib/util.cpp -@@ -17,6 +17,7 @@ - - #if defined(_WIN32) - #include "boinc_win.h" -+#include "str_replace.h" - #include "str_util.h" - #include "win_util.h" - #endif -diff --git a/lib/win_util.cpp b/lib/win_util.cpp -index 86289e0ce7..82b17f4425 100644 ---- a/lib/win_util.cpp -+++ b/lib/win_util.cpp -@@ -23,6 +23,7 @@ - #include "util.h" - #include "filesys.h" - #include "win_util.h" -+#include "str_replace.h" - #include "str_util.h" - - /** diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index e5e0a163bf318c..fc173f5815b152 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.22/7.22.1 - SHA512 8b3efc68fe8df8f95a674d9deddbe355da2070a960b1768ee7f9c2afdd8a373e97297715dec5d7daf131d4b5c478afbc4476e152ec516080620f66e1a1f785af + REF client_release/7.22/7.22.2 + SHA512 ac1f63ecea4d24a86459d5f58aac45f04dfaee3e358fcb5a0ae201e9289e11debada30bf0f3ab1bba462068788a2eca2f4d6b3c45d3603c7b6ca6ad51effc85b HEAD_REF master - PATCHES - fix-build.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 0ae2169e7e4e2d..eca3f87d9903a7 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boinc", - "version": "7.22.1", - "port-version": 1, + "version": "7.22.2", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 5eef22b21e24e8..67664be7c80311 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0f6f1b59e54a64b321aba20d196531d6e181d2c", + "version": "7.22.2", + "port-version": 0 + }, { "git-tree": "0d3f7220d72e02720ad44a15cfc46ebc1a6c26b4", "version": "7.22.1", diff --git a/versions/baseline.json b/versions/baseline.json index 48b293f01bd235..e46725367629ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -609,8 +609,8 @@ "port-version": 0 }, "boinc": { - "baseline": "7.22.1", - "port-version": 1 + "baseline": "7.22.2", + "port-version": 0 }, "bond": { "baseline": "10.0.0", From 90c6f230134d290a1c8274fba0f78711c170d362 Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Mon, 22 May 2023 20:46:55 +0200 Subject: [PATCH 126/533] [c9y] update to version 0.8.0 (#31540) * [c9y] update to 0.8.0 * [c9y] update version database --- ports/c9y/portfile.cmake | 4 ++-- ports/c9y/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/c9y.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/c9y/portfile.cmake b/ports/c9y/portfile.cmake index 9aa01e40039cf3..82328323fc0a59 100644 --- a/ports/c9y/portfile.cmake +++ b/ports/c9y/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rioki/c9y - REF v0.7.0 - SHA512 1c68351a42cea3a5cc52e00d3828acb16d6a96dfc4b9bf53fa4f8090b691a6f5734e2bb219af5cc54bc997517434417a4567d133c5a589f247abe9de73ba1cac + REF v0.8.0 + SHA512 f3161bde45fd534029ef4609b1b49d4edbeb636c9305e01e7e9cfa6a62cde0978632d46597510bea0ff96cae09b819905c0d8c5d2fd85cf641d7b47ea2a732b1 ) vcpkg_cmake_configure( diff --git a/ports/c9y/vcpkg.json b/ports/c9y/vcpkg.json index 0f0424be56e7b8..0c72352873e9a0 100644 --- a/ports/c9y/vcpkg.json +++ b/ports/c9y/vcpkg.json @@ -1,6 +1,6 @@ { "name": "c9y", - "version-semver": "0.7.0", + "version-semver": "0.8.0", "description": "Concurency", "homepage": "https://github.com/rioki/c9y", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e46725367629ab..e0c2c678407e0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1333,7 +1333,7 @@ "port-version": 1 }, "c9y": { - "baseline": "0.7.0", + "baseline": "0.8.0", "port-version": 0 }, "cachelib": { diff --git a/versions/c-/c9y.json b/versions/c-/c9y.json index 4b9b1782c17332..5b8f4a8bf8dbac 100644 --- a/versions/c-/c9y.json +++ b/versions/c-/c9y.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f7e3a1f7a70d40127c90193447fe5595f86c9fb", + "version-semver": "0.8.0", + "port-version": 0 + }, { "git-tree": "c9ab8ee7af65218c39d096c8d8d369bb413a49a5", "version-semver": "0.7.0", From 7f2a9d7891534f3d17fcafdfd74971959233f36f Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Mon, 22 May 2023 21:55:09 +0300 Subject: [PATCH 127/533] [flecs] update to 3.2.3 (#31534) * [flecs] update to 3.2.3 * [flecs] update version database --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/flecs.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 365fc63c3af9d1..8d5eed2fbf69f8 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 18d55e58187840170d7ec11aea7711e854c53dd3d2bdcf458661c92178f5091231f97d869c8719f2b4713db53fd7e25917508288038f2be9edb91ff17606f62b + SHA512 7daa7e1c984b59e749e9e8bed0ddc0d6e848206cc804c29792ae7d2090d685eba279bf0dd9463cfc9577e2c10c66b9fa0c473947828b865652b15d806d50ac91 HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 094108e92c0b2b..2f102932e5e514 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,7 +1,6 @@ { "name": "flecs", - "version": "3.2.2", - "port-version": 1, + "version": "3.2.3", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e0c2c678407e0c..0853ac17569606 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2517,8 +2517,8 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.2", - "port-version": 1 + "baseline": "3.2.3", + "port-version": 0 }, "flint": { "baseline": "2.8.0", diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index a0441f6f72f3bb..11c6a4a8a48fc5 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a231eef7e805676077c2db021b773fbe143413b2", + "version": "3.2.3", + "port-version": 0 + }, { "git-tree": "2a59e268b884b19cbc93cb11f25d838af9c09f17", "version": "3.2.2", From f2328e89e94fa24587cbcf2db82ddff1c68e45a1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 22 May 2023 20:56:55 +0200 Subject: [PATCH 128/533] [cpp-async] Add new port (#31523) * Add cpp-async 2023-05-19 * Update CI baseline * Add new line * Update CI baseline * Fix HEAD_REF * Update CI baseline * Update to v1.0.0 * Update CI baseline * Remove old version --------- Co-authored-by: chausner --- ports/cpp-async/portfile.cmake | 13 +++++++++++++ ports/cpp-async/usage | 4 ++++ ports/cpp-async/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/c-/cpp-async.json | 9 +++++++++ 5 files changed, 37 insertions(+) create mode 100644 ports/cpp-async/portfile.cmake create mode 100644 ports/cpp-async/usage create mode 100644 ports/cpp-async/vcpkg.json create mode 100644 versions/c-/cpp-async.json diff --git a/ports/cpp-async/portfile.cmake b/ports/cpp-async/portfile.cmake new file mode 100644 index 00000000000000..a9ef1265910e98 --- /dev/null +++ b/ports/cpp-async/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/cpp-async + REF "v${VERSION}" + SHA512 c3a6700c86d6bec2680c9d0edfe3ed02e83f8ecec134163243a7bfa4e12d4867a47d64eadd377de9b2a69401b8b512e0ee274275895a8f301c266db24b6e0a4b + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/include/async" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cpp-async/usage b/ports/cpp-async/usage new file mode 100644 index 00000000000000..13d5608235909d --- /dev/null +++ b/ports/cpp-async/usage @@ -0,0 +1,4 @@ +cpp-async is header-only and can be used from CMake via: + + find_path(CPP_ASYNC_INCLUDE_DIRS "async/task.h") + target_include_directories(main PRIVATE ${CPP_ASYNC_INCLUDE_DIRS}) diff --git a/ports/cpp-async/vcpkg.json b/ports/cpp-async/vcpkg.json new file mode 100644 index 00000000000000..476d22cb1a579b --- /dev/null +++ b/ports/cpp-async/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cpp-async", + "version": "1.0.0", + "description": "Support types and functions for C++20 coroutines", + "homepage": "https://github.com/microsoft/cpp-async", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 0853ac17569606..46c7c335bf1ebe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1728,6 +1728,10 @@ "baseline": "2020.06", "port-version": 5 }, + "cpp-async": { + "baseline": "1.0.0", + "port-version": 0 + }, "cpp-base64": { "baseline": "V2.rc.08", "port-version": 0 diff --git a/versions/c-/cpp-async.json b/versions/c-/cpp-async.json new file mode 100644 index 00000000000000..648cf85f0bc82e --- /dev/null +++ b/versions/c-/cpp-async.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f1eaddcca26f72bb7be5a6227bffd3897798341c", + "version": "1.0.0", + "port-version": 0 + } + ] +} From ebb01831d618bc5eab3bd6e8bc6d632b4f7328c1 Mon Sep 17 00:00:00 2001 From: sonodima <62671493+sonodima@users.noreply.github.com> Date: Mon, 22 May 2023 21:03:21 +0200 Subject: [PATCH 129/533] [wmipp] Add new port (#31503) * add port 'wmipp' * added 'wmipp' hash * formatted manifest and rebuilt database * uupdate version database * use ${VERSION} in ports/wmipp/portfile.cmake Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * update version database --------- Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/wmipp/portfile.cmake | 12 ++++++++++++ ports/wmipp/vcpkg.json | 8 ++++++++ versions/baseline.json | 4 ++++ versions/w-/wmipp.json | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 ports/wmipp/portfile.cmake create mode 100644 ports/wmipp/vcpkg.json create mode 100644 versions/w-/wmipp.json diff --git a/ports/wmipp/portfile.cmake b/ports/wmipp/portfile.cmake new file mode 100644 index 00000000000000..f884d3b69b5e39 --- /dev/null +++ b/ports/wmipp/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sonodima/wmipp + REF "v${VERSION}" + + SHA512 e52ad6edadcb5b56c941d18e10968f10ea4fbbb0773132c2eb929e83cbf4aa22b72a161f55b358541e27786ff7f967786eb156b7ff519f8d3449d8b5ef2aa727 + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/include/wmipp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/wmipp/vcpkg.json b/ports/wmipp/vcpkg.json new file mode 100644 index 00000000000000..0e3e704dc2940f --- /dev/null +++ b/ports/wmipp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "wmipp", + "version": "1.0.0", + "description": "Streamlined Windows Management Instrumentation (WMI) integration for seamless C++ development", + "homepage": "https://github.com/sonodima/wmipp", + "license": "MIT", + "supports": "windows & !uwp" +} diff --git a/versions/baseline.json b/versions/baseline.json index 46c7c335bf1ebe..03a55d9e2e055b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8576,6 +8576,10 @@ "baseline": "1.2.0", "port-version": 2 }, + "wmipp": { + "baseline": "1.0.0", + "port-version": 0 + }, "woff2": { "baseline": "1.0.2", "port-version": 3 diff --git a/versions/w-/wmipp.json b/versions/w-/wmipp.json new file mode 100644 index 00000000000000..6736b82d786f41 --- /dev/null +++ b/versions/w-/wmipp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "70a7cc2553e70e4a9e6f50110b0e8b6eedb8c0f9", + "version": "1.0.0", + "port-version": 0 + } + ] +} From d672b68add824921de72ef02a89f3a8b59558bcf Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 23 May 2023 03:04:14 +0800 Subject: [PATCH 130/533] [portable-file-dialogs] Add new port (#31482) * [portable-file-dialogs] Add new port * [portable-file-dialogs] Version stuffs --- ports/portable-file-dialogs/portfile.cmake | 11 +++++++++++ ports/portable-file-dialogs/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/p-/portable-file-dialogs.json | 9 +++++++++ 4 files changed, 40 insertions(+) create mode 100644 ports/portable-file-dialogs/portfile.cmake create mode 100644 ports/portable-file-dialogs/vcpkg.json create mode 100644 versions/p-/portable-file-dialogs.json diff --git a/ports/portable-file-dialogs/portfile.cmake b/ports/portable-file-dialogs/portfile.cmake new file mode 100644 index 00000000000000..8731108891d3d2 --- /dev/null +++ b/ports/portable-file-dialogs/portfile.cmake @@ -0,0 +1,11 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO samhocevar/portable-file-dialogs + REF "${VERSION}" + SHA512 8f3f59534024357b1d4b9054f20f482bfb159c1666be1695220c1be8f028be6adac0d9d82aad7230922a5eea5971c051a8699e60bc99207813776f35ce6937b6 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/portable-file-dialogs.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/portable-file-dialogs/vcpkg.json b/ports/portable-file-dialogs/vcpkg.json new file mode 100644 index 00000000000000..d7074d3c922623 --- /dev/null +++ b/ports/portable-file-dialogs/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "portable-file-dialogs", + "version": "0.1.0", + "description": "Portable GUI dialogs library", + "homepage": "https://github.com/samhocevar/portable-file-dialogs", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 03a55d9e2e055b..f54144243a3d0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6344,6 +6344,10 @@ "baseline": "0.9", "port-version": 5 }, + "portable-file-dialogs": { + "baseline": "0.1.0", + "port-version": 0 + }, "portable-snippets": { "baseline": "2019-09-20", "port-version": 3 diff --git a/versions/p-/portable-file-dialogs.json b/versions/p-/portable-file-dialogs.json new file mode 100644 index 00000000000000..961a58fc144306 --- /dev/null +++ b/versions/p-/portable-file-dialogs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c205f3002701aeb61986151fb84016f820f04103", + "version": "0.1.0", + "port-version": 0 + } + ] +} From 462885c7fbf104fc600651066c648e6fab50b234 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 22 May 2023 21:07:52 +0200 Subject: [PATCH 131/533] [idyntree] Update to 9.0.0 (#31417) * [idyntree] Update idyntree port to 9.0.0 Furthermore, remove irrlicht feature from default features as since version 9.0.0 idyntree requires irrlicht compiled with SDL support on Windows, and that is not available in irrlicht compiled by vcpkg. * [idyntree] Update versions --- ports/idyntree/portfile.cmake | 3 +-- ports/idyntree/vcpkg.json | 7 ++++--- versions/baseline.json | 2 +- versions/i-/idyntree.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/idyntree/portfile.cmake b/ports/idyntree/portfile.cmake index 7af9f707f595f7..44b6a16f0c88e8 100644 --- a/ports/idyntree/portfile.cmake +++ b/ports/idyntree/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO robotology/idyntree REF "v${VERSION}" - SHA512 5661fb442fb6d28e71efcb9780c4205b90017e7f4c0bc761c170e59b1cff22b281c5c8c15bf9c4b2cede1e0bbbb05b53f4a22556e0b5b3678abd4d3f47be49d4 + SHA512 4f3b0f14c4b280c3cf1f2d232e40b4ebebbccf241d31e6fdda94a7e2be8b245373c13ef9c99aa6424a37e56e927ef62d38961d02a1b11585a905d4bef47e3045 HEAD_REF master ) @@ -24,7 +24,6 @@ vcpkg_cmake_configure( -DIDYNTREE_USES_LUA:BOOL=OFF -DIDYNTREE_USES_YARP:BOOL=OFF -DIDYNTREE_USES_ICUB_MAIN:BOOL=OFF - -DIDYNTREE_USES_QT5:BOOL=OFF -DIDYNTREE_USES_ALGLIB:BOOL=OFF -DIDYNTREE_USES_WORHP:BOOL=OFF -DIDYNTREE_COMPILE_TESTS=OFF diff --git a/ports/idyntree/vcpkg.json b/ports/idyntree/vcpkg.json index 54341c5f49698d..038853de5380ff 100644 --- a/ports/idyntree/vcpkg.json +++ b/ports/idyntree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "idyntree", - "version": "8.1.0", + "version": "9.0.0", "description": "Multibody Dynamics Library designed for Free Floating Robots.", "homepage": "https://github.com/robotology/idyntree", "license": "LGPL-2.1-or-later", @@ -17,8 +17,7 @@ } ], "default-features": [ - "assimp", - "irrlicht" + "assimp" ], "features": { "assimp": { @@ -29,7 +28,9 @@ }, "irrlicht": { "description": "Add support for irrlicht-based visualizer", + "supports": "!windows", "dependencies": [ + "glfw3", "irrlicht" ] } diff --git a/versions/baseline.json b/versions/baseline.json index f54144243a3d0f..59b24813e8b7bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3197,7 +3197,7 @@ "port-version": 7 }, "idyntree": { - "baseline": "8.1.0", + "baseline": "9.0.0", "port-version": 0 }, "if97": { diff --git a/versions/i-/idyntree.json b/versions/i-/idyntree.json index ad59902e7bee44..2ad55e7fb4d5f4 100644 --- a/versions/i-/idyntree.json +++ b/versions/i-/idyntree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c7bc2d8282bf918d6be1b0b63af3f4612e673ef", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "65e8740ace938a59b21dc97e30ab531c005ce399", "version": "8.1.0", From 0ccb3d11406922bef1dcc29002f68f633a321f19 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Mon, 22 May 2023 23:56:05 +0200 Subject: [PATCH 132/533] [gsl] fix gsl x64-linux-dynamic build by guarding win32 string replaces (#31504) * Guard win32 string replaces * update version * Use target_compile_definitions for GSL_DLL * Update version * Revert "Use target_compile_definitions for GSL_DLL" This reverts commit 9b228c100a6220109465436eef23150fb6605757. * Address review comments * Update version * Revert "Address review comments" This reverts commit d6e911a87b98637db515de034fefed72ecb2e240. * Address review comments * Remove target_compile_definitions * #ifndef WIN32 -> #ifndef _WIN32 * Update version * Update port-version from 2 to 3 * ./vcpkg x-add-version --all * Restore version 2 port-version in version/g-/gsl.json --- ports/gsl/CMakeLists.txt | 2 +- ports/gsl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gsl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/gsl/CMakeLists.txt b/ports/gsl/CMakeLists.txt index 7e522cc5cea23c..5bc98746e961d4 100644 --- a/ports/gsl/CMakeLists.txt +++ b/ports/gsl/CMakeLists.txt @@ -40,7 +40,7 @@ foreach(DIR IN LISTS FOLDERS) endforeach() file(READ gsl_types.h GSLTYPES_H) -string(REPLACE "#ifdef WIN32" "#if 1 /*WIN32*/" GSLTYPES_H "${GSLTYPES_H}") +string(REPLACE "#ifdef WIN32" "#ifdef _WIN32" GSLTYPES_H "${GSLTYPES_H}") if(BUILD_SHARED_LIBS) string(REPLACE "# ifdef GSL_DLL" "# if 1 /*GSL_DLL*/" GSLTYPES_H "${GSLTYPES_H}") endif() diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index 15e1d8b8d13b57..1284ab30accf7a 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gsl", "version": "2.7.1", - "port-version": 2, + "port-version": 3, "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", "homepage": "https://www.gnu.org/software/gsl/", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 59b24813e8b7bf..8d0700e6c55847 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2966,7 +2966,7 @@ }, "gsl": { "baseline": "2.7.1", - "port-version": 2 + "port-version": 3 }, "gsl-lite": { "baseline": "0.41.0", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index 5cad994a612afa..d01dca2821a74d 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "533b0147bfc479e315c3dc4c181675c302272ae4", + "version": "2.7.1", + "port-version": 3 + }, { "git-tree": "c9aa024bd4ce8327328a818b75cc6188de15ddd2", "version": "2.7.1", From 23414a2bf1aaf1e57bf20cb6d1962f46a732a485 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 24 May 2023 03:58:40 +0800 Subject: [PATCH 133/533] Update to 2.0.9 (#31579) --- ...r-on-Windows-ARM64-by-add-new-define.patch | 45 ------------------- ports/libtorrent/portfile.cmake | 8 ++-- ports/libtorrent/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtorrent.json | 5 +++ 5 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch diff --git a/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch b/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch deleted file mode 100644 index bc72079ec56558..00000000000000 --- a/ports/libtorrent/0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 24b9c178ed316b39236e62dd655c85f3405e147a Mon Sep 17 00:00:00 2001 -From: David Liu -Date: Mon, 13 Feb 2023 18:03:58 +0800 -Subject: [PATCH] fix build error on Windows ARM64 by add new define - -fix build error on Windows ARM64 by add new define ---- - src/assert.cpp | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/assert.cpp b/src/assert.cpp -index d623605b5..482345451 100644 ---- a/src/assert.cpp -+++ b/src/assert.cpp -@@ -190,16 +190,21 @@ TORRENT_EXPORT void print_backtrace(char* out, int len, int max_depth - std::array stack; - - STACKFRAME64 stack_frame = {}; --#if defined(_WIN64) -- int const machine_type = IMAGE_FILE_MACHINE_AMD64; -- stack_frame.AddrPC.Offset = context_record.Rip; -- stack_frame.AddrFrame.Offset = context_record.Rbp; -- stack_frame.AddrStack.Offset = context_record.Rsp; --#else -+#if defined(_M_IX86) - int const machine_type = IMAGE_FILE_MACHINE_I386; - stack_frame.AddrPC.Offset = context_record.Eip; - stack_frame.AddrFrame.Offset = context_record.Ebp; - stack_frame.AddrStack.Offset = context_record.Esp; -+#elif defined(_M_X64) -+ int const machine_type = IMAGE_FILE_MACHINE_AMD64; -+ stack_frame.AddrPC.Offset = context_record.Rip; -+ stack_frame.AddrFrame.Offset = context_record.Rbp; -+ stack_frame.AddrStack.Offset = context_record.Rsp; -+#elif defined(_M_ARM64) -+ int const machine_type = IMAGE_FILE_MACHINE_ARM64; -+ stack_frame.AddrPC.Offset = context_record.Pc; -+ stack_frame.AddrFrame.Offset = context_record.Fp; -+ stack_frame.AddrStack.Offset = context_record.Sp; - #endif - stack_frame.AddrPC.Mode = AddrModeFlat; - stack_frame.AddrFrame.Mode = AddrModeFlat; --- -2.39.1.windows.1 - diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index ce9de31d2311c8..5dc86b3ba18a9c 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -30,11 +30,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 64817e0e8793d0875fc10245de52ffb2540a223d # v2.0.8 - SHA512 607172e6a806d78bb34443101bd384ac7a42e0edc3e7c4a2cf5c3ab5f2be64f84557726dce16c2fbaaa2ba254529a8871b3123b0e79fe87cd5bf26021ecb59da + REF "v${VERSION}" + SHA512 cc9c0d9ae66bd7c7df7487e33e8d452ba7b5756987be35a3309038a1dec576e91de5fbabe9d05e58bea9c82d83aad33c607804eeefaf3113a51354bef1a25340 HEAD_REF RC_2_0 - PATCHES - 0001-fix-build-error-on-Windows-ARM64-by-add-new-define.patch ) vcpkg_from_github( @@ -80,7 +78,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME LibtorrentRasterbar CONFIG_PATH lib/cmake/LibtorrentRasterbar) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # Do not duplicate include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/cmake") diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index f4cd3f0d0ac041..36c64f84032f9e 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.8", + "version": "2.0.9", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/versions/baseline.json b/versions/baseline.json index 8d0700e6c55847..6f8c35a5d68bf1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4617,7 +4617,7 @@ "port-version": 3 }, "libtorrent": { - "baseline": "2.0.8", + "baseline": "2.0.9", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index f95abca5191aaf..9078366a261118 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659f86cfa8b1e0f62ba1d7c6376ec5d7f292fb7c", + "version": "2.0.9", + "port-version": 0 + }, { "git-tree": "884acf58813237198df4d1265661ad93b6b57955", "version": "2.0.8", From e676f024aa2b30a667011d8a18f0cc944a50cf5d Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 24 May 2023 03:59:02 +0800 Subject: [PATCH 134/533] [blaze] Update to 3.8.2 (#31576) * update blaze * update version --------- Co-authored-by: Monica --- ports/blaze/portfile.cmake | 6 +++--- ports/blaze/vcpkg.json | 2 +- versions/b-/blaze.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index 8a79545628bcc3..c78f91d842a54a 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF v3.8.1 - SHA512 6dfd3cb46d796b94cc44a30c4cd5ebfb366d2eb312d75a28787cacb4636df52e4e4e3dce3d9501bf2c07e7fd3621e8ce7f9ffa61a950a4146375b12d75d4872b + REF "v${VERSION}" + SHA512 9786628159991f547902ceb44a159f0ba84d08be16ccc45bfb9aad3cfbf16eaede4ea43d2d4981d420a8a387a07721b113754f6038a6db2d9c7ed2ea967b5361 HEAD_REF master ) @@ -19,4 +19,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/blaze/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/blaze/vcpkg.json b/ports/blaze/vcpkg.json index 116078565de6c7..5df573d5d7537d 100644 --- a/ports/blaze/vcpkg.json +++ b/ports/blaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blaze", - "version": "3.8.1", + "version": "3.8.2", "description": "Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.", "homepage": "https://bitbucket.org/blaze-lib/blaze", "license": "BSD-3-Clause", diff --git a/versions/b-/blaze.json b/versions/b-/blaze.json index 2a94caab10d522..be8283c1140505 100644 --- a/versions/b-/blaze.json +++ b/versions/b-/blaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f237bb789d83a4004b263f9544ed3d6668f160f", + "version": "3.8.2", + "port-version": 0 + }, { "git-tree": "6bea7e024ba776f0a7c5462056054529f79aa86d", "version": "3.8.1", diff --git a/versions/baseline.json b/versions/baseline.json index 6f8c35a5d68bf1..dcfd8aa53815dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -589,7 +589,7 @@ "port-version": 0 }, "blaze": { - "baseline": "3.8.1", + "baseline": "3.8.2", "port-version": 0 }, "blend2d": { From e4e5d2dc0fbd5e52ffdf865f90b7b87a19ead513 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 24 May 2023 04:00:34 +0800 Subject: [PATCH 135/533] [ada-url] Add new port (#31485) * [ada-url] Add new port * [ada-url] Version * [ada-url] Update to 2.4.2 * [ada-url] Bump version * [ada-url] tools doesn't support UWP * [ada-url] Overwrite version --- ports/ada-url/portfile.cmake | 36 ++++++++++++++++++++++++++++++++++++ ports/ada-url/vcpkg.json | 23 +++++++++++++++++++++++ versions/a-/ada-url.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 72 insertions(+) create mode 100644 ports/ada-url/portfile.cmake create mode 100644 ports/ada-url/vcpkg.json create mode 100644 versions/a-/ada-url.json diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake new file mode 100644 index 00000000000000..b67f8ccd6b4637 --- /dev/null +++ b/ports/ada-url/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ada-url/ada + REF "v${VERSION}" + SHA512 689dcdc3e89f2ae51e039f6d354efea3231d3ff025c58f572596d87cebd7d5f2bf5ca8c530df8514369a14831dfdb1c65bc1d93a0ece579031eb3f0dd47548c0 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools ADA_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DADA_BENCHMARKS=OFF + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME ada CONFIG_PATH "lib/cmake/ada") + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES adaparse AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-MIT") diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json new file mode 100644 index 00000000000000..a0981262bac9fb --- /dev/null +++ b/ports/ada-url/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "ada-url", + "version": "2.4.2", + "description": "WHATWG-compliant and fast URL parser written in modern C++", + "homepage": "https://ada-url.com/", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build CLI tools (adaparse)", + "supports": "!uwp" + } + } +} diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json new file mode 100644 index 00000000000000..26721671950682 --- /dev/null +++ b/versions/a-/ada-url.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "184ab96a9e448d759aafb20f540502f43b5fc7f9", + "version": "2.4.2", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index dcfd8aa53815dd..c13d5b80931dd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -36,6 +36,10 @@ "baseline": "3.9.5", "port-version": 12 }, + "ada-url": { + "baseline": "2.4.2", + "port-version": 0 + }, "ade": { "baseline": "0.1.1f", "port-version": 3 From e4e7a0b86b41e220c59abba990998bb2b629c2c4 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 24 May 2023 04:43:07 +0800 Subject: [PATCH 136/533] [minizip-ng] update version to 4.0.0 (#31575) * [minizip-ng] update version to 4.0.0 * update version --- ports/minizip-ng/Modify-header-file-path.patch | 13 ------------- ports/minizip-ng/portfile.cmake | 8 +++----- ports/minizip-ng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/minizip-ng.json | 5 +++++ 5 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 ports/minizip-ng/Modify-header-file-path.patch diff --git a/ports/minizip-ng/Modify-header-file-path.patch b/ports/minizip-ng/Modify-header-file-path.patch deleted file mode 100644 index ac1c6fee8b1cad..00000000000000 --- a/ports/minizip-ng/Modify-header-file-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ef8023..ec1ee55 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,7 +81,7 @@ include(FeatureSummary) - - set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") - set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") --set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers") -+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng CACHE PATH "Installation directory for headers") - set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages") - - set(STDLIB_DEF) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 1e290c3be878b8..6be6a4bf29f6ba 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -5,11 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng - REF 241428886216f0f0efd6926efcaaaa13794e51bd #v3.0.7 - SHA512 779a53fafe63b64f5f703448262871c323f5753cbb58001dd0d0ef10de8d3bd7bb6055db4e763e664ccb5b781ce8dd06bf7c3e6b38eca019de835322a833fa06 + REF "${VERSION}" + SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 HEAD_REF master - PATCHES - Modify-header-file-path.patch ) vcpkg_check_features( @@ -37,7 +35,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index e7c89c8f940210..81d38cc07226df 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "minizip-ng", - "version": "3.0.7", + "version": "4.0.0", "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index c13d5b80931dd0..5ff060bf3242a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5285,7 +5285,7 @@ "port-version": 2 }, "minizip-ng": { - "baseline": "3.0.7", + "baseline": "4.0.0", "port-version": 0 }, "mio": { diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 9df368d513f2f4..4a22dba9fb6088 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9a2226720f5e72647d6b0399f9c0bd5baf8f9b9", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "e97e41aa57defe3c82bebab5941a4e4320f5a704", "version": "3.0.7", From 3a750bdcd02c96f7cc5fd6e56a2b29dd7fa77afc Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 24 May 2023 04:46:17 +0800 Subject: [PATCH 137/533] [irrlicht] update to <1.8.5> (#31558) * [irrlicht] update to <1.8.5> * update version * update portfile.cmake * update version --- ports/irrlicht/fix-osx-compilation.patch | 27 ++++++------------------ ports/irrlicht/fix-sysctl.patch | 12 ----------- ports/irrlicht/portfile.cmake | 9 ++++---- ports/irrlicht/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/irrlicht.json | 5 +++++ 6 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 ports/irrlicht/fix-sysctl.patch diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch index 6f623db265e214..a1daf0b5c10c63 100644 --- a/ports/irrlicht/fix-osx-compilation.patch +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -1,28 +1,13 @@ diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp -index 66144326c..4ea224c24 100644 +index 404bd53..71684d8 100644 --- a/source/Irrlicht/CImageLoaderJPG.cpp +++ b/source/Irrlicht/CImageLoaderJPG.cpp @@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo) boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) { - // DO NOTHING -- return 1; -+ return TRUE; + // DO NOTHING +- return 1; ++ return TRUE; } - - -diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -index 53029eb45..e75b707e1 100644 ---- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm -@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) - if(!CreationParams.WindowId) //load menus if standalone application - { - [[NSAutoreleasePool alloc] init]; -- [NSApplication sharedApplication]; -- [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; -+ [[NSApplication sharedApplication] activateIgnoringOtherApps]; -+ [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; - [NSApp finishLaunching]; - } + + diff --git a/ports/irrlicht/fix-sysctl.patch b/ports/irrlicht/fix-sysctl.patch deleted file mode 100644 index 98c70273ecbf48..00000000000000 --- a/ports/irrlicht/fix-sysctl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/source/Irrlicht/COSOperator.cpp -+++ b/source/Irrlicht/COSOperator.cpp -@@ -11,8 +11,8 @@ - #else - #include - #include --#ifndef _IRR_SOLARIS_PLATFORM_ - #include -+#ifdef _IRR_OSX_PLATFORM_ - #include - #endif - #endif diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 37f4ee26e888d1..4bea3839d2b14b 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO irrlicht/Irrlicht%20SDK - REF 1.8/1.8.4 - FILENAME "irrlicht-1.8.4.zip" - SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 + REF 1.8/${VERSION} + FILENAME "irrlicht-${VERSION}.zip" + SHA512 d11c7a056bfb8c9737ed583c5bc5794223bc59fb4620411b63bc4d1eedc41db2ed1cab5cb7a37fee42a7f38c0e0645f5fc53fd329fff0f2aa78e0df6804c47c9 PATCHES fix-encoding.patch - fix-sysctl.patch fix-osx-compilation.patch ) @@ -54,4 +53,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/irrlicht") endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt") diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index d795eb2634380d..93bab6e65bec92 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -1,7 +1,6 @@ { "name": "irrlicht", - "version": "1.8.4", - "port-version": 14, + "version": "1.8.5", "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", "homepage": "http://irrlicht.sourceforge.net", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 5ff060bf3242a5..9e750449e8e8d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3377,8 +3377,8 @@ "port-version": 5 }, "irrlicht": { - "baseline": "1.8.4", - "port-version": 14 + "baseline": "1.8.5", + "port-version": 0 }, "irrxml": { "baseline": "0", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index 06cd40c1b357c3..f9d7634c454f8a 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3", + "version": "1.8.5", + "port-version": 0 + }, { "git-tree": "a66d1403393733885e625b5f95fc1b7d3ed03505", "version": "1.8.4", From b1c5f22661c457db80a83abacbb47fb5c8c0f67a Mon Sep 17 00:00:00 2001 From: Adam Lugowski Date: Tue, 23 May 2023 13:47:47 -0700 Subject: [PATCH 138/533] [task-thread-pool] new port (#31570) * [task-thread-pool] new port * Fix formatting * Fix hash * Add blank line * Regenerate versions/t-/task-thread-pool.json --- ports/task-thread-pool/portfile.cmake | 13 +++++++++++++ ports/task-thread-pool/vcpkg.json | 8 ++++++++ versions/baseline.json | 4 ++++ versions/t-/task-thread-pool.json | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 ports/task-thread-pool/portfile.cmake create mode 100644 ports/task-thread-pool/vcpkg.json create mode 100644 versions/t-/task-thread-pool.json diff --git a/ports/task-thread-pool/portfile.cmake b/ports/task-thread-pool/portfile.cmake new file mode 100644 index 00000000000000..f3476542cdd1b5 --- /dev/null +++ b/ports/task-thread-pool/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alugowski/task-thread-pool + REF v${VERSION} + SHA512 8f67e4d467c16bd0986f4fbfda6e7ca74760ddf3c4333660c764c97df0a21a40f36dc5af11c47f41e1cc0eb9c498ff2ca7b93a11a32dea296181592f5a05fd1d + HEAD_REF main +) + +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp") + +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-BSD.txt" "${SOURCE_PATH}/LICENSE-Boost.txt" "${SOURCE_PATH}/LICENSE-MIT.txt") diff --git a/ports/task-thread-pool/vcpkg.json b/ports/task-thread-pool/vcpkg.json new file mode 100644 index 00000000000000..b5cc94e8678137 --- /dev/null +++ b/ports/task-thread-pool/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "task-thread-pool", + "version": "1.0.7", + "description": "Fast and lightweight thread pool for C++11 and newer.", + "homepage": "https://github.com/alugowski/task-thread-pool", + "documentation": "https://github.com/alugowski/task-thread-pool/blob/main/README.md", + "license": "BSD-2-Clause OR MIT OR BSL-1.0" +} diff --git a/versions/baseline.json b/versions/baseline.json index 9e750449e8e8d7..185025c1579a8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7856,6 +7856,10 @@ "baseline": "9.21.2-0e30f5c", "port-version": 2 }, + "task-thread-pool": { + "baseline": "1.0.7", + "port-version": 0 + }, "taskflow": { "baseline": "3.6.0", "port-version": 0 diff --git a/versions/t-/task-thread-pool.json b/versions/t-/task-thread-pool.json new file mode 100644 index 00000000000000..4cc180cdb53226 --- /dev/null +++ b/versions/t-/task-thread-pool.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b64ff5ad8b40dbfe129aabe53f11b81ba71e4743", + "version": "1.0.7", + "port-version": 0 + } + ] +} From 0a99cd4c21539ad1ed7cb4e3b64f8f8052e31b39 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 24 May 2023 06:01:26 +0800 Subject: [PATCH 139/533] [liblsquic] Fix found boringssl on debug or release (#31554) * [liblsquic] Fix found boringssl on debug or release * update version --- ports/liblsquic/fix-found-boringssl.patch | 53 +++++++++++++++++++++++ ports/liblsquic/portfile.cmake | 5 ++- ports/liblsquic/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/liblsquic.json | 5 +++ 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 ports/liblsquic/fix-found-boringssl.patch diff --git a/ports/liblsquic/fix-found-boringssl.patch b/ports/liblsquic/fix-found-boringssl.patch new file mode 100644 index 00000000000000..a3a632c5ef4fe0 --- /dev/null +++ b/ports/liblsquic/fix-found-boringssl.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5d4086a..e085a83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,10 +120,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug") + SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od") + #SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DFIU_ENABLE=1") + #SET(LIBS ${LIBS} fiu) ++ SET(LIB_NAME ssld cryptod) + ELSE() + SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Ox") + # Comment out the following line to compile out debug messages: + #SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_LOWEST_LOG_LEVEL=LSQ_LOG_INFO") ++ SET(LIB_NAME ssl crypto) + ENDIF() + + ENDIF() #MSVC +@@ -191,7 +193,7 @@ IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR) + ELSE() + + +- FOREACH(LIB_NAME ssl crypto) ++ FOREACH(LIB ${LIB_NAME}) + # If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl, + # BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via + # add_subdirectory: +@@ -201,20 +203,20 @@ ELSE() + # add_subdirectory(third_party/lsquic) + IF (DEFINED BORINGSSL_LIB) + IF (CMAKE_SYSTEM_NAME STREQUAL Windows) +- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME} +- NAMES ${LIB_NAME} ++ FIND_LIBRARY(BORINGSSL_LIB_${LIB} ++ NAMES ${LIB} + PATHS ${BORINGSSL_LIB} + PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo + NO_DEFAULT_PATH) + ELSE() +- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME} +- NAMES lib${LIB_NAME}${LIB_SUFFIX} ++ FIND_LIBRARY(BORINGSSL_LIB_${LIB} ++ NAMES lib${LI}${LIB_SUFFIX} + PATHS ${BORINGSSL_LIB} +- PATH_SUFFIXES ${LIB_NAME} ++ PATH_SUFFIXES ${LIB} + NO_DEFAULT_PATH) + ENDIF() + ENDIF() +- IF(BORINGSSL_LIB_${LIB_NAME}) ++ IF(BORINGSSL_LIB_${LIB}) + MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}") + ELSE() + MESSAGE(FATAL_ERROR "BORINGSSL_LIB_${LIB_NAME} library not found") diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake index 847500e02eaaae..b0d18b4a505a0c 100644 --- a/ports/liblsquic/portfile.cmake +++ b/ports/liblsquic/portfile.cmake @@ -9,7 +9,10 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REF v3.1.1 SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee HEAD_REF master - PATCHES disable-asan.patch) + PATCHES + disable-asan.patch + fix-found-boringssl.patch +) # Submodules vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json index 09570d93629e29..cb12234746972d 100644 --- a/ports/liblsquic/vcpkg.json +++ b/ports/liblsquic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblsquic", "version": "3.1.1", - "port-version": 1, + "port-version": 2, "description": "An implementation of the QUIC and HTTP/3 protocols.", "homepage": "https://github.com/litespeedtech/lsquic", "license": "MIT AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 185025c1579a8b..f309b7e3e9c2c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4214,7 +4214,7 @@ }, "liblsquic": { "baseline": "3.1.1", - "port-version": 1 + "port-version": 2 }, "liblzma": { "baseline": "5.4.1", diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json index 0280cb1bdaf20f..6c114d84eaf735 100644 --- a/versions/l-/liblsquic.json +++ b/versions/l-/liblsquic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9117a86afaed60857454ba0b5a5e684fc947ba56", + "version": "3.1.1", + "port-version": 2 + }, { "git-tree": "2a2383de53efd9458419db7bd82db49b342023da", "version": "3.1.1", From 2718aa52a31977b792af7e9c2f83eaf4ddcd932d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 24 May 2023 07:49:23 +0800 Subject: [PATCH 140/533] [recastnavigation] Update to 1.6.0 and use official CMakeLists (#31551) * [recast] Update to 1.6.0 and use official CMakeLists * version bump * Use VERSION instead * version * New port recastnavigation and set recast depends on it. * version * Apply suggestion * version * version * Apply suggestion * version --------- Co-authored-by: jyu49 --- ports/recast/CMakeLists.txt | 67 --------------------------- ports/recast/portfile.cmake | 25 +--------- ports/recast/vcpkg.json | 14 ++---- ports/recastnavigation/portfile.cmake | 28 +++++++++++ ports/recastnavigation/vcpkg.json | 17 +++++++ versions/baseline.json | 8 +++- versions/r-/recast.json | 5 ++ versions/r-/recastnavigation.json | 9 ++++ 8 files changed, 70 insertions(+), 103 deletions(-) delete mode 100644 ports/recast/CMakeLists.txt create mode 100644 ports/recastnavigation/portfile.cmake create mode 100644 ports/recastnavigation/vcpkg.json create mode 100644 versions/r-/recastnavigation.json diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt deleted file mode 100644 index a82f7d91d432cb..00000000000000 --- a/ports/recast/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(recast) - -set(SRC - DebugUtils/Source/DebugDraw.cpp - DebugUtils/Source/DetourDebugDraw.cpp - DebugUtils/Source/RecastDebugDraw.cpp - DebugUtils/Source/RecastDump.cpp - Detour/Source/DetourAlloc.cpp - Detour/Source/DetourCommon.cpp - Detour/Source/DetourNavMesh.cpp - Detour/Source/DetourNavMeshBuilder.cpp - Detour/Source/DetourNavMeshQuery.cpp - Detour/Source/DetourNode.cpp - DetourCrowd/Source/DetourCrowd.cpp - DetourCrowd/Source/DetourLocalBoundary.cpp - DetourCrowd/Source/DetourObstacleAvoidance.cpp - DetourCrowd/Source/DetourPathCorridor.cpp - DetourCrowd/Source/DetourPathQueue.cpp - DetourCrowd/Source/DetourProximityGrid.cpp - DetourTileCache/Source/DetourTileCache.cpp - DetourTileCache/Source/DetourTileCacheBuilder.cpp - Recast/Source/Recast.cpp - Recast/Source/RecastAlloc.cpp - Recast/Source/RecastArea.cpp - Recast/Source/RecastContour.cpp - Recast/Source/RecastFilter.cpp - Recast/Source/RecastLayers.cpp - Recast/Source/RecastMesh.cpp - Recast/Source/RecastMeshDetail.cpp - Recast/Source/RecastRasterization.cpp - Recast/Source/RecastRegion.cpp -) - -add_library(recast ${SRC}) - -target_include_directories( - recast PUBLIC - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ -) - -install( - TARGETS recast - EXPORT unofficial-recast-config - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast) - -if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils/Include) - install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour/Include) - install(DIRECTORY DetourCrowd/Include/ DESTINATION include/recast/DetourCrowd/Include) - install(DIRECTORY DetourTileCache/Include/ DESTINATION include/recast/DetourTileCache/Include) - install(DIRECTORY Recast/Include/ DESTINATION include/recast/Recast/Include) -endif() diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index ebace1d11c492a..d7c7ca948ced45 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -1,24 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO recastnavigation/recastnavigation - REF 1.5.1 - SHA512 09900d8893e0c633a79e6188d15e68d1047040a0f2bceb2542f486dded64e69b918eaae159def81416a014fae26a46502783a2a712462bee4be2a3edf7bef47f - HEAD_REF master -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) - -vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +message(WARNING "This port is a stub port retained for compatibility. Use 'recastnavigation' instead.") \ No newline at end of file diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json index 003d3d40e50cea..541b6560f3c10e 100644 --- a/ports/recast/vcpkg.json +++ b/ports/recast/vcpkg.json @@ -1,18 +1,10 @@ { "name": "recast", - "version": "1.5.1", - "port-version": 6, - "description": "Navigation-mesh Toolset for Games", + "version-string": "deprecated", + "description": "A stub package that pulls in recastnavigation. Do not depend on this package.", "homepage": "https://github.com/recastnavigation/recastnavigation", "license": "Zlib", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "recastnavigation" ] } diff --git a/ports/recastnavigation/portfile.cmake b/ports/recastnavigation/portfile.cmake new file mode 100644 index 00000000000000..69dcac3626ef37 --- /dev/null +++ b/ports/recastnavigation/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO recastnavigation/recastnavigation + REF v${VERSION} + SHA512 7567aaa78219cc490a6f76210fba1f130f0c17aeaa06432ab1207e0fd03404abe31042e8b03971aa0d04ad65d39469f13575fe0072fb920c38581d39568b70fb + HEAD_REF master +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRECASTNAVIGATION_DEMO=OFF + -DRECASTNAVIGATION_TESTS=OFF + -DRECASTNAVIGATION_EXAMPLES=OFF + +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/recastnavigation) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/recastnavigation/vcpkg.json b/ports/recastnavigation/vcpkg.json new file mode 100644 index 00000000000000..08a5e13e306096 --- /dev/null +++ b/ports/recastnavigation/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "recastnavigation", + "version": "1.6.0", + "description": "Navigation-mesh Toolset for Games", + "homepage": "https://github.com/recastnavigation/recastnavigation", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f309b7e3e9c2c8..b888aa27cc8c7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7029,8 +7029,12 @@ "port-version": 0 }, "recast": { - "baseline": "1.5.1", - "port-version": 6 + "baseline": "deprecated", + "port-version": 0 + }, + "recastnavigation": { + "baseline": "1.6.0", + "port-version": 0 }, "recycle": { "baseline": "6.0.0", diff --git a/versions/r-/recast.json b/versions/r-/recast.json index 521da8273858aa..b9f2a59db8dee0 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08f63ca8f875d78682decac6a5084cf72589ce1f", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "f6f99b923ad8fbbee1aafd0deb361f8cf7eb7bd6", "version": "1.5.1", diff --git a/versions/r-/recastnavigation.json b/versions/r-/recastnavigation.json new file mode 100644 index 00000000000000..a4b5216dc24622 --- /dev/null +++ b/versions/r-/recastnavigation.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d08244dcfe4974f58b9dd481f1e3e34414a46207", + "version": "1.6.0", + "port-version": 0 + } + ] +} From 3bd49b738c720ad4623e429eb2a73a90c5fb3257 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 24 May 2023 20:43:23 +0200 Subject: [PATCH 141/533] [vcpkg-find-acquire-program] Revise test port (#31557) * [vcpkg-find-acquire-program] Revise test port * Update * Update * Test expected fail * Revert test --- .../vcpkg-find-acquire-program/portfile.cmake | 83 ++++++++++++++----- .../vcpkg-find-acquire-program/vcpkg.json | 2 +- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake index 88a4856c5f5e1c..0316fc2b69b27d 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake +++ b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake @@ -1,21 +1,62 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -if(CMAKE_HOST_WIN32) - foreach(PROG GO JOM NASM PERL YASM GIT PYTHON3 PYTHON2 RUBY 7Z NUGET FLEX BISON GPERF GASPREPROCESSOR DARK SCONS SWIG DOXYGEN ARIA2 PKGCONFIG) - vcpkg_find_acquire_program(${PROG}) - foreach(SUBPROG IN LISTS ${PROG}) - if(NOT EXISTS "${SUBPROG}") - message(FATAL_ERROR "Program ${SUBPROG} did not exist.") - endif() - endforeach() - endforeach() -endif() - -foreach(PROG GN NINJA MESON BAZEL) - vcpkg_find_acquire_program(${PROG}) - foreach(SUBPROG IN LISTS ${PROG}) - if(NOT EXISTS "${SUBPROG}") - message(FATAL_ERROR "Program ${SUBPROG} did not exist.") - endif() - endforeach() -endforeach() +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# For each vcpkg_find_acquire_program(NAME).cmake script, +# there must be a literal call to vcpkg_find_acquire_program(NAME).cmake + +set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON2 PYTHON3 YASM) +vcpkg_find_acquire_program(BAZEL) +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(GIT) +vcpkg_find_acquire_program(GN) +vcpkg_find_acquire_program(NINJA) +vcpkg_find_acquire_program(PERL) +vcpkg_find_acquire_program(PKGCONFIG) +vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(PYTHON3) +vcpkg_find_acquire_program(YASM) + +if(NOT VCPKG_TARGET_IS_OSX) + # System python too old (3.9; meson needs 3.10) + list(APPEND variables MESON) + vcpkg_find_acquire_program(MESON) +endif() + +if(VCPKG_HOST_IS_LINUX) + list(APPEND variables PATCHELF) + vcpkg_find_acquire_program(PATCHELF) +endif() + +if(VCPKG_HOST_IS_WINDOWS) + list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET RUBY SCONS SWIG) + vcpkg_find_acquire_program(7Z) + vcpkg_find_acquire_program(ARIA2) + vcpkg_find_acquire_program(CLANG) + vcpkg_find_acquire_program(DARK) + vcpkg_find_acquire_program(DOXYGEN) + vcpkg_find_acquire_program(GASPREPROCESSOR) + vcpkg_find_acquire_program(GO) + vcpkg_find_acquire_program(GPERF) + vcpkg_find_acquire_program(JOM) + vcpkg_find_acquire_program(NASM) + vcpkg_find_acquire_program(NUGET) + vcpkg_find_acquire_program(RUBY) + vcpkg_find_acquire_program(SCONS) + vcpkg_find_acquire_program(SWIG) +endif() + +set(missing "") +foreach(variable IN LISTS variables) + list(POP_BACK "${variable}" program) + if(NOT EXISTS "${program}") + list(APPEND missing "${variable}: ${program}") + endif() + list(POP_FRONT "${variable}" interpreter) + if(interpreter AND NOT EXISTS "${interpreter}") + list(APPEND missing "${variable} (interpreter): ${interpreter}") + endif() +endforeach() +if(missing) + list(JOIN missing "\n " missing) + message(FATAL_ERROR "The following programs do not exist:\n ${missing}") +endif() diff --git a/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json index 987003b4cf0d3c..fb9166ef5b82c8 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json +++ b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json @@ -3,5 +3,5 @@ "version-string": "0", "port-version": 1, "description": "Test port to exercise vcpkg_find_acquire_program", - "supports": "windows" + "supports": "native" } From 38c74ef00ea723bcb59a0d1435cd64f297d49969 Mon Sep 17 00:00:00 2001 From: ItsBasi <5033630+ItsBasi@users.noreply.github.com> Date: Wed, 24 May 2023 20:46:25 +0200 Subject: [PATCH 142/533] [flatbuffers] Update to 23.5.9 (#31600) --- ports/flatbuffers/portfile.cmake | 4 ++-- ports/flatbuffers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flatbuffers.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index acdeb70ffe13f4..afb8009e264dfb 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers REF "v${VERSION}" - SHA512 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 + SHA512 6eb5417984782208e0fcc33285d02bb13cda526d4029e0dd58e27c4f813eb39f26105ab0ed0880f7c02614985b96a241aad5086dd4f2d131c534a44a2884d08e HEAD_REF master PATCHES fix-uwp-build.patch @@ -36,7 +36,7 @@ if(flatc_path) vcpkg_copy_tools(TOOL_NAMES flatc AUTO_CLEAN) else() file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/flatbuffers-config.cmake" -"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") +"\ninclude(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index b603a4588b9bd7..6c8746376b6a82 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flatbuffers", - "version": "23.3.3", + "version": "23.5.9", "description": [ "Memory Efficient Serialization Library", "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." diff --git a/versions/baseline.json b/versions/baseline.json index b888aa27cc8c7b..6acb5271220eea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,7 +2521,7 @@ "port-version": 0 }, "flatbuffers": { - "baseline": "23.3.3", + "baseline": "23.5.9", "port-version": 0 }, "flecs": { diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 461dd091ff3ce6..63792a3928a741 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "787f5c089a87c5896ef5f0f8b200de1d1081158c", + "version": "23.5.9", + "port-version": 0 + }, { "git-tree": "007f5be0ca9f1fb0e4cd747153edafe584f3e090", "version": "23.3.3", From 319cf43691da5aeb5c5c4aec40ad55c5d6e0122f Mon Sep 17 00:00:00 2001 From: Osyotr Date: Wed, 24 May 2023 21:57:11 +0300 Subject: [PATCH 143/533] [qt5] Apply CVE fixes (#31595) --- .../patches/CVE-2023-32762-qtbase-5.15.diff | 13 ++++++ .../patches/CVE-2023-32763-qtbase-5.15.diff | 45 +++++++++++++++++++ ports/qt5-base/patches/qtbug_96392.patch | 27 +++++++++++ ports/qt5-base/portfile.cmake | 5 +++ ports/qt5-base/vcpkg.json | 2 +- ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff | 32 +++++++++++++ ports/qt5-svg/portfile.cmake | 6 ++- ports/qt5-svg/vcpkg.json | 1 + versions/baseline.json | 4 +- versions/q-/qt5-base.json | 5 +++ versions/q-/qt5-svg.json | 5 +++ 11 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff create mode 100644 ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff create mode 100644 ports/qt5-base/patches/qtbug_96392.patch create mode 100644 ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff diff --git a/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff new file mode 100644 index 00000000000000..eec93f03362ac4 --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-32762-qtbase-5.15.diff @@ -0,0 +1,13 @@ +--- a/src/network/access/qhsts.cpp ++++ b/src/network/access/qhsts.cpp +@@ -364,8 +364,8 @@ quoted-pair = "\" CHAR + bool QHstsHeaderParser::parse(const QList> &headers) + { + for (const auto &h : headers) { +- // We use '==' since header name was already 'trimmed' for us: +- if (h.first == "Strict-Transport-Security") { ++ // We compare directly because header name was already 'trimmed' for us: ++ if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { + header = h.second; + // RFC6797, 8.1: + // diff --git a/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff new file mode 100644 index 00000000000000..a19d76948fa158 --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-32763-qtbase-5.15.diff @@ -0,0 +1,45 @@ +--- a/src/gui/painting/qfixed_p.h ++++ b/src/gui/painting/qfixed_p.h +@@ -54,6 +54,7 @@ + #include + #include "QtCore/qdebug.h" + #include "QtCore/qpoint.h" ++#include + #include "QtCore/qsize.h" + + QT_BEGIN_NAMESPACE +@@ -182,6 +183,14 @@ Q_DECL_CONSTEXPR inline bool operator<(int i, const QFixed &f) { return i * 64 < + Q_DECL_CONSTEXPR inline bool operator>(const QFixed &f, int i) { return f.value() > i * 64; } + Q_DECL_CONSTEXPR inline bool operator>(int i, const QFixed &f) { return i * 64 > f.value(); } + ++inline bool qAddOverflow(QFixed v1, QFixed v2, QFixed *r) ++{ ++ int val; ++ bool result = add_overflow(v1.value(), v2.value(), &val); ++ r->setValue(val); ++ return result; ++} ++ + #ifndef QT_NO_DEBUG_STREAM + inline QDebug &operator<<(QDebug &dbg, const QFixed &f) + { return dbg << f.toReal(); } +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -2163,11 +2163,14 @@ found: + eng->maxWidth = qMax(eng->maxWidth, line.textWidth); + } else { + eng->minWidth = qMax(eng->minWidth, lbh.minw); +- eng->maxWidth += line.textWidth; ++ if (qAddOverflow(eng->maxWidth, line.textWidth, &eng->maxWidth)) ++ eng->maxWidth = QFIXED_MAX; + } + +- if (line.textWidth > 0 && item < eng->layoutData->items.size()) +- eng->maxWidth += lbh.spaceData.textWidth; ++ if (line.textWidth > 0 && item < eng->layoutData->items.size()) { ++ if (qAddOverflow(eng->maxWidth, lbh.spaceData.textWidth, &eng->maxWidth)) ++ eng->maxWidth = QFIXED_MAX; ++ } + + line.textWidth += trailingSpace; + if (lbh.spaceData.length) { diff --git a/ports/qt5-base/patches/qtbug_96392.patch b/ports/qt5-base/patches/qtbug_96392.patch new file mode 100644 index 00000000000000..2f70dfe601a0f6 --- /dev/null +++ b/ports/qt5-base/patches/qtbug_96392.patch @@ -0,0 +1,27 @@ +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -842,7 +842,8 @@ "// Check if EGL is compatible with X. Some EGL implementations, typically on", + "// embedded devices, are not intended to be used together with X. EGL support", + "// has to be disabled in plugins like xcb in this case since the native display,", + "// window and pixmap types will be different than what an X-based platform", +- "// plugin would expect." ++ "// plugin would expect.", ++ "#define USE_X11" + ], + "include": [ "EGL/egl.h", "X11/Xlib.h" ], + "main": [ +--- a/src/platformsupport/eglconvenience/qt_egl_p.h ++++ b/src/platformsupport/eglconvenience/qt_egl_p.h +@@ -61,7 +61,11 @@ # endif + # if !defined(Q_OS_INTEGRITY) + # define WIN_INTERFACE_CUSTOM // NV + # endif // Q_OS_INTEGRITY +-#endif // QT_EGL_NO_X11 ++#else // QT_EGL_NO_X11 ++// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130 ++// that needs USE_X11 to be defined. ++# define USE_X11 ++#endif + + #ifdef QT_EGL_WAYLAND + # define WAYLAND // NV diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 8e0b300aa8c228..94923ba74692ce 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -46,12 +46,17 @@ endif() qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH PATCHES + # CVE fixes from https://download.qt.io/official_releases/qt/5.15/ + patches/CVE-2023-32762-qtbase-5.15.diff + patches/CVE-2023-32763-qtbase-5.15.diff + patches/winmain_pro.patch #Moves qtmain to manual-link patches/windows_prf.patch #fixes the qtmain dependency due to the above move patches/qt_app.patch #Moves the target location of qt5 host apps to always install into the host dir. patches/gui_configure.patch #Patches the gui configure.json to break freetype/fontconfig autodetection because it does not include its dependencies. patches/xlib.patch #Patches Xlib check to actually use Pkgconfig instead of makeSpec only patches/egl.patch #Fix egl detection logic. + patches/qtbug_96392.patch #Backport fix for QTBUG-96392 patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 09f19cc1de3fbb..0ea26af9e08924 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.9", - "port-version": 2, + "port-version": 3, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff b/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff new file mode 100644 index 00000000000000..8f60fba03ac517 --- /dev/null +++ b/ports/qt5-svg/CVE-2023-32573-qtsvg-5.15.diff @@ -0,0 +1,32 @@ +--- a/src/svg/qsvgfont_p.h ++++ b/src/svg/qsvgfont_p.h +@@ -74,6 +74,7 @@ public: + class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted + { + public: ++ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000; + QSvgFont(qreal horizAdvX); + + void setFamilyName(const QString &name); +@@ -86,9 +87,7 @@ public: + void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const; + public: + QString m_familyName; +- qreal m_unitsPerEm; +- qreal m_ascent; +- qreal m_descent; ++ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM; + qreal m_horizAdvX; + QHash m_glyphs; + }; +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -2668,7 +2668,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent, + + qreal unitsPerEm = toDouble(unitsPerEmStr); + if (!unitsPerEm) +- unitsPerEm = 1000; ++ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM; + + if (!name.isEmpty()) + font->setFamilyName(name); diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index ca67a6846fa234..1f8e4520e78e13 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -1,2 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES "static_svg_link_fix.patch") \ No newline at end of file +qt_submodule_installation( + PATCHES + "CVE-2023-32573-qtsvg-5.15.diff" # CVE fix from https://download.qt.io/official_releases/qt/5.15/ + "static_svg_link_fix.patch" +) diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 0a400ec0619ba8..003b1fa77f22c8 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-svg", "version": "5.15.9", + "port-version": 1, "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6acb5271220eea..d0e340550cf8a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6538,7 +6538,7 @@ }, "qt5-base": { "baseline": "5.15.9", - "port-version": 2 + "port-version": 3 }, "qt5-canvas3d": { "baseline": "0", @@ -6642,7 +6642,7 @@ }, "qt5-svg": { "baseline": "5.15.9", - "port-version": 0 + "port-version": 1 }, "qt5-tools": { "baseline": "5.15.9", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 8c462bbda19deb..c3dac43b92cb6d 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9107483664812c119937623d402bea6395c24cd3", + "version": "5.15.9", + "port-version": 3 + }, { "git-tree": "1137d1509e996fa4bde14ec310c6955b50408c8a", "version": "5.15.9", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 88dd8b5d669c82..c382d4e1897517 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a16175a9771d1e7556bcfb785956f0ce5afc26fb", + "version": "5.15.9", + "port-version": 1 + }, { "git-tree": "2182d0b3d29d1e3c4cf58c5a93e896f304d86805", "version": "5.15.9", From bb03d33e6e7fb2b0b5281edbfddcb07e306d2c27 Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 24 May 2023 21:57:44 +0300 Subject: [PATCH 144/533] [sobjectizer] Update to 5.7.4.3 (#31591) * SObjectizer updated to v.5.7.4.3. * x-add-version used for SObjectizer-5.7.4.3. * Update ports/sobjectizer/portfile.cmake Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * Fix hash for SObjectizer 5.7.4.3. * Apply x-add-version for updated SObjectizer. --------- Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/sobjectizer/portfile.cmake | 4 ++-- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sobjectizer.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 282bc713401523..a98071ea25f97c 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer - REF df7c3ee91b29079ae4e3525c34ad83a0d4e83d77 # v.5.7.4.2 - SHA512 4caee3a95723c9564fbd5430492cc82513885ca17003e18b31378fc347ed8ad1b0859bd1693ecaaf514e8f82b86c07d1913a86f007250e2f28a77adfa03918b1 + REF "v.${VERSION}" + SHA512 7bdd89ac3fefa2df4813872f34ab74183352addbb559c06d04f943a71de779add115da030ef96ba29708672a1daa6e72ccba72de39c4c02cbea173ea029874ad ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 995f4865f1966a..af737b50221270 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.4.2", + "version": "5.7.4.3", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d0e340550cf8a8..94d22217978d6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7537,7 +7537,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.4.2", + "baseline": "5.7.4.3", "port-version": 0 }, "soci": { diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 246303007d44b1..c2ff686142a113 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52eda985aee5e14e16a47573154b39f069824d49", + "version": "5.7.4.3", + "port-version": 0 + }, { "git-tree": "a77d86943e98697db670f9ee10fd24e8d19f08ce", "version": "5.7.4.2", From 9a5d4bd1dbaa8e54737d4ad5d5eab4244d439d1d Mon Sep 17 00:00:00 2001 From: Vanilla Date: Thu, 25 May 2023 02:58:54 +0800 Subject: [PATCH 145/533] [folly]: fix build with gcc 13. (#31586) --- ports/folly/fix-build-with-gcc-13.patch | 27 +++++++++++++++++++++++++ ports/folly/portfile.cmake | 1 + ports/folly/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 ports/folly/fix-build-with-gcc-13.patch diff --git a/ports/folly/fix-build-with-gcc-13.patch b/ports/folly/fix-build-with-gcc-13.patch new file mode 100644 index 00000000000000..9b33c8b4456fc0 --- /dev/null +++ b/ports/folly/fix-build-with-gcc-13.patch @@ -0,0 +1,27 @@ +From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 22 Jan 2023 05:06:16 +0000 +Subject: [PATCH] Fix build with GCC 13 (add missing includes) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so etc is no longer transitively included. + +Signed-off-by: Sam James +--- + folly/system/AtFork.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/folly/system/AtFork.cpp b/folly/system/AtFork.cpp +index e888e52858a..a5570330dc3 100644 +--- a/folly/system/AtFork.cpp ++++ b/folly/system/AtFork.cpp +@@ -14,6 +14,9 @@ + * limitations under the License. + */ + ++#include ++#include ++ + #include + + #include diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 9b421a6203f748..bc7730c884a91a 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( boost-1.70.patch fix-windows-minmax.patch fix-deps.patch + fix-build-with-gcc-13.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 3d6ec5b774096a..592927b476a620 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2022.10.31.00", - "port-version": 6, + "port-version": 7, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 94d22217978d6a..cb13f5736c691f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2562,7 +2562,7 @@ }, "folly": { "baseline": "2022.10.31.00", - "port-version": 6 + "port-version": 7 }, "font-chef": { "baseline": "1.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 290ef385592883..7e6326416b1082 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "003ae8b1bc9dc0a460b5c6f6cacda76fa5931cf8", + "version-string": "2022.10.31.00", + "port-version": 7 + }, { "git-tree": "204d88dbc53dc5ff37c58459c1af0c6f19f446db", "version-string": "2022.10.31.00", From 28d4723662cafb7111fb45e28ae8d6b31cd789bc Mon Sep 17 00:00:00 2001 From: sonodima <62671493+sonodima@users.noreply.github.com> Date: Wed, 24 May 2023 20:59:22 +0200 Subject: [PATCH 146/533] [wmipp] Update to 1.2.0 (#31583) * bumped wmipp version to 1.2.0 * wmipp updated version metadata * [wmipp] removed blank line from portfile * rebuilt version database --- ports/wmipp/portfile.cmake | 3 +-- ports/wmipp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wmipp.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/wmipp/portfile.cmake b/ports/wmipp/portfile.cmake index f884d3b69b5e39..202e47bbfa92a6 100644 --- a/ports/wmipp/portfile.cmake +++ b/ports/wmipp/portfile.cmake @@ -2,8 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sonodima/wmipp REF "v${VERSION}" - - SHA512 e52ad6edadcb5b56c941d18e10968f10ea4fbbb0773132c2eb929e83cbf4aa22b72a161f55b358541e27786ff7f967786eb156b7ff519f8d3449d8b5ef2aa727 + SHA512 3cfa7bacc1e03077503fa04e636106ce5bfc66a3fce25e52033433c2328a62229fdf7baad4a0116459fb0c299839ea02507fe8da43c853b9dd8bcfcb3d2301d3 HEAD_REF main ) diff --git a/ports/wmipp/vcpkg.json b/ports/wmipp/vcpkg.json index 0e3e704dc2940f..981421e15c4608 100644 --- a/ports/wmipp/vcpkg.json +++ b/ports/wmipp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wmipp", - "version": "1.0.0", + "version": "1.2.0", "description": "Streamlined Windows Management Instrumentation (WMI) integration for seamless C++ development", "homepage": "https://github.com/sonodima/wmipp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index cb13f5736c691f..f653e3241486b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8593,7 +8593,7 @@ "port-version": 2 }, "wmipp": { - "baseline": "1.0.0", + "baseline": "1.2.0", "port-version": 0 }, "woff2": { diff --git a/versions/w-/wmipp.json b/versions/w-/wmipp.json index 6736b82d786f41..1afd5fe3f1c59d 100644 --- a/versions/w-/wmipp.json +++ b/versions/w-/wmipp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62fe399df24f53348677d6ee7af427a6d0018aaf", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "70a7cc2553e70e4a9e6f50110b0e8b6eedb8c0f9", "version": "1.0.0", From f5b0415c5454cba9d8e28cddfbd15f1e16415197 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Wed, 24 May 2023 21:03:18 +0200 Subject: [PATCH 147/533] [hidapi] Update to 0.14.0 (#31574) * Updated hidapi to 0.14.0 Added new feature pp-data-dump, to make the build of the new pp_data_dump.exe developer tool optional * Use vcpkg_copy_tools for pp_data_dump * Removed unnecessary added empty lines from portfile * Use ${VERSION} variable in portfile instead of hardcoded version number --- ports/hidapi/portfile.cmake | 14 ++++++++++++-- ports/hidapi/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/h-/hidapi.json | 5 +++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 212d585934c97b..12d98903a478e7 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,14 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF hidapi-0.13.1 - SHA512 07b224b9b5146caf693e6d67514fed236436ed68f38a3ada98ebf8352dfaa4e175f576902affb4b79da1bb8c9b47a1ee0831a93c7d3d210e93faee24632f7d53 + REF hidapi-${VERSION} + SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "pp-data-dump" HIDAPI_BUILD_PP_DATA_DUMP +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DHIDAPI_BUILD_HIDTEST=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -16,6 +22,10 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +if ("pp-data-dump" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pp_data_dump AUTO_CLEAN) +endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/libhidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index 3bb2b328aa4060..5473ce745c6310 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hidapi", - "version-semver": "0.13.1", + "version-semver": "0.14.0", "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", "license": "BSD-3-Clause-Clear", @@ -18,5 +18,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "pp-data-dump": { + "description": "Build pp_data_dump.exe tool, to store WIN32 HidD Preparsed Data as file", + "supports": "windows" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index f653e3241486b5..ae5a0aa095bd94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3121,7 +3121,7 @@ "port-version": 0 }, "hidapi": { - "baseline": "0.13.1", + "baseline": "0.14.0", "port-version": 0 }, "highfive": { diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index 22044b723f1ad6..343bc28221845c 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef7fae56bd9bec8a3b50d4ab3f87ba7537ea330b", + "version-semver": "0.14.0", + "port-version": 0 + }, { "git-tree": "7deb8cf068244c5583ce565bf1d302b369ed622b", "version-semver": "0.13.1", From b9fc501b62755bbfd2f3375fca9bf9ea8cfa5e2a Mon Sep 17 00:00:00 2001 From: Doug Cook <45909143+idigdoug@users.noreply.github.com> Date: Wed, 24 May 2023 12:10:01 -0700 Subject: [PATCH 148/533] libtracepoint, libeventheader-tracepoint, libeventheader-decode (#31571) * New ports: libtracepoint, libeventheader-decode, libeventheader-tracepoint * Versions: libtracepoint, libeventheader-decode, libeventheader-tracepoint --- ports/libeventheader-decode/portfile.cmake | 24 ++++++++++++ ports/libeventheader-decode/vcpkg.json | 22 +++++++++++ .../libeventheader-tracepoint/portfile.cmake | 37 +++++++++++++++++++ ports/libeventheader-tracepoint/vcpkg.json | 22 +++++++++++ ports/libtracepoint/portfile.cmake | 37 +++++++++++++++++++ ports/libtracepoint/vcpkg.json | 18 +++++++++ versions/baseline.json | 12 ++++++ versions/l-/libeventheader-decode.json | 9 +++++ versions/l-/libeventheader-tracepoint.json | 9 +++++ versions/l-/libtracepoint.json | 9 +++++ 10 files changed, 199 insertions(+) create mode 100644 ports/libeventheader-decode/portfile.cmake create mode 100644 ports/libeventheader-decode/vcpkg.json create mode 100644 ports/libeventheader-tracepoint/portfile.cmake create mode 100644 ports/libeventheader-tracepoint/vcpkg.json create mode 100644 ports/libtracepoint/portfile.cmake create mode 100644 ports/libtracepoint/vcpkg.json create mode 100644 versions/l-/libeventheader-decode.json create mode 100644 versions/l-/libeventheader-tracepoint.json create mode 100644 versions/l-/libtracepoint.json diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake new file mode 100644 index 00000000000000..6708c2f2a369ff --- /dev/null +++ b/ports/libeventheader-decode/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 + SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libeventheader-decode-cpp" + OPTIONS + -DBUILD_SAMPLES=OFF + -DBUILD_TOOLS=OFF) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_cmake_config_fixup( + PACKAGE_NAME eventheader-decode + CONFIG_PATH lib/cmake/eventheader-decode) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json new file mode 100644 index 00000000000000..e83b558e554a74 --- /dev/null +++ b/ports/libeventheader-decode/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libeventheader-decode", + "version": "1.0.0", + "description": "EventHeader tracepoint decoding classes for C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "libeventheader-tracepoint", + "version>=": "1.0.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake new file mode 100644 index 00000000000000..d151d6d643b6a0 --- /dev/null +++ b/ports/libeventheader-tracepoint/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_BUILD_TYPE release) # Windows port only includes headers. +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 + SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libeventheader-tracepoint" + OPTIONS + -DBUILD_SAMPLES=OFF + -DBUILD_TOOLS=OFF) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup( + PACKAGE_NAME eventheader-tracepoint + CONFIG_PATH lib/cmake/eventheader-tracepoint + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endif() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME eventheader-headers + CONFIG_PATH lib/cmake/eventheader-headers) + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json new file mode 100644 index 00000000000000..a9e3c7d14a1893 --- /dev/null +++ b/ports/libeventheader-tracepoint/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libeventheader-tracepoint", + "version": "1.0.0", + "description": "EventHeader-encoded Linux tracepoints for C/C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "libtracepoint", + "version>=": "1.0.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake new file mode 100644 index 00000000000000..6431b4668bb6c8 --- /dev/null +++ b/ports/libtracepoint/portfile.cmake @@ -0,0 +1,37 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_BUILD_TYPE release) # Windows port only includes headers. +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 + SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libtracepoint" + OPTIONS + -DBUILD_SAMPLES=OFF + -DBUILD_TESTS=OFF) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup( + PACKAGE_NAME tracepoint + CONFIG_PATH lib/cmake/tracepoint + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endif() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME tracepoint-headers + CONFIG_PATH lib/cmake/tracepoint-headers) + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json new file mode 100644 index 00000000000000..9db1f1d3abcf0d --- /dev/null +++ b/ports/libtracepoint/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libtracepoint", + "version": "1.0.0", + "description": "Linux tracepoints interface for C/C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ae5a0aa095bd94..6e102a0b0bd76f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3992,6 +3992,14 @@ "baseline": "2.1.12+20230128", "port-version": 0 }, + "libeventheader-decode": { + "baseline": "1.0.0", + "port-version": 0 + }, + "libeventheader-tracepoint": { + "baseline": "1.0.0", + "port-version": 0 + }, "libevhtp": { "baseline": "1.2.18", "port-version": 5 @@ -4624,6 +4632,10 @@ "baseline": "2.0.9", "port-version": 0 }, + "libtracepoint": { + "baseline": "1.0.0", + "port-version": 0 + }, "libu2f-server": { "baseline": "1.1.0", "port-version": 5 diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json new file mode 100644 index 00000000000000..5e32bf698f15fb --- /dev/null +++ b/versions/l-/libeventheader-decode.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fd67531cc60d91c4d8b45da15cd7414b398b9cd7", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json new file mode 100644 index 00000000000000..556d9c4ff6046e --- /dev/null +++ b/versions/l-/libeventheader-tracepoint.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d8ba8b72bb5c6dde050b85f84e01efb6b36d535c", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json new file mode 100644 index 00000000000000..8a14f9ee300b2d --- /dev/null +++ b/versions/l-/libtracepoint.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f60f9a909a55a04c9bc87b6a3e10df5f0faec1a4", + "version": "1.0.0", + "port-version": 0 + } + ] +} From a4c3f116fa18a4ca42f47652e937e070507b49e5 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Wed, 24 May 2023 15:14:06 -0400 Subject: [PATCH 149/533] [osgearth] Update to version 3.4 (#31569) * [osgearth] Update to version 3.4 * Fix patch indentation * Add missing dependency * Fix tool installation --- ports/osgearth/find-package.patch | 18 ++--- ports/osgearth/fix-osgearth-config.patch | 86 ------------------------ ports/osgearth/portfile.cmake | 10 +-- ports/osgearth/remove-lerc-gltf.patch | 18 +++-- ports/osgearth/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/o-/osgearth.json | 5 ++ 7 files changed, 31 insertions(+), 114 deletions(-) delete mode 100644 ports/osgearth/fix-osgearth-config.patch diff --git a/ports/osgearth/find-package.patch b/ports/osgearth/find-package.patch index 5b0de3e10a9da0..135b1447705ba8 100644 --- a/ports/osgearth/find-package.patch +++ b/ports/osgearth/find-package.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 36ea6c81f..8ed39eb24 100755 +index cf8245b8b..233390a5f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -124,9 +124,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit +@@ -127,9 +127,9 @@ mark_as_advanced(OSGEARTH_ASSUME_SINGLE_GL_CONTEXT) # Mobile/GLES: IF (OSGEARTH_USE_GLES) @@ -14,7 +14,7 @@ index 36ea6c81f..8ed39eb24 100755 ENDIF (OSGEARTH_USE_GLES) -@@ -144,35 +144,54 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +@@ -147,35 +147,54 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") endif() # required @@ -44,7 +44,7 @@ index 36ea6c81f..8ed39eb24 100755 -find_package(Protobuf) -find_package(WEBP) -find_package(Blend2D) --find_package(blosc) +-find_package(Blosc) +find_package(GEOS CONFIG REQUIRED) +set(GEOS_LIBRARY GEOS::geos_c) +find_package(SQLITE3 NAMES unofficial-sqlite3 REQUIRED) @@ -67,8 +67,8 @@ index 36ea6c81f..8ed39eb24 100755 endif() if(OSGEARTH_BUILD_ZIP_PLUGIN) -- find_package(LIBZIP) -+ find_package(LIBZIP CONFIG REQUIRED) +- find_package(LibZip) ++ find_package(libzip CONFIG REQUIRED) + set(LIBZIP_LIBRARY libzip::zip) endif() @@ -83,7 +83,7 @@ index 36ea6c81f..8ed39eb24 100755 endif() # Sqlite enables the MBTiles format: -@@ -214,7 +233,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile +@@ -221,7 +240,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile # Duktape is the JavaScript interpreter SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") IF (WITH_EXTERNAL_DUKTAPE) @@ -92,7 +92,7 @@ index 36ea6c81f..8ed39eb24 100755 ENDIF (WITH_EXTERNAL_DUKTAPE) # Whether to install shaders (glsl files). -@@ -225,7 +244,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak +@@ -232,7 +251,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak # TinyXML is an XML parsing library SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") IF (WITH_EXTERNAL_TINYXML) @@ -102,7 +102,7 @@ index 36ea6c81f..8ed39eb24 100755 ENDIF (WITH_EXTERNAL_TINYXML) # postfix settings for various configs -@@ -300,6 +320,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) +@@ -307,6 +327,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED") ELSE() SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") diff --git a/ports/osgearth/fix-osgearth-config.patch b/ports/osgearth/fix-osgearth-config.patch deleted file mode 100644 index 1da0de4568f2e6..00000000000000 --- a/ports/osgearth/fix-osgearth-config.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in -index 3f27dffe9..c787e7668 100644 ---- a/osgEarthConfig.cmake.in -+++ b/osgEarthConfig.cmake.in -@@ -6,52 +6,54 @@ set(XPREFIX OSGEARTH) - - - --if (osgearth_USE_STATIC_LIBS) -+if (osgEarth_USE_STATIC_LIBS) - set(XPREFIX ${XPREFIX}_STATIC) - endif() - --set(osgearth_DEFINITIONS ${${XPREFIX}_CFLAGS}) -+set(osgEarth_DEFINITIONS ${${XPREFIX}_CFLAGS}) - --find_path(osgearth_INCLUDE_DIR -- NAMES OSGEARTH/RTREE.H -+find_path(osgEarth_INCLUDE_DIR -+ NAMES osgEarth/rtree.h - HINTS ${${XPREFIX}_INCLUDE_DIRS} - ) - --set(OSGEARTH_NAMES osgearth) -+set(OSGEARTH_NAMES osgEarth) - --find_library(osgearth_LIBRARY -+find_library(osgEarth_LIBRARY - NAMES ${OSGEARTH_NAMES} - HINTS ${${XPREFIX}_LIBRARY_DIRS} - ) - --set(osgearth_LIBRARIES ${osgearth_LIBRARY}) --set(osgearth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) --set(osgearth_LIBRARY_DIR ${osgearth_LIBRARY_DIRS}) --set(osgearth_INCLUDE_DIRS ${osgearth_INCLUDE_DIR}) --set(osgearth_LDFLAGS ${${XPREFIX}_LDFLAGS}) -+set(osgEarth_LIBRARIES ${osgEarth_LIBRARY}) -+set(osgEarth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) -+set(osgEarth_LIBRARY_DIR ${osgEarth_LIBRARY_DIRS}) -+set(osgEarth_INCLUDE_DIRS ${osgEarth_INCLUDE_DIR}) -+set(osgEarth_LDFLAGS ${${XPREFIX}_LDFLAGS}) - - include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(osgearth DEFAULT_MSG -- osgearth_LIBRARY -- osgearth_INCLUDE_DIR -+find_package_handle_standard_args(osgEarth DEFAULT_MSG -+ osgEarth_LIBRARY -+ osgEarth_INCLUDE_DIR - ) - --string (REPLACE ";" " " osgearth_LDFLAGS "${osgearth_LDFLAGS}") -+string (REPLACE ";" " " osgEarth_LDFLAGS "${osgEarth_LDFLAGS}") - --set_target_properties(osgearth -+add_library(osgEarth UNKNOWN IMPORTED) -+ -+set_target_properties(osgEarth - PROPERTIES -- IMPORTED_LOCATION "${osgearth_LIBRARIES}" -- INTERFACE_INCLUDE_DIRECTORIES "${osgearth_INCLUDE_DIRS}" -- INTERFACE_LINK_LIBRARIES "${osgearth_LDFLAGS}" -- INTERFACE_COMPILE_OPTIONS "${osgearth_DEFINITIONS}" -+ IMPORTED_LOCATION "${osgEarth_LIBRARIES}" -+ INTERFACE_INCLUDE_DIRECTORIES "${osgEarth_INCLUDE_DIRS}" -+ INTERFACE_LINK_LIBRARIES "${osgEarth_LDFLAGS}" -+ INTERFACE_COMPILE_OPTIONS "${osgEarth_DEFINITIONS}" - ) - -- message(STATUS "osgearth_FOUND: ${osgearth_FOUND}") -- message(STATUS "osgearth_INCLUDE_DIRS: ${osgearth_INCLUDE_DIRS}") -- message(STATUS "osgearth_LIBRARIES: ${osgearth_LIBRARIES}") -- message(STATUS "osgearth_LDFLAGS: ${osgearth_LDFLAGS}") -- message(STATUS "osgearth_DEFINITIONS: ${osgearth_DEFINITIONS}") -+ message(STATUS "osgEarth_FOUND: ${osgEarth_FOUND}") -+ message(STATUS "osgEarth_INCLUDE_DIRS: ${osgEarth_INCLUDE_DIRS}") -+ message(STATUS "osgEarth_LIBRARIES: ${osgEarth_LIBRARIES}") -+ message(STATUS "osgEarth_LDFLAGS: ${osgEarth_LDFLAGS}") -+ message(STATUS "osgEarth_DEFINITIONS: ${osgEarth_DEFINITIONS}") - - - --check_required_components(osgearth) -\ No newline at end of file -+check_required_components(osgEarth) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index e74a4bd5203004..f38385cd4b1143 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF 6b5fb806a9190f7425c32db65d3ea905a55a9c16 #version 3.3 - SHA512 fe79ce6c73341f83d4aee8cb4da5341dead56a92f998212f7898079b79725f46b2209d64e68fe3b4d99d3c5c25775a8efd1bf3c3b3a049d4f609d3e30172d3bf + REF "osgearth-${VERSION}" + SHA512 f65c31922bebcbf722474a047dc29c8c1ceec9c037b0704811af2627fc2d0a124b6e95888e7d3b9b0e5acc146a88ebf8669e3f864a75a91751c3a4571d05a630 HEAD_REF master PATCHES link-libraries.patch find-package.patch remove-tool-debug-suffix.patch remove-lerc-gltf.patch - fix-osgearth-config.patch export-plugins.patch ) @@ -86,11 +85,12 @@ if("tools" IN_LIST FEATURES) file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/${osg_plugins_subdir}") endif() endif() - vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp - osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_bakefeaturetiles osgearth_boundarygen + osgearth_clamp osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer osgearth_createtile osgearth_mvtindex AUTO_CLEAN ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/osgearth/remove-lerc-gltf.patch b/ports/osgearth/remove-lerc-gltf.patch index 4c6f0fdb26989f..e39fbfab6a4dd2 100644 --- a/ports/osgearth/remove-lerc-gltf.patch +++ b/ports/osgearth/remove-lerc-gltf.patch @@ -1,8 +1,8 @@ diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt -index d178f951b..010896310 100644 +index 79acbe9c4..89e28b141 100644 --- a/src/osgEarthDrivers/CMakeLists.txt +++ b/src/osgEarthDrivers/CMakeLists.txt -@@ -30,7 +30,6 @@ add_subdirectory(earth) +@@ -31,7 +31,6 @@ add_subdirectory(earth) add_subdirectory(engine_rex) add_subdirectory(featurefilter_intersect) add_subdirectory(featurefilter_join) @@ -10,11 +10,9 @@ index d178f951b..010896310 100644 add_subdirectory(kml) add_subdirectory(mapinspector) add_subdirectory(monitor) -@@ -40,7 +39,6 @@ add_subdirectory(sky_simple) - add_subdirectory(template) - add_subdirectory(terrainshader) - add_subdirectory(webp) --add_subdirectory(lerc) - add_subdirectory(vdatum_egm2008) - add_subdirectory(vdatum_egm84) - add_subdirectory(vdatum_egm96) +@@ -61,5 +60,4 @@ endif() + + IF(NOT APPLE AND NOT ANDROID) + add_subdirectory(fastdxt) +- add_subdirectory(lerc) + ENDIF() diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 86d921ec2c3dac..36d07a1f686268 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,13 +1,13 @@ { "name": "osgearth", - "version": "3.3", - "port-version": 7, + "version": "3.4", "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", "supports": "!(arm | x86 | wasm32)", "dependencies": [ "basisu", + "blosc", "cfitsio", "draco", "geos", diff --git a/versions/baseline.json b/versions/baseline.json index 6e102a0b0bd76f..1048e7662afffb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6065,8 +6065,8 @@ "port-version": 3 }, "osgearth": { - "baseline": "3.3", - "port-version": 7 + "baseline": "3.4", + "port-version": 0 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 50486c76689f06..c438f5d8e839b2 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "765cddcfc821c355b20c1fed7a43f181f8eb0817", + "version": "3.4", + "port-version": 0 + }, { "git-tree": "c39e21352cff6e65fe8f6315ee9b7828143e0eb8", "version": "3.3", From 5ad9850efe94dc46ea8ecf9a4b5a23b59455ff44 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 24 May 2023 21:20:14 +0200 Subject: [PATCH 150/533] [gdal] fix tools feature (#31545) --- ports/gdal/portfile.cmake | 1 + ports/gdal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 723fd52ed3a294..511fe7f17e5e2b 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -137,6 +137,7 @@ if (BUILD_APPS) gdalmdimtranslate gnmanalyse gnmmanage + sozip AUTO_CLEAN ) endif() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index ee25a2732919f9..dd609c9bc0b2c3 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.7.0", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 1048e7662afffb..ccb06701b8a02e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2722,7 +2722,7 @@ }, "gdal": { "baseline": "3.7.0", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 60f2d6c3b4b02f..f0c01df5897f6f 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "119c87c321a3a925253f5503cfac1e6960d5923e", + "version-semver": "3.7.0", + "port-version": 1 + }, { "git-tree": "befcd2fe67a87498bfdaea5601b58f120e984038", "version-semver": "3.7.0", From d856a6560e1297f97e906c889f5bea673721b97f Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Wed, 24 May 2023 12:22:49 -0700 Subject: [PATCH 151/533] [cppgraphqlgen] Update to v4.5.3 (#31448) * [cppgraphqlgen] Update to v4.5.3 * Run vcpkg x-add-version --all * Use VERSION variable in REF to stay in sync * Run vcpkg x-add-version --overwrite-version cppgraphqlgen --- ports/cppgraphqlgen/portfile.cmake | 4 ++-- ports/cppgraphqlgen/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppgraphqlgen.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 4642f320b62d1e..8d13d570e969ad 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.5.1 - SHA512 a4539d09eabecc7dc0c6715796db4915c8ac602fc1650b8a212b2a09168be15eb0992646fd5b577b7c7c06d8f77e808dae2481027ceb053c96e5b5eabd560103 + REF "v${VERSION}" + SHA512 0a41306862bc9f370fb369bd0cdc015fd15b95179ac2de60d8d412a26d385044177d1ca6e730e96e2ff0b0ffabcfe0246fdd3d926348641a145cd2894eb9cb7f HEAD_REF main ) diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 87a2f745436728..7b0f0279e5e4d8 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version": "4.5.1", + "version": "4.5.3", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ccb06701b8a02e..a8adf5c482799c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1793,7 +1793,7 @@ "port-version": 2 }, "cppgraphqlgen": { - "baseline": "4.5.1", + "baseline": "4.5.3", "port-version": 0 }, "cppitertools": { diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index 1d5f320679e880..8bf2f00f8955b4 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d87ba9b4921a48271c8c6abbe7e9c3f96651b4f", + "version": "4.5.3", + "port-version": 0 + }, { "git-tree": "28aa180fcf127016dd1d8ceca4fd964228af191a", "version": "4.5.1", From 357604e844c2e9d2a82fc21702f0d525071f3dbd Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 25 May 2023 03:42:04 +0800 Subject: [PATCH 152/533] [osg] Change OPENGL_PROFILE to GL2 (#26120) * [osg] Change OPENGL_PROFILE to GL2 * x-add-version * resolve conflicts * Update usage * update version * Update osg.json --- ports/osg/portfile.cmake | 2 +- ports/osg/usage | 5 +++-- ports/osg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/osg.json | 5 +++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 99c09ebec6b79b..868e6ddb59e584 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -74,7 +74,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # The package osg can be configured to use different OpenGL profiles via a custom triplet file: # Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3, and GLES2+GLES3 if(NOT DEFINED osg_OPENGL_PROFILE) - set(osg_OPENGL_PROFILE "GL3") + set(osg_OPENGL_PROFILE "GL2") endif() # Plugin control variables are used only if prerequisites are satisfied. diff --git a/ports/osg/usage b/ports/osg/usage index 51e9c25a58b14c..7b7388febe6337 100644 --- a/ports/osg/usage +++ b/ports/osg/usage @@ -1,4 +1,5 @@ The package osg can be configured to use different OpenGL profiles via a custom triplet file. Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3. -The default value is GL3. -set(osg_OPENGL_PROFILE GL2) +The default value is GL2. If you want use other profiles, please add the following +code to a custom triplet file. +set(osg_OPENGL_PROFILE GL3) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 34daa77fea1bf0..9cf0765685839b 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 18, + "port-version": 19, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a8adf5c482799c..e4e64fc10ba386 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6058,7 +6058,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 18 + "port-version": 19 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 2db46a0915d37f..1b99314dceea00 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50d656eed69f1bb2d38d5ead688d555f4faf8224", + "version": "3.6.5", + "port-version": 19 + }, { "git-tree": "cb957f4950031c9c7fedfbcfe1ba698cc435dedd", "version": "3.6.5", From 78a727b60864afa46c3c73148e6780b02de25ef5 Mon Sep 17 00:00:00 2001 From: Brain Date: Wed, 24 May 2023 23:30:45 +0100 Subject: [PATCH 153/533] [DPP] Bump to version 10.0.24 (#31568) * [bot] Update DPP to v10.0.24 * Update portfile.cmake * Update ports/dpp/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update dpp.json * remove unused * Update dpp.json --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/dpp/portfile.cmake | 6 +----- ports/dpp/remove-wrong-header.patch | 13 ------------- ports/dpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/dpp.json | 5 +++++ 5 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 ports/dpp/remove-wrong-header.patch diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index baa1c840c8fbcb..99c8e6052736be 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,10 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 18bbb7d2c1385d179cac9ded31d1b11e8d24f172e7ffe2ba79071203e1e2f277657e21d660b18ee4b849bc093d350f4bc5401702400084b56c3ebd6f03ce28df - HEAD_REF master - PATCHES - remove-wrong-header.patch + SHA512 2f1e5415c121d5f19d2abb1b389512ad22c3cac6779ed897403d430b2c4e62c758ab25d46a3fd02538add711073fadd616a690b4981f3782e46c18ff05d116dc ) vcpkg_cmake_configure( @@ -27,4 +24,3 @@ endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - diff --git a/ports/dpp/remove-wrong-header.patch b/ports/dpp/remove-wrong-header.patch deleted file mode 100644 index a1ae8fb5044298..00000000000000 --- a/ports/dpp/remove-wrong-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/dpp/user.cpp b/src/dpp/user.cpp -index 0f5bce1..cdd7903 100644 ---- a/src/dpp/user.cpp -+++ b/src/dpp/user.cpp -@@ -22,7 +22,7 @@ - #include - #include - #include --#include "user.h" -+// #include "user.h" - - using json = nlohmann::json; - diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 74348aaaf50e09..016e2b4faadea1 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dpp", - "version": "10.0.23", - "port-version": 1, + "version": "10.0.24", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e4e64fc10ba386..ec1ac7c1a97fb9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2161,8 +2161,8 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.23", - "port-version": 1 + "baseline": "10.0.24", + "port-version": 0 }, "draco": { "baseline": "1.5.6", diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index a05124cc09d4f9..58f1cc79fdc057 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c631e7b3f93d40c4aea0d65e722e1ff1ac028ac", + "version": "10.0.24", + "port-version": 0 + }, { "git-tree": "f5258ce203526b7be2ba77c9ab6deb7a197273af", "version": "10.0.23", From 24a3b63e6b2a2f9ae71483b83148e3cf8ea7bd0e Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Thu, 25 May 2023 20:39:42 +0200 Subject: [PATCH 154/533] vcpkg - make it compatible with non wayland systems (#31520) --- ports/tracy/005-fix-imgui-path-legacy.patch | 13 +++++++++++++ ports/tracy/portfile.cmake | 2 ++ ports/tracy/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tracy.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/tracy/005-fix-imgui-path-legacy.patch diff --git a/ports/tracy/005-fix-imgui-path-legacy.patch b/ports/tracy/005-fix-imgui-path-legacy.patch new file mode 100644 index 00000000000000..a8b5abea241a12 --- /dev/null +++ b/ports/tracy/005-fix-imgui-path-legacy.patch @@ -0,0 +1,13 @@ +diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk +index 24765f1a..dc2923c8 100644 +--- a/profiler/build/unix/legacy.mk ++++ b/profiler/build/unix/legacy.mk +@@ -1,7 +1,7 @@ + CFLAGS += + CXXFLAGS := $(CFLAGS) -std=c++17 + DEFINES += -DIMGUI_ENABLE_FREETYPE +-INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui ++INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) + LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl + + PROJECT := Tracy diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 2e1bd15c90b127..33c50cc12b2e21 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( 002-fix-capstone-5.patch 003-fix-imgui-path.patch 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 + 005-fix-imgui-path-legacy.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -84,6 +85,7 @@ function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" OUTPUT_VARIABLE relative_path_makefile_dir) + set(ENV{LEGACY} 1) vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 0a7ffdbd85be4a..0353c4cc4f2304 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tracy", "version-semver": "0.9.1", + "port-version": 1, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ec1ac7c1a97fb9..a8037e26c11c62 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8130,7 +8130,7 @@ }, "tracy": { "baseline": "0.9.1", - "port-version": 0 + "port-version": 1 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 380053bc215ac1..48efad1c12aeb3 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77e2063ccf000ddf44db90335335b0d87efe0bf4", + "version-semver": "0.9.1", + "port-version": 1 + }, { "git-tree": "1dbe1080d7c00eb3aa76f87c8c62511d9d9671a7", "version-semver": "0.9.1", From 210149f5995d1727dcd733aea4e3c6b324f691f6 Mon Sep 17 00:00:00 2001 From: sean <43609023+spnda@users.noreply.github.com> Date: Thu, 25 May 2023 20:43:57 +0200 Subject: [PATCH 155/533] [fastgltf] Update to 0.5.0 (#31541) * [fastgltf] Update to 0.5.0 * Versions * Fix fastgltf CI baseline * Update 0.5.0 & update hash * Update hash * Update hash --- ports/fastgltf/find_package.patch | 13 +++++++++++++ ports/fastgltf/portfile.cmake | 3 ++- ports/fastgltf/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/f-/fastgltf.json | 5 +++++ 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 ports/fastgltf/find_package.patch diff --git a/ports/fastgltf/find_package.patch b/ports/fastgltf/find_package.patch new file mode 100644 index 00000000000000..fb2a533962b208 --- /dev/null +++ b/ports/fastgltf/find_package.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a311b65..bfbfbb3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,6 +74,8 @@ if (FASTGLTF_DOWNLOAD_SIMDJSON) + NAMESPACE fastgltf:: + DESTINATION lib/cmake/fastgltf + ) ++else() ++ find_package(simdjson CONFIG REQUIRED) + endif() + + # Create the library target diff --git a/ports/fastgltf/portfile.cmake b/ports/fastgltf/portfile.cmake index c4bad4e528ccaa..c2c42c8ac38639 100644 --- a/ports/fastgltf/portfile.cmake +++ b/ports/fastgltf/portfile.cmake @@ -2,8 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO spnda/fastgltf REF "v${VERSION}" - SHA512 a1456790a44b8d172e19425835d28e5a48994b8494b3f4b197dbab77c049816eead73cfc978e3ef6d41084799f4875b15ef88020357404d278f35189969d69d2 + SHA512 85b946f9ea849bcbbb77ff5d4dc8196d3348757cf6a940be1a50923158a31aa7b43aebed2799256cb3d303a81fa28e5eaeb000b6ecca3ab15f6a7a20908d8e8f HEAD_REF main + PATCHES find_package.patch ) vcpkg_cmake_configure( diff --git a/ports/fastgltf/vcpkg.json b/ports/fastgltf/vcpkg.json index 2ae4ba43d9bc35..febb0b262b9a49 100644 --- a/ports/fastgltf/vcpkg.json +++ b/ports/fastgltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastgltf", - "version": "0.4.0", + "version": "0.5.0", "description": "Blazing fast C++17 glTF 2.0 loader powered by SIMD", "homepage": "https://github.com/spnda/fastgltf", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4c9dab800c597..26398672777a09 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -381,8 +381,6 @@ evpp:arm-neon-android=fail evpp:arm64-android=fail evpp:x64-android=fail faiss:arm64-windows=fail -fastgltf:arm-neon-android=fail -fastgltf:arm64-android=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index a8037e26c11c62..4f9d38ec8257aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2429,7 +2429,7 @@ "port-version": 4 }, "fastgltf": { - "baseline": "0.4.0", + "baseline": "0.5.0", "port-version": 0 }, "fastio": { diff --git a/versions/f-/fastgltf.json b/versions/f-/fastgltf.json index e1307bb6d6f24d..d88e24b5e52544 100644 --- a/versions/f-/fastgltf.json +++ b/versions/f-/fastgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fdd22bd96978abf4f7d8b8fef6406eb8d79ec3f", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "b74244ec99460cdaf1e81a401e423fe6975ce252", "version": "0.4.0", From eaa1a7da28f69939225330d14ce74217df657112 Mon Sep 17 00:00:00 2001 From: Ryan McKenzie Date: Thu, 25 May 2023 11:44:39 -0700 Subject: [PATCH 156/533] [rsm-mmio] Update to 2.0.0 (#31616) * bump version to 2.0.0 * cleanup typo * formatting * add license id * update version db --- ports/rsm-mmio/portfile.cmake | 4 ++-- ports/rsm-mmio/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/r-/rsm-mmio.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/rsm-mmio/portfile.cmake b/ports/rsm-mmio/portfile.cmake index cec066167175f0..83bc1f462c824c 100644 --- a/ports/rsm-mmio/portfile.cmake +++ b/ports/rsm-mmio/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/mmio - REF 1.1.0 - SHA512 54c63c345d9e0a284d13078d525fcbe73d793462968121fee89a19c810cdac736aca9c81f4c8b4f5ea51db1c47ad0c55e7cea38772049e4939b0d6e280f9a332 + REF 2.0.0 + SHA512 a1b0d586c12708233c0379b16a9f60bab27f12cb414736ee245e37888622ac352e834a58808127087788f930311125e2b26e6dad156c72e68143f95910cda48f HEAD_REF main ) diff --git a/ports/rsm-mmio/vcpkg.json b/ports/rsm-mmio/vcpkg.json index b88664f9c89b99..f88d47d5e8d8da 100644 --- a/ports/rsm-mmio/vcpkg.json +++ b/ports/rsm-mmio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "rsm-mmio", - "version-semver": "1.1.0", - "port-version": 2, - "description": "A cross-platform memory-mapped io library for C++ ", + "version-semver": "2.0.0", + "description": "A cross-platform memory-mapped io library for C++", "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", + "license": "MIT", "supports": "!osx & !uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 4f9d38ec8257aa..64f957f7de9066 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7169,8 +7169,8 @@ "port-version": 0 }, "rsm-mmio": { - "baseline": "1.1.0", - "port-version": 2 + "baseline": "2.0.0", + "port-version": 0 }, "rsocket": { "baseline": "2021.08.30.00", diff --git a/versions/r-/rsm-mmio.json b/versions/r-/rsm-mmio.json index 31ae61086639b9..7f14bad7728fd9 100644 --- a/versions/r-/rsm-mmio.json +++ b/versions/r-/rsm-mmio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e1a7d844e1e48dab00aab46943a739a4fe2f3e4", + "version-semver": "2.0.0", + "port-version": 0 + }, { "git-tree": "b64c5538a5de9cc3e4e516ba97f437480b94c6f0", "version-semver": "1.1.0", From 582a7ef7a0dc5cdda5c015e98f57c97218e18c32 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 25 May 2023 20:46:43 +0200 Subject: [PATCH 157/533] [minizip-ng] Restore non-conflicting filepaths (#31612) --- ports/minizip-ng/portfile.cmake | 4 ++-- ports/minizip-ng/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/minizip-ng.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 6be6a4bf29f6ba..5b0cd5868e3fd8 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DMZ_FETCH_LIBS=OFF - -DMZ_PROJECT_SUFFIX:STRING=-ng + -DMZ_LIB_SUFFIX=-ng ) vcpkg_cmake_install() @@ -41,4 +41,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index 81d38cc07226df..5d83b7facfed15 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "minizip-ng", "version": "4.0.0", + "port-version": 1, "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 64f957f7de9066..60d20d515918dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5298,7 +5298,7 @@ }, "minizip-ng": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "mio": { "baseline": "2023-03-03", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 4a22dba9fb6088..511750c2fdf74c 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e55bf50acfd71d5f37f98bee270ff687f65219f", + "version": "4.0.0", + "port-version": 1 + }, { "git-tree": "f9a2226720f5e72647d6b0399f9c0bd5baf8f9b9", "version": "4.0.0", From a9e8ed2469bdc653350b7e0f6ddba7549db6425e Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 26 May 2023 01:08:27 +0300 Subject: [PATCH 158/533] [gdal] Don't depend on default features of proj (#31606) --- ports/gdal/vcpkg.json | 15 ++++++++++++--- ports/libgeotiff/vcpkg.json | 10 ++++++++-- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ versions/l-/libgeotiff.json | 5 +++++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index dd609c9bc0b2c3..9f678b98cd6306 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.7.0", - "port-version": 1, + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -13,8 +13,17 @@ "name": "pkgconf", "host": true }, - "proj", - "tiff", + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + }, + { + "name": "tiff", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index 6a4f05b5b4ac5a..5305df2f043b7a 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,12 +1,18 @@ { "name": "libgeotiff", "version": "1.7.1", - "port-version": 2, + "port-version": 3, "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", "license": "MIT", "dependencies": [ - "proj", + { + "name": "proj", + "default-features": false, + "features": [ + "tiff" + ] + }, { "name": "tiff", "default-features": false diff --git a/versions/baseline.json b/versions/baseline.json index 60d20d515918dc..3348bf67388bc3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2722,7 +2722,7 @@ }, "gdal": { "baseline": "3.7.0", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.22", @@ -4058,7 +4058,7 @@ }, "libgeotiff": { "baseline": "1.7.1", - "port-version": 2 + "port-version": 3 }, "libgit2": { "baseline": "1.4.2", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index f0c01df5897f6f..a067e14cfef789 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f287b8dfcfba6e4f2d8ee8cdba0e63f0ae326fd7", + "version-semver": "3.7.0", + "port-version": 2 + }, { "git-tree": "119c87c321a3a925253f5503cfac1e6960d5923e", "version-semver": "3.7.0", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index c539bb5dadc345..d231b03aba5867 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f42371900964fce2757e37ad8d36ca2b7bd0dfd8", + "version": "1.7.1", + "port-version": 3 + }, { "git-tree": "2397fd7d09c89af1810821e9b4c47ec71e2748c5", "version": "1.7.1", From 4edb1e4f1452a6925a5ed3ca9f8cb8854ca8b173 Mon Sep 17 00:00:00 2001 From: Samuel Kogler Date: Fri, 26 May 2023 00:28:37 +0200 Subject: [PATCH 159/533] [platform-folders] Fix incorrect install location for .cmake file (#31605) * [platform-folders] Fix incorrect install location for .cmake file * [platform-folders] Update vcpkg version after fix --- ports/platform-folders/portfile.cmake | 2 +- ports/platform-folders/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/platform-folders.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index 9cb354f57595d1..df06adb9e6e26c 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -26,7 +26,7 @@ endif() if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MinGW) vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH cmake) else() - vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake) + vcpkg_cmake_config_fixup(PACKAGE_NAME platform_folders CONFIG_PATH lib/cmake/platform_folders) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/platform-folders/vcpkg.json b/ports/platform-folders/vcpkg.json index ac2e0c27ed0d8c..2c6ae3d6218dec 100644 --- a/ports/platform-folders/vcpkg.json +++ b/ports/platform-folders/vcpkg.json @@ -1,6 +1,7 @@ { "name": "platform-folders", "version": "4.2.0", + "port-version": 1, "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"", "homepage": "https://github.com/sago007/PlatformFolders", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3348bf67388bc3..2cd67931adec81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6266,7 +6266,7 @@ }, "platform-folders": { "baseline": "4.2.0", - "port-version": 0 + "port-version": 1 }, "plf-colony": { "baseline": "6.33", diff --git a/versions/p-/platform-folders.json b/versions/p-/platform-folders.json index bd92441933dff6..80c0445cfa63e3 100644 --- a/versions/p-/platform-folders.json +++ b/versions/p-/platform-folders.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf5e8d5b3192a857b2e85276a2ff8c6f76e28d82", + "version": "4.2.0", + "port-version": 1 + }, { "git-tree": "8448d41ddd7f2f2302c9a6a80dde44bb8494b096", "version": "4.2.0", From 08d69d5e5bbbc40aa9db71957e008c67535d99f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Fri, 26 May 2023 00:30:37 +0200 Subject: [PATCH 160/533] [blake3] Update port to use official buildsystem (#31602) * [blake3] Update port to use official buildsystem * [blake3] Add version to database * [blake3] Force correct filenames * [blake3] Add version to database * [blake3] Backport DSO/DLL support * [blake3] Add version to database --- ports/blake3/CMakeLists.txt | 65 ------------------------------------- ports/blake3/portfile.cmake | 39 +++++++++++++++++++--- ports/blake3/vcpkg.json | 5 +++ versions/b-/blake3.json | 5 +++ versions/baseline.json | 2 +- 5 files changed, 45 insertions(+), 71 deletions(-) delete mode 100644 ports/blake3/CMakeLists.txt diff --git a/ports/blake3/CMakeLists.txt b/ports/blake3/CMakeLists.txt deleted file mode 100644 index 1ef6c3893f272e..00000000000000 --- a/ports/blake3/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -cmake_minimum_required(VERSION 3.19) - -project(blake3 LANGUAGES C) - -add_library(blake3) - -target_sources(blake3 PRIVATE - c/blake3.c - c/blake3_dispatch.c - c/blake3_portable.c -) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_AVX512=1) - target_sources(blake3 PRIVATE - c/blake3_avx2.c - c/blake3_sse2.c - c/blake3_sse41.c - ) - if(NOT MSVC) - set_source_files_properties(c/blake3_avx2.c COMPILE_FLAGS -mavx2) - set_source_files_properties(c/blake3_sse2.c COMPILE_FLAGS -msse2) - set_source_files_properties(c/blake3_sse41.c COMPILE_FLAGS -msse4.1) - endif() -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - if(WIN32 AND MSVC) - enable_language(ASM_MASM) - target_sources(blake3 PRIVATE - c/blake3_avx2_x86-64_windows_msvc.asm - c/blake3_sse2_x86-64_windows_msvc.asm - c/blake3_sse41_x86-64_windows_msvc.asm - c/blake3_avx512_x86-64_windows_msvc.asm - ) - elseif(WIN32 AND NOT MSVC) - enable_language(ASM) - target_sources(blake3 PRIVATE - c/blake3_avx2_x86-64_windows_gnu.S - c/blake3_sse2_x86-64_windows_gnu.S - c/blake3_sse41_x86-64_windows_gnu.S - c/blake3_avx512_x86-64_windows_gnu.S - ) - else() - enable_language(ASM) - target_sources(blake3 PRIVATE - c/blake3_avx2_x86-64_unix.S - c/blake3_sse2_x86-64_unix.S - c/blake3_sse41_x86-64_unix.S - c/blake3_avx512_x86-64_unix.S - ) - endif() -else() - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_SSE2=1 BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1 BLAKE3_NO_AVX512=1) -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON=1) - target_sources(blake3 PRIVATE - c/blake3_neon.c - ) -else() - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_NEON=1) -endif() - -install(TARGETS blake3) -install(FILES c/blake3.h DESTINATION include) diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake index 85d73c206e23a4..23e2bcdd87940e 100644 --- a/ports/blake3/portfile.cmake +++ b/ports/blake3/portfile.cmake @@ -1,20 +1,49 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE3-team/BLAKE3 - REF 1.3.3 + REF "${VERSION}" SHA512 3ea57a86af7357582479ed5d762d368ee52421636c72723b08f528f9bf53637bad0058c5aded0b9a1b9479f374f5d3b110677e00c2b1124a47bfcdac800c2836 HEAD_REF main ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +# these four files are included in the next release +vcpkg_download_distfile( + CMAKELISTS_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/CMakeLists.txt + FILENAME blake3-CMakeLists.txt + SHA512 598699b90053fdbe381843f886c213f5e6d03281a9b8c1403726c300e83a9da353879da7170637024663af576e54f74a307049577360ded90d25e11bd852edde +) +vcpkg_download_distfile( + CMAKECONFIGIN_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3-config.cmake.in + FILENAME blake3-config.cmake.in + SHA512 f9bdb41bd4e4930ab31624f484f895fbda57066a4b3e0a38e7ffefab7343779d1c356fbaf6231643fd069f7a176b840f234f74d9f9ee4167cc430d7bfec0f40f +) +vcpkg_download_distfile( + PKGCONFIGIN_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/libblake3.pc.in + FILENAME libblake3.pc.in + SHA512 cfbaea63368e655c3ac3357f791b6332ae0241f3fd4f98e19c48f28e633e25a5b1125d1cc6b4815edfd013a76379dffcf9723852a7b76f2910d19dc77e538fa2 +) +vcpkg_download_distfile( # we need the dllexport macro (otherwise these files are identical) + BLAKE3_H_SOURCE_PATH + URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3.h + FILENAME blake3.h + SHA512 0f9852ff0e527e8fe0d567408c5c100ee3707a1b942ac1fbd78208a68ecfd32814729b5082720278d25d4cf45eb1020fcf3e4199cab0a67a6ca6af4321bcbc3e +) +file(COPY_FILE "${CMAKELISTS_SOURCE_PATH}" "${SOURCE_PATH}/c/CMakeLists.txt") +file(COPY_FILE "${CMAKECONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3-config.cmake.in") +file(COPY_FILE "${PKGCONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/libblake3.pc.in") +file(COPY_FILE "${BLAKE3_H_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3.h") vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/c" ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json index 1672cb66cb676b..cc5f7d369f51f2 100644 --- a/ports/blake3/vcpkg.json +++ b/ports/blake3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "blake3", "version": "1.3.3", + "port-version": 1, "description": "BLAKE3 cryptographic hash function.", "homepage": "https://github.com/BLAKE3-team/BLAKE3", "license": "CC0-1.0 OR Apache-2.0", @@ -8,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json index 1d73c6e3076057..41456f9181b710 100644 --- a/versions/b-/blake3.json +++ b/versions/b-/blake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13ac9cc003839e6730587218103f4912e7886311", + "version": "1.3.3", + "port-version": 1 + }, { "git-tree": "707d127029e3c2e2c2216fba6e36247ce43414b3", "version": "1.3.3", diff --git a/versions/baseline.json b/versions/baseline.json index 2cd67931adec81..34c108bf678cf9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -586,7 +586,7 @@ }, "blake3": { "baseline": "1.3.3", - "port-version": 0 + "port-version": 1 }, "blas": { "baseline": "2023-03-25", From c6592ce60ff394049905365865f59e3a4d93d35b Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 26 May 2023 06:33:51 +0800 Subject: [PATCH 161/533] [podofo] Change to github and update version to 0.10.0 (#31584) * [podofo] Change to github and update version to 0.10.0 * update version * fix static export * v db * fix export name and add usage * v db * disable build libxml2 features * format * v db --- ports/podofo/0002-HAVE_UNISTD_H.patch | 15 ----- ports/podofo/0003-uwp_fix.patch | 15 ----- ports/podofo/0005-fix-crypto.patch | 29 ---------- ports/podofo/fix-compiler.patch | 12 ---- ports/podofo/fix-x64-osx.patch | 13 ----- ports/podofo/freetype.patch | 18 ------ ports/podofo/install-cmake-config.patch | 77 +++++++++++++------------ ports/podofo/portfile.cmake | 25 ++------ ports/podofo/usage | 4 ++ ports/podofo/vcpkg.json | 6 +- versions/baseline.json | 2 +- versions/p-/podofo.json | 5 ++ 12 files changed, 61 insertions(+), 160 deletions(-) delete mode 100644 ports/podofo/0002-HAVE_UNISTD_H.patch delete mode 100644 ports/podofo/0003-uwp_fix.patch delete mode 100644 ports/podofo/0005-fix-crypto.patch delete mode 100644 ports/podofo/fix-compiler.patch delete mode 100644 ports/podofo/fix-x64-osx.patch delete mode 100644 ports/podofo/freetype.patch create mode 100644 ports/podofo/usage diff --git a/ports/podofo/0002-HAVE_UNISTD_H.patch b/ports/podofo/0002-HAVE_UNISTD_H.patch deleted file mode 100644 index 6aed4b27972ec5..00000000000000 --- a/ports/podofo/0002-HAVE_UNISTD_H.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/podofo_config.h.in b/podofo_config.h.in -index fea9ada..a813c7b 100644 ---- a/podofo_config.h.in -+++ b/podofo_config.h.in -@@ -59,3 +59,10 @@ - #cmakedefine PODOFO_HAVE_OPENSSL_NO_RC4 - #cmakedefine PODOFO_HAVE_LIBIDN - #cmakedefine PODOFO_HAVE_UNISTRING_LIB -+ -+/* Fix build for MacOS 10.13 */ -+#if defined(__APPLE__) && !defined(__IOS__) -+#cmakedefine01 HAVE_UNISTD_H -+#else -+#cmakedefine HAVE_UNISTD_H -+#endif diff --git a/ports/podofo/0003-uwp_fix.patch b/ports/podofo/0003-uwp_fix.patch deleted file mode 100644 index 4801447c7f9421..00000000000000 --- a/ports/podofo/0003-uwp_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/podofo/base/PdfCompilerCompat.h b/src/podofo/base/PdfCompilerCompat.h -index 146731d..7041712 100644 ---- a/src/podofo/base/PdfCompilerCompat.h -+++ b/src/podofo/base/PdfCompilerCompat.h -@@ -113,6 +113,10 @@ - #define NOMINMAX - #endif - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -+#include -+#endif -+ - // Integer types - fixed size types guaranteed to work anywhere - // because we detect the right underlying type name to use with - // CMake. Use typedefs rather than macros for saner error messages diff --git a/ports/podofo/0005-fix-crypto.patch b/ports/podofo/0005-fix-crypto.patch deleted file mode 100644 index a873ee4c9efa19..00000000000000 --- a/ports/podofo/0005-fix-crypto.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f23dd5a..fd9e8ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -315,11 +315,12 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) - FIND_PACKAGE(ZLIB REQUIRED) - MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") - --FIND_PACKAGE(LIBCRYPTO) -+FIND_PACKAGE(OpenSSL) - --IF(LIBCRYPTO_FOUND) -+IF(OpenSSL_FOUND) - SET(PODOFO_HAVE_OPENSSL TRUE) -- INCLUDE_DIRECTORIES(${LIBCRYPTO_INCLUDE_DIR}) -+ LIST(APPEND OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) -+ ADD_DEFINITIONS(-DPODOFO_HAVE_OPENSSL_1_1) - MESSAGE("Found OpenSSL's libCrypto headers in ${LIBCRYPTO_INCLUDE_DIR}, library at ${LIBCRYPTO_LIBRARIES}") - ELSE(LIBCRYPTO_FOUND) - MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") -@@ -396,8 +397,6 @@ ENDIF(CppUnit_FOUND) - - ENDIF(NOT PODOFO_BUILD_LIB_ONLY) - --FIND_PACKAGE(OpenSSL) -- - FIND_PACKAGE(FREETYPE REQUIRED) - MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") - diff --git a/ports/podofo/fix-compiler.patch b/ports/podofo/fix-compiler.patch deleted file mode 100644 index e698da3e041ac4..00000000000000 --- a/ports/podofo/fix-compiler.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt -index 16f0798..12fc0e8 100644 ---- a/src/podofo/CMakeLists.txt -+++ b/src/podofo/CMakeLists.txt -@@ -1,5 +1,7 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - -+set(CMAKE_CXX_STANDARD 14) -+ - IF(NOT PODOFO_MAIN_CMAKELISTS_READ) - MESSAGE(FATAL_ERROR "Run cmake on the CMakeLists.txt in the project root, not the one in the 'src' directory. You will need to delete CMakeCache.txt from the current directory.") - ENDIF(NOT PODOFO_MAIN_CMAKELISTS_READ) diff --git a/ports/podofo/fix-x64-osx.patch b/ports/podofo/fix-x64-osx.patch deleted file mode 100644 index 621f0f68e8e43e..00000000000000 --- a/ports/podofo/fix-x64-osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/podofo/base/PdfDate.cpp b/src/podofo/base/PdfDate.cpp -index cefa221..75d80e4 100644 ---- a/src/podofo/base/PdfDate.cpp -+++ b/src/podofo/base/PdfDate.cpp -@@ -196,7 +196,7 @@ PdfDate::PdfDate( const PdfString & sDate ) - - strncpy(m_szDate,sDate.GetString(),PDF_DATE_BUFFER_SIZE); - -- struct tm _tm{}; -+ struct tm _tm; memset (&_tm, 0, sizeof(struct tm)); - _tm.tm_mday = 1; - - const char * pszDate = sDate.GetString(); diff --git a/ports/podofo/freetype.patch b/ports/podofo/freetype.patch deleted file mode 100644 index f241690f719136..00000000000000 --- a/ports/podofo/freetype.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/modules/FindFREETYPE.cmake b/cmake/modules/FindFREETYPE.cmake -index 41114798f..0911dc092 100644 ---- a/cmake/modules/FindFREETYPE.cmake -+++ b/cmake/modules/FindFREETYPE.cmake -@@ -15,9 +15,13 @@ SET(FREETYPE_FIND_QUIETLY 1) - # first we try to find ft2build.h in the new location as - # of freetype 2.5.1 - FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h -+ PATHS - /usr/include/freetype2 - /usr/local/include/freetype2 - /usr/X11/include/freetype2 -+ PATH_SUFFIXES -+ freetype2 -+ include/freetype2 - NO_CMAKE_SYSTEM_PATH - ) - diff --git a/ports/podofo/install-cmake-config.patch b/ports/podofo/install-cmake-config.patch index 1373e5839ba39c..90881aa7264613 100644 --- a/ports/podofo/install-cmake-config.patch +++ b/ports/podofo/install-cmake-config.patch @@ -1,49 +1,52 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index df623ef..8e653b8 100644 +index 597847b..da988ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -569,10 +569,4 @@ CONFIGURE_FILE(${PoDoFo_SOURCE_DIR}/podofo_config.h.in ${PoDoFo_BINARY_DIR}/podo +@@ -258,11 +258,6 @@ endif() # To use these dependencies set PODOFO_DIR to the podofo BUILD directory in # your build (eg -DPODOFO_DIR=/path/to/podofo when running cmake to configure - # the app that'll use podofo). See: FIND_PACKAGE(...) in the cmake docs. --IF(PODOFO_BUILD_SHARED) -- EXPORT(TARGETS podofo_shared FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake") --ENDIF(PODOFO_BUILD_SHARED) --IF(PODOFO_BUILD_STATIC) -- EXPORT(TARGETS podofo_static FILE "${CMAKE_CURRENT_BINARY_DIR}/PoDoFoConfig.cmake") --ENDIF(PODOFO_BUILD_STATIC) + # the app that'll use podofo). See: find_package(...) in the cmake docs. +-if(PODOFO_BUILD_SHARED) +- export(TARGETS podofo_shared FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") +-else() +- export(TARGETS podofo_static podofo_private FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") +-endif() + # Enable packaging + set(CPACK_PACKAGE_DESCRIPTION "A C++ PDF manipulation library") diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt -index bba6b5f..16f0798 100644 +index 3a148fb..4ca1420 100644 --- a/src/podofo/CMakeLists.txt +++ b/src/podofo/CMakeLists.txt -@@ -275,10 +275,14 @@ IF(PODOFO_BUILD_STATIC) - CACHE INTERNAL "Which PoDoFo library variant to depend on") - SET(USING_SHARED_PODOFO FALSE) - INSTALL(TARGETS podofo_static -+ EXPORT PoDoFoConfig - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "${LIBDIRNAME}" - ARCHIVE DESTINATION "${LIBDIRNAME}" - ) -+ INSTALL(EXPORT PoDoFoConfig +@@ -77,11 +77,15 @@ if(PODOFO_BUILD_STATIC) + CLEAN_DIRECT_OUTPUT 1 + OUTPUT_NAME "podofo" + ) +- install(TARGETS podofo_static ++ install(TARGETS podofo_static podofo_private ++ EXPORT podofo-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ install(EXPORT podofo-config + DESTINATION share/podofo -+ ) - ENDIF(PODOFO_BUILD_STATIC) - - IF(PODOFO_BUILD_SHARED) -@@ -301,10 +305,14 @@ IF(PODOFO_BUILD_SHARED) - CACHE INTERNAL "Which PoDoFo library variant to depend on") - SET(USING_SHARED_PODOFO TRUE) - INSTALL(TARGETS podofo_shared -+ EXPORT PoDoFoConfig - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "${LIBDIRNAME}" - ARCHIVE DESTINATION "${LIBDIRNAME}" - ) -+ INSTALL(EXPORT PoDoFoConfig ++ ) + set(PODOFO_LIBRARIES podofo_static podofo_private + CACHE INTERNAL "Which podofo library variant to depend on") + endif() +@@ -102,10 +106,14 @@ if(PODOFO_BUILD_SHARED) + # Since we're building a shared podofo, prefer to depend on this one for + # tests and tools over the static library (if built). + install(TARGETS podofo_shared ++ EXPORT podofo-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++ install(EXPORT podofo-config + DESTINATION share/podofo -+ ) - ++ ) - # Create a pkg-config file for linking against shared library + # Create a pkg-config file for linking against shared library + # if pkg-config is available on the system. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index d9cc0308bb4d8e..491499529d54bb 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -1,23 +1,11 @@ -set(PODOFO_VERSION 0.9.8) -if (VCPKG_TARGET_IS_UWP) - set(ADDITIONAL_PATCH "0003-uwp_fix.patch") -endif() - -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo - REF ${PODOFO_VERSION} - FILENAME "podofo-${PODOFO_VERSION}.tar.gz" - SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1 + REF "${VERSION}" + SHA512 674024af031392253bc9ea02e392fa7b4a5c8894f3129e05f27133774ccf8b696e225789e886dedbe90bc2323c318b76e79857453a56d6014d7a5514e3f861a2 PATCHES - 0002-HAVE_UNISTD_H.patch - freetype.patch - ${ADDITIONAL_PATCH} - 0005-fix-crypto.patch - fix-x64-osx.patch install-cmake-config.patch - fix-compiler.patch ) set(PODOFO_NO_FONTMANAGER ON) @@ -25,7 +13,6 @@ if("fontconfig" IN_LIST FEATURES) set(PODOFO_NO_FONTMANAGER OFF) endif() -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PODOFO_BUILD_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PODOFO_BUILD_STATIC) set(IS_WIN32 OFF) @@ -40,7 +27,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPODOFO_BUILD_LIB_ONLY=1 - -DPODOFO_BUILD_SHARED=${PODOFO_BUILD_SHARED} -DPODOFO_BUILD_STATIC=${PODOFO_BUILD_STATIC} -DPODOFO_NO_FONTMANAGER=${PODOFO_NO_FONTMANAGER} -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=${PODOFO_NO_FONTMANAGER} @@ -57,7 +43,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/PoDoFoConfig.cmake" +vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/podofo-config.cmake" "# Create imported target podofo_shared" [[ include(CMakeFindDependencyMacro) @@ -71,4 +57,5 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/podofo/usage b/ports/podofo/usage new file mode 100644 index 00000000000000..b21f4bb792ea9d --- /dev/null +++ b/ports/podofo/usage @@ -0,0 +1,4 @@ +podofo provides CMake targets: + + find_package(podofo CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,podofo_shared,podofo_static>) diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index d27ed0bfc1615b..a0e505d94c8cba 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "podofo", - "version": "0.9.8", + "version": "0.10.0", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://sourceforge.net/projects/podofo/", "license": "LGPL-2.0-only", @@ -9,6 +9,10 @@ "freetype", "libjpeg-turbo", "libpng", + { + "name": "libxml2", + "default-features": false + }, "openssl", "tiff", { diff --git a/versions/baseline.json b/versions/baseline.json index 34c108bf678cf9..0692e59f36d3bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6325,7 +6325,7 @@ "port-version": 4 }, "podofo": { - "baseline": "0.9.8", + "baseline": "0.10.0", "port-version": 0 }, "poissonrecon": { diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 8d6ab713507d5b..c8293e554a91c8 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "179964b988c6b05e259e8e631b2a3db4539589a1", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "e302c730989d9f85b236c00b51e44dd067af7e6d", "version": "0.9.8", From 5511010e18b3248f6e8c5ca3e27426df99b06de8 Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Fri, 26 May 2023 16:36:03 -0400 Subject: [PATCH 162/533] [bshoshany-thread-pool] Updated to v3.5.0 (#31640) * [bshoshany-thread-pool] Updated to v3.5.0 * [bshoshany-thread-pool] Updated to v3.5.0 --- ports/bshoshany-thread-pool/portfile.cmake | 26 +++++++++++----------- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index 8143da5e035a5a..dd8589ea9ffc58 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,13 +1,13 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO bshoshany/thread-pool - REF v3.4.0 - SHA512 4eea216422ea7fd6df52589e84fefb34248fe56fd0bbdcc5c33ae21c0ba6b950ec74a31eeea144edfc22444f6777dc09f668fd3ed5236604e0c7de62e45381a7 - HEAD_REF master -) - -file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") - -file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bshoshany/thread-pool + REF "v${VERSION}" + SHA512 43200acf989adbabc0478d847931d2e46c4ce13de9d28f2e603e6b86d38a7370c0e50bacd36bff5a1a200f33ae6394764adc64ce9a54df5e418d85fb525b4b3f + HEAD_REF master +) + +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/include/*.hpp") + +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 8c69c8efac619e..38abafcd5b819c 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "3.4.0", + "version": "3.5.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index c43dd8be092894..d652925cf28dc0 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed9b93bfd6a7031b7d96fa5443873f4c2634a049", + "version": "3.5.0", + "port-version": 0 + }, { "git-tree": "e7d60a5fc41c5f4aa283aeb1527a4bc8b55e934c", "version": "3.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0692e59f36d3bc..078f2f72b8edd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1277,7 +1277,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.4.0", + "baseline": "3.5.0", "port-version": 0 }, "bsio": { From 3637f5824d6b760dae4f29191c5388f79c674914 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 27 May 2023 00:38:50 +0400 Subject: [PATCH 163/533] [opencl] fixed installation rules (#31627) * opencl: fixed installation rules * Update version database --- ports/opencl/portfile.cmake | 4 ++-- ports/opencl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/opencl.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index 393d4f67fcac2a..ead33b72a8da87 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -68,10 +68,10 @@ else() endif() elseif(VCPKG_TARGET_IS_OSX) if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) endif() if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() endif() endif() diff --git a/ports/opencl/vcpkg.json b/ports/opencl/vcpkg.json index fd108491c41c3a..33b43e394f9584 100644 --- a/ports/opencl/vcpkg.json +++ b/ports/opencl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencl", "version-string": "v2023.02.06", + "port-version": 1, "description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL", "homepage": "https://github.com/KhronosGroup/OpenCL-Headers", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 078f2f72b8edd4..3826f01fc13dcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5874,7 +5874,7 @@ }, "opencl": { "baseline": "v2023.02.06", - "port-version": 0 + "port-version": 1 }, "opencolorio": { "baseline": "2.1.2", diff --git a/versions/o-/opencl.json b/versions/o-/opencl.json index 13cd9405748ead..747c0e128c9c0b 100644 --- a/versions/o-/opencl.json +++ b/versions/o-/opencl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d206a1716a411eb9862c98d65ab3552def0c6492", + "version-string": "v2023.02.06", + "port-version": 1 + }, { "git-tree": "2bdf9379777f48897786b5a69d395325c0eb4aec", "version-string": "v2023.02.06", From 76f90a98f8a8bb932902cc51d2d61e4efa113020 Mon Sep 17 00:00:00 2001 From: recsater Date: Sat, 27 May 2023 05:43:07 +0900 Subject: [PATCH 164/533] [cppzmq] draft dependency update (#31624) * [cppzmq] draft dependency update cppzmq's draft feature need zeromq draft but it was not included. * Update baseline.json * Update cppzmq.json * Update ports/cppzmq/vcpkg.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update cppzmq.json * format * version --------- Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: FrankXie --- ports/cppzmq/vcpkg.json | 12 +++++++++++- versions/baseline.json | 2 +- versions/c-/cppzmq.json | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/cppzmq/vcpkg.json b/ports/cppzmq/vcpkg.json index be1541be7584c2..a76d194ee89ac5 100644 --- a/ports/cppzmq/vcpkg.json +++ b/ports/cppzmq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cppzmq", "version": "4.9.0", + "port-version": 1, "description": "Header-only C++ binding for ZeroMQ", "homepage": "https://github.com/zeromq/cppzmq", "license": "MIT", @@ -17,7 +18,16 @@ ], "features": { "draft": { - "description": "Build and install draft" + "description": "Build and install draft", + "dependencies": [ + { + "name": "zeromq", + "default-features": false, + "features": [ + "draft" + ] + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 3826f01fc13dcd..3589c96c3fce06 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1838,7 +1838,7 @@ }, "cppzmq": { "baseline": "4.9.0", - "port-version": 0 + "port-version": 1 }, "cpr": { "baseline": "1.10.2+3", diff --git a/versions/c-/cppzmq.json b/versions/c-/cppzmq.json index 8b0863a0d1358e..674c7104a3ffa7 100644 --- a/versions/c-/cppzmq.json +++ b/versions/c-/cppzmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f50d93799a1982bbbdd22e88c7a784f9a7e38368", + "version": "4.9.0", + "port-version": 1 + }, { "git-tree": "7f4360cc5fa484c4ecd286ef6c545bde4b01bc39", "version": "4.9.0", From 6cbeef851eabee66fa060b09b88859e9a2162c85 Mon Sep 17 00:00:00 2001 From: xventura81 Date: Fri, 26 May 2023 22:44:55 +0200 Subject: [PATCH 165/533] [activemq-cpp] Update activemq-cppConfig.cmake (#31623) * Update activemq-cppConfig.cmake libapr-1.dll has to be found in bin/ folder * Update activemq-cpp port version to 13 --------- Co-authored-by: Xavier Ventura --- ports/activemq-cpp/activemq-cppConfig.cmake | 4 ++-- ports/activemq-cpp/vcpkg.json | 2 +- versions/a-/activemq-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/activemq-cpp/activemq-cppConfig.cmake b/ports/activemq-cpp/activemq-cppConfig.cmake index 5719f9b6bb30a1..715a1630d9ac5e 100644 --- a/ports/activemq-cpp/activemq-cppConfig.cmake +++ b/ports/activemq-cpp/activemq-cppConfig.cmake @@ -133,9 +133,9 @@ if (ACTIVEMQ_CPP_DLL_RELEASE) # if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG) _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib") - _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/libapr-1.dll") _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib") - _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/libapr-1.dll") if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG) _activemq_cpp_windows_dependencies() if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index 54ed5e65c46684..9c30eca47c76ad 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 12, + "port-version": 13, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", "supports": "!(uwp | osx)", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 8323b6cd772fe8..27d32b9f1f4ef3 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75c1e838f461bba7a78802919b2ec16bdbfd154e", + "version-semver": "3.9.5", + "port-version": 13 + }, { "git-tree": "d8cbff606d12daa3bf08a8fa623c2d524f1e05e5", "version-semver": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index 3589c96c3fce06..c2487a326fa8df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -34,7 +34,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 12 + "port-version": 13 }, "ada-url": { "baseline": "2.4.2", From f84cbe7a1192c242e244e4f29c9d233a2f547bab Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Sat, 27 May 2023 05:46:49 +0900 Subject: [PATCH 166/533] [gtk] update to 4.10.3 (#31615) * [gtk] update to 4.10.3 (microsoft/vcpkg#31614) * [gtk] regenerate versions repository (microsoft/vcpkg#31614) --- ports/gtk/portfile.cmake | 4 ++-- ports/gtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtk.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index d02b84bbdd5593..f02521e5f93bcb 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF 74677018183b7b815c54b236841447132c0141e3 #v4.10.1 - SHA512 7611c09c1b259c1e079b84abae603920b27403c0900b3265a07e540166bd468603ee2eb77e68e820921d979c345e69c62447fcead6fe38bb21d32bde8ece1e26 + REF 06b3ced8e7fc936caed43379b120d75be09713ca #v4.10.3 + SHA512 3fe7da84993bab8afbd0725b06e10546fbbb550a1e2b356431c152b5392fc1e94e400430f1b6a2c39bdddf8fecbe34fb65794bd1bf41c9bdca4e40e12136ac91 HEAD_REF master # branch name PATCHES 0001-build.patch diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 9573f7c7f55ecb..88c72157b0eae4 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk", - "version": "4.10.1", + "version": "4.10.3", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index c2487a326fa8df..6d782b9d1a0cfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2993,7 +2993,7 @@ "port-version": 0 }, "gtk": { - "baseline": "4.10.1", + "baseline": "4.10.3", "port-version": 0 }, "gtk3": { diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 37bc0667f7f450..79c4e4c2ac7d42 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6542974036eeeb96bcfa2f343a58dc9a07c54b3", + "version": "4.10.3", + "port-version": 0 + }, { "git-tree": "416961a907f2f0412d4d59517a904d06b4985ffb", "version": "4.10.1", From 1fd5ef71cc9fd6f404a0ef7096e3ae53382e19fa Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 26 May 2023 22:47:34 +0200 Subject: [PATCH 167/533] [Qt6] update to 6.5.1 (#31613) * [Qt6] update to 6.5.1 * update version path * v db --- ports/qt/vcpkg.json | 2 +- ports/qt3d/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtapplicationmanager/vcpkg.json | 2 +- ports/qtbase/cmake/qt_port_data.cmake | 90 ++++++++++----------- ports/qtbase/cmake/qt_port_details.cmake | 2 +- ports/qtbase/vcpkg.json | 3 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtgrpc/vcpkg.json | 2 +- ports/qthttpserver/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/portfile.cmake | 2 +- ports/qtinterfaceframework/vcpkg.json | 2 +- ports/qtlanguageserver/vcpkg.json | 2 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 3 +- ports/qtpositioning/vcpkg.json | 3 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquick3dphysics/vcpkg.json | 2 +- ports/qtquickeffectmaker/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtspeech/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/vcpkg.json | 3 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/vcpkg.json | 2 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 98 +++++++++++------------ versions/q-/qt.json | 5 ++ versions/q-/qt3d.json | 5 ++ versions/q-/qt5compat.json | 5 ++ versions/q-/qtactiveqt.json | 5 ++ versions/q-/qtapplicationmanager.json | 5 ++ versions/q-/qtbase.json | 5 ++ versions/q-/qtcharts.json | 5 ++ versions/q-/qtcoap.json | 5 ++ versions/q-/qtconnectivity.json | 5 ++ versions/q-/qtdatavis3d.json | 5 ++ versions/q-/qtdeclarative.json | 5 ++ versions/q-/qtdeviceutilities.json | 5 ++ versions/q-/qtdoc.json | 5 ++ versions/q-/qtgrpc.json | 5 ++ versions/q-/qthttpserver.json | 5 ++ versions/q-/qtimageformats.json | 5 ++ versions/q-/qtinterfaceframework.json | 5 ++ versions/q-/qtlanguageserver.json | 5 ++ versions/q-/qtlocation.json | 5 ++ versions/q-/qtlottie.json | 5 ++ versions/q-/qtmqtt.json | 5 ++ versions/q-/qtmultimedia.json | 5 ++ versions/q-/qtnetworkauth.json | 5 ++ versions/q-/qtopcua.json | 5 ++ versions/q-/qtpositioning.json | 5 ++ versions/q-/qtquick3d.json | 5 ++ versions/q-/qtquick3dphysics.json | 5 ++ versions/q-/qtquickeffectmaker.json | 5 ++ versions/q-/qtquicktimeline.json | 5 ++ versions/q-/qtremoteobjects.json | 5 ++ versions/q-/qtscxml.json | 5 ++ versions/q-/qtsensors.json | 5 ++ versions/q-/qtserialbus.json | 5 ++ versions/q-/qtserialport.json | 5 ++ versions/q-/qtshadertools.json | 5 ++ versions/q-/qtspeech.json | 5 ++ versions/q-/qtsvg.json | 5 ++ versions/q-/qttools.json | 5 ++ versions/q-/qttranslations.json | 5 ++ versions/q-/qtvirtualkeyboard.json | 5 ++ versions/q-/qtwayland.json | 5 ++ versions/q-/qtwebchannel.json | 5 ++ versions/q-/qtwebengine.json | 5 ++ versions/q-/qtwebsockets.json | 5 ++ versions/q-/qtwebview.json | 5 ++ 94 files changed, 366 insertions(+), 145 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 8dc3f6ffb37c84..4f8ed2aaac160e 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index ba49d4348fa3f1..d97b1694edbfe3 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 7f6f038dc268e2..616651262421fd 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.5.0", + "version": "6.5.1", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index d29d4885dc9783..b3281b5663fc8d 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.5.0", + "version": "6.5.1", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 89a90416ce3c72..e1cc282637f41a 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index e61e3068fc6c48..deb11de26462ef 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,48 +1,48 @@ -set(qtbase_HASH "29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3") -set(qttools_HASH "fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd") -set(qtdeclarative_HASH "df31f08be3849b2775c1fbeb72f9922f7fa64b8b18b506e5ce309b718cfaeef9bb7225cb55610c8cf695f85e5fc0430461f1317b335358b4196b5e48242a7d00") -set(qtsvg_HASH "ef317b9b3621b5554df20bc570b67392f9c0ab37929b4c9dc0e9902c1b63763aff5d9bdf50b50f7c0a3c9f74c513a53553744dda68d8d29f593fc70f787f1009") -set(qt5compat_HASH "097f6cda4dee6eac8dd224d8539c26c1c016cb065f1718040f1b8e0b230b562f9b46f05d20655d30fe719d0886e02961a6dfbe7226d0dcc30f7145fe2f32a000") -set(qtshadertools_HASH "da62ec1ea4d20f91d83cfbbfc3cc25feb87051a1c2af58fd50afe4ee42b2fce9bb645e59291beb5893ec5dc7c0cb9d1defea0e90d7023c175e30c34dac13cdc5") -set(qtquicktimeline_HASH "80e1a979f86f68a817d5138a3e3033a3934123e72dad58bfad6383430ab24a7f1010e76cd41e549f00baeca6be76f2f17bff6b39855d0e5c47b003c59e5b1d55") -set(qtquick3d_HASH "84e5e7015596c035a74f94ec2c6ea254c820b7c4bdc730ec487642108eb6e948867aae1033314a7a4cf0fc37db673537008ec1a44079594acd76ecbaf475c467") -set(qttranslations_HASH "aa10c2e6937597805e385e52e36cc3dcecf0980a80d34fe8b642b7f830f1667e8c6b9aec17019cba7d2f3fe2f640c794a96f834ed8d4cb782f7fa73954ad892d") -set(qtwayland_HASH "d0a9b3cb5f93b99b20eca98512ebc8b6b8453df822e2aad7cd38169cd22ab1661ac0fc14223679174e8dbeaa63c2f3013287fef1b8ef620aa23ff6abbb6b730e") -set(qtdoc_HASH "59ff6e9afe4635e437b26fd37fd4c88a8ddb5b8f1e3903615c3b9687e973f4287863ad0075595c00b212ea10ab9c446c277446d82948108745e2ba71cd37fe21") -set(qtcoap_HASH "b90d5f79045f0c5cb441d4888265b2048ee28e977bc8c4e3d600e61c2eb07698ced2d97b40b1e44ca3e3e168b6580fdbd43fdd892da4ca6503f85055812dc8d7") -set(qtopcua_HASH "f362750263db27cc64df0a2bb1a12cc07ddbc332553e7f54cecb103126b79d86e9dcf3da82a37da423d3b3124bd4b4e2ccd0aeb3413c49334064cd9f39124246") -set(qtimageformats_HASH "2456f6e85baccc933f275e2d1f0e1ee75ef6816b811d52544345b208e19755d9a9ced5fd314d47744d894bd0395c0b9f9792b739d021f90fa67e7c3c08b9f751") -set(qtmqtt_HASH "45aa0d834eae5d5264e5571d4c2f37ba842933b212dd6ca16af38123f848151e43b1a47b99f723b911fa52f1a58b1d601b8c76950ab07f68e04665e73d6c59ed") -set(qtnetworkauth_HASH "bf18b3a677306ff4d3dd0e9f579f36a14f6b8b51134c45c2e0cd1988c453b5ca52dd0cda9189f6f41050e6d6ea1fe27872099db5af0d3616de7751e4f25c34c0") -set(qt3d_HASH "875e1e3a94de59d9b1a2eb94c0a289b76ac7c2163075447d6fed9dbb32846242300f52d5c141d985ce89437e012af43171f2bd2f640e527a370800b51b83b344") -set(qtactiveqt_HASH "e1a3d412cb51eac6cd3b107a0aba710edbb84720c5ee2d2908b8fbfa01e464b68698d09c9e0ea2e76dbf3cb0eed5ae04907d97c1ce17d487767c66e8b0738698") -set(qtdatavis3d_HASH "9f57efebe40baa2ff1fdce049f4bab6383bda76519e86ac36d0cc45e4a43f4503b22294efe8dbe80d14971260bfbf3ad1fe2a11b00edae65f678358c75e23397") -set(qtdeviceutilities_HASH "31c6be3de9dc19f9b8549cee1231ae99e935f4d186e51113bca3f69a8ac75b183993d0954ca6f81ecfe7eff9d62bdd7821ecbf34328cbfa4359ec06ca69459d1") -set(qtlottie_HASH "ed60cb385a4a252f1bc3ceb64fa9a62babdd12a7595fd61c847e9a363d8c91f897603d1cdfe11585e7bcbf303ccc273ad1b51af1cbda17e31335e95c76585942") -set(qtscxml_HASH "21933952c5eecce2cfe45c8c7b50d249b71f49538ee6736a7180534abd44b6032ea9e4d2aa9b658b78f60ffd61cd065046da6df5abed13483237e8d8dcd9fe56") -set(qtvirtualkeyboard_HASH "5d9b0936d937ee8a18a3badb6418dff66b7b600a71329b3ea9fe399b43d89745633d6a2ea7b7199cd9c25a6751bfec60a91d8364285334a98e61b2cf27421d31") -set(qtcharts_HASH "6b9b5081ae96af7fa122b6d9b59334d2bc69ebb44e91e544d39d62b570fa0cf763494162f7aa5c6960fbcd1197e856b19c2b278713e1d5e843e30fb25d9a2648") -set(qtconnectivity_HASH "8113dfb556d29c7e3cbac197498b532beba6a22fdfafe6d5fa778be11e8f83b318d06f6e159002c3e1bda39adae173dd2df06b819ca04066cc5a536b80da882b") -set(qtpositioning_HASH "c4ba9c6a1b73eb5db74eb405d2a5814e18309ad353536116bbf9042aa58d31607683593d797b78e662bb246941baa61f1856357b1a6c2fc1bf0a7bcf18fe921e") -set(qtlocation_HASH "e0b0c8f4093436aa53661fbcea885ee86565ff8e61bae4b567be24e7251e56b77071b78e160903ddc487b36931ce6f1a525c74135cd360cdd1d189da4463a96d") -set(qtmultimedia_HASH "fe0dd9a534d30fa47129c4dbefb789ce1fc5b3d2a59b7583c986262a26a0638e2147edc77cf7c484af9c01acce9aaccaaa4a406c12bde324555790a956859341") -set(qtremoteobjects_HASH "a917d766538040706d5bb78590bd2a577a98759ebfd516dce9c55d3c5a34411907e55de9da04d47f2b37e927541b915802fa66fceb03826c88bed4f8e8e75fa9") -set(qtsensors_HASH "1daf326529075d978a6deda1ed2f77f4c32468962fae44837ad7f54c6052ae2ac475df6e40f954375d0d7a1bd1ce3c7947668f1a726fca2556fab5e972f08805") -set(qtserialbus_HASH "ad92c88e13da77477eb9bc9a1b81ef316c56ea456ed962e010ef8e1e00409d12c7527b1230447ad9a2fa18f6737a8ab84a37712bc948dda7f1b0acb388c2dda8") -set(qtserialport_HASH "6d20025bedcd4f049f99efc775380d1d3578daa59e8f008961fa0e5c495d57992265917fad5471b917f60a4eb4e72491184e1281021320aed94cbedde22f2d71") -set(qtwebchannel_HASH "146bf4b190a5d9af36f17cff9340df8faa2465ccb47fec767157d4c47a9ff4554bd3917d6694da1ee6914e34ac3793b6c99673712b12b65b1f3e9f59e274933f") -set(qtwebengine_HASH "02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0") -set(qtwebsockets_HASH "b13a6c385573cd19cefa48dfd6be1066c09b046f5a54d2c61fda3ab83903dc75b2f3fa0aa45f9e56610526214a64416f90d955becf2aff90611387a605314b67") -set(qtwebview_HASH "ad572e4921c92bd160d84b88987bd125b9f9c5a9f2123f552cf7840f15146d76e13ea621e3f0506c308cbe836f0e6a9cbfd4847ae93fe6fbf6122b0dfc8bbca7") -set(qtinterfaceframework_REF "062662be9975e186a64c19a43b04f13c3e2aebfc") -set(qtapplicationmanager_HASH "d5f09e13d364169f4bfca933c612b8b9e950a229d2ff81f58cdf4eae2a31f4b9d1200d4a71dbb20a947fbf9034a82091eee989aaa47ab4b1b707b6bf23d490a2") -set(qtlanguageserver_HASH "22c13eef40382b45b8f3c07d2aae95c09a24f438ba214dd0e19f601578386883f35df41630ebf512f263cbd0c3c5c296ba19d1dcd0e323381150dcf47cbf7661") -set(qthttpserver_HASH "50b5f96f0a63aca5f73d639c0ea08f525b3df4e416767fc4612872bb5b7edb8332711d7682f47b91c630c9e6f8e7d3c9ca2674d521fa054d6265dec06467a414") -set(qtquick3dphysics_HASH "49125a76427ce6eee85be5ca543b4f88877d782415c054ff09062769cad8cd10932eda58e9320b722c8eb6e6bf8b5bf717df9ace2514b5112652032cf5737cc2") -set(qtspeech_HASH "aaf6a788b5d602708d2b6d0528d43190405135a291834ab719c3886709f43254050d0845d7531689b4426961793bddf42d45b9c7ce381da9c6b9cf6043cf60d3") -set(qtgrpc_HASH "b74514d4c181dd3ebb64fe0943064e074ab65a7a172dff747d1315c460dbcea03ae3488b0d8e01285d54c18ec819b68218170bf974e8d2f0943f842d6c95a2ca") -set(qtquickeffectmaker_HASH "8896045c56c5a05feb3bc2ea3610376585d8f5d2afa30e9a0cb48b96eace31ec98e753bc72669e8c1255a205754ee01a44c89b41f4cc8124ae30fc2b3a4c797f") +set(qtbase_HASH "7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a") +set(qttools_HASH "fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20") +set(qtdeclarative_HASH "7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7") +set(qtsvg_HASH "4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437") +set(qt5compat_HASH "513de021e2ab3413399b9f8cb7e86e744af468e28f1d11c1024d49650ac6658939e7e96607432511aa4095e6e122b9434f36e43ea712e657b10d7dfa0bd08b7d") +set(qtshadertools_HASH "547c5e0c6220c6200f440ed1d6f3373423fceea09de8d1dc81c5d49f7e24beee6d460341828d74844a2e1af1181c702d93247dd95b273a0b1e110dcdcab69557") +set(qtquicktimeline_HASH "72fa2c96beabf2ad734bf458f5a41edb7178bcf9c53184425ac33e75d648bd617ebc393a4036226846e3ca407fa17fca7bb15a23b7c75f12796353deddb962fc") +set(qtquick3d_HASH "a06ac092d923e103ca2902f363a1a47c7696ba3b356f61473d8b461ef3663aad80c8fbc8a22efd04def76ce2a7b7a3a16b7be5a9f9f58f198b18ee27d2f913e8") +set(qttranslations_HASH "c04839aa7071a8d5fc4a351e7266f4985dfaa5fbe0952fb32850676145d9adaceacb49c15b64831622a3f213fc87b7019d99bb7d2ffe6dc5a70ba62a2a252766") +set(qtwayland_HASH "9074adfb5ea9cc18896dade6706ef5a863033130f23aa11e0a7b2ae6e4df2fb64b636815e2489debb1032919a8ad20d39813d40b3ba7a87cebd801c9fae0d4f0") +set(qtdoc_HASH "9a2bd23c356687797f99b90c7a2bf6f283a7752e97cd8b35929ddb90800281c11b5dd7627090ad3cb7308f084b5fe20bee45118ec8c210e3c1b24d44c07a94b4") +set(qtcoap_HASH "1b19616c83983397cef046c98d73b152e562af7be7c69416372e885f1dc2c9a6f8ec6ec0fe99ebb0cd10e44fd91713cef4e5f375d04badb03e4f76e3b7e10991") +set(qtopcua_HASH "80ab237127ab3084d012d0fc0a608ee749398043584c047271d09f7591eef096ff6494e2de6cccc884653aaab830b2e8cab8a068e839766a4d21a079898220ef") +set(qtimageformats_HASH "41b82b829579d81e964212ecb6adf56a02fbe0293c33718c428977eb55df2008ea0af6214e051b5415fdfc828c532276be7b9cfb1523d8fc4dc07d4b337d49e3") +set(qtmqtt_HASH "5c296848e32ba4ed97b8e40f4f97d3af3c5b46ac56b86be63c672972b5e04cf02f5a4caa79005db89e0b71d590b9182cd3c0f0c106801331713fb06176bd3e59") +set(qtnetworkauth_HASH "04ddad0dd13ccef59790d9f0db394752076b0663a76c049a0a987e4841b5ad72fa053cbbb998cae9120481f683c5a488bb0b980fc3f6801b83078ac423a7079d") +set(qt3d_HASH "a5b3e4431c8924eb75cd23a806d05334aa9bca884bcbc0973359fb4c79370774fde26ca485826b1aa861362d65b51aafca93a909aed265a59cc0e60d9aceabb3") +set(qtactiveqt_HASH "0daf2748948b963a17865908c469976a55f1f53af57ba79f534191a613f900ab07e1149c351c26e24e2b8e4e73e1f1c16e263d10e1384d31484ee92452dcb7e2") +set(qtdatavis3d_HASH "2aebe20de8010e49d49c35decccaafedf540b0ffb35bd0a4d7dad974cee3378063cfddea79a8e5bcfa9b23f5745feeaa4c81ffb7cad3e654721d06dca61b78c6") +set(qtdeviceutilities_HASH "f29add1d30296a884ccd031dff083e65ff5efc8e5946401bfafa576552698deec231bcf6bc0b1df973622c522aa004d6adc8f10face19246df16efa58a702e84") +set(qtlottie_HASH "788079a5246c3a3abfdd7525f13e8e7966adb86bb0259fe7a8049a55ea5aa536f67bb6b3e21b1c1e8951e0aa422950fd25aa795262a89ab71cd813f929e14ad2") +set(qtscxml_HASH "5be0c7fc913880500e360860a9b1f50dc868b4e4b02c6e774578221754a88ece44d90d80ea85aa74b23cc3790a20f1e2b00b7d395612143d42e7c63708ed9dd7") +set(qtvirtualkeyboard_HASH "46c39666319ef00c1570e1a4f6bcdf3a8ae15042c2ee77f0f21ff907fe587a8382b9f29ac756f4bb02b62cd7569c584a7a5e80889ab44141e6fbc0245eaef291") +set(qtcharts_HASH "fe48ce2f4c3ba57f7ab23e7e5c02bdc303f1902ffa5b786e07d62b63b29551a0a3653764ca55c6b57b52f77b7a71795801e2fb942df1d8ccd03f594c92e6f94f") +set(qtconnectivity_HASH "a02f1859e5a02c0df0cebc2c3b0660febbc2f22ba6924558be47e51b3a135fb8376c580f1b5fe21f5b7b22f790bcefa431270accc31c95c0118d43ff0e2a37b8") +set(qtpositioning_HASH "67006663299b14a85a4a7cab2a03ec39f3b938c0f2f09520e3869509bedd24a2053e6f964bcca4d02df71c21d184b253f46cf1dd59e9da5c22cefbd1910ca305") +set(qtlocation_HASH "31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1") +set(qtmultimedia_HASH "2085d223869b627a2e5590a08081eb23ca34f8122c6492867db4596d5414e9c3eeca9338cf1745638ee60f0c559cbaa73aaab14c40785accf60a0d7e177fb937") +set(qtremoteobjects_HASH "86928e5a5da758dd4af1b9cd2d8de99c1b75b07064bcee983ee32abc747ce863b91c2efa3fe2a05de453acf27c775aa2161380d198480da17e37bf746cbd383c") +set(qtsensors_HASH "c5ef5ded692eacba8c85d756fc3b9a56681af8695f2a4f1e2b0bc18b07cc3b4159a7bfe06ff8163158ead8370e5a496601e2ca77a15acd9e7e25e1dcaedff086") +set(qtserialbus_HASH "f5588739797d445db536629cfac4246d74ce4beace3712e9ea55c8d4d682cfb312ed199ba7d5227f4429a36e88537d0e2cf3e5d414d86f78a7c3ee4ba41da038") +set(qtserialport_HASH "2a85f98d6eca51896a8e32bb531326c8479fde8d09ef2936ba1acb2bbfcf565ccdbffde29fee3b685709b8e1aa3a77437515607f280b483937c417dd15d55793") +set(qtwebchannel_HASH "a61a22b84f10f1ca5272e87de501f1c75f15a8f9a0aa5ff18d4df74a60bb8bec589289164863b6539cff4796c7c19a5ba126027e41107fccc43cf7523def1b0c") +set(qtwebengine_HASH "68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428") +set(qtwebsockets_HASH "cd11d6b50e60c5246cd6469a0bf4ce75afd3ab57c8e082a71c25d5a0662e1a23276e232106dd3e8893ce60ca86cc2ab6c213433fbb194efdf1a9be4ae53f2b4d") +set(qtwebview_HASH "669debc9b7a7562a1343bb65a7d1775c42404dd356184fc5d5180f5674cb8682e8e391f9673985263b8c2a7be1c0f6d5de1d2a20d6489cc5ef685b7a1280a01d") +set(qtinterfaceframework_REF "158de49df4e9ba3cc0bdbda18eeb3f223a023ef0") +set(qtapplicationmanager_HASH "406b469f295ed8bb337a2503e2a03b8c8c8838559dd596b21035d8a6d59e0d1089f54424d5ec30e298737ae0af945822eae16e4730318192c0276655e4b03042") +set(qtlanguageserver_HASH "85faa9e1fc6daa2dbbd0d061a9d467f9832feb8871871dc2b8d177c235224f69636f3909f27063511bdace50e121674a1745007afc2a3d36d250241e03db4808") +set(qthttpserver_HASH "acf6b1cafe84abbd277d1aaef0f1adb5be5256addb1d34ab079764ed757413f41dd44a1e396d5b274bab283d56d657dd3d8ea2c2ccd870f4009039fc01c0c5e9") +set(qtquick3dphysics_HASH "c5077b1756dba045c3a9388b1632f9ed2d44eb92b6b309c7852b7ab02a5f5d6e8a3c50e307b7005f27355d09e183b5866b213bd003009884be4258f747d0d839") +set(qtspeech_HASH "59c2f25e2b93f453fc9f674a5292ab10318de6a861a13bf4128d9166edc51efa9f0b615386fe6291c410e7f0fced138a98ff58a004653b06c522c96173e1fa6d") +set(qtgrpc_HASH "41a774d7c28a59e18c24107709d2b9e78abd28afa0f8ada2719e760d5c9092b7aea5d009a29d72ad7b8f88f443288113ca1c8d4c28bc386b642a95f3ca51fd66") +set(qtquickeffectmaker_HASH "fbc9c56aaed95469940151131901d6ebbd1c29b56d8eecce51c1dee16e80cd6cd446c6cbf247c618a8382ecbbf537c68fefd273aa644f5a85600e1cd812f6027") # Keep for beta/rc #set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) -#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) \ No newline at end of file +#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index b59345a2933d12..071c2db52a0144 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,7 @@ ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake ## 7. Set QT_UPDATE_VERSION back to 0 -set(QT_VERSION 6.5.0) +set(QT_VERSION 6.5.1) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index c2cd75d9c04ab7..dfece584e0abc7 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.5.0", - "port-version": 2, + "version": "6.5.1", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 3ecfab09ef3251..1ca0391407989e 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.5.0", + "version": "6.5.1", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 049b5cc1d6166f..b9087cdd7fd870 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index d7f7a527ace005..1f7d2a083f898a 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 7bb7968a9690d3..00c117f1e817a9 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index b3529abe489edd..528d03ee584d6f 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 74c35875349bd6..2e50c22e967a4e 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.5.0", + "version": "6.5.1", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 7070bd42622875..e3f1ec222e9fc5 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json index b83052017a7002..cd086d2df04194 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt framework based gRPC clients and services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index 7229f547be8bb3..285fd5533ea7e6 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index dd2898c541d1c2..7e76171744c26f 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.5.0", + "version": "6.5.1", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index 769e8f8eed4c23..da7180d7355e90 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -50,4 +50,4 @@ if(NOT VCPKG_CROSSCOMPILING) endif() endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/6.5.0/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/6.5.1/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 05ebe030cbf7e4..24e73a5e57b86a 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index add387cc35f578..adee6c641bd4af 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.5.0", + "version": "6.5.1", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index f6eb06da44f63a..32047556622d6b 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index af54a5807c473f..3416701277d243 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.5.0", + "version": "6.5.1", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 2a248fa310ff58..993cceadb61081 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index c7b711bf55ea71..8ea9bde7b0e260 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 6346e699cb53dd..2cf636cf2ae99c 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 57f01898a90d30..75b2a8833cb41f 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtopcua", - "version": "6.5.0", - "port-version": 1, + "version": "6.5.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 7f417fa3c8928d..e4821141bc5a0d 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtpositioning", - "version": "6.5.0", - "port-version": 1, + "version": "6.5.1", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index ad84adda890c7d..f947f2d0c9c778 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.5.0", + "version": "6.5.1", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 4438577bf20955..11f9703bb94030 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.5.0", + "version": "6.5.1", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json index 7a3cc4c0f54964..19f27a80eafd61 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 5d82eb7c51f978..128870b2c9436b 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.5.0", + "version": "6.5.1", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 23a33b09036e73..1500d39f540413 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index fc3b51026fc442..c7f173227a8f64 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.5.0", + "version": "6.5.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index c18ba91fe735c5..274cce6123e389 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index 5ddcf226a3dcdf..a28ffce67a9727 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.5.0", + "version": "6.5.1", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index 240f5f5b1b45f5..661cebecb0f571 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 93e8fecbae47cb..a0d4044eeabadf 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.5.0", + "version": "6.5.1", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index 905620cfd1365d..26bd33f25591cd 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 9d33739b65e921..b22081dd4df7c6 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 4d3aba05510f60..ec102190f5a800 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qttools", - "version": "6.5.0", - "port-version": 1, + "version": "6.5.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 18ff8ebdbe8088..47c94ae4584a19 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index fd1170b9458786..ea5b8430e0233f 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.5.0", + "version": "6.5.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 2799ce9f14be0d..b9937bb35127d1 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.5.0", + "version": "6.5.1", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 4ed4777ddba8a2..1e93d34aadffd3 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 3df78cd7b47a30..175c4ecc4044a5 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 473152094b3ef7..f5f25df8c7ce9c 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 4735c17327bf0f..a42ca6e1fade45 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.5.0", + "version": "6.5.1", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6d782b9d1a0cfa..a7fc6af48f2558 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6521,7 +6521,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qt-advanced-docking-system": { @@ -6529,7 +6529,7 @@ "port-version": 0 }, "qt3d": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qt5": { @@ -6705,7 +6705,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qt6betablock": { @@ -6713,59 +6713,59 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtbase": { - "baseline": "6.5.0", - "port-version": 2 + "baseline": "6.5.1", + "port-version": 0 }, "qtcharts": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtcoap": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtdoc": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtgrpc": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qthttpserver": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtimageformats": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtkeychain": { @@ -6777,43 +6777,43 @@ "port-version": 1 }, "qtlanguageserver": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtlocation": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtlottie": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtmqtt": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtopcua": { - "baseline": "6.5.0", - "port-version": 1 + "baseline": "6.5.1", + "port-version": 0 }, "qtpositioning": { - "baseline": "6.5.0", - "port-version": 1 + "baseline": "6.5.1", + "port-version": 0 }, "qtquick3d": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtquickcontrols2": { @@ -6821,75 +6821,75 @@ "port-version": 0 }, "qtquickeffectmaker": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtscxml": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtsensors": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtserialbus": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtserialport": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtshadertools": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtspeech": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtsvg": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qttools": { - "baseline": "6.5.0", - "port-version": 1 + "baseline": "6.5.1", + "port-version": 0 }, "qttranslations": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtwayland": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtwebengine": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "qtwebview": { - "baseline": "6.5.0", + "baseline": "6.5.1", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 3add2fcb82a57f..8bb0dd8710d771 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da935525e462432e2d89412513704c8c4d04b7cd", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "ecd656220f58ebf6651801b9fc439ba5d8f6b62b", "version": "6.5.0", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 1b31dfb73af1a6..5b29f27877cf48 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c367d3e4afaa2271628a5608d9144f912c830236", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "56a3a7a27a022640d0f965aeb1d56ece4c63006d", "version": "6.5.0", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index d293e8a548743e..8eb7e001c8d46e 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c953278f6f3c74a1976bc64198fea68cdb8cf33", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "b4a3c116018e4b6f97e056193c82af718bda10b3", "version": "6.5.0", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 27a7c3c94d1ac3..b5e6304b8975a7 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac50dbe92da8d65ed1109b1d5aa29ee11a3c8484", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "906e0b257af28f5690907f94ad79bc95f3a34f5c", "version": "6.5.0", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 08a6640edae562..9519c7086b18ee 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "176431e9f906352e8c2d98e040ae240f5e1af12b", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "02767f9ffe5a4a96fa2555440e17e92d1795548d", "version": "6.5.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 1ebe8e2187e4c3..60c606d6e81025 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce56d3e7af720645f1c4be18d11e659c1d3e48bf", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "8a00cef259fdf1a9198f95e0618c98b7f1b21527", "version": "6.5.0", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 9d0dea1b2a64c4..33de7f92a2a7d2 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b89cbc106466e35706c76769266b48a6f6c4a7dc", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "a9cb7b445154fb5957aec5455428d0bde929fcda", "version": "6.5.0", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 3eb5bb87a0a787..902bf567fc5e71 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8611534889e66c2c8754af713351c1638a481fd5", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "f5c864cedd1698478c95617d82ba56b1dd240ab2", "version": "6.5.0", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index a4640ce6d08152..d336b321f3e885 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2f10a4251e58ed95aed33cb1fa65be236b9aa93", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "4e87723595352e8637721bea77ffc9c1ad73c031", "version": "6.5.0", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index cb08e903b8975a..3989df21e9cad7 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72b95739835b676e075323ca63ef5aaff5b08599", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "55f14b0a4149603a1d171ebf4cc99d8dfb2739c3", "version": "6.5.0", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index d4d5e0f1ebafaa..6ec3acb286d3f3 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2c7cddc945b4f3d00f6cda3b2fc99406a2b8aab", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "c0d4c48a9b7ef8047bb2068271fb433deddd3ffb", "version": "6.5.0", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index b15350f5d10e06..34f5158bcb693d 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ea28da9eb4c9533b02f9033b1e15e2dab30a411", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "21885adf14cf548990d1a47fb4baf3c75bc00859", "version": "6.5.0", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 833701a4f31f3b..3aa77b24ac1ea4 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f443139e15746d7e481577bc491bf6aa6bcbe21a", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "54a7e5b497830856aad12dec08b7bb01c37b4999", "version": "6.5.0", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index d028852436a744..20943d90318e75 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee1ca6322fefa8ed2e2b6ac36cd884017773eb3e", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "8fb784c858ca56e7ed43e80c0d5937962a2f72b2", "version": "6.5.0", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 7ed7220ce5a300..2426ecbb7e0183 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1706eb781c19e5462e3571cece087413afb5f9d", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "9467160ab402bfd2f04461aee718cb9043d3a094", "version": "6.5.0", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 8d8d9fc067243d..b80e00974b8352 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f034441ea62f407b1950448250507277defe3d1", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "6a6f759bf37a0bbc86ccdac3eccbfa40816cbd79", "version": "6.5.0", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 882ef2e3a2343b..8fd34c5f01065f 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f68eabb8f185b700ff927d6bbf92a9442d7997c9", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "3c0fac0141ef882b26d1904189a1aafd4dc4540f", "version": "6.5.0", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 219b349f4a3dbb..9e93cfdd194fe7 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7f571ef4fa6f184badc8c18c602f8c16e6a6241", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "248be805b9a3c9d95efa723392d374a9c94a5c27", "version": "6.5.0", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 86ed9fb5f74976..5c135435b12f5b 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e02cff0ad1cc428f9cb4b1a3913c2a8e94b5269", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "d015b0691674d099f1a1ab1c6b812a914f3bad80", "version": "6.5.0", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index b24084b8ef0f97..3424eb3a8119c0 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6520cf06147823c43100bdb90f5028c362f32241", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "5c8d01536a9c595ddc58327caac428c86ffe2262", "version": "6.5.0", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 06261e261a1939..decdee0b95bd9f 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "571de902d0fb9afca17431fa67b9538e9d044435", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "3129ca4a0ba4f6e94550a56d32228560cb3483f9", "version": "6.5.0", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index e5a777ec545763..2cd6a9676813f1 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d52c87cf46872d7383c2ce8e1ea8fc733278d801", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "a10258ebedf8a3f71b8d761b58933e40bf70fac3", "version": "6.5.0", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 838c7cd9313bea..70e1170e0e2927 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd5935ec38e0763e16b5114b3cfd11a8637356e6", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "767609a9d9713dae6a4c0fd2696a1ec994e28e21", "version": "6.5.0", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index ed6ba1cbe8d7b2..c4a79e37e9ffbf 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efd0da43f5e4b4f2b82e450c4221447a911ceec5", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "efe3fbd8d37c121fbb7758de82fac9bd4b315a77", "version": "6.5.0", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index d85d2a56252489..907144fb2f89d7 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "584655742d0c13b02e93e6ee399db6b815240ae9", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "440f18e3ab2e18be1de9550ed16ddb7164c5b826", "version": "6.5.0", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 5ad1e9dd784ecc..04f1da7a4e1b6d 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbcfad3bdbfc6ce6b91af6022fc4356cb9d7d121", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "ab3f7bbf20de8d370d5ac8711f2190d96db87f7e", "version": "6.5.0", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index d3543e2862a7f5..9ceb87f3b8f1ec 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8adad221bc2099c9d260511d3089c8ed2095e08d", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "dc5e1726976f64617ee280062596560c791d4b38", "version": "6.5.0", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index f7ef5feb071d96..8a2747f446929e 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1281941d8283e90e488de0850976dc7c931f90b", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "fafa1b506a25f0b343afc09ee5708e885ac56076", "version": "6.5.0", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index de8bf8cfdee373..66001849b79d9e 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee7485463ea5cecaf0588e3981f92f5383b5de23", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "3f9caf40f1987be65ca3ce699cd176c4453bea14", "version": "6.5.0", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index e6f4c86e0dfe66..594d4a72bf91e1 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31dc41d8cdd92f1338d68c02d92c6d82131d893c", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "cce29bbf6dbad6125ffd59ca29bbc0fd8f9d1108", "version": "6.5.0", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index ee8d95fa04930d..0635cbc4a412a9 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa85f82d720805365a3aee69c035d6a36f458852", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "a900efa4d344d886cba9d538ecee24346957a76f", "version": "6.5.0", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 99d0e1cb91a3dd..9db6812d438c2f 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6563eec17634cc4113685b766af209e123d0403d", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "2520f438dda2ec0a8b244be6e1b0fc839e26948d", "version": "6.5.0", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 99b6ab53a09409..ecd986b17ded55 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bd32a069bea0cd0bc541e079d5ec54cc00067e1", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "8a3dea63a3bfc75f36c32fffd27ff7e300febc8f", "version": "6.5.0", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index dbed7c2bea6ab3..3ca92c7d395970 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b47a09c1a8be3ad3663701e234582b96c44b919", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "e16e52bb2baeb3a3af3d096cf6357e2494b325d6", "version": "6.5.0", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index bfb1122c8c95a7..a8e9a110df27ab 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f9ec2c71036ec90f472a4dd927a8ba3ca58e4c", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "664a5427ec4a5d715d4e09f9bbe1222810ddb898", "version": "6.5.0", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index e79adce1eab4dd..c14f515d33b9d8 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ce40cf354db1eac0e6b54e428113a9cf693af33", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "6407a70cfbb2ced50ed116bd1e51b8f3a7e54c8a", "version": "6.5.0", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 54159cb07b97c4..8003200fa37bce 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0cbdb8adac05f3e67bcf95b7c03e8ecb7ae7bc6", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "816b0eb532cf6901c8448ccba8363cfe9938ef5b", "version": "6.5.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 02c8cfb38dee56..920b399e8f9909 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c5bb58bb17966dd13c0ca571efb413a60633c5a", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "98c6a3ef4410b89a77895592986355c43674a881", "version": "6.5.0", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index c4fca0f9a0fdd3..42ef3b1793cf2a 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93a8ee0c9d08e15552ec7fe153a7ba70ece3024b", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "b75cda024ccc8c8ba3f9a196a9a6149309d93425", "version": "6.5.0", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index da12f197a52681..79cfbd1a21f5cf 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd796171aaa99042b420d9e8bbaf78f68b67ee8c", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "2591b11ad8fe48bb353ece5a06c8c27492cb1c1d", "version": "6.5.0", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 09f6b847b9986d..ff9519b3752f7d 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f02347f31fc483b355d5cf812a28a278ce27413", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "860b82f5d06b7f0eed9ed449507a47d156cfb4ca", "version": "6.5.0", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 794c2aef273397..9c191dad0b9371 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0fcf659cccb63f7924f92e042a08b13bb1a82c7", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "40d6a94591187d5fdfb57beebbbad45aa26a1859", "version": "6.5.0", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 1e36fc3adc6f3d..4bba71fbb9dda9 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ed2eac3d05493db52c3bf31dd9b25893cdc287c", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "2d44e1b4b4683a771c3457652baef60f290f1776", "version": "6.5.0", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index eeb9b6911441aa..e1935fee42842e 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "389d6233f9bca6f05e244de47e42add02f15f52e", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "c325d5163eea00256739eb59ac084c0c386c2b0d", "version": "6.5.0", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 49fcca77d814ce..84686d20d83d4d 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9854803006b93e0c755bad2e044a79973818db1", + "version": "6.5.1", + "port-version": 0 + }, { "git-tree": "250bcb4eb32ec73ee4376ec7af6a365c8f8f61f1", "version": "6.5.0", From afbb37cfd648335fd980f6fb7dbc2d0c84c009cf Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 27 May 2023 06:36:20 +0800 Subject: [PATCH 168/533] [llvm] Add atlmfc as a dependence in windows platform (#31604) * [llvm] Add atlmfc as a dependence in windows platform * Update platform of atlmfc --- ports/llvm/portfile.cmake | 2 +- ports/llvm/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 2d16786241392e..1ddcc720d901fe 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project - REF llvmorg-${VERSION} + REF "llvmorg-${VERSION}" SHA512 99beff9ee6f8c26f16ea53f03ba6209a119099cbe361701b0d5f4df9d5cc5f2f0da7c994c899a4cec876da8428564dc7a8e798226a9ba8b5c18a3ef8b181d39e HEAD_REF main PATCHES diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index ba2271c8facc01..99f7b717a8b632 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,12 +1,16 @@ { "name": "llvm", "version": "15.0.7", - "port-version": 2, + "port-version": 3, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ + { + "name": "atlmfc", + "platform": "windows & !mingw" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index a7fc6af48f2558..d3d15af56a2ece 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4926,7 +4926,7 @@ }, "llvm": { "baseline": "15.0.7", - "port-version": 2 + "port-version": 3 }, "lmdb": { "baseline": "0.9.29", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 14192fc7d15c16..875d835dfc3cd8 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ba26e4d72f4d6112c483a09d9a2dd0aa42067f3", + "version": "15.0.7", + "port-version": 3 + }, { "git-tree": "9c069ac90689417940c7a8e5a972afac79042619", "version": "15.0.7", From 1c5a340f6e10985e2d92af174a68dbd15c1fa4e1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 29 May 2023 08:24:09 +0200 Subject: [PATCH 169/533] [vcpkg_acquire_msys,vcpkg-ci-msys2] Ensure msys2 package list freshness (#29067) * [vcpkg-ci-msys2] New test port for msys2 freshness * Add features for script updates * Remove duplicate libbz2 entry * Automatically update all msys packages, add autoconf-wrapper * Update primary URL and mirrors * Follow repo renames * Fix dependencies of 'file' * Resolve dependencies at runtime Don't require msys2 packages to be order from dependent to independent. This allows to directly use the packages official dependencies, even if they contain cycles. It also allows to maintain a stable alphabetical order of the package declarations, even if the dependencies change over time. This helps to avoid duplicate declaration. * Fix updating * [gettext] Preset more MSVC checks * Update msys2 packages * gettext fixes * CI * Simplify: Remove update-critical Desired changes can be picked in git gui etc.. * PKGCONFIG moved --------- Co-authored-by: Monica Co-authored-by: Billy Robert O'Neal III --- scripts/cmake/vcpkg_acquire_msys.cmake | 699 ++++++++++-------- scripts/cmake/vcpkg_configure_make.cmake | 2 +- .../test_ports/vcpkg-ci-msys2/portfile.cmake | 336 +++++++++ scripts/test_ports/vcpkg-ci-msys2/vcpkg.json | 12 + 4 files changed, 751 insertions(+), 298 deletions(-) create mode 100644 scripts/test_ports/vcpkg-ci-msys2/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-msys2/vcpkg.json diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 67441df14b5499..736d463238b802 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -1,45 +1,49 @@ -# Mirror list from https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys -# Sourceforge is not used because it does not keep older package versions +# Full mirror list: https://github.com/msys2/MSYS2-packages/blob/master/pacman-mirrors/mirrorlist.msys set(Z_VCPKG_ACQUIRE_MSYS_MIRRORS - "https://www2.futureware.at/~nickoe/msys2-mirror/" + # Alternative primary + "https://repo.msys2.org/" + # Tier 1 "https://mirror.yandex.ru/mirrors/msys2/" "https://mirrors.tuna.tsinghua.edu.cn/msys2/" "https://mirrors.ustc.edu.cn/msys2/" - "https://mirror.bit.edu.cn/msys2/" "https://mirror.selfnet.de/msys2/" - "https://mirrors.sjtug.sjtu.edu.cn/msys2/" ) +# Downloads the given package function(z_vcpkg_acquire_msys_download_package out_archive) cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "URL;SHA512;FILENAME" "") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_download_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") endif() - set(all_urls "${arg_URL}") - + string(REPLACE "https://repo.msys2.org/" "https://mirror.msys2.org/" all_urls "${arg_URL}") foreach(mirror IN LISTS Z_VCPKG_ACQUIRE_MSYS_MIRRORS) - string(REPLACE "https://repo.msys2.org/" "${mirror}" mirror_url "${arg_URL}") + string(REPLACE "https://mirror.msys2.org/" "${mirror}" mirror_url "${arg_URL}") list(APPEND all_urls "${mirror_url}") endforeach() vcpkg_download_distfile(msys_archive URLS ${all_urls} SHA512 "${arg_SHA512}" - FILENAME "msys-${arg_FILENAME}" + FILENAME "${arg_FILENAME}" QUIET ) set("${out_archive}" "${msys_archive}" PARENT_SCOPE) endfunction() -# writes to the following variables in parent scope: -# - Z_VCPKG_MSYS_ARCHIVES -# - Z_VCPKG_MSYS_TOTAL_HASH -# - Z_VCPKG_MSYS_PACKAGES -# - Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE +# Declares a package +# Writes to the following cache variables: +# - Z_VCPKG_MSYS_PACKAGES_AVAILABLE +# - Z_VCPKG_MSYS_${arg_NAME}_URL +# - Z_VCPKG_MSYS_${arg_NAME}_SHA512 +# - Z_VCPKG_MSYS_${arg_NAME}_FILENAME +# - Z_VCPKG_MSYS_${arg_NAME}_DEPS # - Z_VCPKG_MSYS_${arg_NAME}_PATCHES +# - Z_VCPKG_MSYS_${arg_NAME}_DIRECT +# - Z_VCPKG_MSYS_${arg_NAME}_PROVIDES +# - Z_VCPKG_MSYS_${alias}_PROVIDED_BY function(z_vcpkg_acquire_msys_declare_package) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS;PATCHES") + cmake_parse_arguments(PARSE_ARGV 0 arg "DIRECT" "NAME;URL;SHA512" "DEPS;PATCHES;PROVIDES") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") @@ -50,37 +54,104 @@ function(z_vcpkg_acquire_msys_declare_package) endif() endforeach() - if(NOT arg_URL MATCHES [[^https://repo\.msys2\.org/.*/(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$]]) - message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}") + if(arg_DIRECT) + if(NOT arg_NAME) + message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package requires argument: NAME") + endif() + get_filename_component(filename "${arg_URL}" NAME) + else() + if(NOT arg_URL MATCHES [[^https://mirror\.msys2\.org/.*/(([^/]*)-[^-/]+-[^-/]+-[^-/]+\.pkg\.tar\.(xz|zst))$]]) + message(FATAL_ERROR "internal error: regex does not match supplied URL to vcpkg_acquire_msys: ${arg_URL}") + endif() + set(filename "msys2-${CMAKE_MATCH_1}") + if(NOT DEFINED arg_NAME) + set(arg_NAME "${CMAKE_MATCH_2}") + endif() + if(Z_VCPKG_MSYS_${arg_NAME}_DIRECT) + return() + endif() + if(arg_NAME IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE) + message(FATAL_ERROR "Redeclaration of package '${arg_NAME}'") + endif() endif() - set(filename "${CMAKE_MATCH_1}") - if(NOT DEFINED arg_NAME) - set(arg_NAME "${CMAKE_MATCH_2}") + list(APPEND Z_VCPKG_MSYS_PACKAGES_AVAILABLE "${arg_NAME}") + set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "${Z_VCPKG_MSYS_PACKAGES_AVAILABLE}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_URL "${arg_URL}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_SHA512 "${arg_SHA512}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_FILENAME "${filename}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_DEPS "${arg_DEPS}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_DIRECT "${arg_DIRECT}" CACHE INTERNAL "") + set(Z_VCPKG_MSYS_${arg_NAME}_PROVIDES "${arg_PROVIDES}" CACHE INTERNAL "") + foreach(name IN LISTS arg_PROVIDES) + set(Z_VCPKG_MSYS_${name}_PROVIDED_BY "${arg_NAME}" CACHE INTERNAL "") + endforeach() +endfunction() + +# Collects all required packages to satisfy the given input set +# Writes to the following cache variables: +# - Z_VCPKG_MSYS__ARCHIVE +function(z_vcpkg_acquire_msys_download_packages) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "OUT_UNKNOWN;OUT_RESOLVED" "PACKAGES") + set(backlog "${arg_PACKAGES}") + list(REMOVE_DUPLICATES backlog) + + list(FILTER arg_PACKAGES EXCLUDE REGEX "^mingw64") + if(NOT arg_PACKAGES STREQUAL "" AND NOT "msys2-runtime" IN_LIST arg_PACKAGES) + list(APPEND backlog "msys2-runtime") endif() - if("${arg_NAME}" IN_LIST Z_VCPKG_MSYS_PACKAGES OR arg_Z_ALL_PACKAGES) - list(REMOVE_ITEM Z_VCPKG_MSYS_PACKAGES "${arg_NAME}") - list(APPEND Z_VCPKG_MSYS_PACKAGES ${arg_DEPS}) - set(Z_VCPKG_MSYS_PACKAGES "${Z_VCPKG_MSYS_PACKAGES}" PARENT_SCOPE) + set(unknown "") + set(resolved "") + set(need_msys_runtime 0) + while(NOT backlog STREQUAL "") + list(POP_FRONT backlog name) + if(DEFINED Z_VCPKG_MSYS_${name}_PROVIDED_BY AND NOT name IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE) + set(name "${Z_VCPKG_MSYS_${name}_PROVIDED_BY}") + if(name IN_LIST resolved) + continue() + endif() + endif() + if(NOT name IN_LIST Z_VCPKG_MSYS_PACKAGES_AVAILABLE) + list(APPEND unknown "${name}") + continue() + endif() + list(APPEND resolved "${name}") + list(REMOVE_ITEM Z_VCPKG_MSYS_${name}_DEPS ${resolved} ${backlog}) + list(APPEND backlog ${Z_VCPKG_MSYS_${name}_DEPS}) z_vcpkg_acquire_msys_download_package(archive - URL "${arg_URL}" - SHA512 "${arg_SHA512}" - FILENAME "${filename}" + URL "${Z_VCPKG_MSYS_${name}_URL}" + SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}" + FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}" ) + set(Z_VCPKG_MSYS_${name}_ARCHIVE "${archive}" CACHE INTERNAL "") + endwhile() + if(DEFINED arg_OUT_UNKNOWN) + set("${arg_OUT_UNKNOWN}" "${unknown}" PARENT_SCOPE) + endif() + if(DEFINED arg_OUT_RESOLVED) + set("${arg_OUT_RESOLVED}" "${resolved}" PARENT_SCOPE) + endif() +endfunction() - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${arg_NAME}") - set(Z_VCPKG_MSYS_ARCHIVES "${Z_VCPKG_MSYS_ARCHIVES}" PARENT_SCOPE) - set(Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE "${archive}" PARENT_SCOPE) - set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" PARENT_SCOPE) - string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${arg_SHA512}") - foreach(patch IN LISTS arg_PATCHES) +# Returns a stable collection of hashes, regardless of package order +function(z_vcpkg_acquire_msys_collect_hashes out_hash) + cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "" "PACKAGES") + list(SORT arg_PACKAGES) + set(result "") + foreach(name IN LISTS arg_PACKAGES) + if(NOT DEFINED Z_VCPKG_MSYS_${name}_SHA512) + message(FATAL_ERROR "SHA512 unknown for '${name}'.") + endif() + string(APPEND result "${Z_VCPKG_MSYS_${name}_SHA512}") + foreach(patch IN LISTS Z_VCPKG_MSYS_${name}_PATCHES) file(SHA512 "${patch}" patch_sha) - string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${patch_sha}") + string(APPEND result "${patch_sha}") endforeach() - set(Z_VCPKG_MSYS_TOTAL_HASH "${Z_VCPKG_MSYS_TOTAL_HASH}" PARENT_SCOPE) - endif() + endforeach() + set(${out_hash} "${result}" PARENT_SCOPE) endfunction() function(vcpkg_acquire_msys out_msys_root) @@ -94,13 +165,12 @@ function(vcpkg_acquire_msys out_msys_root) message(WARNING "vcpkg_acquire_msys was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - set(Z_VCPKG_MSYS_TOTAL_HASH "") - set(Z_VCPKG_MSYS_ARCHIVES "") - - set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}") - - if(NOT arg_NO_DEFAULT_PACKAGES) - list(APPEND Z_VCPKG_MSYS_PACKAGES bash coreutils sed grep gawk gzip diffutils make pkg-config) + z_vcpkg_acquire_msys_declare_all_packages() + set(requested "${arg_PACKAGES}") + if(arg_Z_ALL_PACKAGES) + set(requested "${Z_VCPKG_MSYS_PACKAGES_AVAILABLE}") + elseif(NOT arg_NO_DEFAULT_PACKAGES) + list(APPEND requested bash coreutils file gawk grep gzip diffutils make pkgconf sed) endif() if(DEFINED arg_DIRECT_PACKAGES AND NOT arg_DIRECT_PACKAGES STREQUAL "") @@ -113,421 +183,456 @@ function(vcpkg_acquire_msys out_msys_root) message(FATAL_ERROR "vcpkg_acquire_msys(... DIRECT_PACKAGES ...) requires exactly pairs of URL/SHA512") endif() + set(direct_packages "") # direct_packages_last > direct_packages_number - 1 > 0 - 1 >= 0, so this is fine foreach(index RANGE "${direct_packages_last}") math(EXPR url_index "${index} * 2") math(EXPR sha512_index "${url_index} + 1") list(GET arg_DIRECT_PACKAGES "${url_index}" url) list(GET arg_DIRECT_PACKAGES "${sha512_index}" sha512) - get_filename_component(filename "${url}" NAME) - z_vcpkg_acquire_msys_download_package(archive + if(NOT filename MATCHES "^(.*)-[^-]+-[^-]+-[^-]+\.pkg\.tar\..*$") + message(FATAL_ERROR "Cannot determine package name for '${filename}'") + endif() + set(pkg_name "${CMAKE_MATCH_1}") + z_vcpkg_acquire_msys_declare_package( + NAME "${pkg_name}" URL "${url}" SHA512 "${sha512}" - FILENAME "${filename}" + DIRECT ) - string(REGEX MATCH "^(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$" pkg_name "${filename}") - set(pkg_name "${CMAKE_MATCH_2}") - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${pkg_name}") - set(Z_VCPKG_MSYS_${pkg_name}_ARCHIVE "${archive}") - string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${sha512}") + list(APPEND direct_packages "${pkg_name}") endforeach() + list(INSERT requested 0 ${direct_packages}) + endif() + + z_vcpkg_acquire_msys_download_packages( + PACKAGES ${requested} + OUT_RESOLVED resolved + OUT_UNKNOWN unknown + ) + if(NOT unknown STREQUAL "") + message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${requested}): ${unknown} +This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") endif() + set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "${resolved}" CACHE INTERNAL "Export for CI") - # To add new entries, use https://packages.msys2.org/package/$PACKAGE?repo=msys + z_vcpkg_acquire_msys_collect_hashes(hashes PACKAGES ${resolved}) + string(SHA512 total_hash "${hashes}") + string(SUBSTRING "${total_hash}" 0 16 total_hash) + set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}") + + if(NOT EXISTS "${path_to_root}") + file(REMOVE_RECURSE "${path_to_root}.tmp") + file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp") + foreach(name IN LISTS resolved) + file(ARCHIVE_EXTRACT + INPUT "${Z_VCPKG_MSYS_${name}_ARCHIVE}" + DESTINATION "${path_to_root}.tmp" + ) + if(Z_VCPKG_MSYS_${name}_PATCHES) + z_vcpkg_apply_patches( + SOURCE_PATH "${path_to_root}.tmp" + PATCHES ${Z_VCPKG_MSYS_${name}_PATCHES} + ) + endif() + endforeach() + file(RENAME "${path_to_root}.tmp" "${path_to_root}") + endif() + # Due to skipping the regular MSYS2 installer, + # some config files need to be established explicitly. + if(NOT EXISTS "${path_to_root}/etc/fstab") + # This fstab entry removes the cygdrive prefix from paths. + file(WRITE "${path_to_root}/etc/fstab" "none / cygdrive binary,posix=0,noacl,user 0 0") + endif() + message(STATUS "Using msys root at ${path_to_root}") + set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE) +endfunction() + + +macro(z_vcpkg_acquire_msys_declare_all_packages) + set(Z_VCPKG_MSYS_PACKAGES_AVAILABLE "" CACHE INTERNAL "") + + # The following list can be updated via test port vcpkg-ci-msys2[update-all]. + # Upstream binary package information is available via + # https://packages.msys2.org/search?t=binpkg&q= + + # msys subsystem z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" - SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 - DEPS libbz2 + URL "https://mirror.msys2.org/msys/x86_64/autoconf-wrapper-20221207-1-any.pkg.tar.zst" + SHA512 601ceb483ddf49d744ed7e365317d64777752e35010a1087082452afd42d8d29fc5331cb3fa4654eb09eec85416c8c5b70fed91a45acfaa667f06f80e6d42f30 + PROVIDES autoconf + DEPS autoconf2.71 bash sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" - SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e + URL "https://mirror.msys2.org/msys/x86_64/autoconf2.71-2.71-1-any.pkg.tar.zst" + SHA512 bf725b7d4440764fb21061c066b765193801a03c7ded03cf19ae85aee87ea54059c4283e56877e4e2a54cfec9ef65874160c2cb76de0d08f2550c6032f07c36e + DEPS awk bash diffutils m4 perl sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/patch-2.7.6-1-x86_64.pkg.tar.xz" - SHA512 04d06b9d5479f129f56e8290e0afe25217ffa457ec7bed3e576df08d4a85effd80d6e0ad82bd7541043100799b608a64da3c8f535f8ea173d326da6194902e8c + URL "https://mirror.msys2.org/msys/x86_64/autoconf-archive-2022.09.03-1-any.pkg.tar.zst" + SHA512 d8567215c405632cd9ce232982c79aa1e8c063d13aac7c64a0ba84901c26710f0254ab72ab9ab464a9ec3fb7163ed60cb950b1f0509880f3378066b073a83d80 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gzip-1.11-1-x86_64.pkg.tar.zst" - SHA512 bcd9d7839aef5f2b73c4d39b51838e62626c201c808d512806ba0a1619aee83c7deddb0d499fd93f9815fe351d7ab656c31c9dc7ee1171d77ad6d598e04dfcbe - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/automake-wrapper-20221207-1-any.pkg.tar.zst" + SHA512 22a65f75d1f19788cab93ecf70cb653fcedf67c18285ccbd2bb74ed1303dae8b09e9cfff40e8733920e75d8c4754d59481fa0c5b07d0c28803809448b011f45f + PROVIDES automake + DEPS automake1.16 bash gawk ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/texinfo-6.8-3-x86_64.pkg.tar.zst" - SHA512 5cc16d3b3c3b9859fe61233fa27f2146526e2b4d6e626814d283b35bfd77bc15eb4ffaec00bde6c10df93466d9155a06854a7ecf2e0d9af746dd56c4d88d192e + URL "https://mirror.msys2.org/msys/x86_64/automake1.16-1.16.5-1-any.pkg.tar.zst" + SHA512 62c9dfe28d6f1d60310f49319723862d29fc1a49f7be82513a4bf1e2187ecd4023086faf9914ddb6701c7c1e066ac852c0209db2c058f3865910035372a4840a DEPS bash perl + PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch" ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bash-5.1.008-1-x86_64.pkg.tar.zst" - SHA512 a2ab8c958615134dc666254baca8cb13ed773036954e458de74ffb3bfe661bb33149082d38b677024da451755098a9201ab7dd435ced6e7f6b4e94c3ae368daf - DEPS msys2-runtime - ) - z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-3-any.pkg.tar.zst" - SHA512 f639deac9b2191c2096584cf374103bbb1e9d2476dd0ebec94b1e80da59be25b88e362ac5280487a89f0bb0ed57f99b66e314f36b7de9cda03c0974806a3a4e2 - DEPS m4 perl + URL "https://mirror.msys2.org/msys/x86_64/bash-5.2.015-1-x86_64.pkg.tar.zst" + SHA512 2a1e35ccabe023332454cc58f6b9d8c4fdf9fb823f4c8a99127fcf69ab6f7aca35a3d7ea0f4f97378c4f696ef397f48bd30c2379f41d8b5dffd2de0d6177e612 + PROVIDES sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-archive-2019.01.06-1-any.pkg.tar.xz" - SHA512 77540d3d3644d94a52ade1f5db27b7b4b5910bbcd6995195d511378ca6d394a1dd8d606d57161c744699e6c63c5e55dfe6e8664d032cc8c650af9fdbb2db08b0 - DEPS m4 perl + URL "https://mirror.msys2.org/msys/x86_64/binutils-2.40-1-x86_64.pkg.tar.zst" + SHA512 d7f00f93b54fd77102cc2e535303902d0958664eeacf09865a92e572a5bdca11e0782b7b89eb6412c3340a02fc581cbfeb074a5be1b75537422a2b28ed0e6773 + DEPS libiconv libintl zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/diffutils-3.8-2-x86_64.pkg.tar.zst" - SHA512 ee74e457c417d6978b3185f2fb8e15c9c30ecfc316c2474d69c978e7eb2282a3bd050d68dbf43d694cb5ab6f159b0e7ca319d01f8192071d82a224dde87d69b5 - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/bzip2-1.0.8-4-x86_64.pkg.tar.zst" + SHA512 1d2ce42c6775c0cb0fe9c2863c975fd076579131d0a5bce907355315f357df4ee66869c9c58325f5b698f3aba2413b2823deda86dd27fdb6e2e5e5d4de045259 + DEPS libbz2 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/binutils-2.37-5-x86_64.pkg.tar.zst" - SHA512 32129cf97b53d5f6d87b42f17643e9dfc2e41b9ab4e4dfdc10e69725a9349bb25e57e0937e7504798cae91f7a88e0f4f5814e9f6a021bb68779d023176d2f311 - DEPS libiconv libintl + URL "https://mirror.msys2.org/msys/x86_64/coreutils-8.32-5-x86_64.pkg.tar.zst" + SHA512 63f99348e654440458f26e9f52ae3289759a5a03428cf2fcf5ac7b47fdf7bf7f51d08e3346f074a21102bee6fa0aeaf88b8ebeba1e1f02a45c8f98f69c8db59c + DEPS libiconv libintl gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.7-3-x86_64.pkg.tar.zst" - SHA512 a202ddaefa93d8a4b15431dc514e3a6200c47275c5a0027c09cc32b28bc079b1b9a93d5ef65adafdc9aba5f76a42f3303b1492106ddf72e67f1801ebfe6d02cc - DEPS grep sed coreutils file findutils + URL "https://mirror.msys2.org/msys/x86_64/diffutils-3.9-1-x86_64.pkg.tar.zst" + SHA512 5858c7cfa84b2f79b8e61a34901f43af441cf6e792f534532aeafced4cee470241e72d117cffa5136ffa6ad1b04e2a4e0963080df1b380e9b2657dc7dd9bd193 + DEPS libiconv libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/file-5.41-2-x86_64.pkg.tar.zst" - SHA512 124c3983608879362acea7d487bf23690f371b3cfe0355385f0e643263b2a5568abe5cebda92ef9bc534e81f850138f589e75982f36a53f509676056d71de642 - DEPS gcc-libs zlib libbz2 + URL "https://mirror.msys2.org/msys/x86_64/file-5.44-5-x86_64.pkg.tar.zst" + SHA512 68d1df9eb548af935b4f3e7f32d0bb3599bf6d59219e229a0501e531b78c6fbecba620c8854f504b44acc48c9bacc4c2420975c598a396ae7f6ae56c742ab6d2 + DEPS gcc-libs libbz2 liblzma libzstd zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" - SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/findutils-4.9.0-3-x86_64.pkg.tar.zst" + SHA512 1538733929ecc11bc7c19797577e4cd59cc88499b375e3c2ea4a8ed4d66a1a02f4468ff916046c76195ba92f4c591d0e351371768117a423595d2e43b3321aad + DEPS libintl libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-3-x86_64.pkg.tar.zst" - SHA512 9d03e8fc5677dd1386454bd27a683667e829ad5b1b87fc0879027920b2e79b25a2d773ab2556cd29844b18dd25b26fef5a57bf89e35ca318e39443dcaf0ca3ba - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/gawk-5.2.1-2-x86_64.pkg.tar.zst" + SHA512 0d056ae2bd906badc4e8ac362bd848800ec0fbe53137c74eb20667b86fa18c7fc0da291c5baec129a8fdfba31216d8500d827475b8ad0e8bcbfb2a0e46ddb95e + PROVIDES awk + DEPS libintl libreadline mpfr sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-3-x86_64.pkg.tar.zst" - SHA512 955420cabd45a02f431f5b685d8dc8acbd07a8dcdda5fdf8b9de37d3ab02d427bdb0a6d8b67c448e307f21094e405e916fd37a8e9805abd03610f45c02d64b9e - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/gcc-libs-11.3.0-3-x86_64.pkg.tar.zst" # 05-Jul-2022 + SHA512 eb8dccfa7939f3cb86a585a71d3083dda814bb38ee8484446147533a355520862989716b5ff3e483741496c594314367759646153cb6a4fedc0b44a87373a3fc ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-2-x86_64.pkg.tar.zst" - SHA512 0719e8d3683711453ff77496cad11583e877ea52806e5ea3f470444705705db20a8a9fe99987166b02c6bd240c06c7d86faa979a7bc5536c9c804d800b60b7be - DEPS libiconv libintl gmp + URL "https://mirror.msys2.org/msys/x86_64/gettext-0.21-2-x86_64.pkg.tar.zst" + SHA512 2f6b95686e6c9cabfdac22994cbd6402dc22da71ab9582205874e7967452be65a25bf73b8994cce679ef43b26a29dec25eb3f233f7126d8c4b2f5ddd28588bd4 + DEPS libasprintf libgettextpo libintl ) + # This package shouldn't be a here z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/grep-3.0-2-x86_64.pkg.tar.xz" - SHA512 c784d5f8a929ae251f2ffaccf7ab0b3936ae9f012041e8f074826dd6077ad0a859abba19feade1e71b3289cc640626dfe827afe91c272b38a1808f228f2fdd00 - DEPS libiconv libintl libpcre + URL "https://mirror.msys2.org/msys/x86_64/gettext-devel-0.21-2-x86_64.pkg.tar.zst" + SHA512 c8852c4c8cf7810434dab18c7a002e59c2248de93b575097a30a31f4e7f41719855c0f3cf55356173576aab03119139f71dce758df1421b3f23c1ca3520e4261 + DEPS gettext # libiconv-devel ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/sed-4.8-2-x86_64.pkg.tar.zst" - SHA512 8391be777239e0bfc19dc477995ee581ea9dbb1ba34fc27f57ba9d858e7489ac9b7200479d405712b43fa88434dd597be71d161fa8c05606e7ef991711bfc4c1 - DEPS libintl + URL "https://mirror.msys2.org/msys/x86_64/gmp-6.2.1-2-x86_64.pkg.tar.zst" + SHA512 b2df273243ba08ed2b1117d2b4826900706859c51c1c39ca6e47df2b44b006b2512f7db801738fdbb9411594bc8bc67d308cf205f7fa1aab179863844218e513 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libpcre-8.45-1-x86_64.pkg.tar.zst" - SHA512 b10a69380c44ea35367f310a7400eae26beacf347ddbb5da650b54924b80ffd791f12a9d70923567e5081e3c7098f042e47bcff1328d95b0b27ce63bcd762e88 - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/grep-1~3.0-6-x86_64.pkg.tar.zst" + SHA512 79b4c652082db04c2ca8a46ed43a86d74c47112932802b7c463469d2b73e731003adb1daf06b08cf75dc1087f0e2cdfa6fec0e8386ada47714b4cff8a2d841e1 + DEPS libiconv libintl libpcre sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" - SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/gzip-1.12-2-x86_64.pkg.tar.zst" + SHA512 107754050a4b0f8633d680fc05aae443ff7326f67517f0542ce2d81b8a1eea204a0006e8dcf3de42abb3be3494b7107c30aba9a4d3d03981e9cacdc9a32ea854 + DEPS bash ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake-wrapper-11-4-any.pkg.tar.zst" - SHA512 175940ebccb490c25d2c431dd025f24a7d0c930a7ee8cb81a44a4989c1d07f4b5a8134e1d05a7a1b206f8e19a2308ee198b1295e31b2e139f5d9c1c077252c94 - DEPS gawk + URL "https://mirror.msys2.org/msys/x86_64/libasprintf-0.21-2-x86_64.pkg.tar.zst" + SHA512 e583ae8a6611f11ce56bdd8c0e420854d253070072776c78358ee052260fb3c7b1a7a53eed5e3f1e555e883fa489bb6154679ffe91c88e0390596805b1799d71 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gawk-5.1.0-2-x86_64.pkg.tar.zst" - SHA512 d4b00e2b53ce99ddd3ee8e41c41add5ab36d26a54107acf7f5a5bf4a0033d72465cdab86f5b2eb8b7aca2cb5027a3e35cb194794c3bf563c0075ca3dbcad6987 - DEPS libintl libreadline mpfr + URL "https://mirror.msys2.org/msys/x86_64/libbz2-1.0.8-4-x86_64.pkg.tar.zst" + SHA512 5a7be6d04e55e6fb1dc0770a8c020ca24a317807c8c8a4813146cd5d559c12a6c61040797b062e441645bc2257b390e12dd6df42519e56278a1fe849fe76a1c4 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst" - SHA512 d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072 - DEPS gmp gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/libcrypt-2.1-4-x86_64.pkg.tar.zst" + SHA512 8bd56a777326dc8793df8bc7bc837bbfd9fb888d678fbfded8c37449fcc85aa3e318b5a249f773aa38ef4e12d8c58f080dce7db9c322b649702bdba292708ebc + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-1-x86_64.pkg.tar.zst" - SHA512 c5c8009ef069d05c2209b69c8e87094b09aac4b5c3dfdbea474d8262e55d286b400f1360c6a9778fd5eb87fb76a6463c21188286a1a1919ad79153eae3c44b0f + URL "https://mirror.msys2.org/msys/x86_64/libgettextpo-0.21-2-x86_64.pkg.tar.zst" + SHA512 e5736e2d5b8a7f0df02bab3a4c0e09f5a83069f4ff5554fa176f832b455fe836210686428172a34951db7f4ce6f20ec5428440af06d481fcaa90d632aac4afd2 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. - SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba - DEPS liblzma libiconv gettext + URL "https://mirror.msys2.org/msys/x86_64/libiconv-1.17-1-x86_64.pkg.tar.zst" + SHA512 e8fc6338d499ccf3a143b3dbdb91838697de76e1c9582bb44b0f80c1d2da5dcfe8102b7512efa798c5409ba9258f4014eb4eccd24a9a46d89631c06afc615678 + DEPS gcc-libs libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz" - SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad + URL "https://mirror.msys2.org/msys/x86_64/libintl-0.21-2-x86_64.pkg.tar.zst" + SHA512 fd066ea0fa9bc67fe3bcb09ba4d9dd4524611840bb3179e521fa3049dc88ba5e49851cc04cb76d8f0394c4ec1a6bf45c3f6ce6231dc5b0d3eb1f91d983b7f93b + DEPS gcc-libs libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libreadline-8.1.001-1-x86_64.pkg.tar.zst" - SHA512 4104eb0c18b8c06ab3bd4ba6420e3464df8293bec673c88da49e2f74cf1d583c922e9ead5691271fe593d424f92d1fd8668a3002174d756993d5b18337459bab - DEPS ncurses + URL "https://mirror.msys2.org/msys/x86_64/liblzma-5.4.1-1-x86_64.pkg.tar.zst" + SHA512 298a49e0c26587899e37c894f61c9e9c4702548bcc181610fc8408b773097cc3e042b5ae24a4e01ee0b592b68c8f24152f9dcc298b7d1860ffa6562c2513274d + # This package installs only a DLL. No extra deps. + DEPS # gettext libiconv sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/ncurses-6.2-2-x86_64.pkg.tar.zst" - SHA512 4bf744a21ab2030ea9d65eb4d824ec5bed4532b7a489859e5e19bba11b5ba9be08613de48acb38baacfd2a7295722e4d858d7c577565f1999d2583defbbb58f2 - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/libpcre-8.45-3-x86_64.pkg.tar.zst" + SHA512 566a2723f5b078a586d80c077f9267afb7badf3640386640a098d76ef9142797e7fa8acef5e638b962d9479206fb443c924750eec00a26bccdc39fb49094963f + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst" - SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72 - DEPS perl - PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch" + URL "https://mirror.msys2.org/msys/x86_64/libreadline-8.2.001-3-x86_64.pkg.tar.zst" + SHA512 fe8fa6c0d9fd81eab945855b83b9ee8ae224159b3c5eb550424645f2a611e82fd92744093cbcd560a2e2717a142b0dbb3f3cbb627bf41a309483241d3340a9c3 + DEPS ncurses ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" - SHA512 ad21734c05bc7faa809bc4ba761fb41a3b448d31794d1fd3d430cf4afe05ae991aabece4ec9a25718c01cc323d507bf97530533f0a20aabc18a7a2ccc0ae02b1 - DEPS libcrypt + URL "https://mirror.msys2.org/msys/x86_64/libtool-2.4.7-3-x86_64.pkg.tar.zst" + SHA512 a202ddaefa93d8a4b15431dc514e3a6200c47275c5a0027c09cc32b28bc079b1b9a93d5ef65adafdc9aba5f76a42f3303b1492106ddf72e67f1801ebfe6d02cc + DEPS sh tar + # extra deps which are really needed + awk findutils grep sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-3-x86_64.pkg.tar.zst" - SHA512 15cee333a82b55ff6072b7be30bf1c33c926d8ac21a0a91bc4cbf655b6f547bc29496df5fa288eb47ca2f88af2a4696f9b718394437b65dd06e3d6669ca0c2e5 + URL "https://mirror.msys2.org/msys/x86_64/libzstd-1.5.4-1-x86_64.pkg.tar.zst" + SHA512 5aed6a9b2e40759144878f1b5f888f221016fe3fb23ba04f17d515ca51b78c592f79747d90fcc096c735d74cccfeb22c19f2154dfa49d14bedc6c306f0c07759 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/pkg-config-0.29.2-4-x86_64.pkg.tar.zst" - SHA512 9f72c81d8095ca1c341998bc80788f7ce125770ec4252f1eb6445b9cba74db5614caf9a6cc7c0fcc2ac18d4a0f972c49b9f245c3c9c8e588126be6c72a8c1818 - DEPS libiconv + URL "https://mirror.msys2.org/msys/x86_64/m4-1.4.19-2-x86_64.pkg.tar.zst" + SHA512 7471099ba7e3b47e5b019dc0e563165a8660722f2bbd337fb579e6d1832c0e7dcab0ca9297c4692b18add92c4ad49e94391c621cf38874e2ff63d4f926bac38c + DEPS bash gcc-libs libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/make-4.3-3-x86_64.pkg.tar.zst" - SHA512 1d991bfc2f076c8288023c7dd71c65470ad852e0744870368a4ab56644f88c7f6bbeca89dbeb7ac8b2719340cfec737a8bceae49569bbe4e75b6b8ffdcfe76f1 - DEPS libintl msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/make-4.4.1-1-x86_64.pkg.tar.zst" + SHA512 7e1c95b976d949db4b74c444e0d1495bbee26649aa82eadf34076dba3c1223d4e7b901e07935ba73dceda67f0a0cf25dd99fe3eed5300a5163fdaab14ca8d9fc + DEPS libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.21-1-x86_64.pkg.tar.zst" - SHA512 44444064b9860dbd3cb886812fb20ee97ab04a65616cca497be69c592d5507e7bc66bfe8dbd060a4df9c5d9bb44cb0f231584d65cb04351146d54d15852227af - DEPS gettext + URL "https://mirror.msys2.org/msys/x86_64/mpfr-4.2.0-2-x86_64.pkg.tar.zst" + SHA512 a294154a0c48bbf6673e87f5f38eda9f8a0c99f8300a795c14cd2ec4ae18b39b158b2e76ca1cda51fa76575bd70339cb3b24c4ccf8f265f0e59515f5e457b040 + DEPS gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gettext-0.21-1-x86_64.pkg.tar.zst" - SHA512 6ef5f4094c4a174550a898cac4f60215d22de09f7e5f72bdb297d18a6f027e6122b4a519aa8d5781f9b0201dcae14ad7910b181b1499d6d8bbeb5a35b3a08581 - DEPS libintl libgettextpo libasprintf tar + URL "https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.4.6-1-x86_64.pkg.tar.zst" + SHA512 fbdcf2572d242b14ef3b39f29a6119ee58705bad651c9da48ffd11e80637e8d767d20ed5d562f67d92eecd01f7fc3bc351af9d4f84fb9b321d2a9aff858b3619 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/tar-1.34-2-x86_64.pkg.tar.zst" - SHA512 127a971f5c087500ec4858697205b36ae76dba82307f1bcaaa44e746337d85d97360e46e55ef7fecbfa2a4af428ee26d804fa7d7c2b8ce6de1b86328dd14ef2d - DEPS libiconv libintl + URL "https://mirror.msys2.org/msys/x86_64/ncurses-6.4-1-x86_64.pkg.tar.zst" + SHA512 48093633b6506f4217fbe37b43d4e128874a01e5e56f817de38112e5a5b8d3ee4f77e99fb3cd63b55616e3ae84edbc49ac78d90968a24c25dfa368103d208897 + DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libgettextpo-0.21-1-x86_64.pkg.tar.zst" - SHA512 bb217639deadb36734bafb8db5217e654d00b93a3ef366116cc6c9b8b8951abef9a7e9b04be3fae09074cf68576f18575a0d09f3d2f344985606c1449a17222e - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/patch-2.7.6-2-x86_64.pkg.tar.zst" + SHA512 eb484156e6e93da061645437859531f7b04abe6fef9973027343302f088a8681d413d87c5635a10b61ddc4a3e4d537af1de7552b3a13106639e451b95831ec91 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libasprintf-0.21-1-x86_64.pkg.tar.zst" - SHA512 62dde7bfcfea75ea9adb463807d7c128019ffeec0fb23e73bc39f760e45483c61f4f29e89cdbfab1e317d520c83fe3b65306fbd7258fe11ea951612dbee479fe - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/perl-5.36.0-1-x86_64.pkg.tar.zst" + SHA512 fa83a0451b949155bdba53d71d51381d99e4a28dc0f872c53912c8646a5e1858495b8dcfdb0c235975e41de57bc2464eb1e71ffeab96a25c4aa5327cdaa03414 + DEPS coreutils libcrypt sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/findutils-4.8.0-1-x86_64.pkg.tar.zst" - SHA512 74f8750636becefd3675c89957dfb8a244d2db6fec80bf352998edfef93f66d0e2a37d7f2869a79dd197acf2057ccd6aefd12c58e94154765896a432831ab49c - DEPS libintl libiconv + URL "https://mirror.msys2.org/msys/x86_64/pkgconf-1.9.4-1-x86_64.pkg.tar.zst" + SHA512 0a5f0d69eec591a00d1aee985458dd855100184ec845b076d8f22ca51ba106964b8cf5b0061df288cdd611aa6a6e5fcb98eafded1c46536a0d17253240966f15 + PROVIDES pkg-config ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libintl-0.21-1-x86_64.pkg.tar.zst" - SHA512 be0242eed25793e86e0560868f76cf06a358ffc0b2beb357e776d6c7819e545ac90f9358b17a85aa598584babe3ab4bb4544e360a28f5cec965f314178b930d1 - DEPS libiconv + URL "https://mirror.msys2.org/msys/x86_64/sed-4.9-1-x86_64.pkg.tar.zst" + SHA512 8006a83f0cc6417e3f23ffd15d0cbca2cd332f2d2690232a872ae59795ac63e8919eb361111b78f6f2675c843758cc4782d816ca472fe841f7be8a42c36e8237 + DEPS libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libiconv-1.16-2-x86_64.pkg.tar.zst" - SHA512 3ab569eca9887ef85e7dd5dbca3143d8a60f7103f370a7ecc979a58a56b0c8dcf1f54ac3df4495bc306bd44bf36ee285aaebbb221c4eebfc912cf47d347d45fc - DEPS gcc-libs + URL "https://mirror.msys2.org/msys/x86_64/tar-1.34-3-x86_64.pkg.tar.zst" + SHA512 19e063393ef0f7eb18df2755798985e78a171f9aa4a747490a357b108d02a9a6a76cae514dd58da0e48a7dd66857dc251be30535677d9fa02e1640bc165cc004 + DEPS libiconv libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/gcc-libs-11.2.0-3-x86_64.pkg.tar.zst" - SHA512 be7bb61d1b87eafbb91cf9d0fee3270b9d5e2420c403ea394967941195d52ae248ce4ffde20af41a05310527a920269018f49487be617211a5e340486babd0f8 - DEPS msys2-runtime + URL "https://mirror.msys2.org/msys/x86_64/texinfo-7.0.2-1-x86_64.pkg.tar.zst" + SHA512 f3fc972bb4f738d3a6a736285ee2574262989fdb7bec0f4a260abb1bbfeb94f3fb3795986ba121cf623a96c60eccea2ff67906275acd466c640eae2fe18a2158 + DEPS perl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.4.6-1-x86_64.pkg.tar.zst" - SHA512 fbdcf2572d242b14ef3b39f29a6119ee58705bad651c9da48ffd11e80637e8d767d20ed5d562f67d92eecd01f7fc3bc351af9d4f84fb9b321d2a9aff858b3619 + URL "https://mirror.msys2.org/msys/x86_64/unzip-6.0-2-x86_64.pkg.tar.xz" + SHA512 b8a1e0ce6deff26939cb46267f80ada0a623b7d782e80873cea3d388b4dc3a1053b14d7565b31f70bc904bf66f66ab58ccc1cd6bfa677065de1f279dd331afb9 + DEPS bash libbz2 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst" + URL "https://mirror.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst" SHA512 5323fd6635093adf67c24889f469e1ca8ac969188c7f087244a43b3afa0bf8f14579bd87d9d7beb16a7cd61a5ca1108515a46b331868b4817b35cebcb4eba1d1 + DEPS sh ) - z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst" - SHA512 ce73d4270942f61963e8307f6bec945d14e3774455684842b8fde836b19a4e9cbf8efd0663ffb28ad872493db70fa3a4e14bd0b248c2067199f4fee94e80e77e - DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python + URL "https://mirror.msys2.org/msys/x86_64/xz-5.4.1-1-x86_64.pkg.tar.zst" + SHA512 5a04e8c244c05926da4bcc63f4fdc731b508c37396629c33e98833c7b6e10c0784b1b0de72f6f11f7f2bdab5ac8eafe2e1613081efd0f973b558200c6ccb6d90 + DEPS libiconv libintl liblzma ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openblas-0.3.19-1-any.pkg.tar.zst" - SHA512 0d18a93d7804d6469b8566cf4ad3a7efbdf8a4a4b05d191b23a30e107586423c6338b9f4a5ea2cc93052e6c0336dc82a43c26189c410263a6e705e6f3ebe261a - DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread + URL "https://mirror.msys2.org/msys/x86_64/zlib-1.2.13-1-x86_64.pkg.tar.zst" + SHA512 8dc7525091cf94b1c0646fd21a336cd984385e7e163f925b1f3f786c8be8b884f6cb9b68f55fdb932104c0eb4c8e270fc8df2ec4742404d2dcd0ad9c3e29e7e8 + DEPS gcc-libs ) + + # mingw64 subsystem z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" - SHA512 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" + SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-3.8.9-2-any.pkg.tar.zst" - SHA512 8a45b28b2b0471718bd1ab096958872b18ae3b25f06c30718c54d1edaf04214397330a51776f3e4eee556ac47d9e3aa5e1b211c5df0cf6be3046a6f3a79cfa7d - DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20230311-1-any.pkg.tar.zst" + SHA512 f7526ad35bccc5edba3fcf1354a85eacbd61dba5780b1bc65c7e8795ecb252432004af809052bb0ba981b1dea174c40e2d3f20655d8e2b29be95ad54d2aa5782 + DEPS mingw-w64-x86_64-p11-kit ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" - SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 - DEPS mingw-w64-x86_64-gcc-libs + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-expat-2.5.0-1-any.pkg.tar.zst" + SHA512 b49ec84750387af5b73a78d654673d62cf0e2cb2b59b4d25acb7eca3830018f7a2aefe600d67d843417cfbdd97db81ecfd49a8811e312f53b42c21fb106b230d ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" - SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-10-any.pkg.tar.zst" + SHA512 0fbe2b01a22c327affcf1581b33912494731ac32c58cc94df740604f6f5a284f89f13508f977f4e15a1345c81e3e8ada3ff5c55bff0a907631d27ed7c0f74677 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ncurses-6.3-3-any.pkg.tar.zst" - SHA512 888c155d878651dc31c9a01455ab689d7b644cec759521b69b8399c20b6ddc77c90f3ee4ddeed8857084335335b4b30e182d826fb5b78719b704f13a1dfdbd54 - DEPS mingw-w64-x86_64-libsystre + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-12.2.0-10-any.pkg.tar.zst" + SHA512 94b001fa5a2cba5a5fc4b27887cf1dfc930a67dd03a889247b15d51f11280af01c509fe63b7412ec36b549a5a302e1f4d98a13685d1d10068e7d12a4446777a4 + PROVIDES mingw-w64-x86_64-libssp mingw-w64-x86_64-omp + DEPS mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" - SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 - DEPS mingw-w64-x86_64-libtre + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-0.21.1-1-any.pkg.tar.zst" + SHA512 9002289afe530706912eb5b8feffe1d7adb23e01d6b79516ff5deef2faec1577b31890dda15426cc4cc2f30b5f12e55166a4bad492db533234b44cc89fe81117 + DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv ) z_vcpkg_acquire_msys_declare_package( - NAME "mingw-w64-x86_64-libtre" - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" - SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst" + SHA512 7d884ef1186bd6942f7a7ace28963aae679bb6c6c77c05f186323c44b11894b80f53203a6fad55a0ae112fec41b4e1a624e67021e5f2f529a7fedf35c2755245 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-openssl-1.1.1.m-1-any.pkg.tar.zst" - SHA512 9471b0e5b01453f6ee5c92be6e259446c6b5be45d1da8985a4735b3e54c835d9b86286b2af126546419bf968df096442bd4f60f30efa1a901316e3c02b98525f - DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libffi-3.4.4-1-any.pkg.tar.zst" + SHA512 ec88a0e0cb9b3ff3879d3fd952d3ad52f0d86a42669eddaeca47778ab0d5213abdea7d480a23aa3870e08d6b93b9c4988855e368474be7186e9719456baae5df ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-ca-certificates-20210119-1-any.pkg.tar.zst" - SHA512 5590ca116d73572eb336ad73ea5df9da34286d8ff8f6b162b38564d0057aa23b74a30858153013324516af26671046addd6bcade221e94e7b8ed5e8f886e1c58 - DEPS mingw-w64-x86_64-p11-kit + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst" + SHA512 57221118a6ed975ddde322e0d34487d4752c18c62c6184e9ed77ca14fe0a3a78a78aefe628cda3285294a5564d87cd057c56f4864b12fa8580d68b8e8a805e16 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-p11-kit-0.24.1-1-any.pkg.tar.zst" - SHA512 6437919cd61c8b1a59b346bbd93d960adb7f11206e8c0010311d71d0fe9aa03f950ecf08f19a5555b27f481cc0d61b88650b165ae9336ac1a1a0a9be553239b9 - DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libsystre-1.0.1-4-any.pkg.tar.xz" + SHA512 6540e896636d00d1ea4782965b3fe4d4ef1e32e689a98d25e2987191295b319eb1de2e56be3a4b524ff94f522a6c3e55f8159c1a6f58c8739e90f8e24e2d40d8 + PROVIDES mingw-w64-x86_64-libgnurx + DEPS mingw-w64-x86_64-libtre ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libtasn1-4.18.0-1-any.pkg.tar.zst" - SHA512 2584a6e0bc2b7d145f026487951b8690e3d8e79f475a7b77f95fc27ca9a9f1887fe9303e340ba2635353c4a6f6a2f10a907dd8778e54be7506a15459f616d4a4 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtasn1-4.19.0-1-any.pkg.tar.zst" + SHA512 761a7c316914d7f98ec6489fb4c06d227e5956d50f2e233ad9be119cfd6301f6b7e4f872316c0bae3913268c1aa9b224b172ab94130489fbd5d7269ff9064cfb DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-sqlite3-3.37.2-1-any.pkg.tar.zst" - SHA512 0f83f10b0c8f4699a6b84deb6986fcd471cb80b995561ad793e827f9dd66110d555744918ed91982aec8d9743f6064726dd5eba3e695aa9ab5381ea4f8e76dbe - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libtre-git-r128.6fb7206-2-any.pkg.tar.xz" + SHA512 d595dbcf3a3b6ed098e46f370533ab86433efcd6b4d3dcf00bbe944ab8c17db7a20f6535b523da43b061f071a3b8aa651700b443ae14ec752ae87500ccc0332d + PROVIDES mingw-w64-x86_64-libtre + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.1.001-1-any.pkg.tar.zst" - SHA512 b38aef9216ea2ba7edd82ce57a48dbc913b9bdcb44b96b9800342fe097d706ba39c9d5ba08d793d2c3388722479258bb05388ae09d74a1edcaaf9002e9d71853 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst" + SHA512 e79bb2c93f4c9426c5a5400cd0d3a871c39c56db7068d45b208778fce19a9adb18229ee826397ee2fe8e68df0c554281490315687b3f50b48d6c7f2a6a68ec4b + PROVIDES mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" - SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-1-any.pkg.tar.zst" + SHA512 57b86866e2439baa21f296ecb5bdfd624a155dbd260ffe157165e2f8b20bc6fbd5cc446d25dee61e9ed8c28aca941e6f478be3c2d70393f160ed5fd8438e9683 + DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-mpfr + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpdecimal-2.5.1-1-any.pkg.tar.zst" + SHA512 1204c31367f9268ffd6658be04af7687c01f984c9d6be8c7a20ee0ebde1ca9a03b766ef1aeb1fa7aaa97b88a57f7a73afa7f7a7fed9c6b895a032db11e6133bf DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.11.1-2-any.pkg.tar.zst" - SHA512 15fd4e085fabe2281f33c8f36f4b1b0be132e5b100f6d4eaf54688842791aa2cf4e6d38a855f74f42be3f86c52e20044518f5843f8e9ca13c54a6ea4adb973a8 - DEPS mingw-w64-x86_64-tcl + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0-1-any.pkg.tar.zst" + SHA512 5c8edf4f5ab59afa51cbf1c5ae209583feebaea576e7e3abb59d7e448fe13e143993e6f35117c26ccc221bc6efc44568119c2e25d469c726a592a026b2498d92 + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.11-5-any.pkg.tar.zst" - SHA512 9db75ff47260ea3652d1abf60cd44649d0e8cbe5c4d26c316b99a6edb08252fb87ed017c856f151da99bcaa0bd90c0bebae28234035b008c5bd6508511639852 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20230211-1-any.pkg.tar.zst" + SHA512 3a86a851805646939dadd9dc4756fea45ffdbd89dec32f8452513d6aa491760861850eec68efb6a48b8b99953d7904547c6d55ff4fd67f20fd2641591781b53c + DEPS mingw-w64-x86_64-libsystre ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-xz-5.2.5-2-any.pkg.tar.zst" - SHA512 94fcf8b9f9fbc2cfdb2ed53dbe72797806aa3399c4dcfea9c6204702c4504eb4d4204000accd965fcd0680d994bf947eae308bc576e629bbaa3a4cefda3aea52 - DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.21-7-any.pkg.tar.zst" + SHA512 e1e49f477cb44f00b5f8760f9c25bd24746844fd076ca0c490b882cfe31204ae100692387e83de22cd89093c102ae751b99bca9dd2d328aaf5de0e401a531e8a + PROVIDES mingw-w64-x86_64-OpenBLAS + DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-omp ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst" - SHA512 38daa0edd1a2c1efdd56baeb6805d10501a57e0c8ab98942e4a16f8b021908dac315513ea85f5278adf300bce3052a44a3f8b473adb0d5d3656aa4a48fe61081 - DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.1.0-1-any.pkg.tar.zst" + SHA512 f146d0f2b31b767422c767f4ea39312cbe90eac86e8b248e24d28595069e6cc450351280dd5b837e27ffdd743fb7eb4880360a658f0d2b3709b8a170be3e37d2 + #DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" - SHA512 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 - DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-mpc mingw-w64-x86_64-mpfr + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-p11-kit-0.24.1-5-any.pkg.tar.zst" + SHA512 cbdecf7bf56ce64605a77b3c700c30322f7b0fbc8efbe2cb7007ae4108815ef96530a57db5631c788b41f1d20fbcad202de92066871bb76c78ea27ea07c848e0 + DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" - SHA512 f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 - DEPS mingw-w64-x86_64-mpfr + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.10.10-1-any.pkg.tar.zst" + SHA512 be778ecfd0d4a0f186f0628dab8959596c83b1f1cfaf8554fef63e3b9fd6c5506fa30cf84ad16bbb1eed6793b1f62a5770eff71fa53de6304c0c63d3bb164b00 + PROVIDES mingw-w64-x86_64-python3 mingw-w64-x86_64-python3.10 + DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0-3-any.pkg.tar.zst" - SHA512 be8ad04e53804f18cfeec5b9cba1877af1516762de60891e115826fcfe95166751a68e24cdf351a021294e3189c31ce3c2db0ebf9c1d4d4ab6fea1468f73ced5 - DEPS mingw-w64-x86_64-gmp + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.24.2-1-any.pkg.tar.zst" + SHA512 0c651815fc7d553430c577d350f460f74b731951125bf44cdbf148c705cb45801c032b98b53315cf98fbf57be3c8f5b598a148f0fbf93dd55079361e05445e7e + PROVIDES mingw-w64-x86_64-python3-numpy + DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" - SHA512 d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-readline-8.2.001-6-any.pkg.tar.zst" + SHA512 7b09a854b2225732b8452f6df7ebb378463066da3801ea29372c52ff68b2f6be5ccf8adf3d7d15a75e6fb3d471c5ade7bd4b9fc9599116d269c00bd9adde566e + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-expat-2.4.4-1-any.pkg.tar.zst" - SHA512 479e6591d06eee2686591d7232a60d4092540deb40cf0c2c418de861b1da6b21fb4be82e603dd4a3b88f5a1b1d21cdb4f016780dda8131e32be5c3dec85dfc4d + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.41.1-1-any.pkg.tar.zst" + SHA512 efa7ddcb9326bf25abcac35db36d461fb0817d40f5a6ffc1b412b627df5030a1494b0c87d2f0d0231bc962362d213e6c8eaad7cf057e88f51a0cdd8d2377d327 + PROVIDES mingw-w64-x86_64-sqlite mingw-w64-x86_64-sqlite-analyzer + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libffi-3.3-4-any.pkg.tar.zst" - SHA512 1d7be396ef132289be0c33792c4e81dea6cb7b1eafa249fb3e8abc0b393d14e5114905c0c0262b6a7aed8f196ae4d7a10fbafd342b08ec76c9196921332747b5 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" + SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" - SHA512 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.12-1-any.pkg.tar.zst" + SHA512 145e4a1e3093da20cd6755ca8d2b04f7ace87e3ac952d3593880d57f6719a4767ca315543a4f82ee5cb37cff311ff29c446b36484568f65fb6d0c58706763b9b + DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" - SHA512 f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.12-1-any.pkg.tar.zst" + SHA512 d3eb26a0fa4986ba4f6c77baf48d6fa9d623500f0b72aac9a385ff3c242dc8842eb80b563490995c162869fe3366e8b89d65561b4810b6b661ebbff2161428bf + DEPS mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - NAME "mingw-w64-x86_64-libwinpthread" - URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - SHA512 a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.1-1-any.pkg.tar.zst" + SHA512 93e01ebade4de60f06f4485f083accd9c9e212d2fa2de63acca6d7d31f009a4fb89720da23101018fd74b99415e1fb661cc3f3a7ba4be3cea49dadd768826f33 + DEPS mingw-w64-x86_64-gettext ) - - if(NOT Z_VCPKG_MSYS_PACKAGES STREQUAL "") - message(FATAL_ERROR "Unknown packages were required for vcpkg_acquire_msys(${arg_PACKAGES}): ${packages} -This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") - endif() - - string(SHA512 total_hash "${Z_VCPKG_MSYS_TOTAL_HASH}") - string(SUBSTRING "${total_hash}" 0 16 total_hash) - set(path_to_root "${DOWNLOADS}/tools/msys2/${total_hash}") - if(NOT EXISTS "${path_to_root}") - file(REMOVE_RECURSE "${path_to_root}.tmp") - file(MAKE_DIRECTORY "${path_to_root}.tmp/tmp") - set(index 0) - foreach(archive IN LISTS Z_VCPKG_MSYS_ARCHIVES) - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${archive}_ARCHIVE}" - LOGNAME "msys-${TARGET_TRIPLET}-${index}" - WORKING_DIRECTORY "${path_to_root}.tmp" - ) - math(EXPR index "${index} + 1") - if(Z_VCPKG_MSYS_${archive}_PATCHES) - z_vcpkg_apply_patches( - SOURCE_PATH "${path_to_root}.tmp" - PATCHES ${Z_VCPKG_MSYS_${archive}_PATCHES} - ) - endif() - endforeach() - file(RENAME "${path_to_root}.tmp" "${path_to_root}") - endif() - # Due to skipping the regular MSYS2 installer, - # some config files need to be established explicitly. - if(NOT EXISTS "${path_to_root}/etc/fstab") - # This fstab entry removes the cygdrive prefix from paths. - file(WRITE "${path_to_root}/etc/fstab" "none / cygdrive binary,posix=0,noacl,user 0 0") - endif() - message(STATUS "Using msys root at ${path_to_root}") - set("${out_msys_root}" "${path_to_root}" PARENT_SCOPE) -endfunction() + z_vcpkg_acquire_msys_declare_package( + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst" + SHA512 c07bea5fcc78016da74756612827b662b5dd4901d27f3a3390acc3c39b767806f48b09bd231140a40e3cd7aba76e5d869ed18278c720277e55f831f0c7809d54 + ) +endmacro() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 2a853259e90493..3ff67423655bb5 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -224,7 +224,7 @@ function(vcpkg_configure_make) # Establish a bash environment as expected by autotools. if(CMAKE_HOST_WIN32) - list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4 which) + list(APPEND msys_require_packages autoconf-wrapper automake-wrapper binutils libtool make pkgconf which) vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) set(base_cmd "${MSYS_ROOT}/usr/bin/bash.exe" --noprofile --norc --debug) vcpkg_list(SET add_to_env) diff --git a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake new file mode 100644 index 00000000000000..222727ca95ffd7 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake @@ -0,0 +1,336 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(msys_repo_url "https://mirror.msys2.org/msys/x86_64") +set(mingw64_repo_url "https://mirror.msys2.org/mingw/mingw64") +set(mingw32_repo_url "https://mirror.msys2.org/mingw/mingw32") + +# Ignore these updates (e.g. for known problems) +vcpkg_list(SET ignored_packages + https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20211016-3-any.pkg.tar.zst +) + +# Ignore these dependencies (e.g. interactive or effectively optional) +vcpkg_list(SET ignored_dependencies + autoconf2.13 autoconf2.69 + automake1.11 automake1.12 automake1.13 automake1.14 automake1.15 + db + gdbm + info + less + libiconv-devel + libltdl + mingw-w64-x86_64-tzdata +) + +# Ignore these provides (e.g. effectively optional) +vcpkg_list(SET ignored_provides + gnome-common + perl-Archive-Tar perl-Attribute-Handlers perl-AutoLoader perl-CPAN-Meta-Requirements perl-CPAN-Meta-YAML perl-CPAN-Meta perl-CPAN perl-Carp perl-Compress-Raw-Bzip2 perl-Compress-Raw-Zlib perl-Config-Perl-V perl-DB_File perl-Data-Dumper perl-Devel-PPPort perl-Devel-SelfStubber perl-Digest-MD5 perl-Digest-SHA perl-Digest perl-Dumpvalue perl-Encode perl-Env perl-Exporter perl-ExtUtils-CBuilder perl-ExtUtils-Constant perl-ExtUtils-Install perl-ExtUtils-MakeMaker perl-ExtUtils-Manifest perl-ExtUtils-PL2Bat perl-ExtUtils-ParseXS perl-File-Fetch perl-File-Path perl-File-Temp perl-Filter-Simple perl-Filter-Util-Call perl-FindBin perl-Getopt-Long perl-HTTP-Tiny perl-I18N-Collate perl-I18N-LangTags perl-IO-Compress perl-IO-Socket-IP perl-IO-Zlib perl-IO perl-IPC-Cmd perl-IPC-SysV perl-JSON-PP perl-Locale-Maketext-Simple perl-Locale-Maketext perl-MIME-Base64 perl-Math-BigInt-FastCalc perl-Math-BigInt perl-Math-BigRat perl-Math-Complex perl-Memoize perl-Module-CoreList perl-Module-Load-Conditional perl-Module-Load perl-Module-Loaded perl-Module-Metadata perl-NEXT perl-Net-Ping perl-Params-Check perl-PathTools perl-Perl-OSType perl-PerlIO-via-QuotedPrint perl-Pod-Checker perl-Pod-Escapes perl-Pod-Perldoc perl-Pod-Simple perl-Pod-Usage perl-Safe perl-Scalar-List-Utils perl-Search-Dict perl-SelfLoader perl-Socket perl-Storable perl-Sys-Syslog perl-Term-ANSIColor perl-Term-Cap perl-Term-Complete perl-Term-ReadLine perl-Test-Harness perl-Test-Simple perl-Test perl-Text-Abbrev perl-Text-Balanced perl-Text-ParseWords perl-Text-Tabs perl-Thread-Queue perl-Thread-Semaphore perl-Tie-File perl-Tie-RefHash perl-Time-HiRes perl-Time-Local perl-Time-Piece perl-Unicode-Collate perl-Unicode-Normalize perl-Win32 perl-Win32API-File perl-XSLoader perl-autodie perl-autouse perl-base perl-bignum perl-constant perl-encoding-warnings perl-experimental perl-if perl-lib perl-libnet perl-parent perl-perlfaq perl-podlators perl-threads-shared perl-threads perl-version +) + + +string(TIMESTAMP now "%s" UTC) + +function(age_in_days out_var timestamp) + set(age "") + if(timestamp) + math(EXPR age "(${now} - ${timestamp}) / 3600 / 24") + endif() + set(${out_var} "${age}" PARENT_SCOPE) +endfunction() + +function(pretty_age out_var age_in_days) + if(age_in_days STREQUAL "") + set(${out_var} "(timestamp unknown)" PARENT_SCOPE) + else() + set(${out_var} "(${age_in_days} days ago)" PARENT_SCOPE) + endif() +endfunction() + +function(get_vcpkg_builddate out_var name) + if(NOT DEFINED Z_VCPKG_MSYS_${name}_ARCHIVE) + z_vcpkg_acquire_msys_download_package(Z_VCPKG_MSYS_${name}_ARCHIVE + URL "${Z_VCPKG_MSYS_${name}_URL}" + SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}" + FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}" + ) + set(Z_VCPKG_MSYS_${name}_ARCHIVE "${Z_VCPKG_MSYS_${name}_ARCHIVE}" PARENT_SCOPE) + endif() + set(pkginfo_dir "${CURRENT_BUILDTREES_DIR}/vcpkg") + file(REMOVE_RECURSE "${pkginfo_dir}/${name}.txt" "${pkginfo_dir}/_tmp") + file(MAKE_DIRECTORY "${pkginfo_dir}/_tmp") + execute_process( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${name}_ARCHIVE}" .PKGINFO + WORKING_DIRECTORY "${pkginfo_dir}/_tmp" + ) + file(RENAME "${pkginfo_dir}/_tmp/.PKGINFO" "${pkginfo_dir}/${name}.txt") + file(STRINGS "${pkginfo_dir}/${name}.txt" builddate REGEX "builddate = [0-9]+") + string(REPLACE "builddate = " "" builddate "${builddate}") + set(${out_var} "${builddate}" PARENT_SCOPE) +endfunction() + +function(get_vcpkg_provides out_var name) + if(NOT DEFINED Z_VCPKG_MSYS_${name}_ARCHIVE) + z_vcpkg_acquire_msys_download_package(Z_VCPKG_MSYS_${name}_ARCHIVE + URL "${Z_VCPKG_MSYS_${name}_URL}" + SHA512 "${Z_VCPKG_MSYS_${name}_SHA512}" + FILENAME "${Z_VCPKG_MSYS_${name}_FILENAME}" + ) + set(Z_VCPKG_MSYS_${name}_ARCHIVE "${Z_VCPKG_MSYS_${name}_ARCHIVE}" PARENT_SCOPE) + endif() + set(pkginfo_dir "${CURRENT_BUILDTREES_DIR}/vcpkg") + file(REMOVE_RECURSE "${pkginfo_dir}/${name}.txt" "${pkginfo_dir}/_tmp") + file(MAKE_DIRECTORY "${pkginfo_dir}/_tmp") + execute_process( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${name}_ARCHIVE}" .PKGINFO + WORKING_DIRECTORY "${pkginfo_dir}/_tmp" + ) + file(RENAME "${pkginfo_dir}/_tmp/.PKGINFO" "${pkginfo_dir}/${name}.txt") + file(STRINGS "${pkginfo_dir}/${name}.txt" provides REGEX "provides = .+") + string(REPLACE "provides = " "" provides "${provides}") + set(${out_var} "${provides}" PARENT_SCOPE) +endfunction() + +function(update_vcpkg_download script_file name new_url) + message(STATUS "- Updating vcpkg...") + if(NOT new_url MATCHES [[^https://mirror\.msys2\.org/.*/(([^/]*)-[^-/]+-[^-/]+-[^-/]+\.pkg\.tar\.(xz|zst))$]]) + message(FATAL_ERROR "Supplied URL does not match the expected pattern: ${arg_URL}") + endif() + set(filename "msys2-${CMAKE_MATCH_1}") + vcpkg_download_distfile(archive + URLS "${new_url}" + FILENAME "${filename}" + SKIP_SHA512 + ) + execute_process( + COMMAND "${CMAKE_COMMAND}" -E sha512sum "${archive}" + OUTPUT_VARIABLE sha512 + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REGEX REPLACE " .*" "" sha512 "${sha512}") + vcpkg_replace_string("${SCRIPTS}/cmake/${script_file}" "${Z_VCPKG_MSYS_${name}_URL}" "${new_url}") + vcpkg_replace_string("${SCRIPTS}/cmake/${script_file}" "${Z_VCPKG_MSYS_${name}_SHA512}" "${sha512}") +endfunction() + +function(pretty_dependencies out_var list_name) + foreach(dependency IN LISTS ignored_dependencies) + list(TRANSFORM ${list_name} REPLACE "^${dependency}\$" "(${dependency})") + endforeach() + list(JOIN ${list_name} " " list_string) + set(${out_var} "${list_string}" PARENT_SCOPE) +endfunction() + +function(analyze_package_list list_var script) + message(STATUS "*** Analyzing packages in '${script}'") + vcpkg_list(SET critical) # Packages which can be upgraded and are fairly old in vcpkg + vcpkg_list(SET mismatched_deps) # Packages which have vcpkg deps different from msys2 deps + vcpkg_list(SET missing) # Packages used in (new) deps but not declared + vcpkg_list(SET upgradable) # Packages which can be upgrade but are fairly fresh in vcpkg + vcpkg_list(SET vanished) # Packages which vanished from the msys2 database + + # Preload details from direct packages + foreach(name IN LISTS ${list_var}) + if(NOT Z_VCPKG_MSYS_${name}_DIRECT) + continue() + endif() + get_vcpkg_provides(vcpkg_provides "${name}") + set(Z_VCPKG_MSYS_${name}_PROVIDES "${vcpkg_provides}") + foreach(provided IN LISTS vcpkg_provides) + set(Z_VCPKG_MSYS_${provided}_PROVIDED_BY "${name}") + endforeach() + endforeach() + + # msys2.org removes packages 1.75 years after it was removed from the active database, + # cf. https://www.msys2.org/docs/faq/#how-long-are-old-packages-kept-on-repomsys2org + # We don't know the date of that replacement, and mirrors might use a shorter time. + # But we can compare the build date of the package currently downloaded by vcpkg + # and the build date of the package in the msys2 database. + # If this time span exceeds 'max_age', an update is marked as critical. + set(max_age 365) # days + math(EXPR minimum_builddate "${now} - 6 * 30 * 24 * 3600") + foreach(name IN LISTS ${list_var}) + if(Z_VCPKG_MSYS_${name}_DIRECT) + message(STATUS "${name} (DIRECT)") + elseif("DIRECT_ONLY" IN_LIST ARGN) + continue() + else() + message(STATUS "${name}") + endif() + set(vcpkg_url "${Z_VCPKG_MSYS_${name}_URL}") + set(vcpkg_deps "${Z_VCPKG_MSYS_${name}_DEPS}") + set(vcpkg_provides "${Z_VCPKG_MSYS_${name}_PROVIDES}") + + set(repo "msys") + if(name MATCHES "^mingw-w64-x86_64") + set(repo "mingw64") + elseif(name MATCHES "^mingw-w64-i686") + set(repo "mingw32") + endif() + + file(GLOB files "${${repo}_repo_files}/${name}-*/desc") + set(found 0) + foreach(file IN LISTS files) + # Find the package + file(STRINGS "${file}" desc) + if(NOT desc MATCHES "%NAME%;${name};") + continue() + elseif(NOT desc MATCHES "%FILENAME%;([^;]+)") + continue() + endif() + set(found 1) + set(current_url "${${repo}_repo_url}/${CMAKE_MATCH_1}") + # Check the URL + if(NOT vcpkg_url STREQUAL current_url AND NOT current_url IN_LIST ignored_packages) + get_vcpkg_builddate(vcpkg_builddate "${name}") + age_in_days(vcpkg_age "${vcpkg_builddate}") + pretty_age(vcpkg_age_pretty "${vcpkg_age}") + set(current_age "") + if(desc MATCHES "%BUILDDATE%;([0-9]+)") + age_in_days(current_age "${CMAKE_MATCH_1}") + endif() + pretty_age(current_age_string "${current_age}") + message(STATUS "- vcpkg: ${vcpkg_url} ${vcpkg_age_pretty}") + message(STATUS "+ msys2: ${current_url} ${current_age_string}") + + set(age_diff "0") + if(NOT vcpkg_age STREQUAL "" AND NOT current_age STREQUAL "") + math(EXPR age_diff "${current_age} - ${vcpkg_age}") + endif() + if(age_diff GREATER max_age) + if("update-all" IN_LIST FEATURES) + update_vcpkg_download("${script}" "${name}" "${current_url}") + else() + vcpkg_list(APPEND critical "${name}") + endif() + elseif(NOT vcpkg_url STREQUAL current_url) + if("update-all" IN_LIST FEATURES) + update_vcpkg_download("${script}" "${name}" "${current_url}") + else() + vcpkg_list(APPEND upgradable "${name}") + endif() + endif() + endif() + # Check the dependencies + if(desc MATCHES "%DEPENDS%;([^%]*)" OR vcpkg_deps) + list(JOIN CMAKE_MATCH_1 " " current_deps) + separate_arguments(current_deps UNIX_COMMAND "${current_deps}") + list(TRANSFORM current_deps REPLACE "[<=>].*" "") + list(SORT current_deps) + list(SORT vcpkg_deps) + pretty_dependencies(current_deps_string current_deps) + if(Z_VCPKG_MSYS_${name}_DIRECT AND NOT current_deps STREQUAL "") + message(STATUS "* msys2 dependencies: ${current_deps_string}") + elseif(NOT vcpkg_deps STREQUAL current_deps) + pretty_dependencies(vcpkg_deps_string vcpkg_deps) + message(STATUS "- vcpkg dependencies: ${vcpkg_deps_string}") + message(STATUS "+ msys2 dependencies: ${current_deps_string}") + list(REMOVE_ITEM current_deps ${ignored_dependencies}) + if(NOT vcpkg_deps STREQUAL current_deps) + vcpkg_list(APPEND mismatched_deps "${name}") + endif() + list(REMOVE_ITEM current_deps ${known_packages} ${${list_var}} ${ignored_dependencies}) + set(missing_deps "") + foreach(dep IN LISTS current_deps) + if(NOT DEFINED Z_VCPKG_MSYS_${dep}_PROVIDED_BY) + list(APPEND missing_deps "${dep}") + endif() + endforeach() + if(missing_deps) + list(JOIN missing_deps " " missing_deps_string) + message(STATUS "! unknown dependencies: ${missing_deps_string}") + vcpkg_list(APPEND missing ${missing_deps}) + endif() + endif() + endif() + # Check the "provides" + if(desc MATCHES "%PROVIDES%;([^%]*)" OR vcpkg_provides) + list(JOIN CMAKE_MATCH_1 " " current_provides) + separate_arguments(current_provides UNIX_COMMAND "${current_provides}") + list(TRANSFORM current_provides REPLACE "[<=>].*" "") + list(REMOVE_ITEM current_provides ${ignored_provides}) + list(JOIN vcpkg_provides " " vcpkg_provides_string) + if(NOT vcpkg_provides STREQUAL current_provides) + list(JOIN vcpkg_provides " " vcpkg_provides_string) + list(JOIN current_provides " " current_provides_string) + message(STATUS "- vcpkg provides: ${vcpkg_provides_string}") + message(STATUS "+ msys2 provides: ${current_provides_string}") + elseif(NOT vcpkg_provides STREQUAL "") + message(STATUS "* provides: ${vcpkg_provides_string}") + endif() + endif() + endforeach() + if(NOT found) + vcpkg_list(APPEND vanished "${name}") + get_vcpkg_builddate(vcpkg_builddate "${name}") + age_in_days(vcpkg_age "${vcpkg_builddate}") + pretty_age(vcpkg_age_pretty "${vcpkg_age}") + message(STATUS "- vcpkg: ${vcpkg_url} ${vcpkg_age_pretty}") + message(STATUS "! msys2: no match for ${name}") + + age_in_days(current_age "${now}") + set(age_diff "0") + if(NOT vcpkg_age STREQUAL "" AND NOT current_age STREQUAL "") + math(EXPR age_diff "${current_age} - ${vcpkg_age}") + endif() + if(age_diff GREATER max_age) + vcpkg_list(APPEND critical "${name}") + endif() + endif() + endforeach() + + if(mismatched_deps) + list(JOIN mismatched_deps " " mismatched_deps) + message(WARNING "The following msys2 packages have changed dependencies: ${mismatched_deps}") + endif() + if(missing) + list(SORT missing) + list(REMOVE_DUPLICATES missing) + list(JOIN missing " " missing) + message(WARNING "The following msys2 packages would be needed to update all dependencies: ${missing}") + endif() + if(upgradable) + list(JOIN upgradable " " upgradable) + message(WARNING "The following msys2 packages could be updated: ${upgradable}") + endif() + if(critical) + list(JOIN critical " " critical) + message(SEND_ERROR "The following msys2 packages were build more than 6 months ago and should be updated: ${critical}") + endif() + if(vanished) + list(JOIN vanished " " vanished) + message(SEND_ERROR "The following msys2 packages are no longer in the database: ${vanished}") + endif() + message(STATUS "*** Analyzing packages in '${script}' done") +endfunction() + +message(STATUS "*** Downloading current msys2 package lists") +string(TIMESTAMP stamp "%Y-%m-%d" UTC) +foreach(repo IN ITEMS msys mingw32 mingw64) + string(REPLACE "/" "-" local_file "msys2-${stamp}-${repo}.files") + set(archive "${DOWNLOADS}/${local_file}") + vcpkg_download_distfile(repo_files_archive + URLS "${${repo}_repo_url}/${repo}.files" + FILENAME "${local_file}" + SKIP_SHA512 + ) + vcpkg_extract_source_archive(repo_files + ARCHIVE "${repo_files_archive}" + NO_REMOVE_ONE_LEVEL + ) + set(${repo}_repo_files "${repo_files}") +endforeach() +message(STATUS "*** Downloading current msys2 package lists done") + +set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") +vcpkg_acquire_msys(msys_root Z_ALL_PACKAGES) +analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_acquire_msys.cmake") +set(known_packages "${Z_VCPKG_MSYS_PACKAGES_RESOLVED}") + +set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") +vcpkg_find_acquire_program(PKGCONFIG) +analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_acquire_program(PKGCONFIG).cmake" DIRECT_ONLY) + +set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") +include("${SCRIPTS}/cmake/vcpkg_find_fortran.cmake") +vcpkg_find_fortran(FORTRAN) +analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_fortran.cmake" DIRECT_ONLY) diff --git a/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json b/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json new file mode 100644 index 00000000000000..039d3df819996a --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-msys2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vcpkg-ci-msys2", + "version": "1", + "description": "Test vcpkg msys2 freshness", + "license": "MIT", + "supports": "(windows | mingw) & native", + "features": { + "update-all": { + "description": "Update all outdated packages in vcpkg_acquire_msys.cmake" + } + } +} From 1226189a7db719f3e55a6c24076e13d9f91094fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 30 May 2023 20:36:35 +0200 Subject: [PATCH 170/533] [quill] Update to 2.9.1 (#31705) * [quill] Update to 2.9.1 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index c432e764cdf778..3e2bf0cfcbe826 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 c5ec8e8454736633758fcf91ce27d7747eb99a186371939f5b56deddc5569cae895ebf96692ae301aae2bc0e540431863669c750d4ba32c1b27e8ebc0f919f0e + SHA512 35b1c2fa0c41cd0adc295da7182d54dd40990d6717608d7b9214f7c99e860787c3e5988908a525f44a674ddd8ea479532cec25fcf48113a957ee8abaf4d83441 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index b4e6ddfb08fbd7..36861e5b0f7340 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "2.9.0", + "version": "2.9.1", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d3d15af56a2ece..c38d5ca3b62f15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6917,7 +6917,7 @@ "port-version": 8 }, "quill": { - "baseline": "2.9.0", + "baseline": "2.9.1", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 34382f3481c1c0..30fe7574230b6c 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d0b893d24e4034db0e663e68c95188a26523d29", + "version": "2.9.1", + "port-version": 0 + }, { "git-tree": "134b2fe4a72269e7e9be72b882fcf21f37ed1809", "version": "2.9.0", From 1ab4a1e2db3aa65bc7080e8c6c53406c4064e4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Tue, 30 May 2023 20:37:45 +0200 Subject: [PATCH 171/533] [ftxui] Add version 4.1.1 (#31699) --- ports/ftxui/portfile.cmake | 7 ++++++- ports/ftxui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ftxui.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake index 33bb04364a3cc6..264d280be0d5b0 100644 --- a/ports/ftxui/portfile.cmake +++ b/ports/ftxui/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArthurSonzogni/FTXUI REF "v${VERSION}" - SHA512 989afc109e31fa083f5d953d199dc7f4515daaee7014ec1616b48bc66ff49643bc32e5cdd273016a1d44f6921f6031d1e7e41fc2375cfee44fc719223baaaa7b + SHA512 14de98770e8a23707455f9197e9ef3b41effc1b5b8a594a7270b1378034720f58b5a81b99653d8b1f04e003565ae4778a1e5a3d756c8cbf297e2d09e327f608e HEAD_REF master ) @@ -21,6 +21,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ftxui.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftxui.pc") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ftxui.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftxui.pc") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json index e4ea817f44655d..b2043bb3c223ed 100644 --- a/ports/ftxui/vcpkg.json +++ b/ports/ftxui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ftxui", - "version-semver": "4.0.0", + "version-semver": "4.1.1", "description": "C++ Functional Terminal User Interface", "homepage": "https://github.com/ArthurSonzogni/FTXUI", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c38d5ca3b62f15..b9648c4dadd3b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2661,7 +2661,7 @@ "port-version": 1 }, "ftxui": { - "baseline": "4.0.0", + "baseline": "4.1.1", "port-version": 0 }, "function2": { diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json index 25b26fc8e3dc3d..251f3791eb670c 100644 --- a/versions/f-/ftxui.json +++ b/versions/f-/ftxui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69be1052699ec7fee92c1aaf9b4c1e66f9d47ef", + "version-semver": "4.1.1", + "port-version": 0 + }, { "git-tree": "acaddb4b8448c853dac8d132d591fd8062692ae8", "version-semver": "4.0.0", From 95d50e69c394265959f14791bdac8f745dafad12 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Tue, 30 May 2023 14:38:13 -0400 Subject: [PATCH 172/533] [Jsonifier] Update to version 0.9.2 (#31698) * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. --- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jsonifier.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 51d002104af052..d3accbd5f53c50 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 919446d8b0f5bb726dcfd91667a0733cfda04956e8c844716e9fe90a50dc5409db5344346131b4e8830cdfbf90ead6b7e1906097b069d83e7b78934571cbc060 + SHA512 4ba5033315f680d6a5fa29764b4c19ce219e881f2dccef4ede73a8f405fd4ac5d58f543c78fa3c35943601bbfd6922749bd9b086527d057086ec8977c0911d1a HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index f6fb08d4274fae..af3654bd86cfc2 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.1", + "version": "0.9.2", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index b9648c4dadd3b5..ed17612285d795 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3481,7 +3481,7 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.1", + "baseline": "0.9.2", "port-version": 0 }, "jsonnet": { diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index eca1741d56dcd2..17b17eebd36db2 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46dce3bb23c3edd1ae77e46fa11543d678ae26e6", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "990249b807aba05002ba2ac406e0bebc9af26a64", "version": "0.9.1", From 37804988e7b8fc13909877dba32fcd7a3d28910b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 30 May 2023 20:39:46 +0200 Subject: [PATCH 173/533] [azure-c-shared-utility] Fix dependencies (#31693) --- ports/azure-c-shared-utility/vcpkg.json | 5 +++-- versions/a-/azure-c-shared-utility.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 412f0a83c36543..a3220c27677e8e 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-c-shared-utility", "version-date": "2023-01-18", + "port-version": 1, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", @@ -9,11 +10,11 @@ "azure-macro-utils-c", { "name": "curl", - "platform": "linux" + "platform": "!windows" }, { "name": "openssl", - "platform": "linux" + "platform": "!windows & !osx" }, "umock-c", { diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index 8acf4b87bb915c..bead8869d3ae86 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fed72b2797511395842d94efefa040e0fd1f65a", + "version-date": "2023-01-18", + "port-version": 1 + }, { "git-tree": "78c535284693d96c19026445e363459b37a4aca9", "version-date": "2023-01-18", diff --git a/versions/baseline.json b/versions/baseline.json index ed17612285d795..62245a65b8693b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -390,7 +390,7 @@ }, "azure-c-shared-utility": { "baseline": "2023-01-18", - "port-version": 0 + "port-version": 1 }, "azure-core-cpp": { "baseline": "1.9.0", From b4ba8298f5874ea367c2969a477346489258b4cd Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 31 May 2023 02:40:59 +0800 Subject: [PATCH 174/533] [sqlitecpp] update to 3.3.0 (#31689) * update to 3.3.0 * merge patchs * remove ONLY_STATIC_LIBRARY * install .dll --- ...001-unofficial-sqlite3-and-sqlcipher.patch | 16 -------- ports/sqlitecpp/add_runtime_destination.patch | 12 ++++++ ports/sqlitecpp/fix_dependency.patch | 39 +++++++++++++------ ports/sqlitecpp/portfile.cmake | 9 ++--- ports/sqlitecpp/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/s-/sqlitecpp.json | 5 +++ 7 files changed, 51 insertions(+), 37 deletions(-) delete mode 100644 ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch create mode 100644 ports/sqlitecpp/add_runtime_destination.patch diff --git a/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch b/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch deleted file mode 100644 index cb07f1ae109df4..00000000000000 --- a/ports/sqlitecpp/0001-unofficial-sqlite3-and-sqlcipher.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72b1a42..552ff50 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -284,9 +284,9 @@ else (SQLITECPP_INTERNAL_SQLITE) - target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY}) - endif() - else() -- find_package (SQLite3 REQUIRED) -+ find_package (unofficial-sqlite3 CONFIG) - message(STATUS "Link to sqlite3 system library") -- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) -+ target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3) - if(SQLite3_VERSION VERSION_LESS "3.19") - set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") - endif() diff --git a/ports/sqlitecpp/add_runtime_destination.patch b/ports/sqlitecpp/add_runtime_destination.patch new file mode 100644 index 00000000000000..71b2b85261a74e --- /dev/null +++ b/ports/sqlitecpp/add_runtime_destination.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e5723d0..ecc1ac2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -337,6 +337,7 @@ target_include_directories(SQLiteCpp + include(GNUInstallDirs) + install(TARGETS SQLiteCpp + EXPORT ${PROJECT_NAME}Targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT libraries) diff --git a/ports/sqlitecpp/fix_dependency.patch b/ports/sqlitecpp/fix_dependency.patch index a55c94cffebd8e..2277ca6e0b4113 100644 --- a/ports/sqlitecpp/fix_dependency.patch +++ b/ports/sqlitecpp/fix_dependency.patch @@ -1,11 +1,28 @@ -diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in -index 568922f..01196db 100644 ---- a/cmake/SQLiteCppConfig.cmake.in -+++ b/cmake/SQLiteCppConfig.cmake.in -@@ -1,5 +1,5 @@ - include(CMakeFindDependencyMacro) --find_dependency(SQLite3 REQUIRED) -+find_dependency(unofficial-sqlite3 REQUIRED) - if(@UNIX@) - set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@) - find_dependency(Threads REQUIRED) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df5693d..e5723d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -295,9 +295,9 @@ else (SQLITECPP_INTERNAL_SQLITE) + target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY}) + endif() + else() +- find_package (SQLite3 REQUIRED) ++ find_package (unofficial-sqlite3 CONFIG) + message(STATUS "Link to sqlite3 system library") +- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) ++ target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3) + if(SQLite3_VERSION VERSION_LESS "3.19") + set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") + endif() +diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in +index 2b48df4..d0feda9 100644 +--- a/cmake/SQLiteCppConfig.cmake.in ++++ b/cmake/SQLiteCppConfig.cmake.in +@@ -1,6 +1,6 @@ + include(CMakeFindDependencyMacro) + if(NOT @SQLITECPP_INTERNAL_SQLITE@) +- find_dependency(SQLite3 REQUIRED) ++ find_dependency(unofficial-sqlite3 REQUIRED) + endif() + if(@UNIX@) + set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@) diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index 14cf27e04a5e4c..de1cf99fb0d903 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -1,13 +1,11 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" - REF 3.2.0 + REF ${VERSION} HEAD_REF master - SHA512 af57c3e82a8804174c52105ecc14ea7a2d4e293ef13b2fc371f2455890ea54683ed76adf4649e561686a6b4c3368676f5edcc54d9f22c4850be3ba32832d3272 + SHA512 9702b17c55b1b3bc46a72d5c204b560249e9c1f02647c864fd4ca54011e4b0238638800ee870baa5106512a9568338d3faa9c9f9799d42fbd558d10376e3b73a PATCHES - 0001-unofficial-sqlite3-and-sqlcipher.patch fix_dependency.patch + add_runtime_destination.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -28,7 +26,6 @@ vcpkg_cmake_configure( -DSQLITECPP_RUN_CPPCHECK=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_ENABLE_COLUMN_METADATA=ON - -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITECPP_USE_STATIC_RUNTIME=OFF # unconditionally off because vcpkg's toolchains already do the right thing # See https://github.com/SRombauts/SQLiteCpp/blob/e74403264ec7093060f4ed0e84bc9208997c8344/CMakeLists.txt#L40-L46 ${USE_STACK_PROTECTION} diff --git a/ports/sqlitecpp/vcpkg.json b/ports/sqlitecpp/vcpkg.json index 5e6213d7e00bbf..a78d9e6d57f5be 100644 --- a/ports/sqlitecpp/vcpkg.json +++ b/ports/sqlitecpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlitecpp", - "version": "3.2.0", - "port-version": 1, + "version": "3.3.0", "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 62245a65b8693b..8ce6f2cf60d82f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7717,8 +7717,8 @@ "port-version": 3 }, "sqlitecpp": { - "baseline": "3.2.0", - "port-version": 1 + "baseline": "3.3.0", + "port-version": 0 }, "sqlpp11": { "baseline": "0.61", diff --git a/versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json index efd840260e6036..316add8815e659 100644 --- a/versions/s-/sqlitecpp.json +++ b/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b239a7578034b934210ab61e462b789feffe2136", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "3e0dea72ad51e6dd229ecb147989143608868369", "version": "3.2.0", From 8c8f5cccef039399f5c7d33d9c88b1de9666c9eb Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Tue, 30 May 2023 21:52:52 +0300 Subject: [PATCH 175/533] [sdl1] Change the extension of the template MSBuild solution. (#31685) * [sdl1] Change the extension of the template MSBuild solution. It will prevent Visual Studio from suggesting to open it, if you have opened a project using vcpkg as a directory. * Update version database. --- .../sdl1/{SDL1_2017.sln => SDL1_2017.sln.in} | 0 ports/sdl1/portfile.cmake | 22 +++++++++---------- ports/sdl1/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sdl1.json | 5 +++++ 5 files changed, 18 insertions(+), 13 deletions(-) rename ports/sdl1/{SDL1_2017.sln => SDL1_2017.sln.in} (100%) diff --git a/ports/sdl1/SDL1_2017.sln b/ports/sdl1/SDL1_2017.sln.in similarity index 100% rename from ports/sdl1/SDL1_2017.sln rename to ports/sdl1/SDL1_2017.sln.in diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 3f46fe3894be95..c4fe695caec34f 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -13,14 +13,14 @@ vcpkg_from_github( configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/") - + configure_file("${CURRENT_PORT_DIR}/SDL1_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL1_2017.sln" COPYONLY) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIB_TYPE StaticLibrary) else() set(LIB_TYPE DynamicLibrary) endif() - + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(CRT_TYPE_DBG MultiThreadedDebugDLL) set(CRT_TYPE_REL MultiThreadedDLL) @@ -28,13 +28,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(CRT_TYPE_DBG MultiThreadedDebug) set(CRT_TYPE_REL MultiThreaded) endif() - + configure_file("${CURRENT_PORT_DIR}/SDL.vcxproj.in" "${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj" @ONLY) configure_file("${CURRENT_PORT_DIR}/SDLmain.vcxproj.in" "${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj" @ONLY) - - # This text file gets copied as a library, and included as one in the package + + # This text file gets copied as a library, and included as one in the package file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB") - + vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH VisualC/SDL1_2017.sln @@ -42,13 +42,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) LICENSE_SUBPATH COPYING ALLOW_ROOT_INCLUDES ) - + #Take all the fils into include/SDL to sovle conflict with SDL2 port file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/doxyfile") file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/SDL") - + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDLmain.lib") if(NOT DEFINED VCPKG_BUILD_TYPE) @@ -74,10 +74,10 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" ) - + vcpkg_install_make() vcpkg_fixup_pkgconfig() - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json index 43968e5ed3e424..113aea6732338f 100644 --- a/ports/sdl1/vcpkg.json +++ b/ports/sdl1/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 17, + "port-version": 18, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 8ce6f2cf60d82f..474bd0d04c8da3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7310,7 +7310,7 @@ }, "sdl1": { "baseline": "1.2.15", - "port-version": 17 + "port-version": 18 }, "sdl1-mixer": { "baseline": "2023-03-25", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index 65c464975fc993..3426feee6821f0 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5463be881042b7d98bf14377bb790a2a83c3a39e", + "version": "1.2.15", + "port-version": 18 + }, { "git-tree": "45b686784ad1b01e7cfa7988bc3f95bf9aff6b6a", "version": "1.2.15", From ec5193d4cff2d0ed4b5d27daf08f198063975cc6 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 30 May 2023 21:54:30 +0300 Subject: [PATCH 176/533] [bdwgc] Update to v8.2.4 (#31679) * Change REF from v8.2.2 to v8.2.4 --- ports/bdwgc/portfile.cmake | 4 ++-- ports/bdwgc/vcpkg.json | 2 +- versions/b-/bdwgc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 5273f7dbcb6be3..8a8b0a71002766 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc - REF v8.2.2 - SHA512 da6a2de30f096610ea1c0de1ff7a3ab434debaa39199bc1426daff620901fc76e5747e43171d742b17f4afa3c77ef447cba4fda69d76a711e108f3f03af917ca + REF v8.2.4 + SHA512 323d65a867f95cfbf5ecb0ff57e8dede0282cffd0d75153526e50282fe019b2e9b3a0cf16d551654832bd4f01ce8f8461590bfc5f4ea9b5eed80384321d369d7 HEAD_REF master ) diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index eb669775e1dde1..7bba131fbb8ef5 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bdwgc", - "version": "8.2.2", + "version": "8.2.4", "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", "homepage": "https://www.hboehm.info/gc/", "license": "MIT", diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 6029dfc21fb14a..eb4e68c8dff608 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12a48f09e61ae946a6858c69e2c40688bdff3980", + "version": "8.2.4", + "port-version": 0 + }, { "git-tree": "f99370553e85e9f6a10878253cdee86883b0ff30", "version": "8.2.2", diff --git a/versions/baseline.json b/versions/baseline.json index 474bd0d04c8da3..26aca3f4b380ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -497,7 +497,7 @@ "port-version": 5 }, "bdwgc": { - "baseline": "8.2.2", + "baseline": "8.2.4", "port-version": 0 }, "beast": { From 348fe8e55ff00adcf15e79aedd25960f33bc01bd Mon Sep 17 00:00:00 2001 From: ZeeWanderer Date: Tue, 30 May 2023 22:02:36 +0300 Subject: [PATCH 177/533] [blend2d] update port to 0.10 (#31675) * [blend2d] update port to 0.10 - transition from `version-date` to `version` - Update blend2d to 0.10 - Update local asmjit to 2023-04-28 - Arm is fixed for windows * [blend2d] update versions --- ports/blend2d/portfile.cmake | 8 ++++---- ports/blend2d/vcpkg.json | 5 ++--- versions/b-/blend2d.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 37440a5fea5ed1..575cb0835f9f37 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 7b420376ed32f3979f860d8c3be04128ab5c6690 - SHA512 88818bfe18b0638b02f84277a4584ddf2cee2158540c1794c3a96c12891274472dc896bef94408baf9ec398e30549c0b3feda58e4b7bf3014a0cf436f394a3ed + REF 452d549751188b04367b5af46c040cb737f5f76c # commited on 2023-05-11 + SHA512 e2d3a0f5b956aadde5498f3aa4fb0663db8ad525cc909da080315fddf9f6322632a62761f0fe94ddb7c6347896e42c62e7e03e944843b3ca3400326eddc4ffcc HEAD_REF master ) @@ -20,8 +20,8 @@ if(NOT BLEND2D_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF 51b10b19b6631434d3f9ad536a6fb140944a36d2 # commited on 2023-03-25 - SHA512 1fba5159d2adad64e9a2b07a1f90de6988d1da47b9802ca8b57c61a89d8a90924525f6d0d6607279994bdbadcf693b2cc96cd7e4bf7f018ad64127b640dc38fb + REF 3577608cab0bc509f856ebf6e41b2f9d9f71acc4 # commited on 2023-04-28 + SHA512 36557af5c82ccc8e5ef2d4effe22b75e22c2bf1f4504daae3ff813e907449be6e7b25678af071cb9dede7c6e02dc5c8ad2fc2a3da011aa660eb7f5c75ab23042 HEAD_REF master ) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index ebc206c995afd3..22ffc51bf65e0c 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,12 +1,11 @@ { "name": "blend2d", - "version-date": "2022-12-31", - "port-version": 3, + "version": "0.10", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", "license": "Zlib", - "supports": "!(arm & windows) & !uwp & !wasm32", + "supports": "!uwp & !wasm32", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 702fb890a1ed3d..184f4903f707db 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6de437ccd239433cc34d21212797c4755a6c8f4", + "version": "0.10", + "port-version": 0 + }, { "git-tree": "b29172f6f8dd5479a5123214f403137b0180b61f", "version-date": "2022-12-31", diff --git a/versions/baseline.json b/versions/baseline.json index 26aca3f4b380ef..80d615c7bbcc13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -597,8 +597,8 @@ "port-version": 0 }, "blend2d": { - "baseline": "2022-12-31", - "port-version": 3 + "baseline": "0.10", + "port-version": 0 }, "blingfire": { "baseline": "0.1.8.1", From 5fd868c533fa6d10b425507f940066b8ca6087fc Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 30 May 2023 21:04:08 +0200 Subject: [PATCH 178/533] [liblsl] Update to 1.16.2 (#31673) * Update liblsl to 1.16.2 * Update CI baseline --------- Co-authored-by: chausner --- ports/liblsl/portfile.cmake | 2 +- ports/liblsl/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/liblsl.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index aaf9b2b9dc4762..d862c2a5fb9fc2 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl REF v${VERSION} - SHA512 d3af9be687c11272f0122585c8ba48c5d7482af6e6f0cecf640e674682da319246b490b536a890407c7511fcc07a59749ed43134bf7683d30304ac4e3989a73c + SHA512 141f364034a7156caf9ffafbb2f43cc9a932116a3ef1c1b76822649996d6b99b3017b18d91d9c25a9cd718419c5c3b037fa97b2845540bda195f55dd9de27ab1 HEAD_REF master PATCHES use-find-package-asio.patch diff --git a/ports/liblsl/vcpkg.json b/ports/liblsl/vcpkg.json index b4f53be8d38d5d..2c2b3db3301a14 100644 --- a/ports/liblsl/vcpkg.json +++ b/ports/liblsl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblsl", - "version": "1.16.1", - "port-version": 1, + "version": "1.16.2", "description": "C++ lsl library for multi-modal time-synched data transmission over the local network", "homepage": "https://github.com/sccn/liblsl", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 80d615c7bbcc13..4b17e159f33396 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4217,8 +4217,8 @@ "port-version": 0 }, "liblsl": { - "baseline": "1.16.1", - "port-version": 1 + "baseline": "1.16.2", + "port-version": 0 }, "liblsquic": { "baseline": "3.1.1", diff --git a/versions/l-/liblsl.json b/versions/l-/liblsl.json index 4d9b63a7d24814..4ad750d223dbf8 100644 --- a/versions/l-/liblsl.json +++ b/versions/l-/liblsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc1c3d9c2142ad970d88c0a79f680b31c8d674f9", + "version": "1.16.2", + "port-version": 0 + }, { "git-tree": "6849296814880dca06ffd923d7d5c8fc3e4f2a9c", "version": "1.16.1", From 2549b40a9418cf24566a989f10520cf4f8ed7e2f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 30 May 2023 21:05:11 +0200 Subject: [PATCH 179/533] [cminpack] Fix dllexport and pc files (#31667) --- ports/cminpack/portfile.cmake | 21 +++++++++++++++++++++ ports/cminpack/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cminpack.json | 5 +++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ports/cminpack/portfile.cmake b/ports/cminpack/portfile.cmake index 951ffaf3cb7ead..b34977db1cb545 100644 --- a/ports/cminpack/portfile.cmake +++ b/ports/cminpack/portfile.cmake @@ -1,9 +1,19 @@ +# Must be removed on next release +vcpkg_download_distfile(DLLEXPORT_PATCH + URLS https://github.com/devernay/cminpack/commit/0d40c5359674448aa6f78accaddca1d79befff1f.patch?full_index=1 + FILENAME devernay-cminpack-pr-50-dllexport.patch + SHA512 558c21c4d43ff64a38945643810eafaee46c5f61c0e2a98931f9ba2283cf46e234a74f12ce6db4e64289de58f8da190af936f847f42636fd812fdf82ff733763 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO devernay/cminpack REF v1.3.8 SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae + PATCHES + ${DLLEXPORT_PATCH} ) +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" [[ STRING "CMinpack]] [[) # ("CMinpack]]) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -19,5 +29,16 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cminpack-1/cminpack.h" [[!defined(CMINPACK_NO_DLL)]] 0) +endif() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpack.pc" "-lcminpack" "-lcminpack_d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpacks.pc" "-lcminpacks" "-lcminpacks_d") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/cminpackld.pc" "-lcminpackld" "-lcminpackld_d") + endif() +endif() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/CopyrightMINPACK.txt") diff --git a/ports/cminpack/vcpkg.json b/ports/cminpack/vcpkg.json index 5901d2957e4b59..d286b2062821c6 100644 --- a/ports/cminpack/vcpkg.json +++ b/ports/cminpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cminpack", "version": "1.3.8", - "port-version": 3, + "port-version": 4, "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems", "homepage": "http://devernay.free.fr/hacks/cminpack/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4b17e159f33396..b93eac101e2066 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1610,7 +1610,7 @@ }, "cminpack": { "baseline": "1.3.8", - "port-version": 3 + "port-version": 4 }, "cmocka": { "baseline": "2020-08-01", diff --git a/versions/c-/cminpack.json b/versions/c-/cminpack.json index c65eec048c27df..0c82eea0bb838d 100644 --- a/versions/c-/cminpack.json +++ b/versions/c-/cminpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0401d2c926529b034913ab84852eef3fac28f6d4", + "version": "1.3.8", + "port-version": 4 + }, { "git-tree": "c2b1d33d31878445649cbc22e23d10a7b0e5d0b3", "version": "1.3.8", From ca2a346767d4830e9abd1b23d87a51545bd571f1 Mon Sep 17 00:00:00 2001 From: localcc Date: Tue, 30 May 2023 21:28:14 +0200 Subject: [PATCH 180/533] [lightningscanner] add new port (#31631) * [lightningscanner] add new port * update versions * [lightningscanner] fix portfiles * update versions --- ports/lightningscanner/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/lightningscanner/usage | 4 ++++ ports/lightningscanner/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lightningscanner.json | 9 +++++++++ 5 files changed, 61 insertions(+) create mode 100644 ports/lightningscanner/portfile.cmake create mode 100644 ports/lightningscanner/usage create mode 100644 ports/lightningscanner/vcpkg.json create mode 100644 versions/l-/lightningscanner.json diff --git a/ports/lightningscanner/portfile.cmake b/ports/lightningscanner/portfile.cmake new file mode 100644 index 00000000000000..dd385f02e13c53 --- /dev/null +++ b/ports/lightningscanner/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO localcc/LightningScanner + REF v${VERSION} + SHA512 7bd41e049ccdf1dbe39b2ab3c58344822300165482d7c5392fe1cd2b15a40baec9ff080963f7db60f2826ece983a06b921d8a28ba57edf751c2cc7644f0a1150 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIGHTNING_SCANNER_INSTALL=ON + -DLIGHTNING_SCANNER_BUILD_BENCH=OFF + -DLIGHTNING_SCANNER_BUILD_DOCS=OFF + -DLIGHTNING_SCANNER_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/LightningScanner) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + diff --git a/ports/lightningscanner/usage b/ports/lightningscanner/usage new file mode 100644 index 00000000000000..2be4d647578a1e --- /dev/null +++ b/ports/lightningscanner/usage @@ -0,0 +1,4 @@ +The package lightningscanner is compatible with built-in CMake targets: + + find_package(LightningScanner REQUIRED) + target_link_libraries(main PRIVATE LightningScanner::LightningScanner) diff --git a/ports/lightningscanner/vcpkg.json b/ports/lightningscanner/vcpkg.json new file mode 100644 index 00000000000000..d86eba942e8bd3 --- /dev/null +++ b/ports/lightningscanner/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "lightningscanner", + "version": "1.0.0", + "description": "A lightning-fast memory signature/pattern scanner, capable of scanning gigabytes of data per second.", + "homepage": "https://localcc.github.io/LightningScanner/", + "license": "MIT", + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b93eac101e2066..3eff98f78b5fc3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4884,6 +4884,10 @@ "baseline": "2020-11-24", "port-version": 0 }, + "lightningscanner": { + "baseline": "1.0.0", + "port-version": 0 + }, "lilv": { "baseline": "0.24.10", "port-version": 2 diff --git a/versions/l-/lightningscanner.json b/versions/l-/lightningscanner.json new file mode 100644 index 00000000000000..997e21af1b4b1f --- /dev/null +++ b/versions/l-/lightningscanner.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "25cfcf5944e73bfe349e264a37f98ea36558da18", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 2585709af95a8926a5071210aa7a1ba7c2ff1960 Mon Sep 17 00:00:00 2001 From: Raziel Anarki Date: Tue, 30 May 2023 21:31:00 +0200 Subject: [PATCH 181/533] [libgit2] Update to 1.6.4 (#31651) --- ports/libgit2/fix-configcmake.patch | 24 ++++++++++++------------ ports/libgit2/portfile.cmake | 9 +++++---- ports/libgit2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libgit2.json | 5 +++++ 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/ports/libgit2/fix-configcmake.patch b/ports/libgit2/fix-configcmake.patch index 1cc67d89741a11..11b02e89ff4e8d 100644 --- a/ports/libgit2/fix-configcmake.patch +++ b/ports/libgit2/fix-configcmake.patch @@ -19,20 +19,19 @@ index 2a3a91b8c..cbb409350 100644 list(APPEND LIBGIT2_PC_REQUIRES "libpcre") elseif(REGEX_BACKEND STREQUAL "regcomp") add_feature_info(regex ON "using system regcomp") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e7b54d036..6b549deef 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -298,10 +298,28 @@ if(MSVC_IDE) - endif() +diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt +index 876a703e8..8283f9585 100644 +--- a/src/libgit2/CMakeLists.txt ++++ b/src/libgit2/CMakeLists.txt +@@ -110,10 +110,28 @@ FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLU # Install --install(TARGETS git2 -+install(TARGETS git2 EXPORT unofficial-git2Targets + +-install(TARGETS libgit2package ++install(TARGETS libgit2package EXPORT unofficial-git2Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(EXPORT unofficial-git2Targets + NAMESPACE unofficial::git2:: @@ -51,5 +50,6 @@ index e7b54d036..6b549deef 100644 +configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2) + - install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/ + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}") + install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 66e488c4e46604..f0d056dd79e97f 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF v1.4.2 - SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277 - HEAD_REF maint/v1.4 + REF v1.6.4 + SHA512 fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5 + HEAD_REF maint/v1.6 PATCHES fix-configcmake.patch ) @@ -30,7 +30,7 @@ function(set_tls_backend VALUE) endfunction() if("openssl" IN_LIST FEATURES) - list(APPEND GIT_OPTIONS "-DGIT_OPENSSL=1") + list(APPEND GIT_OPTIONS "-DGIT_OPENSSL=1") endif() foreach(GIT2_FEATURE ${FEATURES}) @@ -67,6 +67,7 @@ vcpkg_cmake_configure( -DUSE_HTTPS=${USE_HTTPS} -DREGEX_BACKEND=${REGEX_BACKEND} -DSTATIC_CRT=${STATIC_CRT} + -DBUILD_CLI=OFF ${GIT2_FEATURES} ${GIT_OPTIONS} ) diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index ddb3487815d1bd..11b59aff5d8014 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgit2", - "version-semver": "1.4.2", - "port-version": 3, + "version-semver": "1.6.4", "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 3eff98f78b5fc3..dd312a8832502b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4061,8 +4061,8 @@ "port-version": 3 }, "libgit2": { - "baseline": "1.4.2", - "port-version": 3 + "baseline": "1.6.4", + "port-version": 0 }, "libgme": { "baseline": "0.6.3", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index fa214bea8cc691..b14ae5fdb29bcb 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e400f294d284f6a7ff3a19b2454c919873405f08", + "version-semver": "1.6.4", + "port-version": 0 + }, { "git-tree": "7c2173f86743e6e3c6759d5c781f236c08adbec4", "version-semver": "1.4.2", From d3767842401e86bfa3a2c79e8b48d9660e1b444a Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Tue, 30 May 2023 12:31:49 -0700 Subject: [PATCH 182/533] Update to 1.24.0 (#31645) --- ports/libtcod/portfile.cmake | 4 ++-- ports/libtcod/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtcod.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index 8322bef1f4540f..0c8051c7947d2f 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.23.1 - SHA512 d01e168b02c0540e193f65ad630180b26ac1690b9386aac039149493f436938fed4a0499ac70235f53d2675df595b7223401804b3bd2d8660917020e911f12c9 + REF 1.24.0 + SHA512 21aae343297ea4aefb89f3bc8fd06c7059e4f59dc34c26ef294f4211873f29bf26b5c600746db8af7eda9e9f5ab270bfd862ab34ae3c409051dcad6bb219df8a HEAD_REF main ) diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index b3b15e936f8543..5e5a205e0fa4c0 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version": "1.23.1", + "version": "1.24.0", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", diff --git a/versions/baseline.json b/versions/baseline.json index dd312a8832502b..fefcd32bcd1065 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4601,7 +4601,7 @@ "port-version": 1 }, "libtcod": { - "baseline": "1.23.1", + "baseline": "1.24.0", "port-version": 0 }, "libtess2": { diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 954b9ccd1279aa..12ccd5c0d8d1ed 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae0678aa4f8c3675932de4d2e8986f4a5ca7d30e", + "version": "1.24.0", + "port-version": 0 + }, { "git-tree": "09fe9037f9dc927b39eac5ed74cbce37dbb62f12", "version": "1.23.1", From 89055338b0b21b2e7f9c5c689b23fa5c82b9e1b5 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 30 May 2023 23:33:33 +0400 Subject: [PATCH 183/533] [tbb]: added support for hybrid processors via hwloc (#31643) * [tbb]: added support for hybrid processors via hwloc * updated version registries --- ports/tbb/portfile.cmake | 6 ++++++ ports/tbb/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/t-/tbb.json | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index fefd403bc8a24e..c9f98efb4f0881 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -9,9 +9,15 @@ vcpkg_from_github( HEAD_REF onetbb_2021 ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + hwloc TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DTBB_TEST=OFF -DTBB_STRICT=OFF ) diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index b6fe456e7034f4..6b17fda36005b2 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -1,6 +1,8 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2021.9.0", + "port-version": 1, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", @@ -14,5 +16,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "hwloc": { + "description": "Builds TBB with TBBBind support for Hibrid CPUs or NUMA architectures.", + "supports": "!static & !osx", + "dependencies": [ + "hwloc" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index fefcd32bcd1065..3845267c0a4dc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7886,7 +7886,7 @@ }, "tbb": { "baseline": "2021.9.0", - "port-version": 0 + "port-version": 1 }, "tcb-span": { "baseline": "2021-12-15", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 55cedc1cc90562..a63cac549edba0 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7", + "version": "2021.9.0", + "port-version": 1 + }, { "git-tree": "3a44303f590164f98542c516a049e1328a178bc2", "version": "2021.9.0", From b4ca42fc6d2388aa68fdb9f68ae50f91dbd93250 Mon Sep 17 00:00:00 2001 From: Nicholas Hayes <0xC0000054@users.noreply.github.com> Date: Tue, 30 May 2023 13:37:57 -0600 Subject: [PATCH 184/533] [libheif] Update to 1.16.1 (#31227) * [libheif] Update to 1.16.1 * Fix a missing patch line * Fix the version database --- ports/libheif/gdk-pixbuf.patch | 14 ++++++-------- ports/libheif/portfile.cmake | 2 +- ports/libheif/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libheif.json | 5 +++++ 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ports/libheif/gdk-pixbuf.patch b/ports/libheif/gdk-pixbuf.patch index 0ecd41d0fdb577..257b466694d0a7 100644 --- a/ports/libheif/gdk-pixbuf.patch +++ b/ports/libheif/gdk-pixbuf.patch @@ -1,11 +1,10 @@ -diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt -index 85ad59708..d6aa4a5f9 100644 ---- a/gdk-pixbuf/CMakeLists.txt -+++ b/gdk-pixbuf/CMakeLists.txt -@@ -1,13 +1,10 @@ +diff --git "a/gdk-pixbuf/CMakeLists.txt" "b/gdk-pixbuf/CMakeLists.txt" +index eeb2727..20a6b16 100644 +--- "a/gdk-pixbuf/CMakeLists.txt" ++++ "b/gdk-pixbuf/CMakeLists.txt" +@@ -1,12 +1,9 @@ if(UNIX OR MINGW) find_package(PkgConfig) - find_package(Threads) - pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0) + pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET) @@ -18,7 +17,7 @@ index 85ad59708..d6aa4a5f9 100644 add_library(pixbufloader-heif MODULE pixbufloader-heif.c) -@@ -15,7 +12,7 @@ if(UNIX) +@@ -14,7 +11,7 @@ if(UNIX OR MINGW) target_link_directories(pixbufloader-heif PRIVATE ${GDKPIXBUF2_LIBRARY_DIRS}) @@ -27,4 +26,3 @@ index 85ad59708..d6aa4a5f9 100644 install(TARGETS pixbufloader-heif DESTINATION ${GDKPIXBUF2_MODULE_DIR}) endif() - diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index d1f7f2ac051165..4c6178eefa0998 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 966a95dacc12722d2dd37d449125c3df08f9e9be76ec2dc6762866bf285442c33836046df884b50cc14c799dfdcc1d5c9b16e4f9f36a2dbaf422df089756a234 + SHA512 d81f841ac63d58f56414bf8d799a12af0c846148d2c245cd0c0cc3133edd0b3e08e5018efbc82b83fbab00209a6e0806133f63283bf7244cc4e9cf37b4fa8110 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 77fbb700757559..f2ad6f54d05d0e 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libheif", - "version": "1.15.1", - "port-version": 1, + "version": "1.16.1", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 3845267c0a4dc4..fc922e90b9e8c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4113,8 +4113,8 @@ "port-version": 4 }, "libheif": { - "baseline": "1.15.1", - "port-version": 1 + "baseline": "1.16.1", + "port-version": 0 }, "libhsplasma": { "baseline": "2022-05-19", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index c21f23569efb0e..791c2f113d688e 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30bfad0af10297606d1687eba9fabe7b5eda60e8", + "version": "1.16.1", + "port-version": 0 + }, { "git-tree": "e2b6e5599374567a1f1f61821adc8064fcfaaa0f", "version": "1.15.1", From e05695d03f80251da74146fba74d45eae637e888 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 31 May 2023 03:28:05 +0200 Subject: [PATCH 185/533] [podofo] Cleanup and fixes (#31658) --- ports/podofo/portfile.cmake | 47 +++++++++++++++++-------------------- ports/podofo/vcpkg.json | 28 ++++++++++++++++++---- versions/baseline.json | 2 +- versions/p-/podofo.json | 5 ++++ 4 files changed, 52 insertions(+), 30 deletions(-) diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 491499529d54bb..ac7151ef69f367 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -8,51 +8,48 @@ vcpkg_from_github( install-cmake-config.patch ) -set(PODOFO_NO_FONTMANAGER ON) -if("fontconfig" IN_LIST FEATURES) - set(PODOFO_NO_FONTMANAGER OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fontconfig CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig + INVERTED_FEATURES + fontconfig CMAKE_DISABLE_FIND_PACKAGE_Fontconfig +) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PODOFO_BUILD_STATIC) -set(IS_WIN32 OFF) -if(VCPKG_TARGET_IS_WINDOWS) - set(IS_WIN32 ON) -endif() - file(REMOVE "${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake") file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} + -DPKG_CONFIG_FOUND=true # enable pc file for shared linkage -DPODOFO_BUILD_LIB_ONLY=1 -DPODOFO_BUILD_STATIC=${PODOFO_BUILD_STATIC} - -DPODOFO_NO_FONTMANAGER=${PODOFO_NO_FONTMANAGER} - -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=${PODOFO_NO_FONTMANAGER} - -DCMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO=${IS_WIN32} - -DCMAKE_DISABLE_FIND_PACKAGE_LIBIDN=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_Boost - CMAKE_DISABLE_FIND_PACKAGE_CppUnit - CMAKE_DISABLE_FIND_PACKAGE_LIBCRYPTO + -DCMAKE_DISABLE_FIND_PACKAGE_Libidn=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/podofo-config.cmake" - "# Create imported target podofo_shared" -[[ -include(CMakeFindDependencyMacro) + "# Generated by CMake" + "include(CMakeFindDependencyMacro) +find_dependency(Freetype) +find_dependency(JPEG) +find_dependency(LibXml2) find_dependency(OpenSSL) -# Create imported target podofo_shared -]] -) +find_dependency(PNG) +find_dependency(TIFF) +find_dependency(ZLIB) +if(\"${CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig}\") + find_dependency(Fontconfig) +endif() +\n# Generated by CMake") vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index a0e505d94c8cba..24398f4254cf2c 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,9 +1,10 @@ { "name": "podofo", "version": "0.10.0", + "port-version": 1, "description": "PoDoFo is a library to work with the PDF file format", - "homepage": "https://sourceforge.net/projects/podofo/", - "license": "LGPL-2.0-only", + "homepage": "https://github.com/podofo/podofo", + "license": "LGPL-2.0-or-later", "supports": "!uwp", "dependencies": [ "freetype", @@ -14,7 +15,10 @@ "default-features": false }, "openssl", - "tiff", + { + "name": "tiff", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true @@ -25,12 +29,28 @@ }, "zlib" ], + "default-features": [ + "fontmanager" + ], "features": { "fontconfig": { - "description": "Enable font manager support on Unix platforms", + "description": "Use Fontconfig", "dependencies": [ "fontconfig" ] + }, + "fontmanager": { + "description": "Enable font manager", + "dependencies": [ + { + "name": "podofo", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!windows" + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index fc922e90b9e8c0..d5f2383f50bf10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6330,7 +6330,7 @@ }, "podofo": { "baseline": "0.10.0", - "port-version": 0 + "port-version": 1 }, "poissonrecon": { "baseline": "2021-09-26", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index c8293e554a91c8..9952781259ed64 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8282e8f30863ef7d8a84928ef5dbe0625b09fa2a", + "version": "0.10.0", + "port-version": 1 + }, { "git-tree": "179964b988c6b05e259e8e631b2a3db4539589a1", "version": "0.10.0", From bf1d50ff7a2e015376bf0cb091c0ea9c06f3b20b Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 31 May 2023 05:43:30 +0400 Subject: [PATCH 186/533] [opencl] fixed linkage when libOpenCL is static (#31637) * [opencl]: replaced hardcoded BUILD_SHARED_LIBS (user context) with VCPKG_LIBRARY_LINKAGE (library build context) * Updated version registries --- ports/opencl/portfile.cmake | 2 +- ports/opencl/vcpkg-cmake-wrapper.cmake | 11 ++++++----- ports/opencl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencl.json | 5 +++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index ead33b72a8da87..318cd8631ea172 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -80,4 +80,4 @@ vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) diff --git a/ports/opencl/vcpkg-cmake-wrapper.cmake b/ports/opencl/vcpkg-cmake-wrapper.cmake index 0893710ff58a4a..4010eb40dc3b4e 100644 --- a/ports/opencl/vcpkg-cmake-wrapper.cmake +++ b/ports/opencl/vcpkg-cmake-wrapper.cmake @@ -1,12 +1,12 @@ _find_package(${ARGS}) -if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) find_package(Threads REQUIRED) set(OpenCL_Extra_Libs ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) if(CMAKE_SYSTEM_NAME MATCHES "Windows") list(APPEND OpenCL_Extra_Libs cfgmgr32) - if($ENV{WindowsSDKVersion} MATCHES "^10") - list(APPEND OpenCL_Extra_Libs OneCoreUAP) - endif() + if($ENV{WindowsSDKVersion} MATCHES "^10") + list(APPEND OpenCL_Extra_Libs OneCoreUAP) + endif() endif(CMAKE_SYSTEM_NAME MATCHES "Windows") if(TARGET OpenCL::OpenCL) @@ -15,4 +15,5 @@ if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")) if(OpenCL_LIBRARIES) list(APPEND OpenCL_LIBRARIES ${OpenCL_Extra_Libs}) endif() -endif() \ No newline at end of file + unset(OpenCL_Extra_Libs) +endif() diff --git a/ports/opencl/vcpkg.json b/ports/opencl/vcpkg.json index 33b43e394f9584..454210a30caa67 100644 --- a/ports/opencl/vcpkg.json +++ b/ports/opencl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencl", "version-string": "v2023.02.06", - "port-version": 1, + "port-version": 2, "description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL", "homepage": "https://github.com/KhronosGroup/OpenCL-Headers", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d5f2383f50bf10..56087e5607dc98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5878,7 +5878,7 @@ }, "opencl": { "baseline": "v2023.02.06", - "port-version": 1 + "port-version": 2 }, "opencolorio": { "baseline": "2.1.2", diff --git a/versions/o-/opencl.json b/versions/o-/opencl.json index 747c0e128c9c0b..73222e54e46f97 100644 --- a/versions/o-/opencl.json +++ b/versions/o-/opencl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c55e82e4ec70906ec28b692d2625584025de4725", + "version-string": "v2023.02.06", + "port-version": 2 + }, { "git-tree": "d206a1716a411eb9862c98d65ab3552def0c6492", "version-string": "v2023.02.06", From 8a2b7de29d42d713e4816d542cd610ee59dff63e Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Wed, 31 May 2023 03:59:35 +0200 Subject: [PATCH 187/533] [sleef] Fix that port didn't install the DLL and PDB files from the buildtree (#31696) * sleef port didn't install the DLL and PDB files from the buildtree * Removed accidentally committed out-commented line of code --- ports/sleef/portfile.cmake | 24 ++++++++++++++++++++++++ ports/sleef/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sleef.json | 5 +++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake index 04fd4a7b876444..e51e0374f9c282 100644 --- a/ports/sleef/portfile.cmake +++ b/ports/sleef/portfile.cmake @@ -22,3 +22,27 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Install DLL and PDB files +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + endif() +endif() diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json index 039681d14a9cd0..60b71ed05f49e0 100644 --- a/ports/sleef/vcpkg.json +++ b/ports/sleef/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sleef", "version": "3.5.1", - "port-version": 3, + "port-version": 4, "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", "homepage": "https://sleef.org/", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 56087e5607dc98..775e47acafad44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7514,7 +7514,7 @@ }, "sleef": { "baseline": "3.5.1", - "port-version": 3 + "port-version": 4 }, "sleepy-discord": { "baseline": "2022-02-05", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index 5e58f02d7b9298..b404bed22d9910 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12afaa5146f51bf2912339befaafd1776e10442a", + "version": "3.5.1", + "port-version": 4 + }, { "git-tree": "bd282d0004a477385c5e6487aabc83bab31059ec", "version": "3.5.1", From 23577da4625ad36f44d664b51ec7808f863e31fb Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 1 Jun 2023 02:40:57 +0800 Subject: [PATCH 188/533] [uwebsockets] update version to 20.44.0 (#31731) * [uwebsockets] update version to 20.44.0 * version --- ports/uwebsockets/portfile.cmake | 2 +- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 4648282d84ad12..5caab7b30a1cf1 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 55e4643fa61da40a872c94731b3e057eea107d09ac0b9affa032f1abdecc169dc64fcfebbfffb111bb2ffc2bdd91f6a118856a1af33eb2c93c605913a151465c + SHA512 ceb950a3d4c2ffd58867ef1cc92d5405441dff603ceb6958ef5660f93c8e1da2346cecb43d209ab08d4feac9c1f023f7bff22a13f537dbb3eab0f122f27f70f6 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index ab2f326f600319..6f11f0a395a3c8 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.41.0", + "version-semver": "20.44.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 775e47acafad44..e6eaadc019eff9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8325,7 +8325,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "20.41.0", + "baseline": "20.44.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 762bc7fc705254..e681c10afa3cf0 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53155ed92665dafb62c89bcc7bb9722fd5875316", + "version-semver": "20.44.0", + "port-version": 0 + }, { "git-tree": "0b0f3943b2e6e8260c638dc75c430d4975b87999", "version-semver": "20.41.0", From f3cb0fc72da8feae4b800bb3e8d1a069c2501c34 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 1 Jun 2023 02:41:28 +0800 Subject: [PATCH 189/533] [libphonenumber] Update to 8.13.13 (#31730) * update libphonenumber * update version --------- Co-authored-by: Monica --- ports/libphonenumber/portfile.cmake | 2 +- ports/libphonenumber/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libphonenumber.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libphonenumber/portfile.cmake b/ports/libphonenumber/portfile.cmake index 4ea3e1fc07846e..7dc8027a13c0f7 100644 --- a/ports/libphonenumber/portfile.cmake +++ b/ports/libphonenumber/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libphonenumber REF "v${VERSION}" - SHA512 e685bb9501104527ceec9af7ac424a5f642f6960454fe5a6f10f5e6555bb6d52b68a0465c5475162e8a1ac20a0b1bfb68bd4587ffae64dc017a5c8a5efc5b09f + SHA512 03bd6a6c4499a7135dbfe30acfd0ede818008a1c9a40068c04c0d3cff5638ea10502e186b625534d9f06cbc69da81c470f7d7308cdd08b41428b1a2e0236f409 HEAD_REF master PATCHES fix-re2-identifiers.patch diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index 461ef828614282..52b41caba721e8 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libphonenumber", - "version": "8.13.11", + "version": "8.13.13", "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.", "license": "Apache-2.0", "supports": "!linux & !osx", diff --git a/versions/baseline.json b/versions/baseline.json index e6eaadc019eff9..56ef7d760268ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4393,7 +4393,7 @@ "port-version": 1 }, "libphonenumber": { - "baseline": "8.13.11", + "baseline": "8.13.13", "port-version": 0 }, "libplist": { diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index b6cc94794aea0e..b685c8db9d904b 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2289b15c4eee8082041820c9eb1bfc2cb3982cd9", + "version": "8.13.13", + "port-version": 0 + }, { "git-tree": "8f6bcac3d621a03907f69278cb2a1e303fa414f1", "version": "8.13.11", From 838af19556a975f1755918a360b5f83909857f11 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 31 May 2023 22:42:27 +0400 Subject: [PATCH 190/533] [xbyak] added new version v6.69 (#31726) * [xbyak] added new version v6.69 * update version files --- ports/xbyak/portfile.cmake | 4 ++-- ports/xbyak/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xbyak.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index fd08f1af96161a..1fb5618dfbd1b9 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF v6.60 - SHA512 83dba532c7aaa618d61f2d345caeb0ca0b1c3e4946b758095410f269ba954d1870325ed05aa7a1f8aab0b5a2961ecd878980ab835f3db3078a969d2d951aa7e9 + REF v6.69 + SHA512 c202e5c3688c4dc8cd26d4371c511ffc0fd0885c4d31a6a5fa955c39ae6fcc98f5f0ac2b88c087e10b71b24a91c0e7f082683cd6be67c29a19170723d966a585 HEAD_REF master ) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 8244ab284bc26d..2e919bb187b03e 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xbyak", - "version": "6.60", + "version": "6.69", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 56ef7d760268ec..37ef0d58bd0718 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8697,7 +8697,7 @@ "port-version": 0 }, "xbyak": { - "baseline": "6.60", + "baseline": "6.69", "port-version": 0 }, "xcb": { diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 26a62ce5658832..7b6431e94dc757 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9774b99e4f632c777b1f0d1cec57f4918acc591a", + "version": "6.69", + "port-version": 0 + }, { "git-tree": "d4441480fab1434594b5441612ae5158c81a6642", "version": "6.60", From b8353ae1a768ef79341a4479b6d8aeb27c2c32f9 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Wed, 31 May 2023 14:46:12 -0400 Subject: [PATCH 191/533] [DiscordCoreAPI] Updating to version 2023-05-30 (#31725) * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. --- ports/discordcoreapi/portfile.cmake | 6 ++---- ports/discordcoreapi/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 68ccf788e21e1d..61231c3b92b933 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,11 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF c8d4698d2c0ee818def85d63562585a218b2da70 - SHA512 82a2bada44d1e2c2cc4638b885011a95189febd77bc4d3c26ce8c25005b8202d6c7cbb1f580dbcc1556dd0919f33cfb25127774f37cea17a544fbe31970618b5 + REF 8b54cf9 + SHA512 1ee042939f09b58d20f0a432ae83c696847cdf30922bc6345d76634f32c78706f3fa38a64eae259b592312f4af25af26883c76d5eb3866b08ff7f0dd42dd0ff9 HEAD_REF main - PATCHES - 0001-Add-extern-C-to-avcodec.patch ) vcpkg_cmake_configure( diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index e62f11928f1b6d..e6c07c042d2c56 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,16 +1,16 @@ { "name": "discordcoreapi", - "version-date": "2023-01-02", + "version-date": "2023-05-30", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "LGPL-2.1-or-later", "supports": "(windows & x64 & !static) | (linux & x64)", "dependencies": [ "ffmpeg", + "jsonifier", "libsodium", "openssl", "opus", - "simdjson", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 37ef0d58bd0718..05f727e473823b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2117,7 +2117,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2023-01-02", + "baseline": "2023-05-30", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 1c362a90c394c6..979c27af94acf5 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d24e2b697098510aeb4799426a66c5749f9a3b97", + "version-date": "2023-05-30", + "port-version": 0 + }, { "git-tree": "90c3313d8c31b532ab7e876d0b2f962d29e757f7", "version-date": "2023-01-02", From 9937670d81bc5a90e2b68e148cda6eea2ee28d05 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 31 May 2023 20:46:33 +0200 Subject: [PATCH 192/533] [sentry-native] update to 0.6.3 (#31713) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index dc59508d17caed..476649d28ca0ff 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 11c52db46b436a4c27649383fffded9da1c5d93beadbe7f58a146b29ef2218c2bd0020a5a7bf00790b6c8d9201c028a8ae1600209271482a4b680aa80fc45742 + SHA512 343960b98e5337d44a41fb2cafbf246430763edf6773fe9bdcefafaac6c14016155d8c433d29950b469e63aef90376a604a6e38912fed6ef7d798d6ad17cf999 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index a23591ac50454e..f1c4a78d8b8374 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.2", + "version": "0.6.3", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 05f727e473823b..51aab08a9348e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7377,7 +7377,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.6.2", + "baseline": "0.6.3", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 013458a19c3953..507906d1e0b704 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26846f654fd9638934b225f981999759025ff252", + "version": "0.6.3", + "port-version": 0 + }, { "git-tree": "d7e8c1737ce3b69ee1dda758a40891fc460c8ff9", "version": "0.6.2", From 889192df5510c07b600fc36852dc69f904f48967 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 1 Jun 2023 02:47:10 +0800 Subject: [PATCH 193/533] [zpp-bits/dbg-macro] Update to latest version (#31712) --- ports/dbg-macro/portfile.cmake | 8 ++++---- ports/dbg-macro/vcpkg.json | 5 +++-- ports/zpp-bits/portfile.cmake | 6 +++--- ports/zpp-bits/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/dbg-macro.json | 5 +++++ versions/z-/zpp-bits.json | 5 +++++ 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ports/dbg-macro/portfile.cmake b/ports/dbg-macro/portfile.cmake index 15fd2aabd7c4e3..acdcf728c755c0 100644 --- a/ports/dbg-macro/portfile.cmake +++ b/ports/dbg-macro/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sharkdp/dbg-macro - REF 4db61805d90cb66d91bcc56c2703591a0127ed11 - SHA512 68afaedce857f6007edbb65527745aa07ab3dd736e65602b4c6da04646730ef4c09d9a239a9bcae1806c5a0bc0f70b5766edf245b2fd5f84d64cc03a5cadc5c8 + REF "v${VERSION}" + SHA512 4f785919843026996ffeb3cd8e3494ecd77f42bee104b6659b664b21a3e518739707f5bd006fc8128c99eef241fc6650ad629444f7005df89100a16d8918d05f HEAD_REF master ) -file(COPY ${SOURCE_PATH}/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/dbg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/dbg-macro/vcpkg.json b/ports/dbg-macro/vcpkg.json index 77d5be57ef0162..3bede55fa0c1a1 100644 --- a/ports/dbg-macro/vcpkg.json +++ b/ports/dbg-macro/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dbg-macro", - "version-date": "2021-11-02", + "version": "0.5.0", "description": "A dbg(...) macro for C++", - "homepage": "https://github.com/sharkdp/dbg-macro" + "homepage": "https://github.com/sharkdp/dbg-macro", + "license": "MIT" } diff --git a/ports/zpp-bits/portfile.cmake b/ports/zpp-bits/portfile.cmake index a0064d1d6fe7a2..df75a3bf93f486 100644 --- a/ports/zpp-bits/portfile.cmake +++ b/ports/zpp-bits/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eyalz800/zpp_bits - REF v4.4.13 - SHA512 26298d4485b364ac19a2d5375842052bc21f6f0c6fd355bd41078fc41885a8d26c5386a5cd6169044a4e476bd7b7540832f520ca75c06791e8e30dffb018b557 + REF "v${VERSION}" + SHA512 55757e4a02b680b8eae9e72073bd5612ba7e167bb82c40e89a3e27e3be520b1cd6db11dbb89bfaa4b046ba5b0dab11e02f481cbf93faebc96afc34ab49cd737a HEAD_REF master ) file(INSTALL "${SOURCE_PATH}/zpp_bits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zpp-bits/vcpkg.json b/ports/zpp-bits/vcpkg.json index ed5ec15e407a41..8c8ab51d079776 100644 --- a/ports/zpp-bits/vcpkg.json +++ b/ports/zpp-bits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zpp-bits", - "version": "4.4.13", + "version": "4.4.17", "description": "A lightweight C++20 serialization and RPC library", "homepage": "https://github.com/eyalz800/zpp_bits", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 51aab08a9348e1..d661515fb46f14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2025,7 +2025,7 @@ "port-version": 0 }, "dbg-macro": { - "baseline": "2021-11-02", + "baseline": "0.5.0", "port-version": 0 }, "dbghelp": { @@ -8913,7 +8913,7 @@ "port-version": 3 }, "zpp-bits": { - "baseline": "4.4.13", + "baseline": "4.4.17", "port-version": 0 }, "zserge-webview": { diff --git a/versions/d-/dbg-macro.json b/versions/d-/dbg-macro.json index 9fa5bd8d38d8f4..c272f5d17045cf 100644 --- a/versions/d-/dbg-macro.json +++ b/versions/d-/dbg-macro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b6ca099516f914231ec442bea3e6c5f43a91e43", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "69061b0a26aff6be4f73d8f5fb8e028e5460d34b", "version-date": "2021-11-02", diff --git a/versions/z-/zpp-bits.json b/versions/z-/zpp-bits.json index 155644b4c6fbfb..92911980a5d24e 100644 --- a/versions/z-/zpp-bits.json +++ b/versions/z-/zpp-bits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2068c0855edbc51965c9001fb5af8d45e5115f26", + "version": "4.4.17", + "port-version": 0 + }, { "git-tree": "f1497476711852911f21a84e80c76a30530c98c7", "version": "4.4.13", From 8b10402c57bac884ce91ee5f44615fff6e4b1f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 1 Jun 2023 02:54:31 +0800 Subject: [PATCH 194/533] [vcpkg ci] error out cmake related deprecated functions (#31080) * [vcpkg ci] error out cmake related deprecated functions * Just have a try * fix * pick another variable name * so far so good * Maybe fix CI * rename --------- Co-authored-by: jyu49 --- .github/workflows/untrustedPR.yml | 49 +++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 8add4c7f9bd33f..723a499589820c 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -27,7 +27,8 @@ jobs: unset VCPKG_ROOT git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' > .github-pr.changed-portfiles - if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_apply_patches|vcpkg_build_msbuild|vcpkg_extract_source_archive_ex|vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-cmake; else touch .github-pr.deprecated-cmake; fi + if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_apply_patches|vcpkg_build_msbuild|vcpkg_extract_source_archive_ex)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-function; else touch .github-pr.deprecated-function; fi + if [ -s .github-pr.changed-portfiles ]; then (grep -n -H -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' $(cat .github-pr.changed-portfiles) || true) > .github-pr.deprecated-cmake; else touch .github-pr.deprecated-cmake; fi git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo "$filename" || true; done > .github-pr.missing-license cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo "$filename (has deprecated license \"$match\")" ; fi ; done > .github-pr.deprecated-license @@ -53,7 +54,8 @@ jobs: const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim() const version_string_out = (await fs.readFile('.github-pr.version-string.out', 'utf8')).trim() const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() - const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).split('\n').filter(s => s.length > 0) + const deprecated_function = (await fs.readFile('.github-pr.deprecated-function', 'utf8')).split('\n').filter(s => s.length > 0) + const deprecated_cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).split('\n').filter(s => s.length > 0) const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim() const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).trim() @@ -92,34 +94,55 @@ jobs: approve = false; } - if (cmake.length > 0) { + if (deprecated_function.length > 0) { var deprecated_output = ''; deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n" deprecated_output += "If you feel able to do so, please consider migrating them to the new functions.\n"; - deprecated_output += "In the ports that use the new function vcpkg_cmake_install, vcpkg_cmake_build or vcpkg_cmake_config_fixup, you have to add the corresponding dependencies:\n"; + core.warning(deprecated_output); + + let deprecated_functions = { + vcpkg_extract_source_archive_ex: 'vcpkg_extract_source_archive https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_extract_source_archive', + vcpkg_build_msbuild: 'vcpkg_install_msbuild https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_install_msbuild', + vcpkg_apply_patches: 'the PATCHES arguments to the \"extract\" helpers (for example, vcpkg_from_github() (https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_from_github))', + }; + for (let line of deprecated_function) { + // line has the format: :: 0) { + var deprecated_output = ''; + deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n" + deprecated_output += "These functions have been forbidden in vcpkg, please migrating them to the new functions.\n"; + deprecated_output += "In the ports that use the new function vcpkg_cmake_configure, vcpkg_cmake_install, vcpkg_cmake_build or vcpkg_cmake_config_fixup, you have to add the corresponding dependencies:\n"; deprecated_output += "```json\n"; deprecated_output += '{\n "name": "vcpkg-cmake",\n "host": true\n},\n' deprecated_output += '{\n "name": "vcpkg-cmake-config",\n "host": true\n}\n'; deprecated_output += "```\n"; - core.warning(deprecated_output); + core.error(deprecated_output); - const deprecated_functions = { + let deprecated_functions = { vcpkg_install_cmake: 'vcpkg_cmake_install (from port vcpkg-cmake)', vcpkg_install_cmake: 'vcpkg_cmake_install (from port vcpkg-cmake)', vcpkg_build_cmake: 'vcpkg_cmake_build (from port vcpkg-cmake)', vcpkg_configure_cmake: 'vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)', vcpkg_fixup_cmake_targets: 'vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)', - vcpkg_extract_source_archive_ex: 'vcpkg_extract_source_archive https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_extract_source_archive', - vcpkg_build_msbuild: 'vcpkg_install_msbuild https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_install_msbuild', - vcpkg_apply_patches: 'the PATCHES arguments to the \"extract\" helpers (for example, vcpkg_from_github() (https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_from_github))', }; - for (let line of cmake) { + for (let line of deprecated_cmake) { // line has the format: :: Date: Wed, 31 May 2023 11:55:10 -0700 Subject: [PATCH 195/533] [angelscript] fix build dependency error (#31711) * [angelscript] fix build dependency errors * update version * update portfile.cmake * update version --------- Co-authored-by: Zhao Liu --- ports/angelscript/fix-dependency.patch | 9 +++++++++ ports/angelscript/portfile.cmake | 1 + ports/angelscript/vcpkg.json | 1 + versions/a-/angelscript.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ports/angelscript/fix-dependency.patch diff --git a/ports/angelscript/fix-dependency.patch b/ports/angelscript/fix-dependency.patch new file mode 100644 index 00000000000000..be5213f84a5f18 --- /dev/null +++ b/ports/angelscript/fix-dependency.patch @@ -0,0 +1,9 @@ +diff --git a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +index 4d1ef0f..ec14fe9 100644 +--- a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake ++++ b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +@@ -1,2 +1,4 @@ + include("${CMAKE_CURRENT_LIST_DIR}/AngelscriptTargets.cmake") ++include(CMakeFindDependencyMacro) ++find_dependency(Threads REQUIRED) + diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index f8ea42f52edb57..ac93fa2d0442dc 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES mark-threads-private.patch + fix-dependency.patch ) vcpkg_cmake_configure( diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index b9662364dda0f1..472f7a81154f4b 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,6 +1,7 @@ { "name": "angelscript", "version": "2.36.1", + "port-version": 1, "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", "license": "Zlib", diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index 49745dd32a57bb..d6c134f048ae5f 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c1bc126371829227e923c11f029a539a234a483", + "version": "2.36.1", + "port-version": 1 + }, { "git-tree": "e90e0fe54ab8038226b849471fba169157753c19", "version": "2.36.1", diff --git a/versions/baseline.json b/versions/baseline.json index d661515fb46f14..6b408cde14e1b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -118,7 +118,7 @@ }, "angelscript": { "baseline": "2.36.1", - "port-version": 0 + "port-version": 1 }, "angle": { "baseline": "chromium_5414", From 7be26f0f3cdf46553b326ade080154ec43791bfb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 31 May 2023 21:22:07 +0200 Subject: [PATCH 196/533] [unicorn-lib] Fix, cleanup (#31706) Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/unicorn-lib/CMakeLists.txt | 35 +++++++++++++------------------- ports/unicorn-lib/portfile.cmake | 15 +++++++------- ports/unicorn-lib/vcpkg.json | 11 +++++++++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/u-/unicorn-lib.json | 5 +++++ 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/ports/unicorn-lib/CMakeLists.txt b/ports/unicorn-lib/CMakeLists.txt index b668c3c09a77e0..4f0879e52d844c 100644 --- a/ports/unicorn-lib/CMakeLists.txt +++ b/ports/unicorn-lib/CMakeLists.txt @@ -4,30 +4,23 @@ project(Unicorn_Lib LANGUAGES CXX DESCRIPTION "Unicode library for C++ by Ross S set(CMAKE_CXX_STANDARD 17) option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." OFF) -include(SelectLibraryConfigurations) find_package(ZLIB REQUIRED) -find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) -find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) -select_library_configurations(PCRE2) +find_package(PkgConfig REQUIRED) +pkg_check_modules(PCRE2 IMPORTED_TARGET REQUIRED libpcre2-8) -file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) -foreach(ITR ${UNICORN_LIB_SOURCES}) - if(ITR MATCHES "(.*)-test.cpp(.*)") - list(REMOVE_ITEM UNICORN_LIB_SOURCES ${ITR}) - endif() -endforeach() -add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) -target_include_directories( - unicorn-lib - PUBLIC ${PROJECT_SOURCE_DIR} -) -target_compile_definitions( - unicorn-lib - PRIVATE -DUNICODE -D_UNICODE _CRT_SECURE_NO_WARNINGS -) +file(GLOB_RECURSE UNICORN_LIB_SOURCES "${PROJECT_SOURCE_DIR}/unicorn/*.cpp") +list(FILTER UNICORN_LIB_SOURCES EXCLUDE REGEX "(.*)-test.cpp(.*)") -target_link_libraries(unicorn-lib PUBLIC ${PCRE2_LIBRARY}) -target_link_libraries(unicorn-lib PUBLIC ZLIB::ZLIB) +add_library(unicorn-lib ${UNICORN_LIB_SOURCES}) +target_include_directories(unicorn-lib PUBLIC "${PROJECT_SOURCE_DIR}") +target_link_libraries(unicorn-lib PRIVATE PkgConfig::PCRE2 ZLIB::ZLIB) +if(WIN32) + target_compile_definitions(unicorn-lib PRIVATE -DNOMINMAX -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS) +else() + find_package(Iconv REQUIRED) + target_link_libraries(unicorn-lib PRIVATE Iconv::Iconv) + target_compile_definitions(unicorn-lib PRIVATE -D_XOPEN_SOURCE=700) +endif() if(NOT UNICORN_LIB_SKIP_HEADERS) install(DIRECTORY ${PROJECT_SOURCE_DIR}/unicorn DESTINATION include FILES_MATCHING PATTERN "*.hpp") diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index a206c633cb358c..25ef7557fb00e9 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -1,20 +1,21 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message("unicorn-lib is a static library, now build with static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2022-01-24 + REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2021-10-28 SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d HEAD_REF master ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" OPTIONS_DEBUG -DUNICORN_LIB_SKIP_HEADERS=ON ) @@ -22,6 +23,4 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unicorn-lib/vcpkg.json b/ports/unicorn-lib/vcpkg.json index 9a7ed9aeb2b030..d62d1f99253699 100644 --- a/ports/unicorn-lib/vcpkg.json +++ b/ports/unicorn-lib/vcpkg.json @@ -1,11 +1,20 @@ { "name": "unicorn-lib", "version-date": "2022-01-24", + "port-version": 1, "description": "Unicode library for C++ by Ross Smith", "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", "license": "MIT", + "supports": "!uwp", "dependencies": [ - "pcre2", + { + "name": "libiconv", + "platform": "!windows" + }, + { + "name": "pcre2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 26398672777a09..f25697edeec01c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1601,8 +1601,6 @@ turbobase64:arm-neon-android=fail tvision:arm-neon-android=fail tvision:arm64-android=fail tvision:x64-android=fail -unicorn-lib:arm-uwp=fail -unicorn-lib:x64-uwp=fail unicorn:x64-windows-static-md=fail unittest-cpp:arm-neon-android=fail unittest-cpp:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 6b408cde14e1b7..3b78d5ca719e07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8234,7 +8234,7 @@ }, "unicorn-lib": { "baseline": "2022-01-24", - "port-version": 0 + "port-version": 1 }, "units": { "baseline": "2.3.3", diff --git a/versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json index db2bc9f7856661..976fcb4cc85add 100644 --- a/versions/u-/unicorn-lib.json +++ b/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20329e00e75f4f13bb1b77f3e19c23182861c6cd", + "version-date": "2022-01-24", + "port-version": 1 + }, { "git-tree": "278115c391839dcfc66ac80339c8dcd9a660c9e0", "version-date": "2022-01-24", From 50a5ff3563f9c17f5263548b843ad08af2aba8b5 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:24:33 +0800 Subject: [PATCH 197/533] [folly,fbthrift,mvfst,fizz,wangle,proxygen]: update to 2023.05.15 (#31657) * [folly]: update to 2023.05.15 * remove no more used patch * fix mvfst * fix rsocket * revert indent * fix space --- ...-fix-compatibility-with-boost-1.79.0.patch | 60 ------- ports/fbthrift/0002-fix-dependency.patch | 13 +- ports/fbthrift/fix-glog.patch | 8 +- ports/fbthrift/portfile.cmake | 6 +- ports/fbthrift/vcpkg.json | 3 +- ports/fizz/0003-fix-deps.patch | 16 +- ports/fizz/portfile.cmake | 4 +- ports/fizz/vcpkg.json | 3 +- ports/folly/fix-build-with-gcc-13.patch | 27 ---- ports/folly/portfile.cmake | 5 +- ports/folly/vcpkg.json | 3 +- ports/mvfst/fix_format.patch | 13 ++ ports/mvfst/portfile.cmake | 6 +- ports/mvfst/vcpkg.json | 11 +- ports/proxygen/portfile.cmake | 4 +- ports/proxygen/vcpkg.json | 3 +- .../rsocket/fix-rsockserver-build-error.patch | 153 ++++++++++++++++++ ports/rsocket/portfile.cmake | 1 + ports/rsocket/vcpkg.json | 2 +- ports/wangle/fix_dependency.patch | 4 +- ports/wangle/portfile.cmake | 4 +- ports/wangle/vcpkg.json | 3 +- versions/baseline.json | 24 +-- versions/f-/fbthrift.json | 5 + versions/f-/fizz.json | 5 + versions/f-/folly.json | 5 + versions/m-/mvfst.json | 5 + versions/p-/proxygen.json | 5 + versions/r-/rsocket.json | 5 + versions/w-/wangle.json | 5 + 30 files changed, 263 insertions(+), 148 deletions(-) delete mode 100644 ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch delete mode 100644 ports/folly/fix-build-with-gcc-13.patch create mode 100644 ports/mvfst/fix_format.patch create mode 100644 ports/rsocket/fix-rsockserver-build-error.patch diff --git a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch deleted file mode 100644 index f189e8777fe8bd..00000000000000 --- a/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649 Mon Sep 17 00:00:00 2001 -From: Kevin Lin -Date: Mon, 18 Apr 2022 12:17:40 -0700 -Subject: [PATCH] thrift/compiler/compiler.cc: Include fstream to fix - compatibility with Boost 1.79.0 (#494) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -This patch fixes fbthrift build compatibility with Boost 1.79.0. The symptom is the following compiler error: - -``` -/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc: In function ‘bool apache::thrift::compiler::{anonymous}::generate(const apache::thrift::compiler::{anonymous}::gen_params&, apache::thrift::compiler::t_program*, std::set >&)’: -/opt/mcrouter-build/fbthrift/thrift/compiler/compiler.cc:331:19: error: aggregate ‘std::ofstream genfile’ has incomplete type and cannot be defined - 331 | std::ofstream genfile; - | ^~~~~~~ -make[2]: *** [thrift/compiler/CMakeFiles/thrift1.dir/build.make:76: thrift/compiler/CMakeFiles/thrift1.dir/compiler.cc.o] Error 1 -make[1]: *** [CMakeFiles/Makefile2:253: thrift/compiler/CMakeFiles/thrift1.dir/all] Error 2 -make: *** [Makefile:152: all] Error 2 -``` - -To reproduce, install the standard fbthrift dependencies, but with Boost 1.79.0 compiled from source, followed by: - -``` -$ mkdir build && cd build -$ cmake -DCMAKE_BUILD_TYPE=RELEASE CXXFLAGS="-fPIC" .. -$ make -j -``` - -Adding an include on `fstream` allows for the build to complete successfully. - -Pull Request resolved: https://github.com/facebook/fbthrift/pull/494 - -Reviewed By: iahs - -Differential Revision: D35709922 - -Pulled By: vitaut - -fbshipit-source-id: 96f0764c7b33047acb7b5ad26b21076757aaa5e7 ---- - thrift/compiler/compiler.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/thrift/compiler/compiler.cc b/thrift/compiler/compiler.cc -index 721ff7dbf3..da944c2950 100644 ---- a/thrift/compiler/compiler.cc -+++ b/thrift/compiler/compiler.cc -@@ -32,6 +32,7 @@ - #include - #endif - #include -+#include - - #include - #include --- -2.34.1.windows.1 - diff --git a/ports/fbthrift/0002-fix-dependency.patch b/ports/fbthrift/0002-fix-dependency.patch index b47de99540ee7d..d06d2d79d51473 100644 --- a/ports/fbthrift/0002-fix-dependency.patch +++ b/ports/fbthrift/0002-fix-dependency.patch @@ -1,19 +1,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index beae7d7..0d03162 100644 +index d2b69ad..84b2bf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -100,7 +100,8 @@ endif () +@@ -96,22 +96,24 @@ endif () # Find required dependencies for thrift/lib - if(lib_only OR build_all) + if (THRIFT_LIB_ONLY OR build_all) - find_package(Gflags REQUIRED) + find_package(gflags CONFIG REQUIRED) + set(LIBGFLAGS_LIBRARY gflags::gflags) find_package(glog CONFIG REQUIRED) set (GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) -@@ -108,16 +109,17 @@ if(lib_only OR build_all) - find_package(fmt CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) find_package(ZLIB REQUIRED) - find_package(Zstd REQUIRED) @@ -23,7 +22,6 @@ index beae7d7..0d03162 100644 + elseif(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) + endif() -+ # https://cmake.org/cmake/help/v3.9/module/FindThreads.html set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads) @@ -32,10 +30,9 @@ index beae7d7..0d03162 100644 - ${GLOG_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} - ${ZSTD_INCLUDE_DIRS} -- ${Boost_INCLUDE_DIRS} ) add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0") - if(lib_only) + if (THRIFT_LIB_ONLY) diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in index e1297ed..c7d9d59 100644 --- a/thrift/cmake/FBThriftConfig.cmake.in diff --git a/ports/fbthrift/fix-glog.patch b/ports/fbthrift/fix-glog.patch index 6429171b4ab25d..362e1d1eed09a2 100644 --- a/ports/fbthrift/fix-glog.patch +++ b/ports/fbthrift/fix-glog.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b248a0..beae7d7 100644 +index 7d9a1e7..d2b69ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -101,7 +101,8 @@ endif () +@@ -97,7 +97,8 @@ endif () # Find required dependencies for thrift/lib - if(lib_only OR build_all) + if (THRIFT_LIB_ONLY OR build_all) find_package(Gflags REQUIRED) - find_package(Glog REQUIRED) + find_package(glog CONFIG REQUIRED) + set (GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 53a89d4b6798d1..5c2b0411bbe63c 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF v2022.03.21.00 - SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab + REF "v${VERSION}" + SHA512 b9f7bb7037cbc24ba18928cfad8673fd321ec095dec5fa6ca5b6c51b468873bbefde4326d39faa916747f4273b5a4003d60c0f6f755bfce095f9d3e8946bcb46 HEAD_REF master PATCHES - 0001-fix-compatibility-with-boost-1.79.0.patch fix-glog.patch 0002-fix-dependency.patch ) @@ -51,6 +50,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/frozen/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/gtest/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index ce5ab6c0ebbd3e..fe7f39aea1db39 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fbthrift", - "version-string": "2022.03.21.00", - "port-version": 3, + "version-string": "2023.05.15.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fizz/0003-fix-deps.patch b/ports/fizz/0003-fix-deps.patch index 8518caeca1df35..0ef7605358eb65 100644 --- a/ports/fizz/0003-fix-deps.patch +++ b/ports/fizz/0003-fix-deps.patch @@ -1,5 +1,5 @@ diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 64bf93b..843b035 100644 +index 64eec10..6c5a934 100644 --- a/fizz/CMakeLists.txt +++ b/fizz/CMakeLists.txt @@ -50,10 +50,9 @@ find_package(folly CONFIG REQUIRED) @@ -57,11 +57,11 @@ index 64bf93b..843b035 100644 - list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) -endif() - set(FIZZ_HEADER_DIRS - client -@@ -237,30 +216,25 @@ target_include_directories( - PUBLIC + configure_file(fizz-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/fizz/fizz-config.h DESTINATION ${INCLUDE_INSTALL_DIR}/fizz/) +@@ -243,30 +222,25 @@ target_include_directories( $ + $ $ - ${FOLLY_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} @@ -97,7 +97,7 @@ index 64bf93b..843b035 100644 ${CMAKE_DL_LIBS} ${LIBRT_LIBRARIES}) -@@ -317,8 +291,7 @@ ENDIF(CMAKE_CROSSCOMPILING) +@@ -323,8 +297,7 @@ ENDIF(CMAKE_CROSSCOMPILING) SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) if(BUILD_TESTS) @@ -107,7 +107,7 @@ index 64bf93b..843b035 100644 endif() add_library(fizz_test_support -@@ -331,21 +304,9 @@ add_library(fizz_test_support +@@ -337,21 +310,9 @@ add_library(fizz_test_support target_link_libraries(fizz_test_support PUBLIC fizz @@ -130,7 +130,7 @@ index 64bf93b..843b035 100644 # export fizz headers and targets for unit tests utils # since other projects such as mvfst and proxygen use them -@@ -369,14 +330,13 @@ macro(add_gtest test_source test_name) +@@ -375,14 +336,13 @@ macro(add_gtest test_source test_name) add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp) set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true) diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 43823914e7418b..cd386f2ed5959d 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF 47948342be43ddb951e12a53770278be52d479e7 #v2022.10.31.00 - SHA512 b91fbbe008bbd6ee5e865a585cd51f1a1b69360eba32231f0b585b836e5591ee4cc9ffe1d747a82267f21736056fc97932b35212016e614928c13de7c5a64f55 + REF "v${VERSION}" + SHA512 6b057a0610e12e1bbfa668f0233d0daf0ce872247deaa9301bd8b842c7c01afd78812fe2170479b128852c4bf22dffd4a5d84b1970e59e4e82f35b0fb7e54e5e HEAD_REF master PATCHES 0001-fix-libsodium.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 97d0cd647f3611..35e5c5cf47ee51 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fizz", - "version-string": "2022.10.31.00", - "port-version": 1, + "version-string": "2023.05.15.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/fix-build-with-gcc-13.patch b/ports/folly/fix-build-with-gcc-13.patch deleted file mode 100644 index 9b33c8b4456fc0..00000000000000 --- a/ports/folly/fix-build-with-gcc-13.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 22 Jan 2023 05:06:16 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing includes) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so etc is no longer transitively included. - -Signed-off-by: Sam James ---- - folly/system/AtFork.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/folly/system/AtFork.cpp b/folly/system/AtFork.cpp -index e888e52858a..a5570330dc3 100644 ---- a/folly/system/AtFork.cpp -+++ b/folly/system/AtFork.cpp -@@ -14,6 +14,9 @@ - * limitations under the License. - */ - -+#include -+#include -+ - #include - - #include diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index bc7730c884a91a..afb46e4ce47517 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00 - SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770 + REF "v${VERSION}" + SHA512 311cc6dfebfdfb49bfdd54e66c5dffabb16090610a3b0f05286aadb0e9d6b8b5b27f4bf3400cf74ba35b88f97d6ed7a79a6f32c093c78b8667684d4cbd8baedb HEAD_REF main PATCHES reorder-glog-gflags.patch @@ -17,7 +17,6 @@ vcpkg_from_github( boost-1.70.patch fix-windows-minmax.patch fix-deps.patch - fix-build-with-gcc-13.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 592927b476a620..05b48346e2b26b 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2022.10.31.00", - "port-version": 7, + "version-string": "2023.05.15.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/mvfst/fix_format.patch b/ports/mvfst/fix_format.patch new file mode 100644 index 00000000000000..4bf12f2cd31495 --- /dev/null +++ b/ports/mvfst/fix_format.patch @@ -0,0 +1,13 @@ +diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp +index 744cb81..ff3e559 100644 +--- a/quic/server/QuicServerWorker.cpp ++++ b/quic/server/QuicServerWorker.cpp +@@ -692,7 +692,7 @@ PacketDropReason QuicServerWorker::isDstConnIdMisrouted( + "Dropping packet due to DCID parsing error={}, errorCode={}," + "routingInfo = {} ", + ex.what(), +- ex.errorCode(), ++ toString(ex.errorCode()), + logRoutingInfo(dstConnId)); + // TODO do we need to reset? + return PacketDropReason::PARSE_ERROR_DCID; diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index 8766d87c6fc42c..96a8f316c9fef7 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/mvfst - REF 28857570ac808c5493312144dc5af92d6f0a7381 #2022-11-03 - SHA512 3e413e8906ac83f48936871f24d06980bdeff8b7a659326498549afaa53321c047bcd843a7ed971bfed7ddb51e086a28c1ac5fb0f91aabd0a078dda6a75fe488 + REF aeee9b372827cea28697755ea1f68bfc5288548a #2023-05-18 + SHA512 feece3f05537b58270507d9423cc95fe577532997b857586aa49c2000516f3297c487696b659a35f194f0e970b8e84ff0c1a7446d4af7b400a2183704df995a2 HEAD_REF main + PATCHES + fix_format.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 4082b77518bbe3..e28cc76b28e7a3 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,12 +1,19 @@ { "name": "mvfst", - "version-date": "2022-11-03", + "version-date": "2023-05-18", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebookincubator/mvfst", "license": "MIT", "supports": "!windows", "dependencies": [ - "boost", + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", "fizz", "fmt", "folly", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index b715760ac25abd..24b7a7f144c928 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF 0c932f6c57095838494520ec4ce7243a7f0c1234 #v2022.07.11.00 - SHA512 496189c37be8f42821cb5357e501b02f013858f1917854000777ac5c0403d078837e89dc3eef5f66f30f83c7506e40316d730725d7f97070090ac6549e766093 + REF "v${VERSION}" + SHA512 b08110c4bb4d83a80786aa517edc88d2d9233934705a5deb3da70542251c737113500a11a4cd55d72928635be7c2833e806d1c5391892269a0dd1fe8d4e80187 HEAD_REF master PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 761d0d27a8769e..927729615c7248 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,7 +1,6 @@ { "name": "proxygen", - "version-string": "2022.07.11.00", - "port-version": 1, + "version-string": "2023.05.15.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/rsocket/fix-rsockserver-build-error.patch b/ports/rsocket/fix-rsockserver-build-error.patch new file mode 100644 index 00000000000000..080f8a3fcf8b81 --- /dev/null +++ b/ports/rsocket/fix-rsockserver-build-error.patch @@ -0,0 +1,153 @@ +diff --git a/rsocket/RSocketServer.cpp b/rsocket/RSocketServer.cpp +index 1e20281..3a9f6b2 100644 +--- a/rsocket/RSocketServer.cpp ++++ b/rsocket/RSocketServer.cpp +@@ -125,7 +125,7 @@ void RSocketServer::acceptConnection( + weakConSet = std::weak_ptr(connectionSet_), + scheduledResponder = useScheduledResponder_]( + std::unique_ptr conn, +- SetupParameters params) mutable { ++ SetupParameters params) mutable noexcept{ + if (auto connectionSet = weakConSet.lock()) { + RSocketServer::onRSocketSetup( + serviceHandler, +@@ -135,12 +135,15 @@ void RSocketServer::acceptConnection( + std::move(params)); + } + }, +- std::bind( +- &RSocketServer::onRSocketResume, +- this, +- serviceHandler, +- std::placeholders::_1, +- std::placeholders::_2)); ++ [this, serviceHandler=serviceHandler]( ++ std::unique_ptr connection, ++ ResumeParameters resumeParameters) mutable noexcept{ ++ this->onRSocketResume( ++ serviceHandler, ++ std::move(connection), ++ resumeParameters ++ ); ++ }); + } + + void RSocketServer::onRSocketSetup( +@@ -206,7 +209,7 @@ void RSocketServer::onRSocketSetup( + void RSocketServer::onRSocketResume( + std::shared_ptr serviceHandler, + std::unique_ptr connection, +- ResumeParameters resumeParams) { ++ ResumeParameters resumeParams) noexcept{ + auto result = serviceHandler->onResume(resumeParams.token); + if (result.hasError()) { + stats_->resumeFailedNoState(); +diff --git a/rsocket/RSocketServer.h b/rsocket/RSocketServer.h +index 39dae66..e2346ef 100644 +--- a/rsocket/RSocketServer.h ++++ b/rsocket/RSocketServer.h +@@ -118,7 +118,7 @@ class RSocketServer { + void onRSocketResume( + std::shared_ptr serviceHandler, + std::unique_ptr connection, +- rsocket::ResumeParameters setupPayload); ++ rsocket::ResumeParameters setupPayload)noexcept; + + const std::unique_ptr duplexConnectionAcceptor_; + bool started{false}; +diff --git a/yarpl/flowable/AsyncGeneratorShim.h b/yarpl/flowable/AsyncGeneratorShim.h +index 72d212c..79a09f1 100644 +--- a/yarpl/flowable/AsyncGeneratorShim.h ++++ b/yarpl/flowable/AsyncGeneratorShim.h +@@ -96,7 +96,7 @@ class AsyncGeneratorShim { + value.emplace(std::move(*item)); + } + } catch (const std::exception& ex) { +- value.emplaceException(std::current_exception(), ex); ++ value.emplaceException(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex); + } catch (...) { + value.emplaceException(std::current_exception()); + } +diff --git a/yarpl/flowable/Flowable.h b/yarpl/flowable/Flowable.h +index 9dff78b..bccd70d 100644 +--- a/yarpl/flowable/Flowable.h ++++ b/yarpl/flowable/Flowable.h +@@ -494,7 +494,7 @@ std::shared_ptr> Flowable::fromGenerator( + } + } catch (const std::exception& ex) { + subscriber.onError( +- folly::exception_wrapper(std::current_exception(), ex)); ++ folly::exception_wrapper(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex)); + } catch (...) { + subscriber.onError(std::runtime_error( + "Flowable::fromGenerator() threw from Subscriber:onNext()")); +diff --git a/yarpl/flowable/FlowableOperator.h b/yarpl/flowable/FlowableOperator.h +index 314ba7f..fe63504 100644 +--- a/yarpl/flowable/FlowableOperator.h ++++ b/yarpl/flowable/FlowableOperator.h +@@ -178,7 +178,7 @@ class MapOperator : public FlowableOperator { + this->subscriberOnNext(flowable->function_(std::move(value))); + } + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->terminateErr(std::move(ew)); + } + } +@@ -190,7 +190,7 @@ class MapOperator : public FlowableOperator { + } + } catch (const std::exception& exn) { + this->terminateErr( +- folly::exception_wrapper{std::current_exception(), exn}); ++ folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}); + } + } + +@@ -570,7 +570,7 @@ class FlatMapOperator : public FlowableOperator { + try { + mappedStream = flowable_->function_(std::move(value)); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + { + std::lock_guard g(onErrorExGuard_); + onErrorEx_ = ew; +diff --git a/yarpl/flowable/Subscriber.h b/yarpl/flowable/Subscriber.h +index d1dc3b5..582f9c4 100644 +--- a/yarpl/flowable/Subscriber.h ++++ b/yarpl/flowable/Subscriber.h +@@ -301,7 +301,7 @@ class Base : public LambdaSubscriber { + next_(std::move(value)); + } catch (const std::exception& exn) { + this->cancel(); +- auto ew = folly::exception_wrapper{std::current_exception(), exn}; ++ auto ew = folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + LOG(ERROR) << "'next' method should not throw: " << ew.what(); + onErrorImpl(ew); + return; +diff --git a/yarpl/observable/ObservableOperator.h b/yarpl/observable/ObservableOperator.h +index 451c6bd..0e60b48 100644 +--- a/yarpl/observable/ObservableOperator.h ++++ b/yarpl/observable/ObservableOperator.h +@@ -196,7 +196,7 @@ class MapOperator : public ObservableOperator { + try { + this->observerOnNext(observable_->function_(std::move(value))); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->terminateErr(std::move(ew)); + } + } +diff --git a/yarpl/single/SingleOperator.h b/yarpl/single/SingleOperator.h +index 0b3e739..4defd64 100644 +--- a/yarpl/single/SingleOperator.h ++++ b/yarpl/single/SingleOperator.h +@@ -197,7 +197,7 @@ class MapOperator : public SingleOperator { + auto map_operator = this->getOperator(); + this->observerOnSuccess(map_operator->function_(std::move(value))); + } catch (const std::exception& exn) { +- folly::exception_wrapper ew{std::current_exception(), exn}; ++ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; + this->observerOnError(std::move(ew)); + } + } diff --git a/ports/rsocket/portfile.cmake b/ports/rsocket/portfile.cmake index f6ec73c4aa721d..3ee27b265b8401 100644 --- a/ports/rsocket/portfile.cmake +++ b/ports/rsocket/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( fix-find-dependencies.patch use-cpp-17.patch fix-folly.patch + fix-rsockserver-build-error.patch ) vcpkg_cmake_configure( diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json index 018579f0bffca1..190c786aec3d32 100644 --- a/ports/rsocket/vcpkg.json +++ b/ports/rsocket/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsocket", "version-string": "2021.08.30.00", - "port-version": 1, + "port-version": 2, "description": "C++ implementation of RSocket http://rsocket.io", "homepage": "https://github.com/rsocket/rsocket-cpp", "dependencies": [ diff --git a/ports/wangle/fix_dependency.patch b/ports/wangle/fix_dependency.patch index d8316073b7e647..f44d39fabc9d72 100644 --- a/ports/wangle/fix_dependency.patch +++ b/ports/wangle/fix_dependency.patch @@ -1,5 +1,5 @@ diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index 977bbe4..155f9cc 100644 +index 85ae066..766d3d3 100644 --- a/wangle/CMakeLists.txt +++ b/wangle/CMakeLists.txt @@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING @@ -33,7 +33,7 @@ index 977bbe4..155f9cc 100644 find_package(Librt) @@ -166,6 +171,14 @@ target_include_directories( ${LIBEVENT_INCLUDE_DIR} - ${DOUBLE_CONVERSION_INCLUDE_DIRS} + ${DOUBLE_CONVERSION_INCLUDE_DIR} ) +set(Boost_LIBRARIES Boost::boost Boost::filesystem Boost::thread ) +set(FOLLY_LIBRARIES Folly::folly) diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 15bafaa769a07a..378dfb90f23725 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2022.03.21.00 - SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e + REF "v${VERSION}" + SHA512 aa87614f9630fd325e848bef38c520b85a57eaf0e3dd5cb3421a0bb55322fbdf9c22b153436d703eb30ac9f8c4d02bfb71b9313acd16c412609216eb0ca16109 HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index a7493e597e8a64..46109a2a82b0ed 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wangle", - "version-string": "2022.03.21.00", - "port-version": 1, + "version-string": "2023.05.15.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3b78d5ca719e07..0c4d57e4552175 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2457,8 +2457,8 @@ "port-version": 0 }, "fbthrift": { - "baseline": "2022.03.21.00", - "port-version": 3 + "baseline": "2023.05.15.00", + "port-version": 0 }, "fcl": { "baseline": "0.7.0", @@ -2497,8 +2497,8 @@ "port-version": 0 }, "fizz": { - "baseline": "2022.10.31.00", - "port-version": 1 + "baseline": "2023.05.15.00", + "port-version": 0 }, "flann": { "baseline": "2019-04-07", @@ -2561,8 +2561,8 @@ "port-version": 0 }, "folly": { - "baseline": "2022.10.31.00", - "port-version": 7 + "baseline": "2023.05.15.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -5485,7 +5485,7 @@ "port-version": 6 }, "mvfst": { - "baseline": "2022-11-03", + "baseline": "2023-05-18", "port-version": 0 }, "mygui": { @@ -6441,8 +6441,8 @@ "port-version": 0 }, "proxygen": { - "baseline": "2022.07.11.00", - "port-version": 1 + "baseline": "2023.05.15.00", + "port-version": 0 }, "psimd": { "baseline": "2021-02-21", @@ -7178,7 +7178,7 @@ }, "rsocket": { "baseline": "2021.08.30.00", - "port-version": 1 + "port-version": 2 }, "rtabmap": { "baseline": "0.21.0", @@ -8521,8 +8521,8 @@ "port-version": 4 }, "wangle": { - "baseline": "2022.03.21.00", - "port-version": 1 + "baseline": "2023.05.15.00", + "port-version": 0 }, "wasmedge": { "baseline": "0.12.1", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index e858ddbc1b17c4..287b0be4cf8b66 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ad62e4d34a61f43fee3a61b14aae377ed73249a", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "74805d5c9147b3255703cdce511d9082cdfee016", "version-string": "2022.03.21.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 8d11ac36592752..b3dc373275aff7 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81e1764f1bcde018ea8a73fc36c4f4d14b03e978", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "df45ebd305a5416215667058e31729d6f28f7b64", "version-string": "2022.10.31.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 7e6326416b1082..0f7897a64cf4d3 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "691eb72c1ad244629c0993986a9f33240afa4710", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "003ae8b1bc9dc0a460b5c6f6cacda76fa5931cf8", "version-string": "2022.10.31.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 4b7412e2af279f..8bc751dc5cd933 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "345723d54eef6854daed66dedae0b9d4ead2f9a4", + "version-date": "2023-05-18", + "port-version": 0 + }, { "git-tree": "6187a6048afe0846ffb243d00981f0da0666aa38", "version-date": "2022-11-03", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index ce9986a15b1382..687773730a87a9 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b7e41b105fbb8e30443037e04098621d31a4fb2", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "e66bcd352675efbaf2ff458ae1709c165ed26696", "version-string": "2022.07.11.00", diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json index 9b4d581a30cd54..eb7a6e82adbe97 100644 --- a/versions/r-/rsocket.json +++ b/versions/r-/rsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1d02b39aaa70e97e3ec2551d1cfc6ae1a163199", + "version-string": "2021.08.30.00", + "port-version": 2 + }, { "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c", "version-string": "2021.08.30.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 399ed59dc87b3d..f3e570fa2b98c5 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05744fe658f891ca87fd5cdad73a382ace640bed", + "version-string": "2023.05.15.00", + "port-version": 0 + }, { "git-tree": "e79739dcf42e3dd4d0e32c595b27ece48c762bdd", "version-string": "2022.03.21.00", From 3e93bb69a1cadeb36fe9eca3b6f3912d84f618d5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 31 May 2023 21:27:10 +0200 Subject: [PATCH 198/533] [coolprop,if97,msgpack,refprop-headers] Cleanup (#31694) * [coolprop] Cleanup * Fix uwp * [refprop-headers] Update * [if97] Avoid encoding warnings * [msgpack] More boost dependencies Cf. https://github.com/msgpack/msgpack-c/wiki/install_boost * [coolprop] Use msgpack endianess --------- Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/coolprop/cmake-project-include.cmake | 3 + ports/coolprop/fix-builderror.patch | 12 ++++ ports/coolprop/fix-dependency.patch | 5 +- ports/coolprop/portfile.cmake | 68 +++++----------------- ports/coolprop/vcpkg.json | 4 +- ports/if97/portfile.cmake | 5 +- ports/if97/relax-encoding.diff | 48 +++++++++++++++ ports/if97/vcpkg.json | 1 + ports/msgpack/vcpkg.json | 5 ++ ports/refprop-headers/portfile.cmake | 15 ++--- ports/refprop-headers/unicode-build.diff | 13 +++++ ports/refprop-headers/vcpkg.json | 8 +-- scripts/ci.baseline.txt | 2 - versions/baseline.json | 10 ++-- versions/c-/coolprop.json | 5 ++ versions/i-/if97.json | 5 ++ versions/m-/msgpack.json | 5 ++ versions/r-/refprop-headers.json | 5 ++ 18 files changed, 137 insertions(+), 82 deletions(-) create mode 100644 ports/coolprop/cmake-project-include.cmake create mode 100644 ports/if97/relax-encoding.diff create mode 100644 ports/refprop-headers/unicode-build.diff diff --git a/ports/coolprop/cmake-project-include.cmake b/ports/coolprop/cmake-project-include.cmake new file mode 100644 index 00000000000000..4002296dba5e56 --- /dev/null +++ b/ports/coolprop/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() diff --git a/ports/coolprop/fix-builderror.patch b/ports/coolprop/fix-builderror.patch index 432f4e18c6f4f7..de07acb3017d5d 100644 --- a/ports/coolprop/fix-builderror.patch +++ b/ports/coolprop/fix-builderror.patch @@ -1,3 +1,15 @@ +diff --git a/include/CPmsgpack.h b/include/CPmsgpack.h +index e11f6be..948cc65 100644 +--- a/include/CPmsgpack.h ++++ b/include/CPmsgpack.h +@@ -6,7 +6,6 @@ + + // Workaround MSVC endiannes issues + #if defined(_MSC_VER) && ( defined(_M_ARM) || defined(_M_ARM64) ) +-# define MSGPACK_ENDIAN_LITTLE_BYTE + #endif + + #include "msgpack.hpp" diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp index 23bd4c4..beab710 100644 --- a/src/ODEIntegrators.cpp diff --git a/ports/coolprop/fix-dependency.patch b/ports/coolprop/fix-dependency.patch index ccae2cd46b0915..e89ccba465b7e7 100644 --- a/ports/coolprop/fix-dependency.patch +++ b/ports/coolprop/fix-dependency.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bbf8d6..617ac93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -247,13 +247,11 @@ list(REMOVE_ITEM APP_SOURCES +@@ -247,13 +247,10 @@ list(REMOVE_ITEM APP_SOURCES list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp") set(APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") @@ -16,8 +16,7 @@ index 7bbf8d6..617ac93 100644 +find_package(Eigen3 CONFIG REQUIRED) +find_package(msgpack-cxx CONFIG REQUIRED) +find_package(fmt CONFIG REQUIRED) -+link_libraries(Eigen3::Eigen fmt::fmt) -+include_directories(msgpackc-cxx) ++link_libraries(Eigen3::Eigen msgpack-cxx fmt::fmt) list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include") list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake index 245cd6730fe022..146e1dbfd03b99 100644 --- a/ports/coolprop/portfile.cmake +++ b/ports/coolprop/portfile.cmake @@ -11,59 +11,14 @@ vcpkg_from_github( fix-dependency.patch fix-install.patch ) +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "CACHE LIST" "CACHE STRING") -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_DIR}) - -file(REMOVE_RECURSE ${SOURCE_PATH}/externals) - -# Patch up the file locations -file(COPY - ${CURRENT_INSTALLED_DIR}/include/catch.hpp - DESTINATION ${SOURCE_PATH}/externals/Catch/single_include -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/eigen3/Eigen - DESTINATION ${SOURCE_PATH}/externals/Eigen -) -file(COPY - ${CURRENT_INSTALLED_DIR}/include/eigen3/unsupported/Eigen - DESTINATION ${SOURCE_PATH}/externals/Eigen/unsupported -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/rapidjson - DESTINATION ${SOURCE_PATH}/externals/rapidjson/include -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/IF97.h - DESTINATION ${SOURCE_PATH}/externals/IF97 -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/msgpack.hpp - ${CURRENT_INSTALLED_DIR}/include/msgpack - DESTINATION ${SOURCE_PATH}/externals/msgpack-c/include -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/fmt - DESTINATION ${SOURCE_PATH}/externals/cppformat -) - -file(COPY - ${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h - DESTINATION ${SOURCE_PATH}/externals/REFPROP-headers/ -) - -# Use a nasty hack to include the correct header -file(APPEND - ${SOURCE_PATH}/externals/msgpack-c/include/fmt/format.h - "#include \"fmt/printf.h\"" -) +file(REMOVE_RECURSE "${SOURCE_PATH}/externals") +file(COPY "${CURRENT_INSTALLED_DIR}/include/IF97.h" DESTINATION "${SOURCE_PATH}/externals/IF97") +file(COPY "${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h" DESTINATION "${SOURCE_PATH}/externals/REFPROP-headers/") +file(COPY "${CURRENT_INSTALLED_DIR}/include/rapidjson" DESTINATION "${SOURCE_PATH}/externals/rapidjson/include") +# Fix GCC warning when thread_local is substitude as __thread +vcpkg_replace_string("${SOURCE_PATH}/externals/rapidjson/include/rapidjson/document.h" "thread_local static " "static thread_local ") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" COOLPROP_SHARED_LIBRARY) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY) @@ -71,17 +26,22 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC) +vcpkg_find_acquire_program(PYTHON3) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY} -DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY} -DCOOLPROP_MSVC_DYNAMIC=${COOLPROP_MSVC_DYNAMIC} -DCOOLPROP_MSVC_STATIC=${COOLPROP_MSVC_STATIC} + "-DPYTHON_EXECUTABLE=${PYTHON3}" OPTIONS_RELEASE - -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} + "-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" OPTIONS_DEBUG - -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug + "-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" ) vcpkg_cmake_install() diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json index 0b8de2a570576c..bf69e28b5fb92a 100644 --- a/ports/coolprop/vcpkg.json +++ b/ports/coolprop/vcpkg.json @@ -1,17 +1,15 @@ { "name": "coolprop", "version-semver": "6.4.3", - "port-version": 2, + "port-version": 3, "description": "Thermophysical properties for the masses", "homepage": "https://github.com/CoolProp/CoolProp", "license": "MIT", "dependencies": [ - "catch", "eigen3", "fmt", "if97", "msgpack", - "pybind11", "rapidjson", "refprop-headers", { diff --git a/ports/if97/portfile.cmake b/ports/if97/portfile.cmake index 84948c811836cf..da7f1139a68b1d 100644 --- a/ports/if97/portfile.cmake +++ b/ports/if97/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_from_github( REF v2.1.3 SHA512 b29a74f134d69b72ba4bb825b25f0631f2fb335500da5d9016c4e6e417d8c93a5b309e95770eb6a7b723948dd82a7b46d873a1fe4e3f3047a881603442d73eff HEAD_REF master + PATCHES + relax-encoding.diff ) file(INSTALL "${SOURCE_PATH}/IF97.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/if97/relax-encoding.diff b/ports/if97/relax-encoding.diff new file mode 100644 index 00000000000000..e48ae2bb5a9f3b --- /dev/null +++ b/ports/if97/relax-encoding.diff @@ -0,0 +1,48 @@ +diff --git a/IF97.h b/IF97.h +index 864f3a0..4e6cab5 100644 +--- a/IF97.h ++++ b/IF97.h +@@ -52,7 +52,7 @@ namespace IF97 + // IF97 Constants + const double Tcrit = 647.096; // K + const double Pcrit = 22.064*p_fact; // MPa* +- const double Rhocrit = 322.0; // kg/m³ ++ const double Rhocrit = 322.0; // kg/m^3 + const double Scrit = 4.41202148223476*R_fact; // kJ*/kg-K (needed for backward eqn. in Region 3(a)(b) + const double Ttrip = 273.16; // K + const double Ptrip = 0.000611656*p_fact; // MPa* +@@ -2394,7 +2394,7 @@ namespace IF97 + // The equation is rearranged to solve for rho and turned + // into functions f(T,P,rho0) and f'(T,P,rho0) for the + // Newton-Raphson technique. Functions for +- // dphi/ddelta and d²phi/ddelta² were also required. These ++ // dphi/ddelta and d^2phi/ddelta^2 were also required. These + // additional Taylor functions are defined above. + // + double f(double T, double p, double rho0) const{ +@@ -4172,7 +4172,7 @@ namespace IF97 + return RegionOutput( IF97_HMASS,RegionOutputBackward(Pmax,s,IF97_SMASS),Pmax, NONE); + else { + // Determining H(s) along Tmax is difficult because there is no direct p(T,s) formulation. +- // This linear combination fit h(s)=a*ln(s)+b/s+c/s²+d is not perfect, but it's close ++ // This linear combination fit h(s)=a*ln(s)+b/s+c/s^2+d is not perfect, but it's close + // and can serve as a limit along that Tmax boundary. Coefficients in HTmaxdata above. + // There is a better way to do this using Newton-Raphson on Tmax = T(p,s), but it is iterative and slow. + double ETA = Hmax_n[0]*log(sigma) + Hmax_n[1]/sigma + Hmax_n[2]/pow(sigma,2) +Hmax_n[3]; +@@ -4323,14 +4323,14 @@ namespace IF97 + inline double cvmass_Tp(double T, double p){ return RegionOutput( IF97_CVMASS, T, p, NONE); }; + /// Get the speed of sound [m/s] as a function of T [K] and p [Pa] + inline double speed_sound_Tp(double T, double p){ return RegionOutput( IF97_W, T, p, NONE); }; +- /// Get the [d(rho)/d(p)]T [kg/m³/Pa] as a function of T [K] and p [Pa] ++ /// Get the [d(rho)/d(p)]T [kg/m^3/Pa] as a function of T [K] and p [Pa] + inline double drhodp_Tp(double T, double p){ return RegionOutput( IF97_DRHODP, T, p, NONE); }; + + // ******************************************************************************** // + // Transport Properties // + // ******************************************************************************** // + +- /// Get the viscosity [Pa-s] as a function of T [K] and Rho [kg/m³] ++ /// Get the viscosity [Pa-s] as a function of T [K] and Rho [kg/m^3] + inline double visc_TRho(double T, double rho) { + // Since we have density, we don't need to determine the region for viscosity. + static Region1 R1; // All regions use base region equations for visc(T,rho). diff --git a/ports/if97/vcpkg.json b/ports/if97/vcpkg.json index d1acd0cc9ba619..deeb734b015197 100644 --- a/ports/if97/vcpkg.json +++ b/ports/if97/vcpkg.json @@ -1,6 +1,7 @@ { "name": "if97", "version": "2.1.3", + "port-version": 1, "description": "This repository implements the IF97 formulation for the properties of pure water substance.", "homepage": "https://github.com/CoolProp/IF97", "license": "MIT" diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json index 2d9903b70b22b2..fcc2ebaae08439 100644 --- a/ports/msgpack/vcpkg.json +++ b/ports/msgpack/vcpkg.json @@ -1,13 +1,18 @@ { "name": "msgpack", "version": "6.0.0", + "port-version": 1, "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", "homepage": "https://github.com/msgpack/msgpack-c", "license": "BSL-1.0", "dependencies": [ + "boost-assert", "boost-fusion", "boost-numeric-conversion", "boost-optional", + "boost-predef", + "boost-preprocessor", + "boost-utility", "boost-variant", { "name": "vcpkg-cmake", diff --git a/ports/refprop-headers/portfile.cmake b/ports/refprop-headers/portfile.cmake index befb0184be48b9..a39b5601b93c19 100644 --- a/ports/refprop-headers/portfile.cmake +++ b/ports/refprop-headers/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CoolProp/REFPROP-headers - REF 8df35c7cb557d385bb66431e92e836104a63a33c - SHA512 4424d036c3cd6c9028fffbeda0919d38f4b0a290fb141c6d1ff26c70cd416d9a0d2e1584c51b6ad2e989e84a8a71660f62dadaa88bb22428972165ba01131cb2 + REF b4faab1b73911c32c4b69c526c7e92f74edb67de + SHA512 601fcc70e7e12419e03e71b140c2fcec80eafb19f24f9871355679662802815f98cce2d167638658ba04ba7da0e811b2cf5393ced4dbe40cb2930dee75acced5 HEAD_REF master + PATCHES + unicode-build.diff # https://github.com/CoolProp/REFPROP-headers/issues/21 ) -file(INSTALL ${SOURCE_PATH}/REFPROP_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/REFPROP_lib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/refprop-headers - RENAME copyright -) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/refprop-headers/unicode-build.diff b/ports/refprop-headers/unicode-build.diff new file mode 100644 index 00000000000000..4dc210a4c3d09c --- /dev/null +++ b/ports/refprop-headers/unicode-build.diff @@ -0,0 +1,13 @@ +diff --git a/REFPROP_lib.h b/REFPROP_lib.h +index 60fb64a..df10d2c 100644 +--- a/REFPROP_lib.h ++++ b/REFPROP_lib.h +@@ -762,7 +762,7 @@ extern "C" { + #ifndef UNICODE + msg = dllPath; + #else +- std::wstring wStr = t; ++ std::wstring wStr = dllPath; + msg = std::string(wStr.begin(), wStr.end()); + #endif + RPPath_loaded = msg; diff --git a/ports/refprop-headers/vcpkg.json b/ports/refprop-headers/vcpkg.json index 6cbe9edc62941e..a91b600282334d 100644 --- a/ports/refprop-headers/vcpkg.json +++ b/ports/refprop-headers/vcpkg.json @@ -1,7 +1,7 @@ { "name": "refprop-headers", - "version-date": "2019-04-14", - "port-version": 2, - "description": "The REFPROP Headers", - "homepage": "https://github.com/CoolProp/REFPROP-headers" + "version-date": "2022-12-07", + "description": "Header files for the REFPROP fluid property library", + "homepage": "https://github.com/CoolProp/REFPROP-headers", + "license": "MIT" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f25697edeec01c..7d7f71aa5e796c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -257,8 +257,6 @@ constexpr-contracts:arm-neon-android=fail constexpr-contracts:arm64-android=fail constexpr-contracts:x64-android=fail constexpr-contracts:x64-linux=fail -coolprop:arm-uwp=fail -coolprop:x64-uwp=fail coroutine:arm-neon-android=fail coroutine:arm-uwp=fail coroutine:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 0c4d57e4552175..10ddaaa7b9c735 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1722,7 +1722,7 @@ }, "coolprop": { "baseline": "6.4.3", - "port-version": 2 + "port-version": 3 }, "coroutine": { "baseline": "1.5.0", @@ -3206,7 +3206,7 @@ }, "if97": { "baseline": "2.1.3", - "port-version": 0 + "port-version": 1 }, "igloo": { "baseline": "1.1.1", @@ -5438,7 +5438,7 @@ }, "msgpack": { "baseline": "6.0.0", - "port-version": 0 + "port-version": 1 }, "msgpack-c": { "baseline": "6.0.0", @@ -7065,8 +7065,8 @@ "port-version": 1 }, "refprop-headers": { - "baseline": "2019-04-14", - "port-version": 2 + "baseline": "2022-12-07", + "port-version": 0 }, "rendergraph": { "baseline": "1.3.0", diff --git a/versions/c-/coolprop.json b/versions/c-/coolprop.json index 8c7366b755d5c0..ef17f0ddd80cd4 100644 --- a/versions/c-/coolprop.json +++ b/versions/c-/coolprop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "941407fb13d6b17cf04b6186a80db2e59d145a3f", + "version-semver": "6.4.3", + "port-version": 3 + }, { "git-tree": "5f114941efb93eadb6df38f9493de8bdab0b496a", "version-semver": "6.4.3", diff --git a/versions/i-/if97.json b/versions/i-/if97.json index 0bf82e794089b0..4b7c4a44ffb9af 100644 --- a/versions/i-/if97.json +++ b/versions/i-/if97.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2177f39e3ea1add06da2e665c0e34d2f620ec9a5", + "version": "2.1.3", + "port-version": 1 + }, { "git-tree": "71c163c4d2b1ef30310ba2c87ce66fa6f616034c", "version": "2.1.3", diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json index eeb891a68f9f72..bad0ee95d9f861 100644 --- a/versions/m-/msgpack.json +++ b/versions/m-/msgpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f798edc049a449e0fe3dffb9401659339b371a", + "version": "6.0.0", + "port-version": 1 + }, { "git-tree": "fc124bda56c5eca176379c3e17f9c2f2d63bbdd9", "version": "6.0.0", diff --git a/versions/r-/refprop-headers.json b/versions/r-/refprop-headers.json index 4af03c4ab3ab3e..bdb95e6473a9f6 100644 --- a/versions/r-/refprop-headers.json +++ b/versions/r-/refprop-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd807170148b9b1e7ae93fe6073004fe5438193f", + "version-date": "2022-12-07", + "port-version": 0 + }, { "git-tree": "d7ea98d3dfab53c440e5b2da61a3c347b4d00beb", "version-date": "2019-04-14", From d01e12bfee7da3f59e9ca0310656eb01a3f64643 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Wed, 31 May 2023 23:42:42 +0400 Subject: [PATCH 199/533] [magic-enum] Update to v0.9.1 (#31742) * [magic-enum] Update to v0.9.1 * x-add-version --all --- ports/magic-enum/portfile.cmake | 5 ++--- ports/magic-enum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 47167025a0fe61..e365fe10cffcae 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,15 +3,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.8.2 - SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a + REF v0.9.1 + SHA512 d76acfec5c8bdd1c22d1e278bc28965c8a15ec119b9671bf1bc49c143171f3ec9924e7f7b2e5ca689674f862f81600f7e92ace04f95f9cd96eeeed519fdf55d5 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMAGIC_ENUM_OPT_ENABLE_NONASCII=OFF -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF -DMAGIC_ENUM_OPT_INSTALL=ON diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 45c695ae9b35f4..6e7b955570ceef 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.8.2", + "version": "0.9.1", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 10ddaaa7b9c735..240e878af600ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5061,7 +5061,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.8.2", + "baseline": "0.9.1", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index c9a857a5c7e1c3..882c31994ba436 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d423a24705ddc48956d0c7683f3f8e418ae44b0d", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "579c97b898c772c488b1de1fef924cb8c767c511", "version": "0.8.2", From e527f179b10208896e983337aac4cfccfd45e3f9 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 31 May 2023 22:49:39 +0300 Subject: [PATCH 200/533] [kf5parts] Add new port (#31544) * [kf5parts] New package * [kf5parts] Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * [kf5parts] vcpkg x-add-version kf5parts --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/kf5parts/portfile.cmake | 31 ++++++++++++++++++++++++++++++ ports/kf5parts/vcpkg.json | 36 +++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5parts.json | 9 +++++++++ 4 files changed, 80 insertions(+) create mode 100644 ports/kf5parts/portfile.cmake create mode 100644 ports/kf5parts/vcpkg.json create mode 100644 versions/k-/kf5parts.json diff --git a/ports/kf5parts/portfile.cmake b/ports/kf5parts/portfile.cmake new file mode 100644 index 00000000000000..1f09bc00a2ceba --- /dev/null +++ b/ports/kf5parts/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kparts + REF "v${VERSION}" + SHA512 07ba359faf15f6bc398b64e0534842532e1a3ade94caa6b8dc7886417aa49526b7e0f54bd29805e64b8661f4c402e022bd211a932ee13b0ac4b97e516ae6dbef + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Parts CONFIG_PATH lib/cmake/KF5Parts) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5parts/vcpkg.json b/ports/kf5parts/vcpkg.json new file mode 100644 index 00000000000000..2b0bea7de9abd6 --- /dev/null +++ b/ports/kf5parts/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "kf5parts", + "version": "5.98.0", + "description": "Plugin framework for user interface component", + "homepage": "https://api.kde.org/frameworks/kparts/html/index.html", + "license": "LGPL-2.0-or-later", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5jobwidgets", + "kf5kio", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 240e878af600ee..4fbd34a0166951 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3640,6 +3640,10 @@ "baseline": "5.98.0", "port-version": 0 }, + "kf5parts": { + "baseline": "5.98.0", + "port-version": 0 + }, "kf5plotting": { "baseline": "5.98.0", "port-version": 0 diff --git a/versions/k-/kf5parts.json b/versions/k-/kf5parts.json new file mode 100644 index 00000000000000..f03d4688a912cc --- /dev/null +++ b/versions/k-/kf5parts.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6d66ab25d03620f9df39a90fd00d00b0d6271620", + "version": "5.98.0", + "port-version": 0 + } + ] +} From 6107e4d36e17602f6e6db3b57267f4e143cddd72 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 1 Jun 2023 09:40:27 +0800 Subject: [PATCH 201/533] [symengine] Update version to 0.10.1 (#31709) * [symengine] Update version to 0.10.1 * version --- ports/symengine/portfile.cmake | 5 +++-- ports/symengine/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/s-/symengine.json | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index dc0329930041fe..63126844e41817 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine - REF 7b1880824c2cce98787ae29a317682ba6c294484 #v0.9.0 - SHA512 745b2616b88032ff047a28e46b703bc1912d109524f8aa411a5b7a650a6d89d3f16dc92812381e95b13bc5cf61218d2ff3db9d3809443264340eae180968cbcf + REF "v${VERSION}" + SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934 HEAD_REF master ) @@ -13,6 +13,7 @@ vcpkg_check_features( flint WITH_FLINT mpfr WITH_MPFR tcmalloc WITH_TCMALLOC + llvm WITH_LLVM ) if(integer-class-boostmp IN_LIST FEATURES) diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 8257978180f68f..2384d9f1d9a7c9 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "symengine", - "version": "0.9.0", + "version": "0.10.1", "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "license": "BSD-3-Clause", @@ -45,6 +45,15 @@ "gmp" ] }, + "llvm": { + "description": "Build with LLVM", + "dependencies": [ + { + "name": "llvm", + "default-features": false + } + ] + }, "mpfr": { "description": "Build with mpfr", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4fbd34a0166951..1797bb8a01eeb9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7849,7 +7849,7 @@ "port-version": 0 }, "symengine": { - "baseline": "0.9.0", + "baseline": "0.10.1", "port-version": 0 }, "systemc": { diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 3ac8fdb5461a8f..309e9fbaf70ab8 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63418f8cd771072202c4155627e90e280ddecf3c", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "dd28d6549b4c7db81ef2ee9e91a4e41b0c739191", "version": "0.9.0", From 60f251356d072ffb4b04bf6026ba767e629b672e Mon Sep 17 00:00:00 2001 From: David Matson Date: Wed, 31 May 2023 18:46:16 -0700 Subject: [PATCH 202/533] Use Ninja rather than MSBuild in BlingFire to support UWP. (#31331) Fixes #31330. --- ports/blingfire/ninja.patch | 9 +++++++++ ports/blingfire/portfile.cmake | 3 ++- ports/blingfire/vcpkg.json | 3 ++- versions/b-/blingfire.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 ports/blingfire/ninja.patch diff --git a/ports/blingfire/ninja.patch b/ports/blingfire/ninja.patch new file mode 100644 index 00000000000000..ae7e654f3e3a66 --- /dev/null +++ b/ports/blingfire/ninja.patch @@ -0,0 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 818a3da..e8b3bed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,3 +19,3 @@ IF (WIN32 AND MSVC) + set (CMAKE_CXX_FLAGS " -DNDEBUG") +- add_compile_options("/O2" "/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256") ++ add_compile_options("/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256") + add_compile_options("$<$:/Od>") diff --git a/ports/blingfire/portfile.cmake b/ports/blingfire/portfile.cmake index fff750c3eb82fa..ed09b83e4504ef 100644 --- a/ports/blingfire/portfile.cmake +++ b/ports/blingfire/portfile.cmake @@ -4,11 +4,12 @@ vcpkg_from_github( REF c0381c68b6aa6d1b4e569888bae1642e40494a99 SHA512 0fa15791fc815a992023bae6f30c84dda1d477bcdedcf1343d4dbe4b09b51e17fd87bf130d58e50f378ca94982a6306d7f980e3ff4522091be036428684bdcbb HEAD_REF master + PATCHES + ninja.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - WINDOWS_USE_MSBUILD OPTIONS ${ADDITIONAL_OPTIONS} ) diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json index 1a2b531a19b17d..57e11ede933b47 100644 --- a/ports/blingfire/vcpkg.json +++ b/ports/blingfire/vcpkg.json @@ -1,9 +1,10 @@ { "name": "blingfire", "version": "0.1.8.1", + "port-version": 1, "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.", "license": "MIT", - "supports": "windows & !static & !uwp", + "supports": "windows & !static", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json index 019810537d9798..ce4a39c589177c 100644 --- a/versions/b-/blingfire.json +++ b/versions/b-/blingfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70822350369b68d60a5640eca1b668e1829c8054", + "version": "0.1.8.1", + "port-version": 1 + }, { "git-tree": "8352e7a158da2568b5c67c973b3692681be8b0d6", "version": "0.1.8.1", diff --git a/versions/baseline.json b/versions/baseline.json index 1797bb8a01eeb9..888c5998eb7a89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -602,7 +602,7 @@ }, "blingfire": { "baseline": "0.1.8.1", - "port-version": 0 + "port-version": 1 }, "blitz": { "baseline": "2020-03-25", From 0f1f5200c6bcfdb5d3988db62176dd79d848dfab Mon Sep 17 00:00:00 2001 From: Michael MIGLIORE Date: Thu, 1 Jun 2023 03:47:48 +0200 Subject: [PATCH 203/533] [vtk] patch GCC13 compilation errors (#31447) --- ports/vtk/missing-include-fixes.patch | 40 +++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 ++++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 ports/vtk/missing-include-fixes.patch diff --git a/ports/vtk/missing-include-fixes.patch b/ports/vtk/missing-include-fixes.patch new file mode 100644 index 00000000000000..e6f49cab9ef2d3 --- /dev/null +++ b/ports/vtk/missing-include-fixes.patch @@ -0,0 +1,40 @@ +diff --git a/IO/Image/vtkSEPReader.cxx b/IO/Image/vtkSEPReader.cxx +index 2b15bc249e..cec84d1712 100644 +--- a/IO/Image/vtkSEPReader.cxx ++++ b/IO/Image/vtkSEPReader.cxx +@@ -34,7 +34,6 @@ + #include + + #include +-#include + + namespace details + { +diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h +index 83d127a41e..bdb33a258b 100644 +--- a/IO/Image/vtkSEPReader.h ++++ b/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t ++#include // for std::string + + namespace details + { +diff --git a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +index 6267684218..cf19b83af4 100644 +--- a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp ++++ b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp +@@ -31,6 +31,7 @@ + + /*! @cond Doxygen_Suppress */ + ++#include + #include + #include + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 1f1013529947fc..72eeb48307cce7 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -40,6 +40,7 @@ vcpkg_from_github( iotr.patch ${STRING_PATCH} 9690.diff + missing-include-fixes.patch ) # ============================================================================= diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index edc09943105b91..26f1cab5ab99e4 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 6, + "port-version": 7, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 888c5998eb7a89..358a3105b4d122 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8482,7 +8482,7 @@ }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 6 + "port-version": 7 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 232b24571a3c42..ff008111c0bf92 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ec376669498a8b43b3dc1779386dcc383d7cc1f", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 7 + }, { "git-tree": "340d82faf130e467fb4ed6d5e8ce5bf93101513e", "version-semver": "9.2.0-pv5.11.0", From 65e91ebd9e1d8a5c054b98b87abef68d5d36ce6f Mon Sep 17 00:00:00 2001 From: SIYAO CHEN <1yue8haogaoqi@gmail.com> Date: Thu, 1 Jun 2023 09:56:41 +0800 Subject: [PATCH 204/533] feat: fix rpath setting in osx dynamic debug build (#31681) --- ports/icu/portfile.cmake | 85 +++++++++++++++++++++------------------- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++ 4 files changed, 52 insertions(+), 42 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 87c757ef720d55..355eac58dcf03a 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -88,53 +88,58 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if("tools" IN_LIST FEATURES) set(LIBICUTU_RPATH "libicutu") endif() - # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc - foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) - endforeach() - # add ID_PREFIX to libicui18n libicuio libicutu dependencies - foreach(LIB_NAME IN ITEMS libicui18n libicuio) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) + #31680: Fix @rpath in both debug and release build + foreach(CONFIG_TRIPLE IN ITEMS ${DEBUG_TRIPLET} ${RELEASE_TRIPLET}) + # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc + foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + endforeach() + + # add ID_PREFIX to libicui18n libicuio libicutu dependencies + foreach(LIB_NAME IN ITEMS libicui18n libicuio) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + endforeach() + + # add ID_PREFIX to remaining libicuio libicutu dependencies + foreach(LIB_NAME libicuio libicutu) + vcpkg_execute_build_process( + COMMAND "${INSTALL_NAME_TOOL}" -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" + "${LIB_NAME}.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" + ) + endforeach() + + # add ID_PREFIX to libicuuc dependencies vcpkg_execute_build_process( COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" + "libicuuc.${VERSION}.dylib" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" + LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" ) endforeach() - # add ID_PREFIX to remaining libicuio libicutu dependencies - foreach(LIB_NAME libicuio libicutu) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) - endforeach() - - # add ID_PREFIX to libicuuc dependencies - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" - "libicuuc.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" - LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" - ) endif() vcpkg_install_make() diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 8e3696afb46d99..21ed9065f93f98 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "72.1", - "port-version": 4, + "port-version": 5, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", diff --git a/versions/baseline.json b/versions/baseline.json index 358a3105b4d122..a4fbec32427368 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3190,7 +3190,7 @@ }, "icu": { "baseline": "72.1", - "port-version": 4 + "port-version": 5 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index fbd2ecbdcb183a..4e944556b86fb7 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1735b83e7793135a9d1e3689f7d36475f6d5ff7", + "version": "72.1", + "port-version": 5 + }, { "git-tree": "1a0b575f86d37844108f940fd5f6a312a68d234c", "version": "72.1", From 2f56fdad4bcf43c21ec6f952cf7b91c8c43c5c0d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 1 Jun 2023 04:55:03 +0200 Subject: [PATCH 205/533] [libpq,libxslt] Update libpq, fix misc issues (#31314) * [libpq] Install msys2 autoconf-archive * Install msys2 zic tool * Fix zstd patching * Always build as if cross compiling * Enable feature client for non-windows * Cleanup (WIP) * Cleanup (WIP) * Update portfile.cmake * WIP * WIP * WIP * WIP * [libxslt] Fix pc files * WIP * WIP: Test libpq[all] * WIP * Update to 15.3 * Move patches * Revert "WIP: Test libpq[all]" * Fix install * Skip import libs for plugins * Full CI --- ports/libpq/Makefile | 43 +- ports/libpq/build-msvc.cmake | 80 ++++ ports/libpq/config.pl | 29 -- ports/libpq/libpq.props.in | 8 +- .../windows/MSBuildProject-static-crt.patch | 23 - .../windows/MSBuildProject-static-lib.patch | 13 - .../MSBuildProject_fix_gendef_perl.patch | 13 - .../windows/Mkvcbuild-static-lib.patch | 13 - ports/libpq/patches/windows/Solution.patch | 45 -- .../patches/windows/Solution_DEBUG.patch | 98 ---- .../patches/windows/Solution_RELEASE.patch | 98 ---- ports/libpq/patches/windows/arm.patch | 37 -- .../patches/windows/fix-compile-flag-Zi.patch | 33 -- ports/libpq/patches/windows/install.patch | 223 --------- .../patches/windows/minimize_install.patch | 35 -- ports/libpq/patches/windows/msgfmt.patch | 13 - .../patches/windows/openssl-version.patch | 14 - .../patches/windows/python3_build_DEBUG.patch | 44 -- .../windows/python3_build_RELEASE.patch | 42 -- ports/libpq/patches/windows/tcl_version.patch | 13 - ports/libpq/portfile.cmake | 399 ++++------------ .../{patches => unix}/fix-configure.patch | 21 +- ports/libpq/unix/mingw-install.patch | 36 ++ ports/libpq/unix/no-server-tools.patch | 37 ++ ports/libpq/unix/python.patch | 25 + ports/libpq/unix/single-linkage.patch | 56 +++ ports/libpq/vcpkg-cmake-wrapper.cmake | 2 +- ports/libpq/vcpkg-libs.props.in | 31 ++ ports/libpq/vcpkg.json | 98 +++- .../{patches => }/windows/macro-def.patch | 0 ports/libpq/windows/msbuild.patch | 428 ++++++++++++++++++ .../{patches => }/windows/python_lib.patch | 0 ports/libpq/windows/spin_delay.patch | 24 + .../windows/win_bison_flex.patch | 0 ports/libxslt/portfile.cmake | 9 + ports/libxslt/vcpkg.json | 2 +- versions/baseline.json | 6 +- versions/l-/libpq.json | 5 + versions/l-/libxslt.json | 5 + 39 files changed, 958 insertions(+), 1143 deletions(-) create mode 100644 ports/libpq/build-msvc.cmake delete mode 100644 ports/libpq/config.pl delete mode 100644 ports/libpq/patches/windows/MSBuildProject-static-crt.patch delete mode 100644 ports/libpq/patches/windows/MSBuildProject-static-lib.patch delete mode 100644 ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch delete mode 100644 ports/libpq/patches/windows/Mkvcbuild-static-lib.patch delete mode 100644 ports/libpq/patches/windows/Solution.patch delete mode 100644 ports/libpq/patches/windows/Solution_DEBUG.patch delete mode 100644 ports/libpq/patches/windows/Solution_RELEASE.patch delete mode 100644 ports/libpq/patches/windows/arm.patch delete mode 100644 ports/libpq/patches/windows/fix-compile-flag-Zi.patch delete mode 100644 ports/libpq/patches/windows/install.patch delete mode 100644 ports/libpq/patches/windows/minimize_install.patch delete mode 100644 ports/libpq/patches/windows/msgfmt.patch delete mode 100644 ports/libpq/patches/windows/openssl-version.patch delete mode 100644 ports/libpq/patches/windows/python3_build_DEBUG.patch delete mode 100644 ports/libpq/patches/windows/python3_build_RELEASE.patch delete mode 100644 ports/libpq/patches/windows/tcl_version.patch rename ports/libpq/{patches => unix}/fix-configure.patch (84%) create mode 100644 ports/libpq/unix/mingw-install.patch create mode 100644 ports/libpq/unix/no-server-tools.patch create mode 100644 ports/libpq/unix/python.patch create mode 100644 ports/libpq/unix/single-linkage.patch create mode 100644 ports/libpq/vcpkg-libs.props.in rename ports/libpq/{patches => }/windows/macro-def.patch (100%) create mode 100644 ports/libpq/windows/msbuild.patch rename ports/libpq/{patches => }/windows/python_lib.patch (100%) create mode 100644 ports/libpq/windows/spin_delay.patch rename ports/libpq/{patches => }/windows/win_bison_flex.patch (100%) diff --git a/ports/libpq/Makefile b/ports/libpq/Makefile index ee2ffcaf19572b..67994f4bac2853 100644 --- a/ports/libpq/Makefile +++ b/ports/libpq/Makefile @@ -2,14 +2,12 @@ subdir = . top_builddir = . include src/Makefile.global -.NOTPARALLEL: - ifeq ($(LIBPQ_LIBRARY_TYPE), static) LIBPQ_INSTALL_LIBS = install-stlib endif ifeq ($(LIBPQ_LIBRARY_TYPE), shared) -ifeq ($(USING_MINGW), yes) +ifeq ($(LIBPQ_USING_MINGW), yes) # The import library name is the same as the static library name EXTRA_TARGET = install-lib-static endif @@ -17,21 +15,40 @@ endif .PHONY: all all: - $(MAKE) -C src/include MAKELEVEL=0 - $(MAKE) -C src/common MAKELEVEL=0 - $(MAKE) -C src/port MAKELEVEL=0 - $(MAKE) -C src/interfaces/libpq MAKELEVEL=0 all-$(LIBPQ_LIBRARY_TYPE)-lib - $(MAKE) -C src/bin/pg_config MAKELEVEL=0 + $(MAKE) -C src/include + $(MAKE) -C src/common + $(MAKE) -C src/port + $(MAKE) -C src/interfaces/libpq all-$(LIBPQ_LIBRARY_TYPE)-lib + $(MAKE) -C src/interfaces/ecpg/include + $(MAKE) -C src/interfaces/ecpg/pgtypeslib + $(MAKE) -C src/interfaces/ecpg/ecpglib + $(MAKE) -C src/interfaces/ecpg/compatlib +ifeq ($(LIBPQ_ENABLE_TOOLS), yes) + $(MAKE) -C src/interfaces/ecpg/preproc + $(MAKE) -C src/fe_utils + $(MAKE) -C src/bin +else + $(MAKE) -C src/bin/pg_config +endif .PHONY: install-stlib install-stlib: - $(MAKE) -C src/common MAKELEVEL=0 install -o all + $(MAKE) -C src/common install -o all rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' - $(MAKE) -C src/port MAKELEVEL=0 install -o all + $(MAKE) -C src/port install -o all rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a' .PHONY: install install: $(LIBPQ_INSTALL_LIBS) - $(MAKE) -C src/include MAKELEVEL=0 install - $(MAKE) -C src/interfaces/libpq MAKELEVEL=0 $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib - $(MAKE) -C src/bin/pg_config MAKELEVEL=0 install + $(MAKE) -C src/include install + $(MAKE) -C src/interfaces/libpq $(EXTRA_TARGET) install-lib-$(LIBPQ_LIBRARY_TYPE) install-lib-pc install -o all -o install-lib + $(MAKE) -C src/interfaces/ecpg/include install + $(MAKE) -C src/interfaces/ecpg/pgtypeslib install + $(MAKE) -C src/interfaces/ecpg/ecpglib install + $(MAKE) -C src/interfaces/ecpg/compatlib install +ifeq ($(LIBPQ_ENABLE_TOOLS), yes) + $(MAKE) -C src/interfaces/ecpg/preproc install + $(MAKE) -C src/bin install +else + $(MAKE) -C src/bin/pg_config install +endif diff --git a/ports/libpq/build-msvc.cmake b/ports/libpq/build-msvc.cmake new file mode 100644 index 00000000000000..7857b11e3a9ed9 --- /dev/null +++ b/ports/libpq/build-msvc.cmake @@ -0,0 +1,80 @@ +function(build_msvc build_type source_path) + if(build_type STREQUAL "DEBUG") + set(vcpkg_configuration "Debug") + set(label "${TARGET_TRIPLET}-dbg") + set(packages_dir "${CURRENT_PACKAGES_DIR}/debug") + else() + set(vcpkg_configuration "Release") + set(label "${TARGET_TRIPLET}-rel") + set(packages_dir "${CURRENT_PACKAGES_DIR}") + endif() + + set(build_path "${CURRENT_BUILDTREES_DIR}/${label}") + file(REMOVE_RECURSE "${build_path}") + file(COPY "${source_path}/" DESTINATION "${build_path}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${build_path}/src/include/port/win32.h" "__declspec (dllimport)" "") + endif() + vcpkg_replace_string("${build_path}/src/tools/msvc/MSBuildProject.pm" "perl " "\"${PERL}\" ") + configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${build_path}/libpq.props" @ONLY) + configure_file("${CURRENT_PORT_DIR}/vcpkg-libs.props.in" "${build_path}/vcpkg-libs.props" @ONLY) + set(config "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n\n") + foreach(var IN ITEMS VCPKG_TARGET_ARCHITECTURE VCPKG_LIBRARY_LINKAGE VCPKG_CRT_LINKAGE) + string(APPEND config "\$config->{${var}} = \"${${var}}\";\n") + endforeach() + foreach(option IN ITEMS icu lz4 nls openssl python tcl xml xslt zlib zstd) + if(option IN_LIST FEATURES) + string(APPEND config "\$config->{${option}} = \"${CURRENT_INSTALLED_DIR}\";\n") + endif() + endforeach() + if("openssl" IN_LIST FEATURES) + file(STRINGS "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openssl.pc" OPENSSL_VERSION REGEX "Version:") + string(APPEND config "\$config->{openssl_version} = '${OPENSSL_VERSION}';\n") + endif() + string(APPEND config "\$config->{python_version} = '3.10';\n") + string(APPEND config "\$config->{tcl_version} = '90';\n") + file(WRITE "${build_path}/src/tools/msvc/config.pl" "${config}") + + set(build_in_parallel "-m") + set(build_targets libpq libecpg_compat) + set(install_target core) + if(HAS_TOOLS AND NOT build_type STREQUAL "DEBUG") + set(build_in_parallel "") # mitigate winflex races + set(build_targets client) + set(install_target client) + endif() + + string(REPLACE "x86" "Win32" platform "${VCPKG_TARGET_ARCHITECTURE}") + vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION) + set(ENV{MSBFLAGS} "\ + /p:Platform=${platform} \ + /p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} \ + /p:VCPkgLocalAppDataDisabled=true \ + /p:UseIntelMKL=No \ + /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} \ + /p:VcpkgConfiguration=${vcpkg_configuration} \ + ${build_in_parallel} \ + /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets;${build_path}/vcpkg-libs.props\" \ + /p:VcpkgTriplet=${TARGET_TRIPLET} \ + /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\" \ + /p:ForceImportAfterCppTargets=\"${build_path}/libpq.props\" \ + ") + + message(STATUS "Building ${label}") + foreach(target IN LISTS build_targets) + string(REPLACE "client" "" target "${target}") + vcpkg_execute_required_process( + COMMAND "${PERL}" build.pl ${build_type} ${target} + WORKING_DIRECTORY "${build_path}/src/tools/msvc" + LOGNAME "build-${target}-${label}" + ) + endforeach() + + message(STATUS "Installing ${label}") + vcpkg_execute_required_process( + COMMAND "${PERL}" install.pl "${packages_dir}" ${install_target} + WORKING_DIRECTORY "${build_path}/src/tools/msvc" + LOGNAME "install-${label}" + ) +endfunction() diff --git a/ports/libpq/config.pl b/ports/libpq/config.pl deleted file mode 100644 index 412eb09c4846a2..00000000000000 --- a/ports/libpq/config.pl +++ /dev/null @@ -1,29 +0,0 @@ -our $config = { - asserts => 0, # --enable-cassert - # float4byval=>1, # --disable-float4-byval, on by default - - # float8byval=> $platformbits == 64, # --disable-float8-byval, - # off by default on 32 bit platforms, on by default on 64 bit platforms - - # blocksize => 8, # --with-blocksize, 8kB by default - # wal_blocksize => 8, # --with-wal-blocksize, 8kB by default - ldap => 1, # --with-ldap - extraver => undef, # --with-extra-version= - gss => undef, # --with-gssapi= - icu => undef, # --with-icu= - lz4 => undef, # --with-lz4= - zstd => undef, # --with-zstd= - nls => undef, # --enable-nls= - tap_tests => undef, # --enable-tap-tests - tcl => undef, # --with-tcl= - perl => undef, # --with-perl= - python => undef, # --with-python= - openssl => undef, # --with-ssl=openssl with - uuid => undef, # --with-uuid= - xml => undef, # --with-libxml= - xslt => undef, # --with-libxslt= - iconv => undef, # (not in configure, path to iconv) - zlib => undef # --with-zlib= -}; - -1; diff --git a/ports/libpq/libpq.props.in b/ports/libpq/libpq.props.in index d172a4af4017f4..223e528fe9f96f 100644 --- a/ports/libpq/libpq.props.in +++ b/ports/libpq/libpq.props.in @@ -1,9 +1,9 @@ - + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@ - + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@ @@ -12,9 +12,9 @@ - + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@ - + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@ diff --git a/ports/libpq/patches/windows/MSBuildProject-static-crt.patch b/ports/libpq/patches/windows/MSBuildProject-static-crt.patch deleted file mode 100644 index 03bd832f8597b9..00000000000000 --- a/ports/libpq/patches/windows/MSBuildProject-static-crt.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..faa3e336f 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -84,16 +84,16 @@ EOF - defs => "_DEBUG;DEBUG=1", - opt => 'Disabled', - strpool => 'false', -- runtime => 'MultiThreadedDebugDLL' -+ runtime => 'MultiThreadedDebug' - }); - $self->WriteItemDefinitionGroup( - $f, - 'Release', - { - defs => "", - opt => 'Full', - strpool => 'true', -- runtime => 'MultiThreadedDLL' -+ runtime => 'MultiThreaded' - }); - return; - } diff --git a/ports/libpq/patches/windows/MSBuildProject-static-lib.patch b/ports/libpq/patches/windows/MSBuildProject-static-lib.patch deleted file mode 100644 index 70cd22d60baef7..00000000000000 --- a/ports/libpq/patches/windows/MSBuildProject-static-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..e1dc59aa7 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -265,7 +265,7 @@ sub WriteConfigurationPropertyGroup - my $cfgtype = - ($self->{type} eq "exe") - ? 'Application' -- : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); -+ : ($self->{type} eq "dll" ? 'StaticLibrary' : 'StaticLibrary'); - - print $f < diff --git a/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch b/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch deleted file mode 100644 index 10955c3f98d739..00000000000000 --- a/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..b93992f22 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -384,7 +384,7 @@ EOF - print $f < - Generate DEF file -- perl src\\tools\\msvc\\gendef.pl $cfgname\\$self->{name} $self->{platform} -+ perl "src\\tools\\msvc\\gendef.pl" $cfgname\\$self->{name} $self->{platform} - - EOF - } diff --git a/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch b/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch deleted file mode 100644 index 554d8527a4367c..00000000000000 --- a/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..4f51c12f2 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -199,7 +199,7 @@ sub mkvcbuild - 'syncrep_gram.y'); - $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', - 'jsonpath_gram.y'); -- $postgres->AddDefine('BUILDING_DLL'); -+ # $postgres->AddDefine('BUILDING_DLL'); - $postgres->AddLibrary('secur32.lib'); - $postgres->AddLibrary('ws2_32.lib'); - $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap}); diff --git a/ports/libpq/patches/windows/Solution.patch b/ports/libpq/patches/windows/Solution.patch deleted file mode 100644 index 3387349e0b7a6c..00000000000000 --- a/ports/libpq/patches/windows/Solution.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 51711c2bf..d33fdc3b0 100644 ---- a/src/tools/msvc/Solution.pm -+++ b/src/tools/msvc/Solution.pm -@@ -63,17 +63,21 @@ sub DeterminePlatform - my $self = shift; - - if ($^O eq "MSWin32") - { - # Examine CL help output to determine if we are in 32 or 64-bit mode. - my $output = `cl /help 2>&1`; - $? >> 8 == 0 or die "cl command not found"; -- $self->{platform} = -- ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; -+ if ($output =~ m/x64\s/) { $self->{platform} = 'x64'; -+ } elsif ($output =~ m/x86\s/) { $self->{platform} = 'Win32'; -+ } elsif ($output =~ m/ARM64\s/) { $self->{platform} = 'ARM64'; -+ } elsif ($output =~ m/ARM\s/) { $self->{platform} = 'ARM'; -+ } else { $self->{platform} = 'Unknown' -+ } - } - else - { - $self->{platform} = 'FAKE'; - } - print "Detected hardware platform: $self->{platform}\n"; - return; - } -@@ -757,14 +757,14 @@ EOF - || confess "Could not open pg_config_paths.h"; - print $o <{options}->{zlib}) - { - $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); -- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); -+ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); - } - if ($self->{options}->{openssl}) - { -@@ -989,8 +989,11 @@ sub AddProject - # On both Win32 and Win64 the same library - # names are used without a debugging context. - $dbgsuffix = 0; -- $libsslpath = '\lib\libssl.lib'; -- $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\debug\lib\libssl.lib'; # -+ $libcryptopath = '\debug\lib\libcrypto.lib'; # -+ $proj->AddLibrary('crypt32.lib'); -+ $proj->AddLibrary('ws2_32.lib'); -+ $proj->AddLibrary('secur32.lib'); - } - - $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -1024,7 +1024,7 @@ sub AddProject - if ($self->{options}->{nls}) - { - $proj->AddIncludeDir($self->{options}->{nls} . '\include'); -- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # - } - if ($self->{options}->{gss}) - { -@@ -1051,21 +1051,21 @@ sub AddProject - } - if ($self->{options}->{iconv}) - { - $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); -- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # - } - if ($self->{options}->{icu}) - { - $proj->AddIncludeDir($self->{options}->{icu} . '\include'); - if ($self->{platform} eq 'Win32') - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # - } - else - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # - } -@@ -1074,27 +1074,27 @@ sub AddProject - { - $proj->AddIncludeDir($self->{options}->{xml} . '\include'); - $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); -- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # - } - if ($self->{options}->{xslt}) - { - $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); -- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # - } - if ($self->{options}->{lz4}) - { - $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); -- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); -+ $proj->AddLibrary($self->{options}->{lz4} . '\debug\lib\lz4d.lib'); # - } - if ($self->{options}->{zstd}) - { - $proj->AddIncludeDir($self->{options}->{zstd} . '\include'); -- $proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib'); -+ $proj->AddLibrary($self->{options}->{zstd} . '\debug\lib\zstd.lib'); - } - if ($self->{options}->{uuid}) - { - $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); -- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # - } - return $proj; - } diff --git a/ports/libpq/patches/windows/Solution_RELEASE.patch b/ports/libpq/patches/windows/Solution_RELEASE.patch deleted file mode 100644 index d0bb480413c40e..00000000000000 --- a/ports/libpq/patches/windows/Solution_RELEASE.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 2820ace22..7fddbf0fb 100644 ---- a/src/tools/msvc/Solution.pm -+++ b/src/tools/msvc/Solution.pm -@@ -948,7 +948,7 @@ sub AddProject - if ($self->{options}->{zlib}) - { - $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); -- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); -+ $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); - } - if ($self->{options}->{openssl}) - { -@@ -989,8 +989,11 @@ sub AddProject - # On both Win32 and Win64 the same library - # names are used without a debugging context. - $dbgsuffix = 0; -- $libsslpath = '\lib\libssl.lib'; -- $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\lib\libssl.lib'; # -+ $libcryptopath = '\lib\libcrypto.lib'; # -+ $proj->AddLibrary('crypt32.lib'); -+ $proj->AddLibrary('ws2_32.lib'); -+ $proj->AddLibrary('secur32.lib'); - } - - $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -1024,7 +1024,7 @@ sub AddProject - if ($self->{options}->{nls}) - { - $proj->AddIncludeDir($self->{options}->{nls} . '\include'); -- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # - } - if ($self->{options}->{gss}) - { -@@ -1051,21 +1051,21 @@ sub AddProject - } - if ($self->{options}->{iconv}) - { - $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); -- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # - } - if ($self->{options}->{icu}) - { - $proj->AddIncludeDir($self->{options}->{icu} . '\include'); - if ($self->{platform} eq 'Win32') - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # - } - else - { -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); -- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # - } -@@ -1074,27 +1074,27 @@ sub AddProject - { - $proj->AddIncludeDir($self->{options}->{xml} . '\include'); - $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); -- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # - } - if ($self->{options}->{xslt}) - { - $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); -- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # - } - if ($self->{options}->{lz4}) - { - $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); -- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); -+ $proj->AddLibrary($self->{options}->{lz4} . '\lib\lz4.lib'); # - } - if ($self->{options}->{zstd}) - { - $proj->AddIncludeDir($self->{options}->{zstd} . '\include'); -- $proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib'); -+ $proj->AddLibrary($self->{options}->{zstd} . '\lib\zstd.lib'); - } - if ($self->{options}->{uuid}) - { - $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); -- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # - } - return $proj; - } diff --git a/ports/libpq/patches/windows/arm.patch b/ports/libpq/patches/windows/arm.patch deleted file mode 100644 index c6329b14e5c2aa..00000000000000 --- a/ports/libpq/patches/windows/arm.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..4f51c12f2 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -110,8 +110,8 @@ sub mkvcbuild - - if ($vsVersion >= '9.00') - { -- push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); -- push(@pgportfiles, 'pg_crc32c_sse42.c'); -+ #push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); -+ #push(@pgportfiles, 'pg_crc32c_sse42.c'); - push(@pgportfiles, 'pg_crc32c_sb8.c'); - } - else -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index 823357c02..625f32bf8 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -307,7 +307,6 @@ sub WriteItemDefinitionGroup - : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); - my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); - -- my $targetmachine = -- $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64'; -- -+ my $targetmachine = $self->{platform} eq 'ARM64' ? 'MachineARM64' : 'MachineARM'; -+ - my $includes = join ';', @{ $self->{includes} }, ""; -@@ -347,7 +349,6 @@ sub WriteItemDefinitionGroup - .\\$cfgname\\$self->{name}\\$self->{name}.pdb - false - .\\$cfgname\\$self->{name}\\$self->{name}.map -- false - - - Console diff --git a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch deleted file mode 100644 index b5e3b6cdb33355..00000000000000 --- a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index b93992f..2397511 100644 ---- a/src/tools/msvc/MSBuildProject.pm -+++ b/src/tools/msvc/MSBuildProject.pm -@@ -336,7 +336,7 @@ sub WriteItemDefinitionGroup - false - Level3 - true -- ProgramDatabase -+ OldStyle - Default - - -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index e0c9a88..98f9e67 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -352,9 +352,12 @@ sub CopySolutionOutput - || croak "Could not copy $pf.$ext\n"; - } - } -- lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") -- || croak "Could not copy $pf.pdb\n"; -- print "."; -+ if ($1 eq 'DynamicLibrary') -+ { -+ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") -+ || croak "Could not copy $pf.pdb\n"; -+ print "."; -+ } - } - print "\n"; - return; diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch deleted file mode 100644 index 0d7a6d69a10491..00000000000000 --- a/ports/libpq/patches/windows/install.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index d109b2c90..75c7446e6 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -89,10 +89,10 @@ sub Install - my $majorver = DetermineMajorVersion(); - print "Installing version $majorver for $conf in $target\n"; - -- my @client_dirs = ('bin', 'lib', 'share', 'symbols'); -+ my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq'); - my @all_dirs = ( -- @client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib', -- 'share/extension', 'share/timezonesets', 'share/tsearch_data'); -+ @client_dirs, 'doc', 'doc/libpq', 'doc/libpq/contrib', 'doc/libpq/extension', 'share/libpq/contrib', -+ 'share/libpq/extension', 'share/libpq/timezonesets', 'share/libpq/tsearch_data'); - if ($insttype eq "client") - { - EnsureDirectories($target, @client_dirs); -@@ -117,7 +117,7 @@ sub Install - } - }, - @top_dir); -- CopySetOfFiles('config files', $sample_files, $target . '/share/'); -+ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); - CopyFiles( - 'Import libraries', - $target . '/lib/', -@@ -131,35 +131,35 @@ sub Install - CopySetOfFiles( - 'timezone names', - [ glob('src\timezone\tznames\*.txt') ], -- $target . '/share/timezonesets/'); -+ $target . '/share/libpq/timezonesets/'); - CopyFiles( - 'timezone sets', -- $target . '/share/timezonesets/', -+ $target . '/share/libpq/timezonesets/', - 'src/timezone/tznames/', 'Default', 'Australia', 'India'); - CopySetOfFiles( - 'BKI files', - [ glob("src\\backend\\catalog\\postgres.*") ], -- $target . '/share/'); -+ $target . '/share/libpq/'); - CopySetOfFiles( - 'SQL files', - [ glob("src\\backend\\catalog\\*.sql") ], -- $target . '/share/'); -+ $target . '/share/libpq/'); - CopyFiles( -- 'Information schema data', $target . '/share/', -+ 'Information schema data', $target . '/share/libpq/', - 'src/backend/catalog/', 'sql_features.txt'); - CopyFiles( -- 'Error code data', $target . '/share/', -+ 'Error code data', $target . '/share/libpq/', - 'src/backend/utils/', 'errcodes.txt'); - GenerateTimezoneFiles($target, $conf); - GenerateTsearchFiles($target); - CopySetOfFiles( - 'Stopword files', - [ glob("src\\backend\\snowball\\stopwords\\*.stop") ], -- $target . '/share/tsearch_data/'); -+ $target . '/share/libpq/tsearch_data/'); - CopySetOfFiles( - 'Dictionaries sample files', - [ glob("src\\backend\\tsearch\\dicts\\*_sample*") ], -- $target . '/share/tsearch_data/'); -+ $target . '/share/libpq/tsearch_data/'); - - my $pl_extension_files = []; - my @pldirs = ('src/pl/plpgsql/src'); -@@ -178,7 +178,7 @@ sub Install - }, - @pldirs); - CopySetOfFiles('PL Extension files', -- $pl_extension_files, $target . '/share/extension/'); -+ $pl_extension_files, $target . '/share/libpq/extension/'); - } - - GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls}); -@@ -293,23 +293,26 @@ sub CopySolutionOutput - { - if ($1 == 1) - { -- push(@{ $install_list{'bin'} }, "exe"); -+ push(@{ $install_list{'tools\\libpq'} }, "exe"); - } - elsif ($1 == 2) - { -- push(@{ $install_list{'lib'} }, "dll"); -+ push(@{ $install_list{'bin'} }, "dll"); - if ($is_sharedlib) - { - push(@{ $install_list{'bin'} }, "dll"); - push(@{ $install_list{'lib'} }, "lib"); - } -+ else -+ { -+ push(@{ $install_list{'lib'} }, "lib"); -+ } - } - else - { -- -+ push(@{ $install_list{'lib'} }, "lib"); - # Static libraries, such as libpgport, only used internally - # during build, don't install. -- next; - } - } - elsif ($vcproj eq 'vcxproj' -@@ -320,11 +320,11 @@ sub CopySolutionOutput - { - if ($1 eq 'Application') - { -- push(@{ $install_list{'bin'} }, "exe"); -+ push(@{ $install_list{'tools\\libpq'} }, "exe"); - } - elsif ($1 eq 'DynamicLibrary') - { -- push(@{ $install_list{'lib'} }, "dll"); -+ push(@{ $install_list{'bin'} }, "dll"); - if ($is_sharedlib) - { - push(@{ $install_list{'bin'} }, "dll"); -@@ -333,10 +333,9 @@ sub CopySolutionOutput - } - else # 'StaticLibrary' - { -- -+ push(@{ $install_list{'lib'} }, "lib"); - # Static lib, such as libpgport, only used internally - # during build, don't install. -- next; - } - } - else -@@ -352,7 +352,7 @@ sub CopySolutionOutput - || croak "Could not copy $pf.$ext\n"; - } - } -- lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb") -+ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") - || croak "Could not copy $pf.pdb\n"; - print "."; - } -@@ -374,5 +374,5 @@ sub GenerateTimezoneFiles - print "Generating timezone files..."; - -- my @args = ("$conf/zic/zic", '-d', "$target/share/timezone"); -+ my @args = ("$conf/zic/zic", '-d', "$target/share/libpq/timezone"); - foreach (@tzfiles) - { -@@ -398,7 +398,7 @@ sub GenerateTsearchFiles - $mf =~ /^LANGUAGES\s*=\s*(.*)$/m - || die "Could not find LANGUAGES line in snowball Makefile\n"; - my @pieces = split /\s+/, $1; -- open($F, '>', "$target/share/snowball_create.sql") -+ open($F, '>', "$target/share/libpq/snowball_create.sql") - || die "Could not write snowball_create.sql"; - print $F read_file('src/backend/snowball/snowball_func.sql.in'); - -@@ -483,7 +483,7 @@ sub CopySubdirFiles - foreach my $f (split /\s+/, $flist) - { - lcopy("$subdir/$module/$f.control", -- "$target/share/extension/$f.control") -+ "$target/share/libpq/extension/$f.control") - || croak("Could not copy file $f.control in contrib $module"); - print '.'; - } -@@ -501,7 +501,7 @@ sub CopySubdirFiles - foreach my $f (split /\s+/, $flist) - { - lcopy("$subdir/$module/$f", -- "$target/share/$moduledir/" . basename($f)) -+ "$target/share/libpq/$moduledir/" . basename($f)) - || croak("Could not copy file $f in contrib $module"); - print '.'; - } -@@ -516,7 +516,7 @@ sub CopySubdirFiles - foreach my $f (split /\s+/, $flist) - { - lcopy("$subdir/$module/$f", -- "$target/share/tsearch_data/" . basename($f)) -+ "$target/share/libpq/tsearch_data/" . basename($f)) - || croak("Could not copy file $f in $subdir $module"); - print '.'; - } -@@ -579,7 +579,7 @@ sub CopySubdirFiles - if ($module eq 'spi'); - foreach my $f (split /\s+/, $flist) - { -- lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f") -+ lcopy("$subdir/$module/$f", "$target/doc/libpq/$moduledir/$f") - || croak("Could not copy file $f in contrib $module"); - print '.'; - } -@@ -708,7 +708,7 @@ sub GenerateNLSFiles - my $majorver = shift; - - print "Installing NLS files..."; -- EnsureDirectories($target, "share/locale"); -+ EnsureDirectories($target, "share/libpq/locale"); - my @flist; - File::Find::find( - { -@@ -730,12 +730,12 @@ sub GenerateNLSFiles - next unless /([^\/]+)\.po/; - $lang = $1; - -- EnsureDirectories($target, "share/locale/$lang", -- "share/locale/$lang/LC_MESSAGES"); -+ EnsureDirectories($target, "share/libpq/locale/$lang", -+ "share/libpq/locale/$lang/LC_MESSAGES"); - my @args = ( - "$nlspath\\bin\\msgfmt", - '-o', -- "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", -+ "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", - $_); - system(@args) && croak("Could not run msgfmt on $dir\\$_"); - print "."; diff --git a/ports/libpq/patches/windows/minimize_install.patch b/ports/libpq/patches/windows/minimize_install.patch deleted file mode 100644 index 1a57c275f757b0..00000000000000 --- a/ports/libpq/patches/windows/minimize_install.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index d109b2c90..75c7446e6 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -22,13 +22,13 @@ our (@ISA, @EXPORT_OK); - - my $insttype; - my @client_contribs = ('oid2name', 'pgbench', 'vacuumlo'); --my @client_program_files = ( -- 'clusterdb', 'createdb', 'createuser', 'dropdb', -- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -- 'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', -- 'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', -- 'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', -- 'reindexdb', 'vacuumdb', @client_contribs); -+my @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); -+ #'clusterdb', 'createdb', 'createuser', 'dropdb', -+ #'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -+ #'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', -+ #'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', -+ #'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', -+ #'reindexdb', 'vacuumdb', @client_contribs); - - sub lcopy - { -@@ -121,7 +121,7 @@ sub Install - CopyFiles( - 'Import libraries', - $target . '/lib/', -- "$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib", -+ "$conf\\", "libpgcommon\\libpgcommon.lib", - "libpgport\\libpgport.lib"); - CopyContribFiles($config, $target); - CopyIncludeFiles($target); - diff --git a/ports/libpq/patches/windows/msgfmt.patch b/ports/libpq/patches/windows/msgfmt.patch deleted file mode 100644 index 98be285bcfb1c3..00000000000000 --- a/ports/libpq/patches/windows/msgfmt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index 66c0c3483..2154c6cf6 100644 ---- a/src/tools/msvc/Install.pm -+++ b/src/tools/msvc/Install.pm -@@ -733,7 +733,7 @@ sub GenerateNLSFiles - EnsureDirectories($target, "share/libpq/locale/$lang", - "share/libpq/locale/$lang/LC_MESSAGES"); - my @args = ( -- "$nlspath\\bin\\msgfmt", -+ "msgfmt.exe", - '-o', - "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", - $_); diff --git a/ports/libpq/patches/windows/openssl-version.patch b/ports/libpq/patches/windows/openssl-version.patch deleted file mode 100644 index 77f464041c99ab..00000000000000 --- a/ports/libpq/patches/windows/openssl-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 72c5b98..0d153c0 100644 ---- a/src/tools/msvc/Solution.pm -+++ b/src/tools/msvc/Solution.pm -@@ -128,6 +128,9 @@ sub copyFile - sub GetOpenSSLVersion - { - my $self = shift; -+ if (($ENV{'VCPKG_OPENSSL_VERSION'} // '') =~ /(\d+)\.(\d+)\.(\d+)/m) { -+ return ($1, $2, $3); -+ } - - # Attempt to get OpenSSL version and location. This assumes that - # openssl.exe is in the specified directory. diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch deleted file mode 100644 index 532a066f9b719f..00000000000000 --- a/ports/libpq/patches/windows/python3_build_DEBUG.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..21b5559d6 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -494,14 +494,15 @@ sub mkvcbuild - - # Attempt to get python version and location. - # Assume python.exe in specified dir. -- my $pythonprog = "import sys;print(sys.prefix);" -- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -- my $prefixcmd = -- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -- my $pyout = `$prefixcmd`; -- die "Could not query for python version!\n" if $?; -- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -- -+ #my $pythonprog = "import sys;print(sys.prefix);" -+ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -+ #my $prefixcmd = -+ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -+ #my $pyout = `$prefixcmd`; -+ #die "Could not query for python version!\n" if $?; -+ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -+ my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 310; - # Sometimes (always?) if python is not present, the execution - # appears to work, but gives no data... - die "Failed to query python for version information\n" -@@ -510,11 +511,12 @@ sub mkvcbuild - die - "Python version $pyver is too old (version 3 or later is required)" - if int($pymajorver) < 3; - - my $plpython = $solution->AddProject('plpython' . $pymajorver, - 'dll', 'PLs', 'src/pl/plpython'); -- $plpython->AddIncludeDir($pyprefix . '/include'); -- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); -+ $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! -+ $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); - $plpython->AddReference($postgres); - - # Add transform modules dependent on plpython - \ No newline at end of file diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch deleted file mode 100644 index 5a11378942f8ec..00000000000000 --- a/ports/libpq/patches/windows/python3_build_RELEASE.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index 99f39caa5..21b5559d6 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -494,14 +494,15 @@ sub mkvcbuild - - # Attempt to get python version and location. - # Assume python.exe in specified dir. -- my $pythonprog = "import sys;print(sys.prefix);" -- . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -- my $prefixcmd = -- qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -- my $pyout = `$prefixcmd`; -- die "Could not query for python version!\n" if $?; -- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -- -+ #my $pythonprog = "import sys;print(sys.prefix);" -+ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; -+ #my $prefixcmd = -+ # qq("$solution->{options}->{python}\\python" -c "$pythonprog"); -+ #my $pyout = `$prefixcmd`; -+ #die "Could not query for python version!\n" if $?; -+ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); -+ my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 310; - # Sometimes (always?) if python is not present, the execution - # appears to work, but gives no data... - die "Failed to query python for version information\n" -@@ -510,11 +511,11 @@ sub mkvcbuild - die - "Python version $pyver is too old (version 3 or later is required)" - if int($pymajorver) < 3; - - my $plpython = $solution->AddProject('plpython' . $pymajorver, - 'dll', 'PLs', 'src/pl/plpython'); -- $plpython->AddIncludeDir($pyprefix . '/include'); -- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); -+ $plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib"); - $plpython->AddReference($postgres); - - # Add transform modules dependent on plpython diff --git a/ports/libpq/patches/windows/tcl_version.patch b/ports/libpq/patches/windows/tcl_version.patch deleted file mode 100644 index 5518949a3a092a..00000000000000 --- a/ports/libpq/patches/windows/tcl_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index e2fbe95..8c4f279 100644 ---- a/src/tools/msvc/Mkvcbuild.pm -+++ b/src/tools/msvc/Mkvcbuild.pm -@@ -226,7 +226,7 @@ sub mkvcbuild - $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); - $pltcl->AddReference($postgres); - -- for my $tclver (qw(86t 86 85 84)) -+ for my $tclver (qw(90 90g 90s 90sg)) - { - my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; - if (-e $tcllib) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 4b704a915ae989..b03f3a996dab04 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,365 +1,154 @@ -set(PORT_VERSION ${VERSION}) -# NOTE: the python patches must be regenerated on version update - -## Download and extract sources vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" - FILENAME "postgresql-${PORT_VERSION}.tar.bz2" - SHA512 115a8a4234791bba4e6dcc4617e9dd77abedcf767894ce9472c59cce9d5d4ef2d4e1746f3a0c7a99de4fc4385fb716652b70dce9f48be45a9db5a682517db7e8 + URLS "https://ftp.postgresql.org/pub/source/v${VERSION}/postgresql-${VERSION}.tar.bz2" + FILENAME "postgresql-${VERSION}.tar.bz2" + SHA512 cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6 ) -set(PATCHES - patches/windows/install.patch - patches/windows/win_bison_flex.patch - patches/windows/openssl-version.patch - patches/windows/Solution.patch - patches/windows/MSBuildProject_fix_gendef_perl.patch - patches/windows/msgfmt.patch - patches/windows/python_lib.patch - patches/windows/fix-compile-flag-Zi.patch - patches/windows/tcl_version.patch - patches/windows/macro-def.patch - patches/fix-configure.patch - ) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) - list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) -endif() -if(VCPKG_CRT_LINKAGE STREQUAL "static") - list(APPEND PATCHES patches/windows/MSBuildProject-static-crt.patch) -endif() -if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") - list(APPEND PATCHES patches/windows/arm.patch) -endif() -if(NOT "${FEATURES}" MATCHES "client") - list(APPEND PATCHES patches/windows/minimize_install.patch) -else() - set(HAS_TOOLS TRUE) -endif() vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES ${PATCHES} + PATCHES + unix/fix-configure.patch + unix/single-linkage.patch + unix/no-server-tools.patch + unix/mingw-install.patch + unix/python.patch + windows/macro-def.patch + windows/python_lib.patch + windows/win_bison_flex.patch + windows/msbuild.patch + windows/spin_delay.patch ) -unset(buildenv_contents) -# Get paths to required programs -set(REQUIRED_PROGRAMS PERL) + +if("client" IN_LIST FEATURES) + set(HAS_TOOLS TRUE) +else() + set(HAS_TOOLS FALSE) +endif() + +set(required_programs PERL) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND REQUIRED_PROGRAMS BISON FLEX) + list(APPEND required_programs BISON FLEX) endif() -foreach(program_name ${REQUIRED_PROGRAMS}) +foreach(program_name IN LISTS required_programs) # Need to rename win_bison and win_flex to just bison and flex vcpkg_find_acquire_program(${program_name}) - get_filename_component(${program_name}_EXE_PATH ${${program_name}} DIRECTORY) - vcpkg_add_to_path(PREPEND "${${program_name}_EXE_PATH}") - set(buildenv_contents "${buildenv_contents}\n\$ENV{'PATH'}=\$ENV{'PATH'} . ';${${program_name}_EXE_PATH}';") + get_filename_component(program_dir ${${program_name}} DIRECTORY) + vcpkg_add_to_path(PREPEND "${program_dir}") endforeach() -## Setup build types -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Rr][Ee][Ll][Ee][Aa][Ss][Ee]") - set(_buildtype RELEASE) - set(_short rel) - list(APPEND port_config_list ${_buildtype}) - set(INSTALL_PATH_SUFFIX_${_buildtype} "") - set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") - file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds - set(PACKAGE_DIR_${_buildtype} ${CURRENT_PACKAGES_DIR}) - unset(_short) - unset(_buildtype) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]") - set(_buildtype DEBUG) - set(_short dbg) - list(APPEND port_config_list ${_buildtype}) - set(INSTALL_PATH_SUFFIX_${_buildtype} "/debug") - set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") - file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds - set(PACKAGE_DIR_${_buildtype} "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}") - unset(_short) - unset(_buildtype) -endif() - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -## Do the build -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_cmake_get_vars(vars_file) - include("${vars_file}") +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") - if("openssl" IN_LIST FEATURES) - file(STRINGS "${CURRENT_INSTALLED_DIR}/lib/pkgconfig/openssl.pc" OPENSSL_VERSION REGEX "Version:") - if(OPENSSL_VERSION) - set(ENV{VCPKG_OPENSSL_VERSION} "${OPENSSL_VERSION}") - endif() +if(VCPKG_DETECTED_MSVC) + if("nls" IN_LIST FEATURES) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") endif() - - file(GLOB SOURCE_FILES ${SOURCE_PATH}/*) - foreach(_buildtype ${port_config_list}) - # Copy libpq sources. - message(STATUS "Copying libpq source files to ${BUILDPATH_${_buildtype}}...") - foreach(SOURCE_FILE ${SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${BUILDPATH_${_buildtype}}") - endforeach() - message(STATUS "Copying libpq source files... done") - - vcpkg_apply_patches( - SOURCE_PATH "${BUILDPATH_${_buildtype}}" - PATCHES patches/windows/Solution_${_buildtype}.patch - patches/windows/python3_build_${_buildtype}.patch + if("xml" IN_LIST FEATURES) + x_vcpkg_pkgconfig_get_modules( + PREFIX PC_LIBXML2 + MODULES --msvc-syntax libxml-2.0 + LIBS ) - message(STATUS "Patches applied!") - file(COPY "${CURRENT_PORT_DIR}/config.pl" DESTINATION "${BUILDPATH_${_buildtype}}/src/tools/msvc") - - set(MSPROJ_PERL "${BUILDPATH_${_buildtype}}/src/tools/msvc/MSBuildProject.pm") - file(READ "${MSPROJ_PERL}" _contents) - string(REPLACE "perl" "\"${PERL}\"" _contents "${_contents}") - file(WRITE "${MSPROJ_PERL}" "${_contents}") - - set(CONFIG_FILE "${BUILDPATH_${_buildtype}}/src/tools/msvc/config.pl") - file(READ "${CONFIG_FILE}" _contents) - - ## ldap => undef, # --with-ldap - ## extraver => undef, # --with-extra-version= - ## gss => undef, # --with-gssapi= - ## icu => undef, # --with-icu= ##done - ## nls => undef, # --enable-nls= ##done - ## tap_tests => undef, # --enable-tap-tests - ## tcl => undef, # --with-tcl= #done - ## perl => undef, # --with-perl - ## python => undef, # --with-python= ##done - ## openssl => undef, # --with-openssl= ##done - ## uuid => undef, # --with-ossp-uuid - ## xml => undef, # --with-libxml= ##done - ## xslt => undef, # --with-libxslt= ##done - ## iconv => undef, # (not in configure, path to iconv) ##done (needed by xml) - ## zlib => undef # --with-zlib= ##done - - ## Setup external dependencies - ##"-DFEATURES=core;openssl;zlib" "-DALL_FEATURES=openssl;zlib;readline;libedit;python;tcl;nls;systemd;llvm;icu;bonjour;uuid;xml;xslt;" - if("${FEATURES}" MATCHES "icu") - string(REPLACE "icu => undef" "icu => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "nls") - string(REPLACE "nls => undef" "nls => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - vcpkg_acquire_msys(MSYS_ROOT PACKAGES gettext) - vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") - endif() - if("${FEATURES}" MATCHES "openssl") - string(REPLACE "openssl => undef" "openssl => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "python") - #vcpkg_find_acquire_program(PYTHON3) - #get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) - #vcpkg_add_to_path("${PYTHON3_EXE_PATH}") - string(REPLACE "python => undef" "python => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "tcl") - string(REPLACE "tcl => undef" "tcl => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "xml") - string(REPLACE "xml => undef" "xml => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - string(REPLACE "iconv => undef" "iconv => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "xslt") - string(REPLACE "xslt => undef" "xslt => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "zlib") - string(REPLACE "zlib => undef" "zlib => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "lz4") - string(REPLACE "lz4 => undef" "lz4 => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - if("${FEATURES}" MATCHES "zstd") - string(REPLACE "zstd => undef" "zstd => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") - endif() - - file(WRITE "${CONFIG_FILE}" "${_contents}") - file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}") - configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props" @ONLY) - vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION) - set(ENV{MSBFLAGS} "/p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} - /p:VCPkgLocalAppDataDisabled=true - /p:UseIntelMKL=No - /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} - /m - /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets\" - /p:ForceImportAfterCppTargets=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props\" - /p:VcpkgTriplet=${TARGET_TRIPLET} - /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\"" - ) - if(HAS_TOOLS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(ENV{MSBFLAGS} "$ENV{MSBFLAGS} /p:Platform=Win32") - endif() - message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}...") - vcpkg_execute_required_process( - COMMAND ${PERL} build.pl ${_buildtype} - WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" - LOGNAME "build-${TARGET_TRIPLET}-${_buildtype}" - ) - message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}... done") - else() - set(build_libs libpq libecpg_compat) - foreach(build_lib ${build_libs}) - message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}...") - vcpkg_execute_required_process( - COMMAND ${PERL} build.pl ${_buildtype} ${build_lib} - WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" - LOGNAME "build-${build_lib}-${TARGET_TRIPLET}-${_buildtype}" - ) - message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}... done") - endforeach() - endif() - - message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}...") - vcpkg_execute_required_process( - COMMAND ${PERL} install.pl "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}" client - WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" - LOGNAME "install-${TARGET_TRIPLET}-${_buildtype}" + separate_arguments(LIBXML2_LIBS_DEBUG NATIVE_COMMAND "${PC_LIBXML2_LIBS_DEBUG}") + separate_arguments(LIBXML2_LIBS_RELEASE NATIVE_COMMAND "${PC_LIBXML2_LIBS_RELEASE}") + endif() + if("xslt" IN_LIST FEATURES) + x_vcpkg_pkgconfig_get_modules( + PREFIX PC_LIBXSLT + MODULES --msvc-syntax libxslt + LIBS ) - message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") - endforeach() + separate_arguments(LIBXSLT_LIBS_DEBUG NATIVE_COMMAND "${PC_LIBXSLT_LIBS_DEBUG}") + separate_arguments(LIBXSLT_LIBS_RELEASE NATIVE_COMMAND "${PC_LIBXSLT_LIBS_RELEASE}") + endif() - message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") - #Cleanup - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/symbols") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/symbols") + include("${CMAKE_CURRENT_LIST_DIR}/build-msvc.cmake") + if(NOT VCPKG_BUILD_TYPE) + build_msvc(DEBUG "${SOURCE_PATH}") + endif() + build_msvc(RELEASE "${SOURCE_PATH}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - if(NOT HAS_TOOLS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") - else() + if(HAS_TOOLS) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") endif() - - message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") - set(USE_DL OFF) else() file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}") - + + vcpkg_list(SET BUILD_OPTS) + foreach(option IN ITEMS icu lz4 nls openssl python readline xml xslt zlib zstd) + if(option IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-${option}) + else() + list(APPEND BUILD_OPTS --without-${option}) + endif() + endforeach() if("nls" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --enable-nls) set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}") - else() - list(APPEND BUILD_OPTS --disable-nls) - endif() - if("openssl" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-openssl) - else() - list(APPEND BUILD_OPTS --without-openssl) - endif() - if("zlib" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-zlib) - else() - list(APPEND BUILD_OPTS --without-zlib) - endif() - if("zstd" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-zstd) - else() - list(APPEND BUILD_OPTS --without-zstd) - endif() - if("icu" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-icu) - else() - list(APPEND BUILD_OPTS --without-icu) - endif() - if("lz4" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-lz4) - else() - list(APPEND BUILD_OPTS --without-lz4) - endif() - if("readline" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-readline) - else() - list(APPEND BUILD_OPTS --without-readline) - endif() - if("xml" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-libxml) - else() - list(APPEND BUILD_OPTS --without-libxml) - endif() - if("xslt" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-libxslt) - else() - list(APPEND BUILD_OPTS --without-libxslt) + if(VCPKG_TARGET_IS_ANDROID) + list(APPEND BUILD_OPTS [[LIBS=$LIBS -liconv]]) + endif() endif() if("python" IN_LIST FEATURES) - list(APPEND BUILD_OPTS --with-python) - else() - list(APPEND BUILD_OPTS --without-python) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND BUILD_OPTS "PYTHON=${PYTHON3}") endif() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() - vcpkg_cmake_get_vars(cmake_vars_file) - include("${cmake_vars_file}") if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT) list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") endif() vcpkg_configure_make( - AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE - DETERMINE_BUILD_TRIPLET + AUTOCONFIG + ADDITIONAL_MSYS_PACKAGES autoconf-archive + DIRECT_PACKAGES + "https://mirror.msys2.org/msys/x86_64/tzcode-2023c-1-x86_64.pkg.tar.zst" + 7550b843964744607f736a7138f10c6cd92489406a1b84ac71d9a9d8aa16bc69048aa1b24e1f49291b010347047008194c334ca9c632e17fa8245e85549e3c7a OPTIONS ${BUILD_OPTS} - OPTIONS_RELEASE - "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/lib:${CURRENT_INSTALLED_DIR}/debug/lib" OPTIONS_DEBUG --enable-debug - "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/debug/lib:${CURRENT_INSTALLED_DIR}/lib" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(ENV{LIBPQ_LIBRARY_TYPE} shared) + set(ENV{LIBPQ_LIBRARY_TYPE} shared) else() - set(ENV{LIBPQ_LIBRARY_TYPE} static) + set(ENV{LIBPQ_LIBRARY_TYPE} static) endif() if(VCPKG_TARGET_IS_MINGW) - set(ENV{USING_MINGW} yes) + set(ENV{LIBPQ_USING_MINGW} yes) endif() - vcpkg_install_make() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - if(NOT HAS_TOOLS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - else() - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") - endif() - if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/bin/libpq.dll") - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll") - endif() - endif() - if(VCPKG_TARGET_IS_MINGW) - set(USE_DL OFF) - else() - set(USE_DL ON) + if(HAS_TOOLS) + set(ENV{LIBPQ_ENABLE_TOOLS} yes) endif() + vcpkg_install_make() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/postgresql/server/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") endif() +vcpkg_fixup_pkgconfig() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/symbols" + "${CURRENT_PACKAGES_DIR}/debug/tools" + "${CURRENT_PACKAGES_DIR}/symbols" + "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug" +) + file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT") diff --git a/ports/libpq/patches/fix-configure.patch b/ports/libpq/unix/fix-configure.patch similarity index 84% rename from ports/libpq/patches/fix-configure.patch rename to ports/libpq/unix/fix-configure.patch index 6fd28899cde58c..c0a7f78906ca89 100644 --- a/ports/libpq/patches/fix-configure.patch +++ b/ports/libpq/unix/fix-configure.patch @@ -1,17 +1,18 @@ diff --git a/configure.ac b/configure.ac -index fba79ee..4fadb94 100644 +index 9a73f50..a35395e 100644 --- a/configure.ac +++ b/configure.ac -@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros +@@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [15.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [15.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. ++cross_compiling=yes # Avoid conftest loading shared objects +m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required. Untested combinations of 'autoconf' and PostgreSQL versions are not recommended. You can remove the check from 'configure.ac' but it is then your responsibility whether the result works or not.])]) -@@ -1184,7 +1184,8 @@ if test "$enable_thread_safety" = yes; then +@@ -1274,7 +1275,8 @@ if test "$enable_thread_safety" = yes; then fi if test "$with_readline" = yes; then @@ -21,7 +22,7 @@ index fba79ee..4fadb94 100644 if test x"$pgac_cv_check_readline" = x"no"; then AC_MSG_ERROR([readline library not found If you have readline already installed, see config.log for details on the -@@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.]) +@@ -1284,7 +1286,7 @@ Use --without-readline to disable readline support.]) fi if test "$with_zlib" = yes; then @@ -30,7 +31,7 @@ index fba79ee..4fadb94 100644 [AC_MSG_ERROR([zlib library not found If you have zlib already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. -@@ -1243,6 +1244,9 @@ if test "$with_ssl" = openssl ; then +@@ -1333,6 +1335,9 @@ if test "$with_ssl" = openssl ; then # Minimum required OpenSSL version is 1.0.1 AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) @@ -40,7 +41,7 @@ index fba79ee..4fadb94 100644 if test "$PORTNAME" != "win32"; then AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) -@@ -1250,6 +1254,7 @@ if test "$with_ssl" = openssl ; then +@@ -1340,6 +1345,7 @@ if test "$with_ssl" = openssl ; then AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) fi @@ -48,7 +49,7 @@ index fba79ee..4fadb94 100644 # Function introduced in OpenSSL 1.0.2. AC_CHECK_FUNCS([X509_get_signature_nid]) # Functions introduced in OpenSSL 1.1.0. We used to check for -@@ -1365,15 +1365,18 @@ if test "$with_pam" = yes ; then +@@ -1363,19 +1369,23 @@ if test "$with_pam" = yes ; then fi if test "$with_libxml" = yes ; then @@ -71,8 +72,8 @@ index fba79ee..4fadb94 100644 if test "$with_zstd" = yes ; then - AC_CHECK_LIB(zstd, ZSTD_compress, [], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])]) -+ PKG_CHECK_MODULES([zstd], [zstd], [AC_DEFINE(HAVE_LIBZSTD,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])]) -+ LIBS="$LZ4_LIBS $LIBS" ++ PKG_CHECK_MODULES([ZSTD], [libzstd], [AC_DEFINE(HAVE_LIBZSTD,1,[Define to 1 if with zstd])], [AC_MSG_ERROR([library 'zstd' is required for ZSTD support])]) ++ LIBS="$ZSTD_LIBS $LIBS" fi # Note: We can test for libldap_r only after we know PTHREAD_LIBS; diff --git a/ports/libpq/unix/mingw-install.patch b/ports/libpq/unix/mingw-install.patch new file mode 100644 index 00000000000000..ffeea023cfc559 --- /dev/null +++ b/ports/libpq/unix/mingw-install.patch @@ -0,0 +1,36 @@ +diff --git a/src/Makefile.shlib b/src/Makefile.shlib +index 16255d7..51e9ed2 100644 +--- a/src/Makefile.shlib ++++ b/src/Makefile.shlib +@@ -85,7 +85,11 @@ else + # Naming convention for dynamically loadable modules + shlib = $(NAME)$(DLSUFFIX) + endif ++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared) ++stlib = lib$(NAME).dll.a ++else + stlib = lib$(NAME).a ++endif + + ifndef soname + # additional flags for backend modules +@@ -468,6 +472,9 @@ endif + else # no soname + $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)' + endif ++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared) ++ mv '$(DESTDIR)$(libdir)/$(shlib)' '$(DESTDIR)$(libdir)/../bin/$(shlib)' ++endif + + + installdirs-lib: +@@ -476,6 +483,9 @@ ifdef soname + else + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' + endif ++ifeq ($(PORTNAME)-$(LIBPQ_LIBRARY_TYPE), win32-shared) ++ $(MKDIR_P) '$(DESTDIR)$(libdir)/../bin' ++endif + + + ## diff --git a/ports/libpq/unix/no-server-tools.patch b/ports/libpq/unix/no-server-tools.patch new file mode 100644 index 00000000000000..f83682afb05cd4 --- /dev/null +++ b/ports/libpq/unix/no-server-tools.patch @@ -0,0 +1,37 @@ +diff --git a/src/bin/Makefile b/src/bin/Makefile +index 7f9dde9..bc6d835 100644 +--- a/src/bin/Makefile ++++ b/src/bin/Makefile +@@ -13,29 +13,20 @@ subdir = src/bin + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + ++.NOTPARALLEL: ++# incl. https://www.postgresql.org/docs/current/reference-client.html ++# excl. https://www.postgresql.org/docs/current/reference-server.html + SUBDIRS = \ +- initdb \ + pg_amcheck \ +- pg_archivecleanup \ + pg_basebackup \ +- pg_checksums \ + pg_config \ +- pg_controldata \ +- pg_ctl \ + pg_dump \ +- pg_resetwal \ +- pg_rewind \ +- pg_test_fsync \ +- pg_test_timing \ +- pg_upgrade \ + pg_verifybackup \ +- pg_waldump \ + pgbench \ + psql \ + scripts + + ifeq ($(PORTNAME), win32) +-SUBDIRS += pgevent + else + ALWAYS_SUBDIRS += pgevent + endif diff --git a/ports/libpq/unix/python.patch b/ports/libpq/unix/python.patch new file mode 100644 index 00000000000000..6466746ed433b6 --- /dev/null +++ b/ports/libpq/unix/python.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index a35395e..3c1b3e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1176,7 +1176,19 @@ fi + + if test "$with_python" = yes; then + PGAC_PATH_PYTHON +- PGAC_CHECK_PYTHON_EMBED_SETUP ++ python_majorversion=3 ++ python_version=3.10 ++ PKG_CHECK_MODULES(PYTHON_EMBED, python-${python_version}-embed) ++ python_includespec="${PYTHON_EMBED_CFLAGS}" ++ python_libdir=[$(echo " ${PYTHON_EMBED_LIBS}" | sed -e 's/\( -L[^ ]*\).*/\1/' -e 's/^.* -L//')] ++ python_libspec="${PYTHON_EMBED_LIBS}" ++ python_additional_libs="" ++ AC_SUBST(python_majorversion) ++ AC_SUBST(python_version) ++ AC_SUBST(python_includespec) ++ AC_SUBST(python_libdir) ++ AC_SUBST(python_libspec) ++ AC_SUBST(python_additional_libs) + fi + + if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then diff --git a/ports/libpq/unix/single-linkage.patch b/ports/libpq/unix/single-linkage.patch new file mode 100644 index 00000000000000..dd149c7d3a5bf8 --- /dev/null +++ b/ports/libpq/unix/single-linkage.patch @@ -0,0 +1,56 @@ +diff --git a/src/Makefile.shlib b/src/Makefile.shlib +index 551023c..16255d7 100644 +--- a/src/Makefile.shlib ++++ b/src/Makefile.shlib +@@ -260,10 +260,14 @@ endif + + .PHONY: all-lib all-static-lib all-shared-lib + ++ifndef LIBPQ_LIBRARY_TYPE + all-lib: all-shared-lib + ifdef soname + # no static library when building a dynamically loadable module + all-lib: all-static-lib ++endif ++else ++all-lib: all-$(LIBPQ_LIBRARY_TYPE)-lib + all-lib: lib$(NAME).pc + endif + +@@ -417,9 +421,13 @@ endif # PORTNAME == cygwin || PORTNAME == win32 + ## + + .PHONY: install-lib install-lib-static install-lib-shared installdirs-lib ++ifndef LIBPQ_LIBRARY_TYPE + install-lib: install-lib-shared + ifdef soname + install-lib: install-lib-static ++endif ++else ++install-lib: install-lib-$(LIBPQ_LIBRARY_TYPE) + install-lib: install-lib-pc + endif + +diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile +index 8abdb09..185461e 100644 +--- a/src/interfaces/libpq/Makefile ++++ b/src/interfaces/libpq/Makefile +@@ -115,6 +115,7 @@ backend_src = $(top_srcdir)/src/backend + # Also skip the test on platforms where libpq infrastructure may be provided + # by statically-linked libraries, as we can't expect them to honor this + # coding rule. ++ifeq ($(LIBPQ_LIBRARY_TYPE), shared) + libpq-refs-stamp: $(shlib) + ifneq ($(enable_coverage), yes) + ifeq (,$(filter aix solaris,$(PORTNAME))) +@@ -124,6 +125,10 @@ ifeq (,$(filter aix solaris,$(PORTNAME))) + endif + endif + touch $@ ++else ++.PHONY: libpq-refs-stamp ++libpq-refs-stamp: ++endif + + # Make dependencies on pg_config_paths.h visible in all builds. + fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake index 311f3bb9d53c8f..6f1432570cdd23 100644 --- a/ports/libpq/vcpkg-cmake-wrapper.cmake +++ b/ports/libpq/vcpkg-cmake-wrapper.cmake @@ -6,7 +6,7 @@ PATHS NO_DEFAULT_PATH ) _find_package(${ARGS}) -if(PostgreSQL_FOUND AND @USE_DL@) +if(PostgreSQL_FOUND AND NOT "@VCPKG_TARGET_IS_WINDOWS@") find_library(PostgreSQL_DL_LIBRARY NAMES dl) if(PostgreSQL_DL_LIBRARY) list(APPEND PostgreSQL_LIBRARIES "dl") diff --git a/ports/libpq/vcpkg-libs.props.in b/ports/libpq/vcpkg-libs.props.in new file mode 100644 index 00000000000000..4c777561c7ff4a --- /dev/null +++ b/ports/libpq/vcpkg-libs.props.in @@ -0,0 +1,31 @@ + + + + @CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib;@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib;@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib; + @CURRENT_INSTALLED_DIR@/debug/lib/lz4d.lib + @CURRENT_INSTALLED_DIR@/debug/lib/intl.lib;@CURRENT_INSTALLED_DIR@/debug/lib/iconv.lib;@CURRENT_INSTALLED_DIR@/debug/lib/charset.lib + @CURRENT_INSTALLED_DIR@/debug/lib/libssl.lib;@CURRENT_INSTALLED_DIR@/debug/lib/libcrypto.lib;crypt32.lib;ws2_32.lib;secur32.lib + @CURRENT_INSTALLED_DIR@/debug/lib/python310_d.lib + @CURRENT_INSTALLED_DIR@/debug/lib/tcl90g.lib + @CURRENT_INSTALLED_DIR@/debug/lib/tcl90sg.lib + @CURRENT_INSTALLED_DIR@/debug/lib/tcl90sgx.lib + @LIBXML2_LIBS_DEBUG@ + @LIBXSLT_LIBS_DEBUG@ + @CURRENT_INSTALLED_DIR@/debug/lib/zlibd.lib + @CURRENT_INSTALLED_DIR@/debug/lib/zstd.lib + + + @CURRENT_INSTALLED_DIR@/lib/icuin.lib;@CURRENT_INSTALLED_DIR@/lib/icuuc.lib;@CURRENT_INSTALLED_DIR@/lib/icudt.lib; + @CURRENT_INSTALLED_DIR@/lib/lz4.lib + @CURRENT_INSTALLED_DIR@/lib/intl.lib;@CURRENT_INSTALLED_DIR@/lib/iconv.lib;@CURRENT_INSTALLED_DIR@/lib/charset.lib + @CURRENT_INSTALLED_DIR@/lib/libssl.lib;@CURRENT_INSTALLED_DIR@/lib/libcrypto.lib;crypt32.lib;ws2_32.lib;secur32.lib + @CURRENT_INSTALLED_DIR@/lib/python310.lib + @CURRENT_INSTALLED_DIR@/lib/tcl90.lib + @CURRENT_INSTALLED_DIR@/lib/tcl90s.lib + @CURRENT_INSTALLED_DIR@/lib/tcl90sx.lib + @LIBXML2_LIBS_RELEASE@ + @LIBXSLT_LIBS_RELEASE@ + @CURRENT_INSTALLED_DIR@/lib/zlib.lib + @CURRENT_INSTALLED_DIR@/lib/zstd.lib + + diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 6e5fea70597291..106e4694a9e65b 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpq", - "version": "15.2", - "port-version": 3, + "version": "15.3", "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", @@ -18,6 +17,11 @@ { "name": "vcpkg-cmake-get-vars", "host": true + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true, + "platform": "windows & !mingw" } ], "default-features": [ @@ -26,28 +30,77 @@ "zlib" ], "features": { + "all": { + "description": "Build all supported features", + "dependencies": [ + { + "name": "libpq", + "features": [ + "client", + "icu", + "xml", + "xslt", + "zstd" + ] + }, + { + "name": "libpq", + "features": [ + "bonjour" + ], + "platform": "osx" + }, + { + "name": "libpq", + "features": [ + "nls" + ], + "platform": "!osx" + }, + { + "name": "libpq", + "features": [ + "readline" + ], + "platform": "!windows" + }, + { + "name": "libpq", + "features": [ + "python" + ], + "platform": "!android & !mingw" + }, + { + "name": "libpq", + "features": [ + "tcl" + ], + "platform": "windows & !mingw & !arm" + } + ] + }, "bonjour": { - "description": "Build with Bonjour support (--with-bonjour)", + "description": "Build with Bonjour support", "supports": "osx" }, "client": { - "description": "Build all client tools and libraries (dynamic only?)", - "supports": "!(windows & !mingw & static)" + "description": "Build all client tools and libraries" }, "icu": { - "description": "Build with support for the ICU library (--with-icu)", + "description": "Build with support for the ICU library", "dependencies": [ "icu" ] }, "lz4": { - "description": "Use lz4 (else --without-lz4)", + "description": "Use lz4", "dependencies": [ "lz4" ] }, "nls": { - "description": "Native Language Support (--enable-nls[=LANGUAGES])", + "description": "Native Language Support", "supports": "!osx", "dependencies": [ "gettext", @@ -56,19 +109,20 @@ "host": true, "features": [ "tools" - ] + ], + "platform": "!windows, mingw" } ] }, "openssl": { - "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows) (--with-openssl)", + "description": "support for encrypted client connections and random number generation on platforms that do not have \"/dev/urandom\" (except windows)", "dependencies": [ "openssl" ] }, "python": { - "description": "build the PL/Python server programming language (dynamic only?) (--with-python)", - "supports": "!(windows & (static | mingw))", + "$supports": "!(windows & (static | mingw))", + "description": "build the PL/Python server programming language", "dependencies": [ { "name": "libpq", @@ -81,15 +135,16 @@ ] }, "readline": { - "description": "Use readline (else --without-readline)", + "description": "Use readline", "supports": "!windows, mingw", "dependencies": [ "readline" ] }, "tcl": { - "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)", - "supports": "!(windows & (static | mingw))", + "$supports": "!(windows & (static | mingw))", + "description": "build the PL/Tcl procedural language", + "supports": "windows & !mingw", "dependencies": [ { "name": "libpq", @@ -102,13 +157,16 @@ ] }, "xml": { - "description": "Build with libxml (--with-libxml)", + "description": "Build with libxml", "dependencies": [ - "libxml2" + { + "name": "libxml2", + "default-features": false + } ] }, "xslt": { - "description": "Build with libxslt (--with-libxslt)", + "description": "Build with libxslt", "dependencies": [ { "name": "libpq", @@ -121,13 +179,13 @@ ] }, "zlib": { - "description": "Use zlib (else --without-zlib)", + "description": "Use zlib", "dependencies": [ "zlib" ] }, "zstd": { - "description": "Use zstd (else --without-zstd)", + "description": "Use zstd", "dependencies": [ "zstd" ] diff --git a/ports/libpq/patches/windows/macro-def.patch b/ports/libpq/windows/macro-def.patch similarity index 100% rename from ports/libpq/patches/windows/macro-def.patch rename to ports/libpq/windows/macro-def.patch diff --git a/ports/libpq/windows/msbuild.patch b/ports/libpq/windows/msbuild.patch new file mode 100644 index 00000000000000..ce243a326e6e1d --- /dev/null +++ b/ports/libpq/windows/msbuild.patch @@ -0,0 +1,428 @@ +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index 8de79c6..3bc677d 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -53,6 +53,11 @@ sub Install + my $target = shift; + $insttype = shift; + $insttype = "all" unless ($insttype); ++ if ($insttype eq 'core') ++ { ++ $insttype = 'client'; ++ @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); ++ } + + # if called from vcregress, the config will be passed to us + # so no need to re-include these +@@ -89,7 +94,7 @@ sub Install + my $majorver = DetermineMajorVersion(); + print "Installing version $majorver for $conf in $target\n"; + +- my @client_dirs = ('bin', 'lib', 'share', 'symbols'); ++ my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq'); + my @all_dirs = ( + @client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib', + 'share/extension', 'share/timezonesets', 'share/tsearch_data'); +@@ -117,11 +122,11 @@ sub Install + } + }, + @top_dir); +- CopySetOfFiles('config files', $sample_files, $target . '/share/'); ++ CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/'); + CopyFiles( + 'Import libraries', + $target . '/lib/', +- "$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib", ++ "$conf\\", "libpgcommon\\libpgcommon.lib", + "libpgport\\libpgport.lib"); + CopyContribFiles($config, $target); + CopyIncludeFiles($target); +@@ -293,7 +298,16 @@ sub CopySolutionOutput + { + if ($1 == 1) + { +- push(@{ $install_list{'bin'} }, "exe"); ++ push(@{ $install_list{'tools\\libpq'} }, "exe"); ++ } ++ elsif ($1 == 2) ++ { ++ push(@{ $install_list{'bin'} }, "dll"); ++ push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins ++ } ++ elsif ($is_sharedlib) # forced to static lib by vcpkg triplet ++ { ++ push(@{ $install_list{'lib'} }, "lib"); + } + elsif ($1 == 2) + { +@@ -317,7 +331,16 @@ sub CopySolutionOutput + { + if ($1 eq 'Application') + { +- push(@{ $install_list{'bin'} }, "exe"); ++ push(@{ $install_list{'tools\\libpq'} }, "exe"); ++ } ++ elsif ($1 eq 'DynamicLibrary') ++ { ++ push(@{ $install_list{'bin'} }, "dll"); ++ push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins ++ } ++ elsif ($is_sharedlib) # forced to static lib by vcpkg triplet ++ { ++ push(@{ $install_list{'lib'} }, "lib"); + } + elsif ($1 eq 'DynamicLibrary') + { +@@ -350,7 +373,8 @@ sub CopySolutionOutput + || croak "Could not copy $pf.$ext\n"; + } + } +- lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb") ++ $1 ne 'DynamicLibrary' || ++ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") + || croak "Could not copy $pf.pdb\n"; + print "."; + } +@@ -482,7 +506,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f.control", +- "$target/share/extension/$f.control") ++ "$target/share/libpq/extension/$f.control") + || croak("Could not copy file $f.control in contrib $module"); + print '.'; + } +@@ -500,7 +524,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f", +- "$target/share/$moduledir/" . basename($f)) ++ "$target/share/libpq/$moduledir/" . basename($f)) + || croak("Could not copy file $f in contrib $module"); + print '.'; + } +@@ -515,7 +539,7 @@ sub CopySubdirFiles + foreach my $f (split /\s+/, $flist) + { + lcopy("$subdir/$module/$f", +- "$target/share/tsearch_data/" . basename($f)) ++ "$target/share/libpq/tsearch_data/" . basename($f)) + || croak("Could not copy file $f in $subdir $module"); + print '.'; + } +@@ -578,7 +602,7 @@ sub CopySubdirFiles + if ($module eq 'spi'); + foreach my $f (split /\s+/, $flist) + { +- lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f") ++ lcopy("$subdir/$module/$f", "$target/share/libpq/doc/$moduledir/$f") + || croak("Could not copy file $f in contrib $module"); + print '.'; + } +@@ -708,7 +732,7 @@ sub GenerateNLSFiles + my $majorver = shift; + + print "Installing NLS files..."; +- EnsureDirectories($target, "share/locale"); ++ EnsureDirectories($target, "share/libpq/locale"); + my @flist; + File::Find::find( + { +@@ -730,12 +754,12 @@ sub GenerateNLSFiles + next unless /([^\/]+)\.po/; + $lang = $1; + +- EnsureDirectories($target, "share/locale/$lang", +- "share/locale/$lang/LC_MESSAGES"); ++ EnsureDirectories($target, "share/libpq/locale/$lang", ++ "share/libpq/locale/$lang/LC_MESSAGES"); + my @args = ( +- "$nlspath\\bin\\msgfmt", ++ "msgfmt", + '-o', +- "$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", ++ "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", + $_); + system(@args) && croak("Could not run msgfmt on $dir\\$_"); + print "."; +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index f24d9e5..356cc31 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -81,13 +81,14 @@ EOF + + EOF + ++ my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : ''; + $self->WriteItemDefinitionGroup( + $f, 'Debug', + { + defs => "_DEBUG;DEBUG=1", + opt => 'Disabled', + strpool => 'false', +- runtime => 'MultiThreadedDebugDLL' ++ runtime => 'MultiThreadedDebug' . $maybe_dll + }); + $self->WriteItemDefinitionGroup( + $f, +@@ -96,7 +97,7 @@ EOF + defs => "", + opt => 'Full', + strpool => 'true', +- runtime => 'MultiThreadedDLL' ++ runtime => 'MultiThreaded' . $maybe_dll + }); + return; + } +@@ -266,6 +267,8 @@ sub WriteConfigurationPropertyGroup + ($self->{type} eq "exe") + ? 'Application' + : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); ++ if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static') ++ { $cfgtype =~ s/DynamicLibrary/StaticLibrary/; } + + print $f < +@@ -311,7 +314,9 @@ sub WriteItemDefinitionGroup + my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); + + my $targetmachine = +- $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64'; ++ 'Machine' . uc($self->{platform}); ++ $targetmachine =~ s/WIN32/X86/; ++ my $randomizebase = ($self->{platform} =~ /^ARM/) ? 'true' : 'false'; + + my $includes = join ';', @{ $self->{includes} }, ""; + +@@ -347,7 +352,7 @@ sub WriteItemDefinitionGroup + .\\$cfgname\\$self->{name}\\$self->{name}.pdb + false + .\\$cfgname\\$self->{name}\\$self->{name}.map +- false ++ $randomizebase + + + Console +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index ef0a33c..dd68424 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -114,8 +114,10 @@ sub mkvcbuild + + if ($vsVersion >= '9.00') + { ++ if ($solution->{platform} !~ /^ARM/) { + push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); + push(@pgportfiles, 'pg_crc32c_sse42.c'); ++ } + push(@pgportfiles, 'pg_crc32c_sb8.c'); + } + else +@@ -196,6 +198,7 @@ sub mkvcbuild + 'syncrep_gram.y'); + $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', + 'jsonpath_gram.y'); ++ ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') && + $postgres->AddDefine('BUILDING_DLL'); + $postgres->AddLibrary('secur32.lib'); + $postgres->AddLibrary('ws2_32.lib'); +@@ -240,12 +243,13 @@ sub mkvcbuild + $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); + $pltcl->AddReference($postgres); + +- for my $tclver (qw(86t 86 85 84)) ++ my $v = $solution->{options}->{tcl_version}; ++ for my $tclver ( ("${v}","${v}s","${v}sx") ) + { + my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; + if (-e $tcllib) + { +- $pltcl->AddLibrary($tcllib); ++ $pltcl->AddLibrary("\$(VcpkgTcl${tclver}Libs)"); + $found = 1; + last; + } +@@ -500,8 +504,7 @@ sub mkvcbuild + . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; + my $prefixcmd = + qq("$solution->{options}->{python}\\python" -c "$pythonprog"); +- my $pyout = `$prefixcmd`; +- die "Could not query for python version!\n" if $?; ++ my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}"; + my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + + # Sometimes (always?) if python is not present, the execution +@@ -517,8 +520,8 @@ sub mkvcbuild + + my $plpython = $solution->AddProject('plpython' . $pymajorver, + 'dll', 'PLs', 'src/pl/plpython'); +- $plpython->AddIncludeDir($pyprefix . '/include'); +- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); ++ $plpython->AddIncludeDir($pyprefix . "/include/python$pyver"); ++ $plpython->AddLibrary('$(VcpkgPythonLibs)'); + $plpython->AddReference($postgres); + + # Add transform modules dependent on plpython +diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm +index 570bab5..2d51abe 100644 +--- a/src/tools/msvc/Project.pm ++++ b/src/tools/msvc/Project.pm +@@ -167,6 +167,11 @@ sub AddReference + } + $self->AddLibrary( + "__CFGNAME__/" . $ref->{name} . "/" . $ref->{name} . ".lib"); ++ ++ if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static') ++ { ++ map { $self->AddLibrary($_) } @{ $ref->{libraries} }; ++ } + } + return; + } +diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm +index d30e8fc..231275b 100644 +--- a/src/tools/msvc/Solution.pm ++++ b/src/tools/msvc/Solution.pm +@@ -63,6 +63,11 @@ sub DeterminePlatform + my $self = shift; + + if ($^O eq "MSWin32") ++ { ++ $self->{platform} = uc($self->{options}->{VCPKG_TARGET_ARCHITECTURE}); ++ $self->{platform} =~ s/^X86$/Win32/; ++ } ++ elsif (0) + { + # Examine CL help output to determine if we are in 32 or 64-bit mode. + my $output = `cl /help 2>&1`; +@@ -124,6 +129,9 @@ sub copyFile + sub GetOpenSSLVersion + { + my $self = shift; ++ if ($self->{options}->{openssl_version} =~ /(\d+)\.(\d+)\.(\d+)/m) { ++ return ($1, $2, $3); ++ } + + # Attempt to get OpenSSL version and location. This assumes that + # openssl.exe is in the specified directory. +@@ -148,7 +156,7 @@ sub GetOpenSSLVersion + sub GenerateFiles + { + my $self = shift; +- my $bits = $self->{platform} eq 'Win32' ? 32 : 64; ++ my $bits = $self->{platform} =~ /64/ ? 64 : 32; + my $ac_init_found = 0; + my $package_name; + my $package_version; +@@ -502,7 +510,7 @@ sub GenerateFiles + USE_PAM => undef, + USE_SLICING_BY_8_CRC32C => undef, + USE_SSE42_CRC32C => undef, +- USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => 1, ++ USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => $self->{platform} =~ /^ARM/ ? undef : 1, + USE_SYSTEMD => undef, + USE_SYSV_SEMAPHORES => undef, + USE_SYSV_SHARED_MEMORY => undef, +@@ -760,14 +768,14 @@ sub GenerateFiles + || confess "Could not open pg_config_paths.h"; + print $o <{options}->{zlib}) + { + $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); +- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib'); ++ $proj->AddLibrary('$(VcpkgZlibLibs)'); + } + if ($self->{options}->{openssl}) + { + $proj->AddIncludeDir($self->{options}->{openssl} . '\include'); ++ $proj->AddLibrary('$(VcpkgOpensslLibs)'); ++ } ++ elsif (0) ++ { + my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion(); + + # Starting at version 1.1.0 the OpenSSL installers have +@@ -1027,7 +1039,7 @@ sub AddProject + if ($self->{options}->{nls}) + { + $proj->AddIncludeDir($self->{options}->{nls} . '\include'); +- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); ++ $proj->AddLibrary('$(VcpkgNlsLibs)'); + } + if ($self->{options}->{gss}) + { +@@ -1060,6 +1072,10 @@ sub AddProject + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); ++ $proj->AddLibrary('$(VcpkgIcuLibs)'); ++ } ++ elsif (0) ++ { + if ($self->{platform} eq 'Win32') + { + $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); +@@ -1077,22 +1093,22 @@ sub AddProject + { + $proj->AddIncludeDir($self->{options}->{xml} . '\include'); + $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); +- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); ++ $proj->AddLibrary('$(VcpkgXmlLibs)'); + } + if ($self->{options}->{xslt}) + { + $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); +- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); ++ $proj->AddLibrary('$(VcpkgXsltLibs)'); + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary('$(VcpkgLz4Libs)'); + } + if ($self->{options}->{zstd}) + { + $proj->AddIncludeDir($self->{options}->{zstd} . '\include'); +- $proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib'); ++ $proj->AddLibrary('$(VcpkgZstdLibs)'); + } + if ($self->{options}->{uuid}) + { +diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl +index b8c514a..1fb7619 100644 +--- a/src/tools/msvc/gendef.pl ++++ b/src/tools/msvc/gendef.pl +@@ -122,7 +122,7 @@ sub writedef + + # Strip the leading underscore for win32, but not x64 + $f =~ s/^_// +- unless ($platform eq "x64"); ++ if ($platform eq "Win32"); + + # Emit just the name if it's a function symbol, or emit the name + # decorated with the DATA option for variables. +@@ -150,7 +150,7 @@ sub usage + usage() + unless scalar(@ARGV) == 2 + && ( ($ARGV[0] =~ /\\([^\\]+$)/) +- && ($ARGV[1] eq 'Win32' || $ARGV[1] eq 'x64')); ++ && ($ARGV[1] ne '')); + my $defname = uc $1; + my $deffile = "$ARGV[0]/$defname.def"; + my $platform = $ARGV[1]; diff --git a/ports/libpq/patches/windows/python_lib.patch b/ports/libpq/windows/python_lib.patch similarity index 100% rename from ports/libpq/patches/windows/python_lib.patch rename to ports/libpq/windows/python_lib.patch diff --git a/ports/libpq/windows/spin_delay.patch b/ports/libpq/windows/spin_delay.patch new file mode 100644 index 00000000000000..163e8e6ef75191 --- /dev/null +++ b/ports/libpq/windows/spin_delay.patch @@ -0,0 +1,24 @@ +diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h +index 4d3ffc7..658b1a1 100644 +--- a/src/include/storage/s_lock.h ++++ b/src/include/storage/s_lock.h +@@ -953,12 +953,18 @@ typedef LONG slock_t; + /* If using Visual C++ on Win64, inline assembly is unavailable. + * Use a _mm_pause intrinsic instead of rep nop. + */ +-#if defined(_WIN64) ++#if defined(_M_X64) && !defined(_M_ARM64EC) + static __forceinline void + spin_delay(void) + { + _mm_pause(); + } ++#elif defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC) ++static __forceinline void ++spin_delay(void) ++{ ++ __yield(); ++} + #else + static __forceinline void + spin_delay(void) diff --git a/ports/libpq/patches/windows/win_bison_flex.patch b/ports/libpq/windows/win_bison_flex.patch similarity index 100% rename from ports/libpq/patches/windows/win_bison_flex.patch rename to ports/libpq/windows/win_bison_flex.patch diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index d2ac80d90a6b25..6624f6a781822f 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -66,6 +66,15 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "ifdef LIBEXSLT_STATIC" "if 1") endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxslt.pc" " -lxslt" " -llibxslt") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libexslt.pc" " -lexslt" " -llibexslt") + endif() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index e5b9489b61bc1b..8b9e8b83bc22c4 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxslt", "version": "1.1.37", - "port-version": 1, + "port-version": 2, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a4fbec32427368..933c90bb2078b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4417,8 +4417,8 @@ "port-version": 16 }, "libpq": { - "baseline": "15.2", - "port-version": 3 + "baseline": "15.3", + "port-version": 0 }, "libpqxx": { "baseline": "7.7.4", @@ -4842,7 +4842,7 @@ }, "libxslt": { "baseline": "1.1.37", - "port-version": 1 + "port-version": 2 }, "libxt": { "baseline": "1.2.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index d3c147f6e075a6..e8c2ad3e18c131 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5388715a119316e407f15a6612bf05d2292d73d", + "version": "15.3", + "port-version": 0 + }, { "git-tree": "74cc57fa79744500aef02f0b66be5f46b8005af3", "version": "15.2", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 2f867897ae9beb..b29b3a4855eb69 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5013956f82220811954d9ed3b68e122c11e88a0", + "version": "1.1.37", + "port-version": 2 + }, { "git-tree": "1e2ad3abc4c5d53f33c43f0a1b7aa09ca7e06dc1", "version": "1.1.37", From 6172c4b5a08aecf5755f753c6338fa74103d39cf Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 2 Jun 2023 02:03:26 +0800 Subject: [PATCH 206/533] update to 3.1.1 (#31734) --- ports/openssl/portfile.cmake | 2 +- ports/openssl/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/openssl.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 20203624309a9f..17e94cbe6f027f 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF "openssl-${VERSION}" - SHA512 877b4bc4b59126bdaf626b01322c8ac5325945234acd14907e4a23019f1fd38ec17b5fae9ff60aa9b6b0089c29b0e4255a19cd2a1743c3db82a616286c60d3b9 + SHA512 7073fd82ce17a63d77babb6a184c14c7341e4b1f8f5a6caeaa1a6d9c78d6a12bb6d9cbad5d39d16412be6d1c12eac60364644664a8e26e3940476973ba07fd19 PATCHES disable-apps.patch disable-install-docs.patch diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index f374dde3a166e4..9f49558ce91e2f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.1.0", - "port-version": 4, + "version": "3.1.1", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 933c90bb2078b0..b90afaad527028 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5989,8 +5989,8 @@ "port-version": 1 }, "openssl": { - "baseline": "3.1.0", - "port-version": 4 + "baseline": "3.1.1", + "port-version": 0 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 7432d2ee2f37bf..5f4c258b8e02ce 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc8edd2b6e1e1552688c29dc46d5cd5c9183804b", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "68137d1e48b5f9424e9de3d038a9e2c92f1baf39", "version": "3.1.0", From 033550371675bb4237102a19c1f48b40a419eae0 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 2 Jun 2023 02:05:06 +0800 Subject: [PATCH 207/533] [winpcap/SDL1-mixer] Change the extension of the template MSBuild solution (#31749) * Modify the name of the template solutions * update version --------- Co-authored-by: Monica --- .../{SDL_mixer_2017.sln => SDL_mixer_2017.sln.in} | 0 ports/sdl1-mixer/portfile.cmake | 4 ++-- ports/sdl1-mixer/vcpkg.json | 2 +- ports/winpcap/{Packet.vcxproj => Packet.vcxproj.in} | 0 ports/winpcap/portfile.cmake | 7 +++---- ports/winpcap/vcpkg.json | 2 +- ports/winpcap/{wpcap.vcxproj => wpcap.vcxproj.in} | 0 versions/baseline.json | 4 ++-- versions/s-/sdl1-mixer.json | 5 +++++ versions/w-/winpcap.json | 5 +++++ 10 files changed, 19 insertions(+), 10 deletions(-) rename ports/sdl1-mixer/{SDL_mixer_2017.sln => SDL_mixer_2017.sln.in} (100%) rename ports/winpcap/{Packet.vcxproj => Packet.vcxproj.in} (100%) rename ports/winpcap/{wpcap.vcxproj => wpcap.vcxproj.in} (100%) diff --git a/ports/sdl1-mixer/SDL_mixer_2017.sln b/ports/sdl1-mixer/SDL_mixer_2017.sln.in similarity index 100% rename from ports/sdl1-mixer/SDL_mixer_2017.sln rename to ports/sdl1-mixer/SDL_mixer_2017.sln.in diff --git a/ports/sdl1-mixer/portfile.cmake b/ports/sdl1-mixer/portfile.cmake index e4dbc1f6753e16..299e9db2c7d119 100644 --- a/ports/sdl1-mixer/portfile.cmake +++ b/ports/sdl1-mixer/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/") + configure_file("${CMAKE_CURRENT_LIST_DIR}/SDL_mixer_2017.sln.in" "${SOURCE_PATH}/VisualC/SDL_mixer_2017.sln" COPYONLY) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIB_TYPE StaticLibrary) @@ -73,7 +73,7 @@ else() vcpkg_install_make() vcpkg_fixup_pkgconfig() - file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/sdl1-mixer/vcpkg.json b/ports/sdl1-mixer/vcpkg.json index b0d9ae7d1c5027..52ef800e7f63e8 100644 --- a/ports/sdl1-mixer/vcpkg.json +++ b/ports/sdl1-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl1-mixer", "version-date": "2023-03-25", - "port-version": 1, + "port-version": 2, "description": "An audio mixer that supports various file formats for Simple Directmedia Layer.", "homepage": "https://www.libsdl.org", "license": "Zlib", diff --git a/ports/winpcap/Packet.vcxproj b/ports/winpcap/Packet.vcxproj.in similarity index 100% rename from ports/winpcap/Packet.vcxproj rename to ports/winpcap/Packet.vcxproj.in diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index fb3718c077f021..602fc28ab5a141 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PORT_DIR}/Packet.vcxproj" DESTINATION "${SOURCE_PATH}/packetNtx/Dll/Project/") + configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY) endif() vcpkg_build_msbuild( @@ -84,7 +84,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CURRENT_PORT_DIR}/wpcap.vcxproj" DESTINATION "${SOURCE_PATH}/wpcap/PRJ/") + configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY) endif() vcpkg_build_msbuild( @@ -168,5 +168,4 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files. -") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.") diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index 8dfbb0541e8df3..215c76b1306184 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 9, + "port-version": 10, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org", "supports": "windows" diff --git a/ports/winpcap/wpcap.vcxproj b/ports/winpcap/wpcap.vcxproj.in similarity index 100% rename from ports/winpcap/wpcap.vcxproj rename to ports/winpcap/wpcap.vcxproj.in diff --git a/versions/baseline.json b/versions/baseline.json index b90afaad527028..2de6e9fedee9b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7322,7 +7322,7 @@ }, "sdl1-mixer": { "baseline": "2023-03-25", - "port-version": 1 + "port-version": 2 }, "sdl1-net": { "baseline": "1.2.8", @@ -8590,7 +8590,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 9 + "port-version": 10 }, "winpty": { "baseline": "0.4.3", diff --git a/versions/s-/sdl1-mixer.json b/versions/s-/sdl1-mixer.json index 540bdd76c9e122..aae68871ffd5cb 100644 --- a/versions/s-/sdl1-mixer.json +++ b/versions/s-/sdl1-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9948f6d30a19d1be8d0de5406f7874c5991aec1", + "version-date": "2023-03-25", + "port-version": 2 + }, { "git-tree": "2e208f00e12332057ca6986afe060ff5fc1ef7cc", "version-date": "2023-03-25", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index 0a62c51f051651..ce841f61c47833 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93484c8257a6ac5a90f5d540d143a6f4fe5968f2", + "version": "4.1.3", + "port-version": 10 + }, { "git-tree": "5444737a0b6d0d6a1c5129ae7435f52ac5f6bcb4", "version": "4.1.3", From 69f86f893f19e70b27e6a71e3b91aee79b82736f Mon Sep 17 00:00:00 2001 From: Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> Date: Thu, 1 Jun 2023 12:06:52 -0600 Subject: [PATCH 208/533] Update Vulkan Headers to 1.3.250 (#31721) * [vulkan-headers] Update to 1.3.250 * [vulkan-headers] Update version database --- ports/vulkan-headers/portfile.cmake | 12 +++++------- ports/vulkan-headers/usage | 4 ++++ ports/vulkan-headers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vulkan-headers.json | 5 +++++ 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 ports/vulkan-headers/usage diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index 81cc869c4b400d..3d312fb191d3a8 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -1,16 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF d732b2de303ce505169011d438178191136bfb00 - SHA512 425d393dec95902af46f182b3d8d5d279efefddc9cbce05c2b3e4f1706fa05ff74db0a3db2adc370bf6ac25c152c66d9a96feaac8a427acdc46b1d27e69c2608 - HEAD_REF v1.3.243 + REF bae9700cd9425541a0f6029957f005e5ad3ef660 + SHA512 b1a51cb868563bf044c65cab8411547b8a08ea21998f01e5be53027217ddd18ff6907d78490c08e3f14865c53436ddf092811726ae3df23a29f8edd614bdb95b + HEAD_REF v1.3.250 ) set(VCPKG_BUILD_TYPE release) # header-only port -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vulkan-headers/usage b/ports/vulkan-headers/usage new file mode 100644 index 00000000000000..5b461a6d41572e --- /dev/null +++ b/ports/vulkan-headers/usage @@ -0,0 +1,4 @@ +Vulkan-Headers provides official find_package support: + + find_package(VulkanHeaders CONFIG) + target_link_libraries(main PRIVATE Vulkan::Headers) diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index ca77a5e22a34b3..002040ad37382f 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version": "1.3.243", + "version": "1.3.250", "port-version": 2, "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", diff --git a/versions/baseline.json b/versions/baseline.json index 2de6e9fedee9b9..c694d0aa85521a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8497,7 +8497,7 @@ "port-version": 6 }, "vulkan-headers": { - "baseline": "1.3.243", + "baseline": "1.3.250", "port-version": 2 }, "vulkan-hpp": { diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index f6db8e6a48d263..e1f8cecf78450e 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58c480d0beaa5a34988bd99c452a6fcbfe08721a", + "version": "1.3.250", + "port-version": 2 + }, { "git-tree": "535abf6f9fe02ff97da42e5594a4c1fd55190ec1", "version": "1.3.243", From d8e5ba9b4513ee2088c0cf17834e771300d156bd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 1 Jun 2023 20:07:32 +0200 Subject: [PATCH 209/533] [curl] Update (#31710) --- ports/curl/0005_remove_imp_suffix.patch | 10 +++++----- ports/curl/portfile.cmake | 6 +++--- ports/curl/vcpkg.json | 2 +- ports/curl/version-major-7-8.patch | 20 -------------------- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 6 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 ports/curl/version-major-7-8.patch diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index e52da2585b61ea..7f29e35d9e501b 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -1,7 +1,7 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 1d71e14..62b7b33 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 1d71e14..62b7b33 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt @@ -125,7 +125,6 @@ if(WIN32) if(MSVC) # Add "_imp" as a suffix before the extension to avoid conflicting with @@ -9,4 +9,4 @@ index 1d71e14..62b7b33 100644 - set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") endif() endif() - endif() + elseif(NOT CMAKE_CROSSCOMPILING) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 988c9b7697e3ca..77f83c46fd1089 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -2,8 +2,8 @@ string(REPLACE "." "_" curl_version "curl-${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF ${curl_version} - SHA512 4a7aa0091ac1e0f1d4366277d585c19bd9ad786fa49329a96d43eb6aebd1b366c1c2144436c243686d9ad430e7d3f4137ea0764c7759198f0eb29107a5d86569 + REF "${curl_version}" + SHA512 d3c0bd113c772249c7e4e83cc26c6e2a1ff5644486c96318de6ab035300c52aca10756af665d91c5ce71f9d4afa4afbf7fbb756e9e4c800869b50c8a653bd519 HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -14,7 +14,6 @@ vcpkg_from_github( mbedtls-ws2_32.patch export-components.patch 0023-fix-find-cares.patch - version-major-7-8.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -73,6 +72,7 @@ vcpkg_cmake_configure( -DENABLE_MANUAL=OFF -DCURL_CA_FALLBACK=ON -DCURL_USE_LIBPSL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON OPTIONS_DEBUG -DENABLE_DEBUG=ON ) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index f1ad8f7f3c7888..0a08a1a9d21c37 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "8.0.1", + "version": "8.1.2", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/ports/curl/version-major-7-8.patch b/ports/curl/version-major-7-8.patch deleted file mode 100644 index 6d3bdf95965813..00000000000000 --- a/ports/curl/version-major-7-8.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed60f07bc..270a562d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1609,6 +1609,15 @@ write_basic_package_version_file( - VERSION ${CURL_VERSION} - COMPATIBILITY SameMajorVersion - ) -+file(READ "${version_config}" generated_version_config) -+file(WRITE "${version_config}" " -+if(NOT PACKAGE_FIND_VERSION_RANGE AND PACKAGE_FIND_VERSION_MAJOR STREQUAL \"7\") -+ # Version 8 satisfies version 7... requirements -+ set(PACKAGE_FIND_VERSION_MAJOR 8) -+ set(PACKAGE_FIND_VERSION_COUNT 1) -+endif() -+${generated_version_config}" -+) - - # Use: - # * TARGETS_EXPORT_NAME diff --git a/versions/baseline.json b/versions/baseline.json index c694d0aa85521a..0035d264ef0907 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1941,7 +1941,7 @@ "port-version": 8 }, "curl": { - "baseline": "8.0.1", + "baseline": "8.1.2", "port-version": 0 }, "curlpp": { diff --git a/versions/c-/curl.json b/versions/c-/curl.json index a33cd726ac1f4e..3f36e6a8a9c03b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d", + "version": "8.1.2", + "port-version": 0 + }, { "git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f", "version": "8.0.1", From 85da6f8e1937a4069fb766f41dbf4ea5c31514b5 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 3 Jun 2023 02:16:57 +0800 Subject: [PATCH 210/533] [opentelemetry_cpp] Update to 1.9.1 (#31754) * update to 1.9.1 * update versions * add blank line * update version --- .../opentelemetry-cpp/add-missing-dependencies.patch | 12 ++++++------ .../add-missing-find-dependency.patch | 6 +++--- ports/opentelemetry-cpp/portfile.cmake | 2 +- ports/opentelemetry-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/opentelemetry-cpp.json | 5 +++++ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ports/opentelemetry-cpp/add-missing-dependencies.patch b/ports/opentelemetry-cpp/add-missing-dependencies.patch index 585fd8a4e155df..2de8be70c7a2c1 100644 --- a/ports/opentelemetry-cpp/add-missing-dependencies.patch +++ b/ports/opentelemetry-cpp/add-missing-dependencies.patch @@ -1,15 +1,15 @@ diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake -index 1aa1ba0..10e2f58 100644 +index 34b33d3..19e67e9 100644 --- a/cmake/opentelemetry-proto.cmake +++ b/cmake/opentelemetry-proto.cmake -@@ -285,6 +285,10 @@ else() # cmake 3.8 or lower - target_link_libraries(opentelemetry_proto INTERFACE ${Protobuf_LIBRARIES}) +@@ -311,6 +311,10 @@ if(WITH_OTLP_GRPC) + endif() endif() - + +if(TARGET gRPC::grpc++) + target_link_libraries(opentelemetry_proto PUBLIC gRPC::grpc++) +endif() + if(BUILD_SHARED_LIBS) - set_property(TARGET opentelemetry_proto PROPERTY POSITION_INDEPENDENT_CODE ON) - endif() + foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS}) + set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/ports/opentelemetry-cpp/add-missing-find-dependency.patch b/ports/opentelemetry-cpp/add-missing-find-dependency.patch index fc125e580079f3..1f9c12d1636026 100644 --- a/ports/opentelemetry-cpp/add-missing-find-dependency.patch +++ b/ports/opentelemetry-cpp/add-missing-find-dependency.patch @@ -1,13 +1,13 @@ diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in -index adae58dd..26427722 100644 +index adae58d..2642772 100644 --- a/cmake/opentelemetry-cpp-config.cmake.in +++ b/cmake/opentelemetry-cpp-config.cmake.in @@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION # ############################################################################## - + find_package(Threads) +include(CMakeFindDependencyMacro) +find_dependency(absl) - + set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 154a01c2f9633c..fa3749a846c79a 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp REF "v${VERSION}" - SHA512 eb7dde38134fd9f51f22a2288a3a1db9eeec3dce3889c02fea82e20738a697449be73d632c3d1889ff159f0274d57bfd066db506149b221fe6ced8f18fdc1237 + SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62 HEAD_REF main PATCHES # Use the compiler's default C++ version. Picking a version with diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index aa00547dcf9cf8..b525fbeb2d56a4 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.8.3", - "port-version": 6, + "version-semver": "1.9.1", "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/versions/baseline.json b/versions/baseline.json index 0035d264ef0907..ea396e3c61cefc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6009,8 +6009,8 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.8.3", - "port-version": 6 + "baseline": "1.9.1", + "port-version": 0 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 347650bed4a91f..9afb692e5787fc 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c5c172ee9a7c663746a3c1cbabb359a1cbaf56", + "version-semver": "1.9.1", + "port-version": 0 + }, { "git-tree": "dfd999f93f24e916631d57bf73c0bf02f8c2da0a", "version-semver": "1.8.3", From 9700cf2cc61a5bbe7543bb0e2bf7454a8f1fb713 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 2 Jun 2023 11:17:21 -0700 Subject: [PATCH 211/533] [liburing] Update to 2.3 (#31756) * [liburing] Update to 2.3 * update version --- ports/liburing/portfile.cmake | 7 +++---- ports/liburing/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/l-/liburing.json | 5 +++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 3d36e55c453093..538cdf2bc595e0 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing - REF dda4848a9911120a903bef6284fb88286f4464c9 #liburing-2.2 - SHA512 c2e4969ffb895996bf7465ce86143d4d3401a052624ec19580d34e8adbb2b57801e03541493f61e19a3137984714db645b135b1bc3b41987bccfd926bb486c09 + REF "liburing-${VERSION}" + SHA512 0eda230e527e696189aa04c63f8c444bbfc2e5d2f6b1f2ac9454accdd0aa435979017b803d869c25c29a8575237bec25a8414940a09b6e1e971d84f7e8797506 HEAD_REF master PATCHES fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED @@ -17,8 +17,7 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 704a64c1f892c6..8664faf370d767 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,9 +1,8 @@ { "name": "liburing", - "version": "2.2", - "port-version": 2, + "version": "2.3", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", - "license": null, + "license": "MIT OR LGPL-2.1 OR GPL-2.0", "supports": "linux" } diff --git a/versions/baseline.json b/versions/baseline.json index ea396e3c61cefc..c51e88302ccbd5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4669,8 +4669,8 @@ "port-version": 2 }, "liburing": { - "baseline": "2.2", - "port-version": 2 + "baseline": "2.3", + "port-version": 0 }, "libusb": { "baseline": "1.0.26.11791", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 7cf524347e2e5f..6b424f664bbece 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c8b60f54ff0c4e9a0ae2a1a2cbcf72e2cfeaf04", + "version": "2.3", + "port-version": 0 + }, { "git-tree": "92a2fd81331f9b6ad3119a166ed18159499fa403", "version": "2.2", From 792078465c6024823cd827f2fd52560bd642028c Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 3 Jun 2023 02:19:48 +0800 Subject: [PATCH 212/533] [libadwaita] update to 1.3.2 (#31758) --- ports/libadwaita/portfile.cmake | 6 +++--- ports/libadwaita/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libadwaita.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libadwaita/portfile.cmake b/ports/libadwaita/portfile.cmake index fc697195fb709f..95bff5161465a4 100644 --- a/ports/libadwaita/portfile.cmake +++ b/ports/libadwaita/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libadwaita - REF a905117bd2150de9e85d65f8cdce8d8fb001b89e # 1.2.0 - SHA512 7fc3c054e261d09acefde5571848f36cbe0956c2a9a8c7b4dda255e2a48b96496b3481b325b13e9a93232f2280acb74d63872f3452b64d510d749109c0b0b078 + REF "${VERSION}" + SHA512 5cea6396bab3439fb3ddef95fe86bc84955ce1eb426fc5dd323329eeab8a51e10de5f4d9c45380f905ceea43e094362a577a67386a3ddcefff362af030c8c7e3 HEAD_REF main PATCHES ) @@ -20,7 +20,7 @@ vcpkg_configure_meson( -Dexamples=false -Dvapi=false ADDITIONAL_BINARIES - glib-genmarshal='${GLIB_TOOLS_DIR}/glib-genmarshal${VCPKG_HOST_EXECUTABLE_SUFFIX}' + glib-genmarshal='${GLIB_TOOLS_DIR}/glib-genmarshal' glib-mkenums='${GLIB_TOOLS_DIR}/glib-mkenums' glib-compile-resources='${GLIB_TOOLS_DIR}/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' glib-compile-schemas='${GLIB_TOOLS_DIR}/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' diff --git a/ports/libadwaita/vcpkg.json b/ports/libadwaita/vcpkg.json index 7c43a9e5aac56d..b8420443304dd3 100644 --- a/ports/libadwaita/vcpkg.json +++ b/ports/libadwaita/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libadwaita", - "version": "1.2.0", + "version": "1.3.2", "description": "Building blocks for modern GNOME applications", "homepage": "https://gnome.pages.gitlab.gnome.org/libadwaita", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index c51e88302ccbd5..85773f133c41e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3821,7 +3821,7 @@ "port-version": 1 }, "libadwaita": { - "baseline": "1.2.0", + "baseline": "1.3.2", "port-version": 0 }, "libaiff": { diff --git a/versions/l-/libadwaita.json b/versions/l-/libadwaita.json index ead14d6307fd0f..19c48d57b52c47 100644 --- a/versions/l-/libadwaita.json +++ b/versions/l-/libadwaita.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c273bec50ed1314ccfb55bd957905df22c9ed61", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "259b1d8ef5c02605235b773df4382e86ef0df01a", "version": "1.2.0", From 662dbb50e63af15baa2909b7eac5b1b87e86a0aa Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 2 Jun 2023 20:21:25 +0200 Subject: [PATCH 213/533] allow blank issues (#31755) --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ffa53d8351bee1..9ca38f803334ba 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: false +blank_issues_enabled: true contact_links: - name: I have a question url: https://github.com/microsoft/vcpkg/discussions From 04d50defc7ead2841b593c358f9b15e03ea4bf0e Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 6 Jun 2023 02:23:14 +0800 Subject: [PATCH 214/533] [usockets] update to 0.8.6 (#31824) * update to 0.8.6 * update version --- ports/usockets/portfile.cmake | 2 +- ports/usockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/usockets.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake index 0dbbdadf091dad..29584fc620bab7 100644 --- a/ports/usockets/portfile.cmake +++ b/ports/usockets/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uSockets REF "v${VERSION}" - SHA512 89aadb2d077f58e5450ff62e685b894925113cedfa15cda03a9331fb9adcedcdd2f5fd51a8eae0719143566bef89c658bd75a2553282479d20b40c1d3042d273 + SHA512 a4f71e146003056c4a3e99512e6989fd4a37b5943dfcaf593b7b276231c426abd2e1f60de752443fb62ac5926ecf9812866af3c8ce6c8eeeddffc92fa0eb5afb HEAD_REF master ) diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index ec2d4cc3637e68..ca0c8ac3555e2b 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "usockets", - "version": "0.8.5", + "version": "0.8.6", "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 85773f133c41e5..ae5cfbc8a94e24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8289,7 +8289,7 @@ "port-version": 0 }, "usockets": { - "baseline": "0.8.5", + "baseline": "0.8.6", "port-version": 0 }, "usrsctp": { diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index 2cbf659aeb34fe..7f5b80c9fb4f4b 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "648715b141f4bb501ebc83d09da547ee0b3fe467", + "version": "0.8.6", + "port-version": 0 + }, { "git-tree": "79d76cd232129419d6e9e3afdc6ba689f4c00bf7", "version": "0.8.5", From 7620e50baedf9d6636f9a5d4dc527efe79271dc7 Mon Sep 17 00:00:00 2001 From: Michael MIGLIORE Date: Mon, 5 Jun 2023 22:37:51 +0200 Subject: [PATCH 215/533] [opencascade] Fix shared lib on Linux (#31806) --- ports/opencascade/portfile.cmake | 2 +- ports/opencascade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 1c1984bbe52f34..191d000aadf5bc 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -98,7 +98,7 @@ if (NOT VCPKG_BUILD_TYPE) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # debug creates libd and bind directories that need moving file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index b44e8d573d54e3..37efb036445e8d 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencascade", "version": "7.6.2", - "port-version": 3, + "port-version": 4, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index ae5cfbc8a94e24..042efb443eafbf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5870,7 +5870,7 @@ }, "opencascade": { "baseline": "7.6.2", - "port-version": 3 + "port-version": 4 }, "opencc": { "baseline": "1.1.6", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 481908454808d7..be251b3a3082b3 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "935cc481bbce6ae22ed3257376f0a3edb198d3e2", + "version": "7.6.2", + "port-version": 4 + }, { "git-tree": "3bf7c68565ee022f685f20eb18bb2e38cfdffb17", "version": "7.6.2", From 396fca31e6987f655ff7b8f978e3295f701c43ca Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 6 Jun 2023 04:40:50 +0800 Subject: [PATCH 216/533] [quickfix]: fix exception specification (#31797) --- ports/quickfix/00001-fix-build.patch | 2 +- ports/quickfix/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quickfix.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quickfix/00001-fix-build.patch b/ports/quickfix/00001-fix-build.patch index ddbd6186fdd885..27c09096b63f56 100644 --- a/ports/quickfix/00001-fix-build.patch +++ b/ports/quickfix/00001-fix-build.patch @@ -75,7 +75,7 @@ index 0aa2cd3e..2829e110 100644 #endif +#ifdef __cpp_noexcept_function_type -+#define QUICKFIX_THROW(...) noexcept(false) ++#define QUICKFIX_THROW(...) noexcept +#else +#define QUICKFIX_THROW(...) throw(__VA_ARGS__) +#endif diff --git a/ports/quickfix/vcpkg.json b/ports/quickfix/vcpkg.json index 748140573f2dc5..5ee3acb467d049 100644 --- a/ports/quickfix/vcpkg.json +++ b/ports/quickfix/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quickfix", "version": "1.15.1", - "port-version": 8, + "port-version": 9, "description": "QuickFIX is a free and open source implementation of the FIX protocol.", "homepage": "https://github.com/quickfix/quickfix", "supports": "!uwp & !(osx & arm64)", diff --git a/versions/baseline.json b/versions/baseline.json index 042efb443eafbf..e306b025a27780 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6922,7 +6922,7 @@ }, "quickfix": { "baseline": "1.15.1", - "port-version": 8 + "port-version": 9 }, "quill": { "baseline": "2.9.1", diff --git a/versions/q-/quickfix.json b/versions/q-/quickfix.json index 572afd7c588750..969cfa66d88d59 100644 --- a/versions/q-/quickfix.json +++ b/versions/q-/quickfix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08f8b2eb6b5493a1faae9707021fe1d287ed6fa5", + "version": "1.15.1", + "port-version": 9 + }, { "git-tree": "a8cdc0c05fb161bb28059f93d8dc05ea60d4c118", "version": "1.15.1", From 395ee62e8ba1cf655d848cc0b5e5aa4a2358fedb Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 6 Jun 2023 04:41:14 +0800 Subject: [PATCH 217/533] [daw-header-libraries,daw-json-link]: head-lib update to 2.93.1, json-link update to 3.17.2 (#31794) --- ports/daw-header-libraries/portfile.cmake | 2 +- ports/daw-header-libraries/vcpkg.json | 2 +- ports/daw-json-link/portfile.cmake | 2 +- ports/daw-json-link/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/daw-header-libraries.json | 5 +++++ versions/d-/daw-json-link.json | 5 +++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 07904fe71c4395..3a63ea826d3f04 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries REF "v${VERSION}" - SHA512 caa975cbaa48367148b1f0f13fc12896ff5dd921a7a851853e9e4f4110004fe913f5f18fad6636a281c5c177da77c04877a92c82e40dfa47cc71434087e7fb45 + SHA512 b82973fb71b02263a0c22b1d24c2b2f8cd81bf09f9511d7ec5b656766c361cf6d7f35da2d35ccb2894da3d843b7c342959b7ef701bbe40381e8665ffd5073a9e HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 6ee230972b4add..e869d8dde8c738 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.88.0", + "version": "2.93.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 7668b83096d490..9abcdbbb5d88ae 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link REF "v${VERSION}" - SHA512 dc412cf07c1ef8cdb2b6267d6b630b6396541a49c44ee2d2b2b21f49c61cde387aff81548635c7c043a88aa90f3632aefe6bf0ec79453c5b58c80669e6a84cd2 + SHA512 e5c5076678406fe975e6e5643664d70798737126fcf465b73c4c1e2cfa5c14723ba0a0effd6929b7e5bfcdcf0fe3038774d47a0cf6bdaccd83f1be46fae2c877 HEAD_REF master ) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index c423238e9af184..610886fa5ddb5d 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.15.0", + "version": "3.17.2", "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/versions/baseline.json b/versions/baseline.json index e306b025a27780..023f1cc29bd475 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2009,11 +2009,11 @@ "port-version": 1 }, "daw-header-libraries": { - "baseline": "2.88.0", + "baseline": "2.93.1", "port-version": 0 }, "daw-json-link": { - "baseline": "3.15.0", + "baseline": "3.17.2", "port-version": 0 }, "daw-utf-range": { diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 5f343f3aaadf01..c9156532ab7b20 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff99cdb3f50ade01a8d2e56cf5bc3eb481e5c736", + "version": "2.93.1", + "port-version": 0 + }, { "git-tree": "4d509d523fd58793c43034e371dd65d499cec986", "version": "2.88.0", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 46dcb5a885ba2e..586f52a5b65fea 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf2815582532566a0526546e16b40d60127c8fdb", + "version": "3.17.2", + "port-version": 0 + }, { "git-tree": "2b4fd6d994392648fb87dec71c1f23e0d8fc6d85", "version": "3.15.0", From c6ba8a18a1513f0697a83cf88bd5e21300fc3fff Mon Sep 17 00:00:00 2001 From: MoeSzyslak98 <68633719+MoeSzyslak98@users.noreply.github.com> Date: Tue, 6 Jun 2023 00:11:45 +0330 Subject: [PATCH 218/533] [flatbuffers] Update to 23.5.26 (#31780) * [flatbuffers] v23.5.26 port update * baseline fixed --- ports/flatbuffers/portfile.cmake | 2 +- ports/flatbuffers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flatbuffers.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index afb8009e264dfb..4adaf46459806b 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers REF "v${VERSION}" - SHA512 6eb5417984782208e0fcc33285d02bb13cda526d4029e0dd58e27c4f813eb39f26105ab0ed0880f7c02614985b96a241aad5086dd4f2d131c534a44a2884d08e + SHA512 cd0a5efad8016e1217d01a181d6b02e546f5693c6412361bfeaee820d5dfe5e2a424cee1963270e851c1a4f936ae8a0032a51c5bb16ee19313e0ecc77dc4ba31 HEAD_REF master PATCHES fix-uwp-build.patch diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index 6c8746376b6a82..f52dbbb3c04148 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flatbuffers", - "version": "23.5.9", + "version": "23.5.26", "description": [ "Memory Efficient Serialization Library", "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." diff --git a/versions/baseline.json b/versions/baseline.json index 023f1cc29bd475..6675d30584edd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,7 +2521,7 @@ "port-version": 0 }, "flatbuffers": { - "baseline": "23.5.9", + "baseline": "23.5.26", "port-version": 0 }, "flecs": { diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 63792a3928a741..9bf9340f37876d 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5146d5516c8570263780a1cdf73df98d70936e07", + "version": "23.5.26", + "port-version": 0 + }, { "git-tree": "787f5c089a87c5896ef5f0f8b200de1d1081158c", "version": "23.5.9", From 89f3bf357c8f59953dea735e5dc8169de1946440 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 5 Jun 2023 13:42:09 -0700 Subject: [PATCH 219/533] [azure-core-cpp] Update to 1.10.0 (#31779) ## 1.10.0 (2023-06-01) ### Features Added - Added `Azure::Core::Uuid::AsArray()` and `Azure::Core::Uuid::CreateFromArray()` to enable reading or writing from an existing UUID. This is useful when the UUID was generated outside the Azure SDK, or needs to be used from a component outside the Azure SDK. ### Other Changes - [[#3964]](https://github.com/Azure/azure-sdk-for-cpp/issues/3964) Ensuring some Azure SDK types have the expected default operations. (A community contribution, courtesy of _[jnyfah](https://github.com/jnyfah)_) ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Jennifer Chukwu _([GitHub](https://github.com/jnyfah))_ --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index e9a8ed2c69ef18..2c99f04a2dc488 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.9.0 - SHA512 15650af728123e902c5bcf99ae2e8186b7ad77fe1187f11f379ec7c0dab5a0aba197d6cf6e5348845f51fa0f2d195e9f8eba9595756e600c166bebdf0a8c1b31 + REF azure-core_1.10.0 + SHA512 8917d5a3934a743bd8b44dacc12c3cd410cd59f1fa596c36a50f78562a1c7fe7a189c762e4099f3b24d23fcf5dcb0243ac3f139f1d345e6283ff4b5db418ecda ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 00290ccf0a12be..1b14cfbc5aa7c1 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.9.0", + "version-semver": "1.10.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index e490d58ac577f9..081e2dd93fd8c2 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b74424cb6faf3443c02effba66f048e0539437aa", + "version-semver": "1.10.0", + "port-version": 0 + }, { "git-tree": "307d4685a0813bb00150dfe87aed0b3fbf88c179", "version-semver": "1.9.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6675d30584edd7..4c53d1d1436dd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -393,7 +393,7 @@ "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.9.0", + "baseline": "1.10.0", "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { From 1bc0cf857dbac6065d229a27affa4f8efdb42ac4 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 5 Jun 2023 13:58:05 -0700 Subject: [PATCH 220/533] [teemo] remove port (#31821) Co-authored-by: Zhao Liu --- ports/teemo/portfile.cmake | 38 -------------------------------------- ports/teemo/vcpkg.json | 22 ---------------------- versions/baseline.json | 4 ---- 3 files changed, 64 deletions(-) delete mode 100644 ports/teemo/portfile.cmake delete mode 100644 ports/teemo/vcpkg.json diff --git a/ports/teemo/portfile.cmake b/ports/teemo/portfile.cmake deleted file mode 100644 index a6db3539602246..00000000000000 --- a/ports/teemo/portfile.cmake +++ /dev/null @@ -1,38 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO winsoft666/teemo - REF 03f40f92bfbf3b83dc597a60ba36582505adfa54 - SHA512 86962883dfe09f90c4892deb0235e4f71fc295fb837e2b33a9bcf240b4f91d0e191157968d28a6ec02dfe3f8cb9a3869c6bb5986b8a0ea96250fce6c27fe1172 - HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TEEMO_STATIC) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_CRT) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DTEEMO_STATIC:BOOL=${TEEMO_STATIC} - -DUSE_STATIC_CRT:BOOL=${USE_STATIC_CRT} - -DBUILD_TESTS:BOOL=OFF -) - -vcpkg_cmake_install() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/teemo") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/teemo) -elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/teemo") - vcpkg_cmake_config_fixup(CONFIG_PATH share/teemo) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 1") -else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if 0") -endif() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json deleted file mode 100644 index c4428ccf1bd66f..00000000000000 --- a/ports/teemo/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "teemo", - "version": "2.7", - "maintainers": "winsoft666 ", - "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", - "homepage": "https://github.com/winsoft666/teemo", - "supports": "!osx & !uwp & !arm", - "dependencies": [ - { - "name": "curl", - "default-features": false - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 4c53d1d1436dd4..be232c46fa34cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7908,10 +7908,6 @@ "baseline": "1.0.3", "port-version": 0 }, - "teemo": { - "baseline": "2.7", - "port-version": 0 - }, "telnetpp": { "baseline": "2.1.2", "port-version": 3 From cc968d00bd7b67aa5d0f6b673c1f9da215d644f8 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 6 Jun 2023 01:01:15 +0400 Subject: [PATCH 221/533] [tbb] added Android as supported platform (#31738) * [tbb] added Android support * updated version files * [usd] turned off Android support * updated versions files --- ports/tbb/portfile.cmake | 12 +++++------- ports/tbb/vcpkg.json | 4 ++-- ports/usd/vcpkg.json | 3 ++- versions/baseline.json | 4 ++-- versions/t-/tbb.json | 5 +++++ versions/u-/usd.json | 5 +++++ 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index c9f98efb4f0881..68c5c6d8a15ea3 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -24,18 +24,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB") -vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -set(arch_suffix "") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch_suffix "32") -endif() - - if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^(x86|arm|wasm32)$") + set(arch_suffix "32") + endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tbb${arch_suffix}.pc" "-ltbb12" "-ltbb12_debug") + unset(arch_suffix) endif() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc" diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index 6b17fda36005b2..69352fc6f6d79b 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -2,11 +2,11 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2021.9.0", - "port-version": 1, + "port-version": 2, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", - "supports": "(windows & !uwp) | linux | osx | ios", + "supports": "(windows & !uwp) | linux | osx | ios | android", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index aa10eaf5a8121e..5cd95382f3029f 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,10 +1,11 @@ { "name": "usd", "version": "23.5", + "port-version": 1, "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, - "supports": "!x86 & !arm", + "supports": "!x86 & !arm & !android", "dependencies": [ "boost-assign", "boost-crc", diff --git a/versions/baseline.json b/versions/baseline.json index be232c46fa34cd..7b2fac742530a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7890,7 +7890,7 @@ }, "tbb": { "baseline": "2021.9.0", - "port-version": 1 + "port-version": 2 }, "tcb-span": { "baseline": "2021-12-15", @@ -8282,7 +8282,7 @@ }, "usd": { "baseline": "23.5", - "port-version": 0 + "port-version": 1 }, "usockets": { "baseline": "0.8.6", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index a63cac549edba0..f62ba5397821dc 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d050b3a84687479bb03134f98f6360bfb72e64a8", + "version": "2021.9.0", + "port-version": 2 + }, { "git-tree": "97a86c92ba0419c50673782f0b3a7f1568aaaef7", "version": "2021.9.0", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 1b163da1cea196..5ca746912cc955 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfe836715c8cf43db76006deffa234cecf77745c", + "version": "23.5", + "port-version": 1 + }, { "git-tree": "5a5cb56688d1804bb35d8e361cfd41ef858919c9", "version": "23.5", From da58d7dc45b5f181d039f767ac00d2ab0397c27e Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 6 Jun 2023 05:04:33 +0800 Subject: [PATCH 222/533] [vcpkg baseline][sais/stdexec] Remove port sais and fix stdexec hash (#31773) * remove port sais * fix stdexec hash * update stdexec version * replaced main with a tag * update stdexec version --------- Co-authored-by: Monica --- ports/sais/portfile.cmake | 26 -------------------------- ports/sais/vcpkg.json | 12 ------------ ports/stdexec/portfile.cmake | 6 +++--- ports/stdexec/vcpkg.json | 2 +- versions/baseline.json | 6 +----- versions/s-/stdexec.json | 5 +++++ 6 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 ports/sais/portfile.cmake delete mode 100644 ports/sais/vcpkg.json diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake deleted file mode 100644 index 2a170918aa5598..00000000000000 --- a/ports/sais/portfile.cmake +++ /dev/null @@ -1,26 +0,0 @@ - -vcpkg_download_distfile(ARCHIVE - URLS "https://sites.google.com/site/yuta256/sais-2.4.1.zip" - FILENAME "sais-2.4.1.zip" - SHA512 6f6dd11f842f680bebc1d9b7f6b75752c9589c600fdd5e6373bb7290a686f1de35d4cc3226347e717f89a295363f7fee0ae8b1aa05ad341f4c2ea056fb5b1425 -) - -vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${ARCHIVE}" -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_SAIS64=ON -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json deleted file mode 100644 index 35161b92c9fdeb..00000000000000 --- a/ports/sais/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "sais", - "version": "2.4.1", - "port-version": 5, - "description": "An implementation of the induced sorting algorithm", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/stdexec/portfile.cmake b/ports/stdexec/portfile.cmake index 208a3e422bb8c4..ee4764fda9f233 100644 --- a/ports/stdexec/portfile.cmake +++ b/ports/stdexec/portfile.cmake @@ -25,9 +25,9 @@ vcpkg_download_distfile(RAPIDS_cmake file(COPY "${RAPIDS_cmake}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") vcpkg_download_distfile(execution_bs - URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/main/execution.bs" + URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/R7/execution.bs" FILENAME "execution.bs" - SHA512 22493329bcc26d4c30950df632349daf632adee87bdc904167afcdbb1f9398da2ca3ce9aad1d1c9dab961a2946b0fb9e5b66619b8a529f7cf04fe6aec01c5bb8 + SHA512 90f2a1d150b03c29bb05a5420e091c2371cb973335a089916716d778bc1081764436dc1ff0fec60f642ddb0ca5492c8b0c3a6d5451c2d60a42911f918fe980fa ) file(COPY "${execution_bs}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") @@ -47,4 +47,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/stdexec) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/stdexec/vcpkg.json b/ports/stdexec/vcpkg.json index 04d05f51be0356..0ae84d6f026b3d 100644 --- a/ports/stdexec/vcpkg.json +++ b/ports/stdexec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "stdexec", "version-date": "2023-03-05", - "port-version": 1, + "port-version": 2, "description": "stdexec is an experimental reference implementation of the Senders model of asynchronous programming proposed by P2300 - std::execution for adoption into the C++ Standard.", "homepage": "https://github.com/NVIDIA/stdexec", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7b2fac742530a4..524e372f8b907e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7248,10 +7248,6 @@ "baseline": "0.9.0-rc3", "port-version": 2 }, - "sais": { - "baseline": "2.4.1", - "port-version": 5 - }, "sajson": { "baseline": "2018-09-21", "port-version": 3 @@ -7786,7 +7782,7 @@ }, "stdexec": { "baseline": "2023-03-05", - "port-version": 1 + "port-version": 2 }, "stduuid": { "baseline": "1.2.2", diff --git a/versions/s-/stdexec.json b/versions/s-/stdexec.json index 1f35eea46ac2a9..eda5d41d750883 100644 --- a/versions/s-/stdexec.json +++ b/versions/s-/stdexec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "945f9fceea838cc9f1c251a801a39244785cb08e", + "version-date": "2023-03-05", + "port-version": 2 + }, { "git-tree": "3435db06cfe7eb2aa08dd32988c2360017bb66f1", "version-date": "2023-03-05", From c48c767286550fc316055f6aa3c381396f19e640 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 5 Jun 2023 23:09:39 +0200 Subject: [PATCH 223/533] [starlink-ast] Switch tarball, misc fixes (#31663) * [starlink-ast] Switch tarball, minor fixes * No absolute paths --- ports/starlink-ast/cminpack.diff | 33 ++++++++++++++++++++++++++ ports/starlink-ast/portfile.cmake | 39 +++++++++++++++++-------------- ports/starlink-ast/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/starlink-ast.json | 5 ++++ 5 files changed, 61 insertions(+), 19 deletions(-) diff --git a/ports/starlink-ast/cminpack.diff b/ports/starlink-ast/cminpack.diff index c73b2b707c4de0..deb5e2d7055426 100644 --- a/ports/starlink-ast/cminpack.diff +++ b/ports/starlink-ast/cminpack.diff @@ -1,3 +1,36 @@ +diff --git a/Makefile.in b/Makefile.in +index a935107..51c5e07 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1572,13 +1572,13 @@ libast_la_SOURCES = \ + libast_la_LDFLAGS = -version-info @version_info@ + @EXTERNAL_CMINPACK_FALSE@@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la libast_cminpack.la + @EXTERNAL_CMINPACK_FALSE@@EXTERNAL_PAL_TRUE@libast_la_LIBADD = -lpal libast_cminpack.la +-@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la -lcminpack ++@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la $(LIBCMINPACK) + + # Ensure libast links against libraries containing functions used within + # libast. If AST is configured --with-external-pal, then the internal + # libast_pal library will be empty, and we link to an external PAL + # library instead. Do the same for cminpack +-@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_TRUE@libast_la_LIBADD = -lpal -lcminpack ++@EXTERNAL_CMINPACK_TRUE@@EXTERNAL_PAL_TRUE@libast_la_LIBADD = -lpal $(LIBCMINPACK) + + # AST_PAR is really part of GRP_F_INCLUDE_FILES, but it must not be + # distributed, so list it separately. +diff --git a/configure b/configure +index d9db3ee..f3d3fc0 100755 +--- a/configure ++++ b/configure +@@ -15763,7 +15763,7 @@ fi + EXTERNAL_CMINPACK=$external_cminpack + + if test "$external_cminpack" = "1"; then +- LIBCMINPACK="-lcminpack" ++ LIBCMINPACK="-lcminpack$CMINPACK_DEBUG_SUFFIX" + + + $as_echo "#define EXTERNAL_CMINPACK 1" >>confdefs.h diff --git a/src/polymap.c b/src/polymap.c index 0b436cc..1aee268 100644 --- a/src/polymap.c diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index 9f0e6c61cec62b..d416b91546b512 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -1,35 +1,26 @@ -# There is no 9.2.10 tarball with generated `configure`. -# Reconfiguration needs a custom starlink autoconf. -# Cf. https://github.com/Starlink/ast/issues/21 +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_download_distfile(ARCHIVE - # regular: "https://github.com/Starlink/ast/releases/download/v${VERSION}/ast-${VERSION}.tar.gz" - URLS "https://github.com/Starlink/ast/files/8843897/ast-9.2.9.tar.gz" # not a release asset or tarball + URLS "https://github.com/Starlink/ast/releases/download/v${VERSION}/ast-${VERSION}.tar.gz" FILENAME "starlink-ast-${VERSION}.tar.gz" - SHA512 af19cdf41e20d9e92850d90ea760bd21bc9a53ca5bb181a6e27322a610fd13cd6cef30aaf8de6193a2c3fe3c66428b3bd46492a6b22ac22f18cd9be712aa357b + SHA512 b559535496b88b33845bd3732bb6ee80572dc0d8d963173e0199d44be09add244244d9aab90642de84c65714bca6c73b5bdc3b3290a55f171e6f3ce7643250f5 ) -vcpkg_download_distfile(UPDATE_DIFF - URLS "https://github.com/Starlink/ast/compare/v9.2.9...v${VERSION}.diff" - FILENAME "starlink-ast-v9.2.9...v${VERSION}.diff" - SHA512 fd1255eaefcfdb57273ba241fc604e3ab5eabd2212c17f10daac8fd23436f6d50272bfa35bac292097441ff5334e3d28d12ea6d7d90838f6058e05fc7067c966 -) -file(READ "${UPDATE_DIFF}" diff) -set(files_to_ignore "(configure\\.ac|Makefile|\\.gitignore|component\\.xml)") -string(REGEX REPLACE "diff --git a/${files_to_ignore}[^\n]*\n([-+@ i][^\n]*\n)*" "" diff "${diff}") -file(WRITE "${CURRENT_BUILDTREES_DIR}/update-${VERSION}.diff" "${diff}") vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES cminpack.diff - "${CURRENT_BUILDTREES_DIR}/update-${VERSION}.diff" ) file(REMOVE_RECURSE "${SOURCE_PATH}/cminpack") -vcpkg_replace_string("${SOURCE_PATH}/configure" "9.2.9" "9.2.10") set(CONFIGURE_OPTIONS --without-fortran --with-external-cminpack + "--with-starlink=${CURRENT_INSTALLED_DIR}" + FC=false ) if ("yaml" IN_LIST FEATURES) @@ -51,8 +42,13 @@ vcpkg_configure_make( ADDITIONAL_MSYS_PACKAGES perl OPTIONS ${CONFIGURE_OPTIONS} + OPTIONS_DEBUG + CMINPACK_DEBUG_SUFFIX=_d +) +vcpkg_install_make( + OPTIONS + STAR_LDFLAGS= # Do not override build type's lib dirs ) -vcpkg_install_make() # Avoid vcpkg artifact issues with symlinks foreach(ast_lib IN ITEMS "${CURRENT_PACKAGES_DIR}/lib/libast" "${CURRENT_PACKAGES_DIR}/debug/lib/libast") @@ -75,6 +71,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/ast" ) +# Remove cl preprocessing comments +foreach(file IN ITEMS "include/ast.h" "include/star/ast.h") + file(READ "${CURRENT_PACKAGES_DIR}/${file}" cpp_output) + string(REGEX REPLACE "#line [^ ]+ \"[^\"]*\"" "" cpp_output "${cpp_output}") + file(WRITE "${CURRENT_PACKAGES_DIR}/${file}" "${cpp_output}") +endforeach() + vcpkg_install_copyright( FILE_LIST "${SOURCE_PATH}/COPYING.LESSER" diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 932834422422c5..52812fa27683b6 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "starlink-ast", "version": "9.2.10", + "port-version": 1, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 524e372f8b907e..1fcee846316de5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7762,7 +7762,7 @@ }, "starlink-ast": { "baseline": "9.2.10", - "port-version": 0 + "port-version": 1 }, "staticjson": { "baseline": "1.0.0", diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index 1134be1b4df3d8..a2150030d177db 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13d3dcf5fe4db3f9c3ec43869b4a4e343c35ff65", + "version": "9.2.10", + "port-version": 1 + }, { "git-tree": "f79db80b697effc13bf43a3d370701e0e7a244c4", "version": "9.2.10", From 259762c386bc8cdfa26509ecbb0bf82bdb752c56 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 6 Jun 2023 21:27:45 +0200 Subject: [PATCH 224/533] nghttp3: update to 0.12.0 (#31829) --- ports/nghttp3/portfile.cmake | 2 +- ports/nghttp3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index 15d76e51acf56d..33d32af802aae0 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 2f90bfe983370a10b513991d42304dc4200f28d309e7877e7f112dd6363c6ad4b3a9b348f9dc4263a5f8e216c75b662a8cbc7c4f31e75b5bbb2c99fd6e238c86 + SHA512 a1ac58a8911a55140c5bff87c19cd152fdf3417d6ca26a26a230f914f5e7e1154304ecae8726d04832d2dbc37ce01666db2e32f31e5e73ab50ef0c2d300e5ff1 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index bd3e81a2c03259..d10ae9dd26c1df 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.11.0", + "version": "0.12.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1fcee846316de5..9ec0b6571390d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5617,7 +5617,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "0.11.0", + "baseline": "0.12.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 7bcca795650b9f..d30a126da417c4 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "868b3e41f403af9da33191e05418e37f71a46c30", + "version": "0.12.0", + "port-version": 0 + }, { "git-tree": "8139cb08a1dea31b13af01d3027129cf7874acab", "version": "0.11.0", From 5d3798ac7388ca66c169773e46103b14077b76a4 Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Tue, 6 Jun 2023 12:33:33 -0700 Subject: [PATCH 225/533] [boost] Remove port version constraints (#31572) * remove port version constraints * remove port version constraint * bump port version * version db --------- Co-authored-by: Zhao Liu --- ports/boost-accumulators/vcpkg.json | 44 +-- ports/boost-algorithm/vcpkg.json | 38 +-- ports/boost-align/vcpkg.json | 12 +- ports/boost-any/vcpkg.json | 18 +- ports/boost-array/vcpkg.json | 14 +- ports/boost-asio/vcpkg.json | 40 +-- ports/boost-assert/vcpkg.json | 6 +- ports/boost-assign/vcpkg.json | 26 +- ports/boost-atomic/vcpkg.json | 24 +- ports/boost-beast/vcpkg.json | 46 +-- ports/boost-bimap/vcpkg.json | 30 +- ports/boost-bind/vcpkg.json | 8 +- ports/boost-build/vcpkg.json | 4 +- ports/boost-callable-traits/vcpkg.json | 4 +- ports/boost-chrono/vcpkg.json | 38 +-- ports/boost-circular-buffer/vcpkg.json | 20 +- ports/boost-compatibility/vcpkg.json | 4 +- ports/boost-compute/vcpkg.json | 58 ++-- ports/boost-concept-check/vcpkg.json | 12 +- ports/boost-config/vcpkg.json | 4 +- ports/boost-container-hash/vcpkg.json | 12 +- ports/boost-container/vcpkg.json | 18 +- ports/boost-context/vcpkg.json | 22 +- ports/boost-contract/vcpkg.json | 40 +-- ports/boost-conversion/vcpkg.json | 18 +- ports/boost-convert/vcpkg.json | 26 +- ports/boost-core/vcpkg.json | 12 +- ports/boost-coroutine/vcpkg.json | 28 +- ports/boost-coroutine2/vcpkg.json | 10 +- ports/boost-crc/vcpkg.json | 12 +- ports/boost-date-time/vcpkg.json | 38 +-- ports/boost-describe/vcpkg.json | 6 +- ports/boost-detail/vcpkg.json | 14 +- ports/boost-dll/vcpkg.json | 34 +-- ports/boost-dynamic-bitset/vcpkg.json | 20 +- ports/boost-endian/vcpkg.json | 12 +- ports/boost-exception/vcpkg.json | 22 +- ports/boost-fiber/vcpkg.json | 28 +- ports/boost-filesystem/vcpkg.json | 36 +-- ports/boost-flyweight/vcpkg.json | 30 +- ports/boost-foreach/vcpkg.json | 16 +- ports/boost-format/vcpkg.json | 18 +- ports/boost-function-types/vcpkg.json | 16 +- ports/boost-function/vcpkg.json | 20 +- ports/boost-functional/vcpkg.json | 22 +- ports/boost-fusion/vcpkg.json | 28 +- ports/boost-geometry/vcpkg.json | 70 ++--- ports/boost-gil/vcpkg.json | 26 +- ports/boost-graph-parallel/vcpkg.json | 60 ++-- ports/boost-graph/vcpkg.json | 90 +++--- ports/boost-hana/vcpkg.json | 14 +- ports/boost-heap/vcpkg.json | 28 +- ports/boost-histogram/vcpkg.json | 18 +- ports/boost-hof/vcpkg.json | 4 +- ports/boost-icl/vcpkg.json | 34 +-- ports/boost-integer/vcpkg.json | 16 +- ports/boost-interprocess/vcpkg.json | 24 +- ports/boost-interval/vcpkg.json | 10 +- ports/boost-intrusive/vcpkg.json | 14 +- ports/boost-io/vcpkg.json | 6 +- ports/boost-iostreams/vcpkg.json | 44 +-- ports/boost-iterator/vcpkg.json | 32 +- ports/boost-json/vcpkg.json | 28 +- ports/boost-lambda/vcpkg.json | 24 +- ports/boost-lambda2/vcpkg.json | 4 +- ports/boost-leaf/vcpkg.json | 4 +- ports/boost-lexical-cast/vcpkg.json | 26 +- ports/boost-local-function/vcpkg.json | 18 +- ports/boost-locale/vcpkg.json | 20 +- ports/boost-lockfree/vcpkg.json | 34 +-- ports/boost-log/vcpkg.json | 92 +++--- ports/boost-logic/vcpkg.json | 8 +- ports/boost-math/vcpkg.json | 28 +- ports/boost-metaparse/vcpkg.json | 16 +- ports/boost-modular-build-helper/vcpkg.json | 4 +- ports/boost-move/vcpkg.json | 6 +- ports/boost-mp11/vcpkg.json | 4 +- ports/boost-mpi/vcpkg.json | 44 +-- ports/boost-mpl/vcpkg.json | 18 +- ports/boost-msm/vcpkg.json | 38 +-- ports/boost-multi-array/vcpkg.json | 24 +- ports/boost-multi-index/vcpkg.json | 36 +-- ports/boost-multiprecision/vcpkg.json | 22 +- ports/boost-mysql/vcpkg.json | 24 +- ports/boost-nowide/vcpkg.json | 12 +- ports/boost-numeric-conversion/vcpkg.json | 18 +- ports/boost-odeint/vcpkg.json | 46 +-- ports/boost-optional/vcpkg.json | 24 +- ports/boost-outcome/vcpkg.json | 12 +- ports/boost-parameter-python/vcpkg.json | 12 +- ports/boost-parameter/vcpkg.json | 24 +- ports/boost-pfr/vcpkg.json | 4 +- ports/boost-phoenix/vcpkg.json | 32 +- ports/boost-poly-collection/vcpkg.json | 20 +- ports/boost-polygon/vcpkg.json | 6 +- ports/boost-pool/vcpkg.json | 16 +- ports/boost-predef/vcpkg.json | 4 +- ports/boost-preprocessor/vcpkg.json | 4 +- ports/boost-process/vcpkg.json | 36 +-- ports/boost-program-options/vcpkg.json | 34 +-- ports/boost-property-map-parallel/vcpkg.json | 30 +- ports/boost-property-map/vcpkg.json | 34 +-- ports/boost-property-tree/vcpkg.json | 34 +-- ports/boost-proto/vcpkg.json | 24 +- ports/boost-ptr-container/vcpkg.json | 30 +- ports/boost-python/vcpkg.json | 50 +-- ports/boost-qvm/vcpkg.json | 4 +- ports/boost-random/vcpkg.json | 34 +-- ports/boost-range/vcpkg.json | 38 +-- ports/boost-ratio/vcpkg.json | 18 +- ports/boost-rational/vcpkg.json | 20 +- ports/boost-regex/vcpkg.json | 32 +- ports/boost-safe-numerics/vcpkg.json | 16 +- ports/boost-scope-exit/vcpkg.json | 14 +- ports/boost-serialization/vcpkg.json | 50 +-- ports/boost-signals2/vcpkg.json | 36 +-- ports/boost-smart-ptr/vcpkg.json | 18 +- ports/boost-sort/vcpkg.json | 14 +- ports/boost-spirit/vcpkg.json | 62 ++-- ports/boost-stacktrace/vcpkg.json | 24 +- ports/boost-statechart/vcpkg.json | 28 +- ports/boost-static-assert/vcpkg.json | 6 +- ports/boost-static-string/vcpkg.json | 18 +- ports/boost-stl-interfaces/vcpkg.json | 10 +- ports/boost-system/vcpkg.json | 18 +- ports/boost-test/vcpkg.json | 44 +-- ports/boost-thread/vcpkg.json | 66 ++-- ports/boost-throw-exception/vcpkg.json | 8 +- ports/boost-timer/vcpkg.json | 22 +- ports/boost-tokenizer/vcpkg.json | 16 +- ports/boost-tti/vcpkg.json | 14 +- ports/boost-tuple/vcpkg.json | 12 +- ports/boost-type-erasure/vcpkg.json | 36 +-- ports/boost-type-index/vcpkg.json | 18 +- ports/boost-type-traits/vcpkg.json | 8 +- ports/boost-typeof/vcpkg.json | 10 +- ports/boost-ublas/vcpkg.json | 30 +- ports/boost-uninstall/vcpkg.json | 2 +- ports/boost-units/vcpkg.json | 28 +- ports/boost-unordered/vcpkg.json | 28 +- ports/boost-url/vcpkg.json | 30 +- ports/boost-utility/vcpkg.json | 18 +- ports/boost-uuid/vcpkg.json | 32 +- ports/boost-variant/vcpkg.json | 34 +-- ports/boost-variant2/vcpkg.json | 10 +- ports/boost-vcpkg-helpers/vcpkg.json | 4 +- ports/boost-vmd/vcpkg.json | 6 +- ports/boost-wave/vcpkg.json | 46 +-- ports/boost-winapi/vcpkg.json | 8 +- ports/boost-xpressive/vcpkg.json | 48 +-- ports/boost-yap/vcpkg.json | 10 +- ports/boost/vcpkg.json | 296 +++++++++--------- scripts/boost/generate-ports.ps1 | 17 +- versions/b-/boost-accumulators.json | 5 + versions/b-/boost-algorithm.json | 5 + versions/b-/boost-align.json | 5 + versions/b-/boost-any.json | 5 + versions/b-/boost-array.json | 5 + versions/b-/boost-asio.json | 5 + versions/b-/boost-assert.json | 5 + versions/b-/boost-assign.json | 5 + versions/b-/boost-atomic.json | 5 + versions/b-/boost-beast.json | 5 + versions/b-/boost-bimap.json | 5 + versions/b-/boost-bind.json | 5 + versions/b-/boost-build.json | 5 + versions/b-/boost-callable-traits.json | 5 + versions/b-/boost-chrono.json | 5 + versions/b-/boost-circular-buffer.json | 5 + versions/b-/boost-compatibility.json | 5 + versions/b-/boost-compute.json | 5 + versions/b-/boost-concept-check.json | 5 + versions/b-/boost-config.json | 5 + versions/b-/boost-container-hash.json | 5 + versions/b-/boost-container.json | 5 + versions/b-/boost-context.json | 5 + versions/b-/boost-contract.json | 5 + versions/b-/boost-conversion.json | 5 + versions/b-/boost-convert.json | 5 + versions/b-/boost-core.json | 5 + versions/b-/boost-coroutine.json | 5 + versions/b-/boost-coroutine2.json | 5 + versions/b-/boost-crc.json | 5 + versions/b-/boost-date-time.json | 5 + versions/b-/boost-describe.json | 5 + versions/b-/boost-detail.json | 5 + versions/b-/boost-dll.json | 5 + versions/b-/boost-dynamic-bitset.json | 5 + versions/b-/boost-endian.json | 5 + versions/b-/boost-exception.json | 5 + versions/b-/boost-fiber.json | 5 + versions/b-/boost-filesystem.json | 5 + versions/b-/boost-flyweight.json | 5 + versions/b-/boost-foreach.json | 5 + versions/b-/boost-format.json | 5 + versions/b-/boost-function-types.json | 5 + versions/b-/boost-function.json | 5 + versions/b-/boost-functional.json | 5 + versions/b-/boost-fusion.json | 5 + versions/b-/boost-geometry.json | 5 + versions/b-/boost-gil.json | 5 + versions/b-/boost-graph-parallel.json | 5 + versions/b-/boost-graph.json | 5 + versions/b-/boost-hana.json | 5 + versions/b-/boost-heap.json | 5 + versions/b-/boost-histogram.json | 5 + versions/b-/boost-hof.json | 5 + versions/b-/boost-icl.json | 5 + versions/b-/boost-integer.json | 5 + versions/b-/boost-interprocess.json | 5 + versions/b-/boost-interval.json | 5 + versions/b-/boost-intrusive.json | 5 + versions/b-/boost-io.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-iterator.json | 5 + versions/b-/boost-json.json | 5 + versions/b-/boost-lambda.json | 5 + versions/b-/boost-lambda2.json | 5 + versions/b-/boost-leaf.json | 5 + versions/b-/boost-lexical-cast.json | 5 + versions/b-/boost-local-function.json | 5 + versions/b-/boost-locale.json | 5 + versions/b-/boost-lockfree.json | 5 + versions/b-/boost-log.json | 5 + versions/b-/boost-logic.json | 5 + versions/b-/boost-math.json | 5 + versions/b-/boost-metaparse.json | 5 + versions/b-/boost-modular-build-helper.json | 5 + versions/b-/boost-move.json | 5 + versions/b-/boost-mp11.json | 5 + versions/b-/boost-mpi.json | 5 + versions/b-/boost-mpl.json | 5 + versions/b-/boost-msm.json | 5 + versions/b-/boost-multi-array.json | 5 + versions/b-/boost-multi-index.json | 5 + versions/b-/boost-multiprecision.json | 5 + versions/b-/boost-mysql.json | 5 + versions/b-/boost-nowide.json | 5 + versions/b-/boost-numeric-conversion.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-optional.json | 5 + versions/b-/boost-outcome.json | 5 + versions/b-/boost-parameter-python.json | 5 + versions/b-/boost-parameter.json | 5 + versions/b-/boost-pfr.json | 5 + versions/b-/boost-phoenix.json | 5 + versions/b-/boost-poly-collection.json | 5 + versions/b-/boost-polygon.json | 5 + versions/b-/boost-pool.json | 5 + versions/b-/boost-predef.json | 5 + versions/b-/boost-preprocessor.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-program-options.json | 5 + versions/b-/boost-property-map-parallel.json | 5 + versions/b-/boost-property-map.json | 5 + versions/b-/boost-property-tree.json | 5 + versions/b-/boost-proto.json | 5 + versions/b-/boost-ptr-container.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost-qvm.json | 5 + versions/b-/boost-random.json | 5 + versions/b-/boost-range.json | 5 + versions/b-/boost-ratio.json | 5 + versions/b-/boost-rational.json | 5 + versions/b-/boost-regex.json | 5 + versions/b-/boost-safe-numerics.json | 5 + versions/b-/boost-scope-exit.json | 5 + versions/b-/boost-serialization.json | 5 + versions/b-/boost-signals2.json | 5 + versions/b-/boost-smart-ptr.json | 5 + versions/b-/boost-sort.json | 5 + versions/b-/boost-spirit.json | 5 + versions/b-/boost-stacktrace.json | 5 + versions/b-/boost-statechart.json | 5 + versions/b-/boost-static-assert.json | 5 + versions/b-/boost-static-string.json | 5 + versions/b-/boost-stl-interfaces.json | 5 + versions/b-/boost-system.json | 5 + versions/b-/boost-test.json | 5 + versions/b-/boost-thread.json | 5 + versions/b-/boost-throw-exception.json | 5 + versions/b-/boost-timer.json | 5 + versions/b-/boost-tokenizer.json | 5 + versions/b-/boost-tti.json | 5 + versions/b-/boost-tuple.json | 5 + versions/b-/boost-type-erasure.json | 5 + versions/b-/boost-type-index.json | 5 + versions/b-/boost-type-traits.json | 5 + versions/b-/boost-typeof.json | 5 + versions/b-/boost-ublas.json | 5 + versions/b-/boost-uninstall.json | 5 + versions/b-/boost-units.json | 5 + versions/b-/boost-unordered.json | 5 + versions/b-/boost-url.json | 5 + versions/b-/boost-utility.json | 5 + versions/b-/boost-uuid.json | 5 + versions/b-/boost-variant.json | 5 + versions/b-/boost-variant2.json | 5 + versions/b-/boost-vcpkg-helpers.json | 5 + versions/b-/boost-vmd.json | 5 + versions/b-/boost-wave.json | 5 + versions/b-/boost-winapi.json | 5 + versions/b-/boost-xpressive.json | 5 + versions/b-/boost-yap.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 304 +++++++++---------- 306 files changed, 2850 insertions(+), 2101 deletions(-) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index 56adf6a3f5a817..3291a810530a63 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -2,94 +2,94 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-accumulators", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ublas", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index cc1edc63abcafc..a729cf3858eef9 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -2,82 +2,82 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-algorithm", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index 335d4a2d39dc85..d807165945e04a 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-align", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index 3de6e9afa493cd..c9f06647ea45a8 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-any", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index f89e3cd916dca5..bba38a2d2cf23e 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-array", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 92fdbee2820bef..1564ef1d997942 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -2,88 +2,88 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-asio", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-chrono", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-coroutine", "platform": "!(arm & windows) & !uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-date-time", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ], "features": { diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index c6078e2dd6d650..fe5a19d6b71d29 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-assert", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index 22d88f78dfefec..f51f64a0e82ea2 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -2,58 +2,58 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-assign", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ptr-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index d7cb4758872886..3d2293017a652c 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -2,56 +2,56 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-atomic", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index 80432f2a27d6cb..f20f2036fd256f 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-beast", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "license": "BSL-1.0", @@ -10,91 +10,91 @@ "dependencies": [ { "name": "boost-asio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-endian", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-logic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-string", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index 42ece31a91e7f4..7d36c3dc88e279 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -2,66 +2,66 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-bimap", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lambda", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index 7ea117d5e7a6b2..4f69852729d46a 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -2,22 +2,22 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-bind", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 6bd0ee0a42d078..99d64cbff584f9 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-build", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 40ce0ffa596279..0f14acebc60a34 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-callable-traits", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 808a4ba23201f3..18640736efc227 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -2,84 +2,84 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-chrono", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ratio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index d95a141c6112a8..06f78115ef650c 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -2,46 +2,46 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-circular-buffer", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index ce04c5ec432333..f33acd0682fdcd 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-compatibility", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index f4508b01563c75..49028b44822d2c 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -2,123 +2,123 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-compute", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-chrono", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-uuid", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index da160ca9c010d3..fd02850f5ae6de 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-concept-check", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 511a4c5754e696..6714385e831018 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-config", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index 5482a0c891f408..cd6e36d7e8b364 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-container-hash", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-describe", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index 96721794c1586b..be60f53eb8cc61 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -2,44 +2,44 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-container", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index cf013f150bf43d..1fa3f331addc18 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-context", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "license": "BSL-1.0", @@ -10,45 +10,45 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-pool", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index ec5702b386d470..82618608c58078 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -2,88 +2,88 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-contract", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index 761a19e965ef1c..27fa9d5ae2fbac 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-conversion", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index 2c13fbf25178da..e238589af2afb5 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -2,58 +2,58 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-convert", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 9d511b8ad26d60..9129e8d651158b 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-core", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 429c1fb2042976..dafdd2e4bf1ea8 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-coroutine", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "license": "BSL-1.0", @@ -10,58 +10,58 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 2d6ef6d8dc7b2a..3ba238d3a7201d 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-coroutine2", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "license": "BSL-1.0", @@ -10,20 +10,20 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index d27b5c72df4a7d..59468fd6a07820 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-crc", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index f4834a42a80ba4..de3b8a42cacc4e 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -2,84 +2,84 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-date-time", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index bc3377c3cf718d..8806eb5ec07b92 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-describe", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", "license": "BSL-1.0", "dependencies": [ { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index fd96aa55c80f21..a9ce2dd6b3a5f2 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-detail", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index bb6df043495c16..16441ce549107b 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -2,75 +2,75 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-dll", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index b0d7ad3684f4fa..b57fc1a11097ef 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -2,46 +2,46 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-dynamic-bitset", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 8a67a9b865df93..42b6f6aaacc2c4 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-endian", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index 4316c12709a980..aa180ef43e1f9b 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -2,52 +2,52 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-exception", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index b2a2a5ab97532d..8de865d6748e39 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fiber", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "license": "BSL-1.0", @@ -10,59 +10,59 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-format", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index 19ba2fd83f61cd..099fc23cfd9768 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-filesystem", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "license": "BSL-1.0", @@ -10,73 +10,73 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-atomic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index 787320305b24aa..d4a570c7465474 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -2,66 +2,66 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-flyweight", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-interprocess", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index a9001bc819a225..bf1ea270c4b9fc 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-foreach", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index 7e07319f2017d4..d225c21c238a7d 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-format", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 239d6d521a2fe3..0e8c3c2471cb36 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function-types", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index b50af3d7f1d925..f3172a93c58e6c 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -2,46 +2,46 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index 697655fa219b5f..1037f1c6a308d8 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -2,50 +2,50 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-functional", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index 6624002580bb49..7bf8102e2b26b0 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -2,62 +2,62 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-fusion", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-functional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index b23079c818702c..cc9a820776265a 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -2,146 +2,146 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-geometry", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multiprecision", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-polygon", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-qvm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-rational", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 38280708a86b8a..280052ed027491 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -2,58 +2,58 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-gil", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index a8e6d73fd724d6..aeb050405585e1 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph-parallel", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "license": "BSL-1.0", @@ -10,124 +10,124 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-dynamic-bitset", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-foreach", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-graph", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpi", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map-parallel", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, "mpi", { diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index 43be1f1b4d06e8..17f8f47492be45 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -2,189 +2,189 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-graph", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bimap", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-foreach", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tti", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-xpressive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 5667411555921c..b5c0aab46c3a3b 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hana", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index bf47a50fa50fc5..67b2f87ecfce1e 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -2,62 +2,62 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-heap", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 2fe2bf337492d6..96ee32221d5291 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-histogram", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 917fd419632488..4be6250436dbee 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-hof", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 64b9ad1397a7d4..3652e740c63dc6 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -2,74 +2,74 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-icl", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-date-time", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-rational", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index a33aa9b450b190..53434825cb8d1f 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-integer", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index c9f7914978bd6f..931f8e69acba4d 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interprocess", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 07b079eaf974c9..e59a19fff5a32f 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -2,26 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-interval", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-logic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index 1755550a7c4722..d46ba303ce3f62 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-intrusive", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index 0dd699ce902855..1098385aa19173 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-io", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 4ebda8162248da..4eee204585dd89 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", @@ -10,90 +10,90 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index e90a6698ac5664..4916b8b517f952 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -2,70 +2,70 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iterator", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 2723781368f7c8..5c9ca9b8b38e6c 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -2,64 +2,64 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-json", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-describe", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index b67fc557dd224a..a9e1f734569d1e 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "license": "BSL-1.0", "dependencies": [ { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index 0f83c926f159d8..30785dbbed36c4 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lambda2", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 644600069b522e..ff3ab455416c7a 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-leaf", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index 93afa0139f7e36..5f12844dc80eb1 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -2,58 +2,58 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lexical-cast", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index 5246b218ec39ab..4b78476245d505 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-local-function", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-scope-exit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index c50df322f2994a..001dec436d716b 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-locale", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "license": "BSL-1.0", @@ -10,41 +10,41 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "libiconv", diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 79a6f94645fe11..e114fced2571bb 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -2,74 +2,74 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-lockfree", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-atomic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 9fb0ceca483dda..ea4137697f3112 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-log", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "license": "BSL-1.0", @@ -10,187 +10,187 @@ "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-asio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-atomic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-date-time", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-interprocess", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-xpressive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index 23050fade04397..a7c8ec0188b94f 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -2,22 +2,22 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-logic", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 9ff4841024cbbf..97fad11e37a2b3 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -2,65 +2,65 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-math", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index 3140b7caaaf467..47ca4ce8e8e41c 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-metaparse", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index d8acd95a25cf8c..0935bb9e1ee6e0 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -2,13 +2,13 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-modular-build-helper", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index 0582dd7b305601..b0bb339e9fe172 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-move", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 6054de62b76daa..6a1f27ba44324b 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mp11", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 7c51a3965d7942..a3818c4736833e 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpi", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "license": "BSL-1.0", @@ -10,85 +10,85 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-foreach", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-graph", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, "mpi", { @@ -107,7 +107,7 @@ "python3" ], "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, "python3" ] diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index 64f7360d4fb6ff..aea16ce410de9c 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mpl", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index d9cefec575f0f5..86d94adabf10f2 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -2,82 +2,82 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-msm", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 9f1dfee4ed7aee..d10e91a88c039d 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-array", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-functional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index b2aea630c57452..4ae42c57e9baf9 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -2,78 +2,78 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multi-index", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index 8ed5c7e77be2bf..9707941e1d700a 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -2,51 +2,51 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-multiprecision", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-mysql/vcpkg.json b/ports/boost-mysql/vcpkg.json index 148da21a7d807d..c4fd19b4c83af6 100644 --- a/ports/boost-mysql/vcpkg.json +++ b/ports/boost-mysql/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-mysql", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost mysql module", "homepage": "https://github.com/boostorg/mysql", "license": "BSL-1.0", "dependencies": [ { "name": "boost-asio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-endian", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 808abbcfcbfe2d..c5248530108b4f 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-nowide", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "license": "BSL-1.0", @@ -10,25 +10,25 @@ { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index 7e7498b0343918..1e7953af79c1b3 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-numeric-conversion", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index a097af6bb7c927..c1635d5c3ec36a 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -2,94 +2,94 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-odeint", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-compute", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ublas", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-units", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ], "features": { @@ -98,7 +98,7 @@ "dependencies": [ { "name": "boost-mpi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 587664bba0f0b9..9083c434945de5 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-optional", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index ba59ebb80d44c1..02c4617e1e0ef0 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-outcome", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index a859eba057807f..352367bc342951 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter-python", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "license": "BSL-1.0", @@ -10,24 +10,24 @@ "dependencies": [ { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-python", "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 5dc992fb68ec68..142249d6cfaf5d 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-parameter", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index e0d19ec10295bb..efec615cf3d140 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pfr", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index ae8d884c9d8a31..23b749f2cc46f9 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -2,70 +2,70 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-phoenix", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 92e4df11c9c2e1..d2ea00e8f58fd7 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -2,46 +2,46 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-poly-collection", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-erasure", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 378ef682bf703c..c7f22e73d89d69 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-polygon", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 390c3426239e38..014e75111f80a5 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-pool", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 4d1ebd938c7b8d..9442ca71cd8288 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-predef", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index 82d1cd60414b27..5999e1a3662206 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-preprocessor", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 913567c6085eb3..2e0a538d40dc54 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-process", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "license": "BSL-1.0", @@ -10,72 +10,72 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-asio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index 750c2ac3c88925..8d55c264ee1539 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -2,76 +2,76 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-program-options", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index 43fe2ad8b96c9e..f7340fdf1cf53b 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -2,67 +2,67 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map-parallel", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpi", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 19d32896c3a24c..74bb9456d36df1 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -2,74 +2,74 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-map", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index d5ce0d7a984998..4c89105272c204 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -2,74 +2,74 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-property-tree", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "license": "BSL-1.0", "dependencies": [ { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-format", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 2207243ea8eac2..bbcaa3e931e427 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -2,54 +2,54 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-proto", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 1652906fcd9a00..bff4472f57fac0 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -2,66 +2,66 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ptr-container", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 5f38797e60f4c1..567e8022b725cd 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-python", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "license": "BSL-1.0", @@ -10,101 +10,101 @@ "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-foreach", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-graph", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 7013d5fb8787b1..6d54ef30c7f879 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -2,14 +2,14 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-qvm", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "license": "BSL-1.0", "dependencies": [ { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 72a20ad7d5f211..0ae33e20fcb497 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-random", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "license": "BSL-1.0", @@ -10,69 +10,69 @@ "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-dynamic-bitset", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 0ce1d3986b6782..178466391de9b6 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -2,82 +2,82 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-range", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index edae87c1fb37b7..8aac78043c866c 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ratio", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-rational", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index baab434a2fb111..ca21f65d6d3fa8 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -2,46 +2,46 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-rational", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index abfb145089a708..49d085f0f0f547 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -2,72 +2,72 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-regex", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index d5c12e73b897ea..e9f3b65aa6688d 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-safe-numerics", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "license": "BSL-1.0", "dependencies": [ { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-logic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index 4914a4e3a98efe..b2d67b0a248af7 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-scope-exit", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index e3bd6b85121e60..986167841a9ceb 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -2,108 +2,108 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-serialization", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 4cfe899ef84225..57a27998bd88bd 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -2,78 +2,78 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-signals2", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index b94498fa34e427..af90e16beeaadb 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-smart-ptr", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index d425bfc9929f73..4107ce83c3d3ef 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-sort", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 03681deb2a4333..6aab85d5fe1060 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -2,130 +2,130 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-spirit", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "license": "BSL-1.0", "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-endian", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-pool", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index ad14ea1c381200..dd271544531f69 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stacktrace", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "license": "BSL-1.0", @@ -10,49 +10,49 @@ "dependencies": [ { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index 1ca8acb0529b29..7e9b8d92ecdf9f 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -2,62 +2,62 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-statechart", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index 988786d70ce500..0016d14b5dc853 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-assert", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 094739f73d46cf..49225d1a0c42c6 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-static-string", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 13b0cc84dbdccd..00bbf385fa1cee 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -2,26 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stl-interfaces", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index 0c745eab7126fe..06e9e2382610ea 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -2,44 +2,44 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-system", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index ca22799e025632..85051121f05af8 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-test", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "license": "BSL-1.0", @@ -10,89 +10,89 @@ "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 5fc649f01e549c..04bebe6b0d1f52 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -2,140 +2,140 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-thread", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "license": "BSL-1.0", "dependencies": [ { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-atomic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-chrono", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-date-time", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index 055a62d09db432..ea431321aadc46 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -2,22 +2,22 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-throw-exception", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index a7847923afeced..5c64b147f6fb6f 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-timer", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "license": "BSL-1.0", @@ -10,44 +10,44 @@ { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-chrono", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index a0eb67f412eb01..11e474e377909b 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -2,38 +2,38 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tokenizer", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index a872b1b237c3e5..bd0c69da33c6b1 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -2,34 +2,34 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tti", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 10e88e8b5374ad..90690015a14288 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -2,30 +2,30 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-tuple", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 586eee0085749d..b9d141d9b5f8ba 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -2,80 +2,80 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-erasure", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vmd", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index ac496210195e95..60d94bae138b93 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-index", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index c5e18e13042f68..538ab461f79e41 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -2,22 +2,22 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-type-traits", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index ccaf70cf2ded41..9c1b8b9b41cbdb 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -2,26 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-typeof", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 256bdd19ce19db..5754ea4bb932c0 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -2,66 +2,66 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-ublas", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "license": "BSL-1.0", "dependencies": [ { "name": "boost-compute", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-interval", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index dd50dc5258c102..b809581ea41aca 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uninstall", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Internal vcpkg port used to uninstall Boost", "license": "MIT" } diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 4062bb25f7b964..09297d63f31bce 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -2,62 +2,62 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-units", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lambda", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 591a85e6898d8d..b9fd04df7297df 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -2,62 +2,62 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-unordered", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-url/vcpkg.json b/ports/boost-url/vcpkg.json index 6fd1c9c5a1ae31..0c4ecf33454dfe 100644 --- a/ports/boost-url/vcpkg.json +++ b/ports/boost-url/vcpkg.json @@ -2,68 +2,68 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-url", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost url module", "homepage": "https://github.com/boostorg/url", "license": "BSL-1.0", "dependencies": [ { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index c24e590b6ed59a..8e986e9ac8dfde 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -2,42 +2,42 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-utility", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 45f2c7bf098f69..7307e617820e0f 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -2,71 +2,71 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-uuid", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tti", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index 28457b214da2df..ea4b34c087c776 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -2,74 +2,74 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 9fe403a93a37fb..74a67cb4a3eb5f 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -2,26 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-variant2", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index c5c1e2d670a328..2de29d7364bbad 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -2,13 +2,13 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vcpkg-helpers", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Internal vcpkg port used to modularize Boost", "license": "MIT", "dependencies": [ { "name": "boost-uninstall", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 967041f94ee731..9af1094ae94765 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -2,18 +2,18 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-vmd", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "license": "BSL-1.0", "dependencies": [ { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 97e3b9361b85b2..8df96d7d288f01 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-wave", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "license": "BSL-1.0", @@ -10,94 +10,94 @@ "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-build", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-format", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-modular-build-helper", "host": true, - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-pool", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "vcpkg-cmake", diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 4f012861d8bccb..46db8d2c3000af 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -2,22 +2,22 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-winapi", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "license": "BSL-1.0", "dependencies": [ { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 519c3e12a791b6..cab7a68870f5f7 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -2,102 +2,102 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-xpressive", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "license": "BSL-1.0", "dependencies": [ { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 017990a76926fc..2ec4bf7eb029bb 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -2,26 +2,26 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-yap", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "license": "BSL-1.0", "dependencies": [ { "name": "boost-hana", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vcpkg-helpers", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index 2a8605a0965274..d5aec1b0fb2b7c 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -2,602 +2,602 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost", "version": "1.82.0", - "port-version": 1, + "port-version": 2, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", "dependencies": [ { "name": "boost-accumulators", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-algorithm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-align", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-any", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-asio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-assign", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-atomic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-beast", "platform": "!emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bimap", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-bind", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-callable-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-chrono", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-circular-buffer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-compatibility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-compute", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-concept-check", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-config", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-container-hash", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-context", "platform": "!uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-contract", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-convert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-core", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-coroutine", "platform": "!(arm & windows) & !uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-coroutine2", "platform": "!emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-crc", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-date-time", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-describe", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-detail", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-dll", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-dynamic-bitset", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-endian", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fiber", "platform": "!uwp & !arm & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-filesystem", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-flyweight", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-foreach", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-format", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-function-types", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-functional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-fusion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-geometry", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-gil", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-graph", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-hana", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-heap", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-histogram", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-hof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-icl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-integer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-interprocess", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-interval", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-intrusive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-io", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iostreams", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-iterator", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-json", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lambda", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lambda2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-leaf", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lexical-cast", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-local-function", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-locale", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-lockfree", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-log", "platform": "!uwp & !emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-logic", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-math", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-metaparse", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-move", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mp11", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpl", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-msm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-array", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multi-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-multiprecision", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mysql", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-nowide", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-numeric-conversion", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-odeint", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-optional", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-outcome", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-parameter-python", "platform": "!emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-pfr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-phoenix", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-poly-collection", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-polygon", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-pool", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-predef", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-preprocessor", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-process", "platform": "!emscripten", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-program-options", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-tree", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-proto", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ptr-container", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-python", "platform": "!uwp & !emscripten & !ios & !android", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-qvm", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-random", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-range", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ratio", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-rational", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-regex", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-safe-numerics", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-scope-exit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-serialization", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-signals2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-smart-ptr", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-sort", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-spirit", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-stacktrace", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-statechart", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-assert", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-static-string", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-stl-interfaces", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-system", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-test", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-thread", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-throw-exception", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-timer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tokenizer", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tti", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-tuple", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-erasure", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-index", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-type-traits", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-typeof", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-ublas", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-units", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-unordered", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-url", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-utility", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-uuid", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-variant2", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-vmd", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-wave", "platform": "!uwp", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-winapi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-xpressive", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-yap", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ], "features": { @@ -606,15 +606,15 @@ "dependencies": [ { "name": "boost-graph-parallel", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-mpi", - "version>=": "1.82.0#1" + "version>=": "1.82.0" }, { "name": "boost-property-map-parallel", - "version>=": "1.82.0#1" + "version>=": "1.82.0" } ] } diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index b901fd963bf203..cd746eea2d13e1 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -22,7 +22,7 @@ else { } # Clear this array when moving to a new boost version -$defaultPortVersion = 1 +$defaultPortVersion = 2 $portVersions = @{ #e.g. "boost-asio" = 1; } @@ -177,17 +177,6 @@ function GeneratePortDependency() { } } -function MakePortVersionString() { - param ( - [string]$PortName - ) - $thisPortVersion = Get-PortVersion $PortName - if ($thisPortVersion -ne 0) { - return $version + '#' + $thisPortVersion - } - - return $version -} function AddBoostVersionConstraints() { param ( @@ -198,14 +187,14 @@ function AddBoostVersionConstraints() { foreach ($dependency in $Dependencies) { if ($dependency.Contains("name")) { if ($dependency.name.StartsWith("boost")) { - $dependency["version>="] = MakePortVersionString $dependency.name + $dependency["version>="] = $version } } else { if ($dependency.StartsWith("boost")) { $dependency = @{ "name" = $dependency - "version>=" = MakePortVersionString $dependency + "version>=" = $version } } } diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index 68d247ad0c7d02..c0202d0e6fb2bf 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcd575a4e482f3a331107dcbad72468cb9c14e50", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d45f601cdc5cfb7a4e6d1ec9fdd8396ece8699e9", "version": "1.82.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 84b8dc61aa3aa0..03c7f48d0aee7e 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fbb6d9a02e64aaa4c3f61605b2fac87f8dd8347", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6a184d48bcf1a89a12f66255625340ce9cbfda92", "version": "1.82.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index a7026b54cb5dd5..36c08583639594 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1e1ddf5d00f6698be329c809d1a29e59742a7e2", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6dcfc6f69223f8fffff4c82db31be7495f17062d", "version": "1.82.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index 860bdf62b88366..e7ff292ff77e0b 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1ee12b057e7762b98a5bd7fdd190480e1f51b0f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "798ddb57d8d3bb7a77e424cd5d60f88cc4e6bee7", "version": "1.82.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index e06d45fe934397..11ed1ef2d1ff61 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58b11354551eb994ef8636b3ade5447ae6524a3c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "8503faaf38485a913d4daf3efd2076b67bebdc0b", "version": "1.82.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 7ddad5a7ee2512..dd9f262928c1e2 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12dc4325ca29b508676211dfadc95ff688a00395", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "8f22e5c36ac147808ab3acaa7782f590134ccbd3", "version": "1.82.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 88e8e5fc60eb46..388cd63ffa3ad0 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ab1404e2abab757e8c136c9fcd89fbca14e3696", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "f07d2980139502309087821ca9a78a9a43a766ec", "version": "1.82.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 1b48044392fcf2..eeb1b7e2b601c9 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "393709d7b07cf6b886f9491aff50cbf1338ec6ce", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "cd60150bd194b26b188ecb47675c1ab7963049d1", "version": "1.82.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 2a2ed87a5c9e27..0d8b30785765c4 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cd58a1ad5ec2c381440b733e3799368df678b49", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ed19c1a3b7f57d00917b260e35cd662b28c1f6eb", "version": "1.82.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index cb290593febfcd..129fd4394a1d09 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fdb6d58154d59554f7f6f3456f715f847dcdf12", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "f6a7a34fa0113b74cf593ce3786dc6ad108d779b", "version": "1.82.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index 89a07f27d5bb8e..f2e59601eacf4f 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "630d6888f373108130d81a96b7a406387f8cd96f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "de17313ae17a0044043195c76fd61a75854d4f0d", "version": "1.82.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index ca47a2863598e1..1bb6dbff4f91e5 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c07d5ea417668fe7606ace4749f1577c7c2a8c1", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "1d9372948d3c0fe1da8965e76ded151513f16a52", "version": "1.82.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 52c97243e9cf19..434a99dcf0df7a 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9cbed98f75a402e9f61689754e78e237f44988e", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "9d4a35930b7414144551dc9c2e00b31bcb0ca8b2", "version": "1.82.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index fade7a893d1fda..cba49fe632e07d 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d9d1716d512c7c972cf109e2d27a3c3cf4f0054", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7d252dc8bb4e187e63ea76041f922a308a5b3705", "version": "1.82.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 07062b2d10b0fc..445def4cf86d33 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e35fba1cfd226e9ae4e4a4b54a5b88c4103e440", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6e550f08c345804346e807206cff87fbb07689c1", "version": "1.82.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index 7a46d82690daba..d45b95ade64ccc 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a08e079bd1986adeb839ac17690dbd1b0c0cbf5", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "babfe7cd25186b48ed2ceab45108cf5fd1dfc6e4", "version": "1.82.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index c0f9205e3e9cc4..63dd6202a71595 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e3c4c3602abf9d5417317f7461393eb801864cc", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "5af14050c2efc2528e61019b46813fb1fe2025bb", "version": "1.82.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 280b034a19d25b..bbc728ebd4e427 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b303d9b14bc148147d90600791358321c8f95c3f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d6ce60d84f6a1da95496e017153a19ec2a425d63", "version": "1.82.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index 768b8d901e6b24..6ab5085ee41236 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3db560953c33956f9ba0b19303f99e37d2c6486", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c266d37e02d494dcf4c3623bae07775c2a7baa45", "version": "1.82.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index d473737cccb339..7f9e25e3220ba6 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4dcdf4527bb037a6b6d2973176e4a662c9853e6", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "af2f41ef14357f44466182d783e8cb218d677b1f", "version": "1.82.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 8f6c918c379a3b..821afe667286a3 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce9e91e833ca8eb5ddb0a19df8eb7fa5c809359c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c5bde693ed8971a4e0ba6e22854386d4054898a8", "version": "1.82.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index ef2469f308f0d1..8998a5c8a9aa3b 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d7b26fb8d896742162db28bca0f3aa2c4bf5fa5", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "54ac399bdf18e9c6ab8c9df4d81df4bd86a547d9", "version": "1.82.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 2d91584f8b6794..4c05a6edf2f772 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b57cef3d65241ee8769759b0c4d4f54adea12f12", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "350b9696e8454d9121ffa7ad1c78d56cd378af58", "version": "1.82.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index e38760ee427894..a1f587720f651b 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "128a5459bfe24ef077e6c55f9048115d5b62119f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "2c9e501f72013d017f7422869c77eb6b20f29f46", "version": "1.82.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index fd041241b444ce..ac7b162ac5206b 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42db7c7d2cd967a8602ccbecd50d17ecc45c0f9b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e99972dc970d3a2229996b240d5dc4362204b6dc", "version": "1.82.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index bc5ecf3b72ce79..6d8f77b05ef85b 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d1a4418e25c86642d9382f57d1d5b2713bdd12c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "54d69671454ab2db9d34730a216a5c5efe7d6f0e", "version": "1.82.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index d1d2528d9cbc4a..23605dec7fa16f 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc2d558e972d703d21819dc33f5178d6bf529a22", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "f406b6bfcf32cb14d17d1df5e57a1162a2f2d703", "version": "1.82.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index 03735baa3f093a..77d4596aafa364 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a7abe4f1fe4283093d5eadbbfd76b9b37d188b0", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ee6ae12c7b1d5dc36ced3db516336e96211d239c", "version": "1.82.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index d0861ff5e6299c..8a4bed9045a376 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dba0f9beca895b21c5059b07c9f173e007ee3cd8", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7fb813154ce459ddd8d72dfa8cef59b033be2dad", "version": "1.82.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 58967e424374a0..11a58d0fe7b2d9 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04d885f67c14d286734f0904d56d57338a5e9d8e", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7146ce31ceb0cdce252cdf556502fbd358eb30d5", "version": "1.82.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 94cfc259535cab..6f9d3af20bd36f 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6deadcbe773d183966325ed291aecaba15da86dc", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d121b1d895d48eb80ef58fc6627e192365decfab", "version": "1.82.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index 80f4fab3d4d0c1..39c0d10a841898 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57b9e703cb64af9391eb2410ef649a94cb34e4fb", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "631c0781e5719b44d906954a57f3a9a42bb37e8a", "version": "1.82.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 6a927cae824c61..60f1a1a269e0bc 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6869735032c72f50cd3e5cfdfd08a317fbe1efd", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ea40bd02426af4c5ce99995762c452e3a70b5189", "version": "1.82.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index e63de5e8188b9a..adc7543fbeb8f2 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92417614fbe01c2ebdf9e5c57dca684fb899f9b4", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6cfca57c17b2728555ca512c5912af0787eb067a", "version": "1.82.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index d7505b47ea3b41..dee917e4436c5a 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ef863abb9f1f4ca201881743fffe4f47930b472", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d350f9d70da182a7abddd0cadc649394fb144113", "version": "1.82.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index a6a9f320133717..49b3fd26a3f784 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02c550779838f584656e52ce62aa84913040be26", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6890ed08d6a7b2c9b54ed6150c2c73570cc512c6", "version": "1.82.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 565f5e0866a763..4b9220bfb813ff 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eb353034a1a470c5168e00c6d97e5912f7c4cdf", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ef4cfcde16100435562ccebf90edca8cfc4e204c", "version": "1.82.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index ae91d931d0101c..d230dbb106938a 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d474f76c374b4e212ba4e855c8c91c97a76c9dbc", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "73b5c84611b826d9526898701fac02f83e305c63", "version": "1.82.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 908bbaf71f267c..ae473b94a7a7aa 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ce33f60fe1f1bca7cabdf40085a6f9fc50d7609", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "9e51e733f0ddb9e287a6ee03bf9cbb1f3f65f081", "version": "1.82.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index a09d7d8858a0da..011b6c799723e7 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ae93d92af918047cdbce0acb4e28bfe8b3917a4", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "2145b81bf66231976f183f4f45084b70e4cbdc90", "version": "1.82.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index 6e17525e997b9c..d09a92dac9e12c 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72825aa9cfe566882f23cb67085eb649be57ab57", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "561a41ff688b0ef41aa59abc13345b228ae8831e", "version": "1.82.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index 02313adb68ec02..be0e3f4e0a4e81 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82fdf64c7a6daccebb04097c2264eccd4b753447", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "9562adeb23d81f0bfb89adb5c920ead09b302ec5", "version": "1.82.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 7064b07122fa1f..50238de7eca3ef 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf2f0ad26a4cfe85854392e5579bc75d7a4a60d3", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "1da109d6c53f82fdac9bdf6efa17af3d47dacb54", "version": "1.82.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 10fb77d4c94053..367555bcae2f9c 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dec477afa8d43d2a95ff257974e703a5fe7835d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "dce4e73b054f0b611a8d1e0f9efc9dd8cd79071f", "version": "1.82.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 397f6195aa97d9..6933a627f26774 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd5a2fb579f798abd7b8b0c118543c92ee0f0774", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "3c428ee1b1238a5fbf337fd549d3b3c3afc17930", "version": "1.82.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index a499d2e4de21dc..888bdac5378164 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b150ab085d5b818a169fc105e3b096bf7493e5b0", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "0c32122b9244e041424874f6657451169ab9522d", "version": "1.82.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 53b9d476055090..ab9b48d8132dfa 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4067f77462e9b8846d9a00471584a4d8ffbb857", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "76191c9a206f916d0bdb9619bdad1499c426741c", "version": "1.82.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 9574dde6b68cc9..576eb925ebe097 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8dd74ecbae93b5f746fbe67d895a00cfeb9d231", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ccdfbbf147613d95e1a7fe3cbdbb56aa91dd2b86", "version": "1.82.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index af8b6bc8519e6a..982c68db55a0eb 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f43ba5b79672a46bbf62a53ad000a7e7d14c041b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d3c482730f924eeac5f136bf8bd6cc87f8866ecf", "version": "1.82.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index 4199a277a2fe62..4dcd459e6122c8 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1eb9dc73511a762ae15c9a114f1ccf8e43c73bf9", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e4d430a0ca0203e374d282579904323b025a7e3c", "version": "1.82.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index d92c3f82e2d841..d1659de464b263 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d7127090cf4379d6bd5cb94f6c24567b25d5213", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "4d522c647f882aae8c81ae652b2a5d23d8422f09", "version": "1.82.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 95992d91ca3ac6..7e5408caa1c7d4 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "910fd038954c6cf54b603c02fca5fb21802a1758", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "034d09501ee6199f969a158831419ae14853e73c", "version": "1.82.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 5b6300778ade67..3df54bfd80716b 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a09aa03b51de15b9544589aea569de877eeed1d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "366641b5e6528033cc0067bec3847f26d9031edd", "version": "1.82.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index d8dee2ae9fefa3..c8c1317ddfb281 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1277a21ad4a01b42013c1e4324a5ad47004bff9", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "662c6f191b2d2991f86cb15e71c7297d5d9acd02", "version": "1.82.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index d62dfe169c6e2e..2407bad3a126ba 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d24993000e79436df3c10f8424df464e20da8bd", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "91d333f8870517291000ce2d269485286a4fd9bf", "version": "1.82.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index ffec66bbd869b1..1038ae9a652a7a 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46935203002bae9d52b70d217abde7758c21d2ba", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ed95b549c8719f65d4599fb6a612db94043c033f", "version": "1.82.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 7e979179feec28..49c4dc8c54152c 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae2d2c05c7433c83dc9eed47f7cd13b6a4c6c46f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "dc0de1141c5074cd88b9de17d7ea2b39c58b6afc", "version": "1.82.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index b4edd28572accb..daa7c46a9328bc 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10e93bc8db9627499e8681ccbac7f42e5869b75b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d189e52a32b8ef2ca41b5afe112f5a4e6430ec70", "version": "1.82.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index d0a5801de71acd..3decdf7a5d5062 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c1632e270e737c9f035585137c26841952c337f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c6ef0a6523433599c5a6e0bebedd4b2caa6b56cf", "version": "1.82.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index b120ce853b05d6..bd70ddffe4cc38 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e824cb312fdf8d4b782b625053595e9bb13dc3c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "21da7534c21a1dfd1ff5833e330837ad8fa26341", "version": "1.82.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index fd0d1050e44147..b4b465de78d5f1 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac82b98be4e5ba2e754a532ba2754ae4f0496469", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "9a39f5835d29b23ad73b036797cb4f6f000e83c2", "version": "1.82.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index ea82aab1643fad..8e49624f4ece9b 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32b20eaa8ec0539f484ba8dc1a08fd163757d48d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "06e57442234e51fd436cc31ac285319baaf83e26", "version": "1.82.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index f23e21270a13af..cc779270fbe6fe 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a88bb521a85cb7e8577f49eed059f656b0d81d07", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "5fb8cff5e879195843741626bde8a0cb9955e1aa", "version": "1.82.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 487fa22d206902..66e182b7635a68 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fe41ac7e3024b92d857b855f8833f83d4abd11e", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7a7a8a65879f8262d502979631cd082afdf2d6c6", "version": "1.82.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index 4e1de61433a483..8dd8edd524d5c9 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0594208903bfe03699a0b1c4a549156425bc0bdd", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "5ac3cfaa7a77c860f9ad676a028c0a79976c4e64", "version": "1.82.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index b76d3809b1642e..335978aa80d42e 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb036779325e545fd6138cfbaa0703d729aa401b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "43c810b64420088a3446c74e4d54db10f16c271b", "version": "1.82.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index 35b4155be90d10..7cf1f1cf62da7b 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27cd4bbb12ad5a785f7e32723dbb72c4e4bf023a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "54b82af182eb01789c463148630e7e897ae3f3b7", "version": "1.82.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 723bd7b321997d..5c0c2a8316e7a4 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51ae33edcf3e425aa42f2cfbdcc926ef3996ce6d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "9e386bbe69f3d754f0771134ef2bd349b9e9d381", "version": "1.82.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index fc0fc3d9b82682..245f66f53cac21 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ed08854668287984c74498fb95f081740459048", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d9c9d24ad31946e6bf5bcb2adac9f0124e7534d1", "version": "1.82.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index 0d15b6bf6db67b..e8f1d91ac43033 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e5234382d1b899deef16bbbeb58b19bcf5661dd", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "084161896f614963e296c5ebd58f23ee613988fb", "version": "1.82.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index 568cf244b95a20..7724d8a8ee3a88 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "486c465bb29be1d743d50fd66134aafc9ff6f820", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "3c03453e91b6d10cfd41e5113aea15c9070ba310", "version": "1.82.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 32c2417f6a1c97..c3b9dc661e7cf7 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99d96e2a54223f8db7b94429392de363cd69ee61", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "418ee0f83e1b41fddeb9d416fc383abf40ebcb03", "version": "1.82.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index 307b897ecb8cf5..6dd720c4e73e20 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c52621d3f785a3aee44d5a741597a0a4ffd8912", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "61b0ddfd8a1a5e18f97584b57143de200770bd56", "version": "1.82.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index d5d5e14d115350..4e115439fc8411 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c34b7fa72446bdd3037f8986d0e653dee79d5df5", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "fed3e04ea8531c9c7b141eca201e24a6ae24e420", "version": "1.82.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index aa50616557fcf3..e75fcd27569145 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ae088c69a58eb9a5854ff99807397a0c09daf6a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "5c1a238cc20c885e785bc05a36b974deb5e02db7", "version": "1.82.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index 1dc9f33a8603bd..f58a8959593573 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bda03863857c818ffb310f45d2d148553a5de381", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "1ce5f627ac0c30d041b9f2981fd3c11e4b504825", "version": "1.82.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index e8aee0b899ad45..8f7ec1d94b37ee 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a90f12d1eca80483d10bbd93deccf5439f904e04", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "80e104d697b7ff7a283c5f7ee83ae25fe1192bd7", "version": "1.82.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index 6045026eeed261..d3dfd613e31a16 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f67b743f8b04e8d1e7135745b3a18abe62a4eb5c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e922f77680d62cda6668cff0096eb4c34f04f4c1", "version": "1.82.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 371adce29a8267..43d0adfde20ab7 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2d9b906b09ffd6317c9de5f97537688cde482bd", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e08d5a2eb5d5edfc5a62469dbaa283cf56570d07", "version": "1.82.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 53a4d6f6e4a355..83a53e25c1f6a4 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8536dd1583d433e00586c1cae10d6e8d6e02e330", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "46d34f9c642921c949f7f9122d41f3d679392003", "version": "1.82.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index 595f8fe1ed2e52..c66f3d39909bfc 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a850ad389c07479589bfc617aff5b03a2b98c17", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "62357ac27e3d8d2eefc9bf42f8bb8ab6e417859d", "version": "1.82.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index 7600b4d06bb9a3..5c0e8761382629 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fe88d1349bd1ddf78ded3e786a539514d285835", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "a5add430816876d69afa4df43bd91f776c8c2f7b", "version": "1.82.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index fd176a752123d1..511386b2361d4f 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d678e2c33ccdd2e64aa71ea623e1b89109502482", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7b0e294a0e563b3c9580683dafea094dd3e96849", "version": "1.82.0", diff --git a/versions/b-/boost-mysql.json b/versions/b-/boost-mysql.json index 3fdea4b813c6dc..31ac136953199e 100644 --- a/versions/b-/boost-mysql.json +++ b/versions/b-/boost-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d85c256826e13a62169b1f38bf7c3f8288a697c0", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "93979a186a11766a973ba4d204213cc0237f71d1", "version": "1.82.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 2b67e528bc5121..afa90f5fa609ec 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea86cbf24b6f2bf242d24bd8047699cbe644b68a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "0a33bddbce29068b61dc012e6326446175b79184", "version": "1.82.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index e8cb259701a06e..d086d0a33a1fa0 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00e6f269cd4fab6986205b397e46394795941f31", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "97842146c6a87912141dd1d4654e1576d12e5cef", "version": "1.82.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index cea734d715f041..3419e9b67f34eb 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70ec7a68fae7d61cd0fb694743e84f327ba34272", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ad9209f191bcf6d65e9fae09c5d722ae1b058004", "version": "1.82.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index c9b01b7d813cfa..c91aa7cc4b33ef 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26a359b912dd2fb42978ddf8ae39fbbccc1e34bb", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "100ff3094e97d23516718679d59d9f86821074b8", "version": "1.82.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index 890540c9e0eedc..6ea25478ce0f35 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "089f7ec14f71ee4d59db5bcc795551da347f63df", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "bca5b674d3737aeab820ca2f36e4db187031f296", "version": "1.82.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index e8813c92217600..557b348600b355 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce2b59b01e836bb57415dd89d2895e52efa67970", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "375d3ead166d0600ebedb713227e05b52b624129", "version": "1.82.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index 23a8f93bd4233d..abe8547c7713c4 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba542be6ce0920e0fbc12d2fe1d3fd4edb02c4ec", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6170f4f4b0b7b9105de27ddd1caeb5f92c7feac5", "version": "1.82.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 299a92a222cb44..ac6087f831d765 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84e8832ae82979a2748d319fca9f8e5fb397e1b9", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "441d806b60674a7f79367de3675633972151823e", "version": "1.82.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 09b55e1d8bbd3d..76e70897674c88 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c68391dd87698c5d288e7e6f937d72597e0e749f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "cfcda2e56bf879d0c3d09399abb8eddcfd1b2d27", "version": "1.82.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index ac3cf514dd040b..38e92b91caa5c1 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a905d35b62d85eb36ef4a2748fde453ffa8ac2f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "11d5d87f8e0701ad7c591b83b75d69a27249e8d0", "version": "1.82.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index 9f3a1748fc0853..3190335fd9457d 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff0451ec470d4d15f7eb41a37fb9aa5b960b7348", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c5072bfa0aced94778153484b7b3c9302e0ff0f3", "version": "1.82.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index 779dacb234e909..cf01005e3df991 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f31154b251747a951b5100f83cff4c065eb1295f", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "0a399a01f9750acf2d7ac62288452f3d4319eb0e", "version": "1.82.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index 83a5305efd7359..1f305cb5c45d66 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7efd1a99c14c79b469d86bbf9d39898ffde1858", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "3a0c5194d7a4d8825efff8d67e0c75cae0b058d7", "version": "1.82.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index c3dc9f9fe644de..d0a831b2303d58 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11fa54ebde61dcf9ca2e18a42aa7445b76ce9400", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "85819cdd004323b0afe1a361b9e05fdb55ab6838", "version": "1.82.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 67ee23866af1a6..4732f484ef6fbd 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c4af3d39b6e980d59ecc1baa8f07f9aac97eca2", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "54d30d2c4ffbd008fab793649b57a09338d91b32", "version": "1.82.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index 56084238e435ef..3204588cb11d5f 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b15733a9444492f8882068981b01f270d301b994", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c39f818a3734e996eb777117eb8d1492d7b1b26f", "version": "1.82.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index 9afb98e51867f2..d54b85e6af7edf 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35b35b75e5be38fcdd1d0f2ea49403a3d168bbca", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6906d1d7dc7e80215f7889096b950d7c3b984bc2", "version": "1.82.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index 5e059508f19c59..2f6ccd825ac020 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fb0d2bae69811fc5b3aec9cae898cddc6177cbc", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "2f85d45654b717daeeba34ae150afcdc1df309a2", "version": "1.82.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index 632ca3a52875af..f4c065a709b41e 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba292d3a56bdcbc9be58eba676f68c604e16e6ea", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c183cb16868f5bc299ff89a868eaf6b1a0a2f74a", "version": "1.82.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index ac9e104233aed0..2defac69cbe157 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a88c491de292efd0f32b41b78f69d5da1baf53f7", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "1bce55f9406e1c918ef220127ac1608811d04926", "version": "1.82.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 288902b9506493..40eb19ac5cca70 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "623acfd1039e24498326d202bc3aac4aed87e91c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "fbf9f674a0c21a43d0aa0e1fe4a02cdcef8da616", "version": "1.82.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index eba8d28404f86c..c64e30e0049ef2 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b408c26dbce69d97b4ec2bac833c18284c06979d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e27c5fc20456f37dc552c8002ada45ede962be4e", "version": "1.82.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index a9fc979e796e7a..2a24a86aa58afe 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01f2e32794bd62e7f6409a14bd7c1126ef335d46", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "71b16c8f7212d75d5088b97301030044f3d924f8", "version": "1.82.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 1599b6a5b6acf2..3e8ebc534e792e 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c440ed1d17008e8a77ff3cdcc495af47103f05be", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "0c97951b0f38d6c9b469b367ac136249e1fa23fd", "version": "1.82.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index 8a91166bcfd124..bbd9f9e20e8243 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b034bcdf929c6bc7cfd900580907fd1ca6620fd", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "fc4c6c85df6efb4afe27a53499abdcd17da71a69", "version": "1.82.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 40f9e8350b03b1..3ffc84f5cf1bbf 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb8691f0340e091213aff8763edb106d19d132c4", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "cdb2522204e612067abded077c6ec1f783210f10", "version": "1.82.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index 466be59d105653..f12097ebff5e0c 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27a8384584574ad32bd6daed2a7454bd0d3c6fcb", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "6120e3b8498d9976ad2d49093939c03a032d1609", "version": "1.82.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 21f5a178300f94..4f20a9e20b01f5 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc3fcb5815c297112283b9fd5eabab3106f6e93e", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d31af2d45fe496fd2d89b734027e72c92d23f1d1", "version": "1.82.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 2431d78577058f..f9d09a77a492e8 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13e759cd59d56323d9c3079a28502a8d6814c6d3", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "0e786aeb741e3f8444c7252c33039216a9b74c11", "version": "1.82.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 58faacc5b8e995..112f6d11b90b38 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b1854be566e473fe24ae03d88e2312764dd1917", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "32c1f14869bea00029a8b45bb94cb63ff70cc85a", "version": "1.82.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 68c1bda1c49784..685c621deed97b 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13b68c431b9c906d036a83aa17358f0778de6a97", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "b1b42d850a39f2675bdd583b6138994090f47bb4", "version": "1.82.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index 3e80018ab7ba62..59449582d05726 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6f60c82002c81f4e03209ebffe7f410b926d64d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "62baba852c7f10c46fb042bd70d316e4b0178382", "version": "1.82.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 30018ad99a3e35..02df0092a700fe 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "890abd9cae8fc0c9a3a6f9a6b67a4cfab375a775", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "a61a6534966bd4a70b051538a287de38be4345ba", "version": "1.82.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index f4d5c93f760389..bec95df3fe5c6c 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fd7339a68a26cae5e7f10dc5fc7b01a7763e5bb", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "52a94c57d228888c823e75ffb50c1ada6243d400", "version": "1.82.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 4d97546c3444b4..1943ab562050bd 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "292c5391f0b78b7009740961762e199aa33d5a0a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e3722a0c3169cbadc658d55b9c5042821f38c0ed", "version": "1.82.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 453785df6d9565..4b2145e9d5b86e 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9ec91eb7e104db3c699004fee94ffecbb09a827", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e396fb4ba828edc96c7843024fac4c95d0c3dca6", "version": "1.82.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index cee37ee47585a6..c17d8a27e03876 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2664cfe208b1eff1257e2de86a72ba359ed3e3f4", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "73dbf3ff6a02ae856ea69c4a9c6f32905463ff3a", "version": "1.82.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 538e722991a870..7782833845f71f 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb7f6ee1209b0760b458727da129653965e7e98a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "e6e55a999a301eb62d7c4da853a6aeb296713943", "version": "1.82.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index 1f4d5b9ff24108..3542485a752da8 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b01da85ea910c32e62403ec6e7d7749750e6809b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d6659ace5ff022455382adf6078c00bf015d5170", "version": "1.82.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 7b9b022d52c3d4..014ec96a98c019 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c8e63f22b9a633855cb9be3712ae8010cf0dda7", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "8a8da16449c627e1e3514b6f0c865423def32aef", "version": "1.82.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 423d5236fb8e25..2d79f47849db59 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1bea82cc5898b04f9f797eb47026b667a03de00", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "48fb125e52a85de87f4ff03475742d79f84b42cb", "version": "1.82.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index 0b5c569a095fe3..9a0e4276aceb0b 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6d22c3109a795ff79ca53f0b07afbe683d83558", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7f9b16012eb50bf79ca3c7193b3a91900342fe1b", "version": "1.82.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index a66610d8b09fce..537440cfe0ca4c 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "183d7fba1820b773404a6ea7351f4da539612367", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "10385bb625d17d57f636154ab2b2ec6d35bb4615", "version": "1.82.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 259f65b1981a1a..80240238c85ebf 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3416e3ed72a0b469169cc290cafeabafe2bc4859", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c51c9fa76f925c5824688c6ca9f451716373b5d5", "version": "1.82.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index ec297fb6ac6fb1..625e3d6c9a4d3c 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "161c4be7bd7c9021a41bd62b3b5d06ded0f1bae4", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "df30d3eccc932381af5653911a0708436c1db576", "version": "1.82.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index 68817f8a63166f..52b39d64abf136 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d3578a014b8545ce2e4be7e6243c50e3fe2f41b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "4a53c730b20cacfbd8e6bbbd8faaeee0720c9fc1", "version": "1.82.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 38bd43cb9a8bfc..f48d10495a8168 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fbbc2a47d406102ec479ff755beab26984a20be", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "cf4ae2c2fc67d7878842950e97e57c28811b1fd5", "version": "1.82.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 8660a69fda8344..7809eabe307fc1 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "005084a92857215f3e0db64c3a7a1d1d70c91850", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "c9173d5394c4b31fdf698b156b542c29031d03fe", "version": "1.82.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 47baaccadffb69..09bf7008dabb57 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8672547278454bfc8a842f788ed797c834ca050a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "abc972b6543f779324d60f5c619a205edda22b2b", "version": "1.82.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index b400c394bf1e83..b8f712db463356 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af9dcc786a5ca7717b4d2d04471b7ee12288080c", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d02bcbc9c4ee9a4b27e90ab03010bea7b6c70eb3", "version": "1.82.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index 1111766703b50f..aa7aed2c53208e 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16673cfc230fda05b63868f9cbf21d0e0a206b53", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "34773fec432e120d3f2d9dd482461da7c36ef897", "version": "1.82.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index 6c688ae82144ba..ade95410ed365a 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a15a938616612d49b404940a26fbf8f518816d8", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ab6e440573d5f3ac964c50b3efc24055500a772f", "version": "1.82.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index b65319db8915f6..8352b4e9792b5f 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0dd4493fe63a58cd9fdec0d48b9855a09ecbdd2", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "48342bc4e28a5dea5e4e6ccb8cb0333b5feebfeb", "version": "1.82.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index f17b69f4dba1ae..9a2ee8c15fe0d5 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcca7487581acb01e55bddd3ec306ff543c24ce6", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "d96807810fa612b038f9268c8df545d421fda1a6", "version": "1.82.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index 5c873c339eec55..f21a5f56208334 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a76707af8205f16c15f69fa930aa39e7763472d", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "60fbfc84c6785572c1385528afb5616429828138", "version": "1.82.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index d2f949d34ee7c9..3c9742d6e5d32b 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53a764549e3664798aad8a1cb9bc3e74669c7f6a", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ee2a3d19df6c91036cb772b4747bc7244307cda1", "version": "1.82.0", diff --git a/versions/b-/boost-url.json b/versions/b-/boost-url.json index b9af52cdb0c202..35bdc08d289aff 100644 --- a/versions/b-/boost-url.json +++ b/versions/b-/boost-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bb3a49bd4739d46d1b09bf657a172bdd91deca9", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "5b6110be396379503f9305de47e76d364019b6c6", "version": "1.82.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index 9eaa1bbee21bb2..0c46df30ec67d2 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "353c3edd45cc926548492197f73164d5831728f0", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "b94486558c58f29bb5165d952196d448719caae5", "version": "1.82.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 6be7fdbdb9286c..e66a63c31fb57d 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d98133d8840363483b9f34baeec1b32696bbbd8b", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "718fe77c580850e2dd881ff115ffb0f3d8612774", "version": "1.82.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index ada112156fdbba..48647bc5823987 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7951625567bf2413827f614a1ee917035a5e59ec", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "8f71e0d63ff1504559355737dba1f2ef2452d557", "version": "1.82.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index e44b21302d76b2..ef1540d8c7e5ce 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd3e6bcf37179efe2425ffb104be151a9f1133f8", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "3acfc977da209b860fd7cf1365180af919be0eeb", "version": "1.82.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index 40860550456a2f..56d602d959e6ec 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a0f2ba2f59ce1040abe835b1e5adcd0a6dbc8af", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "f99477ea8dcfb463d2f0a2cce3c60914c2e5adb4", "version": "1.82.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index f53d7608977f67..5fe278ed68e133 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01fa69ff11a1e1e086b621a92ca334d99483a040", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "29976ffbb57716e6bfdf06b84e9958fd890a55c0", "version": "1.82.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 44c76a461021b1..3a4149ca4a054f 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c04f5117190e977f1a7a7067ce483ae581dcf111", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "26703fa9be9c0ca33ead77b9430a714bd672a523", "version": "1.82.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index d8d30524bacfb7..280599eb3cc12c 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fb732247dac823b0563bd50e4fc518c25eb9334", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "db66242e796c29abd3622cf41d506bee622b4d10", "version": "1.82.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index 3ee52f86ae0d74..fd8c35a9266486 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55106712d15cf7092591e0e6a36681274e8f0401", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "ed6d3e07b8e933869bbe2148898adc5916928405", "version": "1.82.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index b9eb0ef4c1de16..60d089fd8df93e 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdad26185e13b995615f4979050d3fd47db4fa32", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "a1b7fd0e064cb4fc3911bfe16e5b89e46bf3b5bb", "version": "1.82.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index a91556f6cc457b..e0ace2e8d1ca06 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef99d3992511da66e8f354441fb291ed0cac08f9", + "version": "1.82.0", + "port-version": 2 + }, { "git-tree": "7714a26cfdcdc9633297140c227198fb18f64061", "version": "1.82.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9ec0b6571390d0..cf468fce7d1040 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -626,139 +626,139 @@ }, "boost": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-accumulators": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-algorithm": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-align": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-any": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-array": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-asio": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-assert": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-assign": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-atomic": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-beast": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-bimap": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-bind": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-build": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-callable-traits": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-chrono": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-circular-buffer": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-compatibility": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-compute": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-concept-check": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-config": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-container": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-container-hash": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-context": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-contract": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-conversion": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-convert": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-core": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-coroutine": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-coroutine2": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-crc": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-date-time": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-describe": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-detail": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-di": { "baseline": "1.2.0", @@ -766,475 +766,475 @@ }, "boost-dll": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-dynamic-bitset": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-endian": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-exception": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-fiber": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-filesystem": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-flyweight": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-foreach": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-format": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-function": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-function-types": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-functional": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-fusion": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-geometry": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-gil": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-graph": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-graph-parallel": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-hana": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-heap": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-histogram": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-hof": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-icl": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-integer": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-interprocess": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-interval": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-intrusive": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-io": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-iostreams": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-iterator": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-json": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-lambda": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-lambda2": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-leaf": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-lexical-cast": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-local-function": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-locale": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-lockfree": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-log": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-logic": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-math": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-metaparse": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-modular-build-helper": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-move": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-mp11": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-mpi": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-mpl": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-msm": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-multi-array": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-multi-index": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-multiprecision": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-mysql": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-nowide": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-numeric-conversion": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-odeint": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-optional": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-outcome": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-parameter": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-parameter-python": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-pfr": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-phoenix": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-poly-collection": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-polygon": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-pool": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-predef": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-preprocessor": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-process": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-program-options": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-property-map": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-property-map-parallel": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-property-tree": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-proto": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-ptr-container": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-python": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-qvm": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-random": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-range": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-ratio": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-rational": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-regex": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-safe-numerics": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-scope-exit": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-serialization": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-signals2": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-smart-ptr": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-sort": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-spirit": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-stacktrace": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-statechart": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-static-assert": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-static-string": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-stl-interfaces": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-system": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-test": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-thread": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-throw-exception": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-timer": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-tokenizer": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-tti": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-tuple": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-type-erasure": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-type-index": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-type-traits": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-typeof": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-ublas": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-uninstall": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-units": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-unordered": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-url": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-utility": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-uuid": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-variant": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-variant2": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-vcpkg-helpers": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-vmd": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-wave": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-winapi": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-xpressive": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boost-yap": { "baseline": "1.82.0", - "port-version": 1 + "port-version": 2 }, "boringssl": { "baseline": "2021-06-23", From ba1ae2ec2dc3123d5edcf067c0c48fe2ec9d7bb1 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 7 Jun 2023 05:53:23 +0800 Subject: [PATCH 226/533] [arrow] Fix the problem that feature acero and dataset cannot be used (#31765) * fix arroeacer not found * update version * fix usage * update version * fix usage * update version --- ports/arrow/portfile.cmake | 16 ++++++++++++++++ ports/arrow/usage-acero | 3 +++ ports/arrow/usage-dataset | 3 +++ ports/arrow/vcpkg.json | 2 +- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ports/arrow/usage-acero create mode 100644 ports/arrow/usage-dataset diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 7a1bbcb7c3dcb7..36b48e1e0b3af5 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -80,6 +80,14 @@ if("dataset" IN_LIST FEATURES) ) endif() +if("acero" IN_LIST FEATURES) + vcpkg_cmake_config_fixup( + PACKAGE_NAME arrowacero + CONFIG_PATH lib/cmake/ArrowAcero + DO_NOT_DELETE_PARENT_CONFIG_PATH + ) +endif() + if("parquet" IN_LIST FEATURES) vcpkg_cmake_config_fixup( PACKAGE_NAME parquet @@ -94,6 +102,14 @@ if("parquet" IN_LIST FEATURES) file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-parquet" usage-parquet) file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-parquet}") endif() +if("dataset" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-dataset" usage-dataset) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-dataset}") +endif() +if("acero" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-acero" usage-acero) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-acero}") +endif() if("example" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") diff --git a/ports/arrow/usage-acero b/ports/arrow/usage-acero new file mode 100644 index 00000000000000..bde5ef80dabeda --- /dev/null +++ b/ports/arrow/usage-acero @@ -0,0 +1,3 @@ + + find_package(ArrowAcero CONFIG REQUIRED) + target_link_libraries(main PRIVATE "$,ArrowAcero::arrow_acero_static,ArrowAcero::arrow_acero_shared>") diff --git a/ports/arrow/usage-dataset b/ports/arrow/usage-dataset new file mode 100644 index 00000000000000..dcb9bda46bb00f --- /dev/null +++ b/ports/arrow/usage-dataset @@ -0,0 +1,3 @@ + + find_package(ArrowDataset CONFIG REQUIRED) + target_link_libraries(main PRIVATE "$,ArrowDataset::arrow_dataset_static,ArrowDataset::arrow_dataset_shared>") diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index fd0baed8b0ea93..15730c3cec6742 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", "version": "12.0.0", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 76d7f7f631bb68..9bcd7e62d2bc90 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4aba951b4604b0846af32c50cf4e6959e0e119d", + "version": "12.0.0", + "port-version": 2 + }, { "git-tree": "4e29a49e78533ec10e3142ae7ad69fdd12c8d163", "version": "12.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index cf468fce7d1040..7821c12fcee4e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -222,7 +222,7 @@ }, "arrow": { "baseline": "12.0.0", - "port-version": 1 + "port-version": 2 }, "arsenalgear": { "baseline": "2.1.0", From 4d0706551b9ded28d1fa83d2b70a3b92d525335a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 7 Jun 2023 00:01:49 +0200 Subject: [PATCH 227/533] Use Stale bot to close issues (#28806) * Use Stale bot to close issues * Update .github/workflows/stale.yml Co-authored-by: Adam Johnson * update action --------- Co-authored-by: Adam Johnson --- .github/workflows/stale.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000000000..a1a4a58e3fc889 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,31 @@ +name: 'Close stale issues and PRs' +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v6 + with: + stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.' + only-labels: 'category:question' + days-before-issue-stale: 28 + days-before-pr-stale: -1 + days-before-close: 14 + - uses: actions/stale@v6 + with: + stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.' + only-labels: 'requires:repro' + days-before-issue-stale: 28 + days-before-pr-stale: -1 + days-before-close: 14 + - uses: actions/stale@v6 + with: + close-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment." + ony-of-labels: 'category:new-port' + close-issue-label: 'new-port-unresolved' + days-before-issue-stale: 60 + days-before-pr-stale: -1 + days-before-close: 14 From a9eb33982376122ec8ab2d42da927c15603f7749 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 6 Jun 2023 15:03:50 -0700 Subject: [PATCH 228/533] Add generate-sas-tokens script. (#31842) --- .../azure-pipelines/generate-sas-tokens.ps1 | 54 +++++++++++++++++++ .../patch-tuesday-checklist.md | 2 + 2 files changed, 56 insertions(+) create mode 100644 scripts/azure-pipelines/generate-sas-tokens.ps1 diff --git a/scripts/azure-pipelines/generate-sas-tokens.ps1 b/scripts/azure-pipelines/generate-sas-tokens.ps1 new file mode 100644 index 00000000000000..ddd417384e246a --- /dev/null +++ b/scripts/azure-pipelines/generate-sas-tokens.ps1 @@ -0,0 +1,54 @@ + +function Get-SasToken { + Param( + [Parameter(Mandatory=$true)] + [int]$KeyNumber, + [Parameter(Mandatory=$true)] + [ValidateNotNullOrEmpty()] + [string]$ResourceGroupName, + [Parameter(Mandatory=$true)] + [ValidateNotNullOrEmpty()] + [string]$StorageAccountName, + [Parameter(Mandatory=$true)] + [ValidateNotNullOrEmpty()] + [string]$ContainerName, + [Parameter(Mandatory=$true)] + [ValidateNotNullOrEmpty()] + [string]$Permission + ) + + $keys = Get-AzStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName + $key = $keys[$KeyNumber - 1] + $ctx = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $key.Value + $start = Get-Date -AsUTC + $end = $start.AddDays(90) + $token = New-AzStorageContainerSASToken -Name $ContainerName -Permission $Permission -StartTime $start -ExpiryTime $end -Context $ctx + return $token.Substring(1) +} + +# Asset Cache: +# Read, Create, List +$assetSas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -ContainerName cache -Permission rcl + +# Binary Cache: +# Read, Create, List, Write +$binarySas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw +$binaryEASas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw + +$response = "Asset Cache SAS: Update`n" + ` + "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=6&path=vcpkg-asset-caching-credentials`n" + ` + "and`n" + ` + "https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=355&path=vcpkg-asset-caching-credentials`n" + ` + "`n" + ` + "token:`n" + ` + "$assetSas`n" + ` + "`n" + ` + "Binary Cache SAS: Update`n" + ` + "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=8&path=vcpkg-binary-caching-credentials`n" + ` + "`n" + ` + "sas-bin:`n" + ` + "$binarySas`n" + ` + "sas-bin-ea:`n" + ` + "$binaryEASas`n" + +Write-Host $response diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md index 9b1adcbadf752d..1050f4475c0dd3 100644 --- a/scripts/azure-pipelines/patch-tuesday-checklist.md +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -19,3 +19,5 @@ * [ ] Submit PR with those changes. * [ ] Submit a full CI rebuild with those changes: https://dev.azure.com/vcpkg/public/_build?definitionId=29 refs/pull/NUMBER/head +* [ ] Run `generate-sas-tokens.ps1` and update the relevant libraries on dev.azure.com/vcpkg and + devdiv.visualstudio.com. From d5d20ed2ee80ef48e86d44ac901ec0117173d149 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 7 Jun 2023 06:10:28 +0800 Subject: [PATCH 229/533] [podofo] Change to github and update version to 0.10.0 (#31584) (#31826) * [podofo] Change to github and update version to 0.10.0 * update version * fix static export * v db * fix export name and add usage * v db * disable build libxml2 features * format * v db Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/dav1d/portfile.cmake | 2 +- ports/dav1d/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/dav1d.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/dav1d/portfile.cmake b/ports/dav1d/portfile.cmake index 7aa56f9907d215..a0caef55cd8d40 100644 --- a/ports/dav1d/portfile.cmake +++ b/ports/dav1d/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO videolan/dav1d REF "${VERSION}" - SHA512 53b3fc0363504d4b9dd29bc88d3c8510ae65ac69b04e97d650e78c9fb5e2b95816d5c29dbc454aa5c2e539401c4be88ae88d7a7a8224007a05183fd249677f31 + SHA512 b2f39fdc95c851f136cbe2be40a75770e56ff0109ee55bd084861eb23a8c1dece070dde8a88781c5bb95e241e019e5985d88321560746ecbcb7ab2f22106c0b4 ) vcpkg_find_acquire_program(NASM) diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json index 00914417cd5f99..8f1a923ae60183 100644 --- a/ports/dav1d/vcpkg.json +++ b/ports/dav1d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dav1d", - "version": "1.1.0", - "port-version": 1, + "version": "1.2.1", "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", "homepage": "https://code.videolan.org/videolan/dav1d", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 7821c12fcee4e8..425fa43548ac47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2005,8 +2005,8 @@ "port-version": 2 }, "dav1d": { - "baseline": "1.1.0", - "port-version": 1 + "baseline": "1.2.1", + "port-version": 0 }, "daw-header-libraries": { "baseline": "2.93.1", diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 1b0aa21eccafef..99f0e7e9caf26d 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e819aee6d5e62ecd2981c858897773239e66b496", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "33290c0ea8117f5ba572eaee0a27c0213ec3fe30", "version": "1.1.0", From 713f5395f761304b043ca1afdcd8bdde5962852f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:13:00 -0700 Subject: [PATCH 230/533] [Exiv2] Add feature to enable BMFF support (#31827) * [Exiv2] Add feature to enable BMFF support * update version --------- Co-authored-by: Zhao Liu --- ports/exiv2/portfile.cmake | 1 + ports/exiv2/vcpkg.json | 4 ++++ versions/baseline.json | 2 +- versions/e-/exiv2.json | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index af39219edf97fa..efd905215c4ac9 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS video EXIV2_ENABLE_VIDEO png EXIV2_ENABLE_PNG nls EXIV2_ENABLE_NLS + bmff EXIV2_ENABLE_BMFF ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC) diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index 0c41d423ca4e05..f8b4bab47e259b 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "exiv2", "version": "0.27.6", + "port-version": 1, "description": "Image metadata library and tools", "homepage": "https://exiv2.org", "license": "GPL-2.0-or-later", @@ -20,6 +21,9 @@ } ], "features": { + "bmff": { + "description": "Support for BMFF files (e.g., CR3, HEIF, HEIC, AVIF, and JPEG XL)" + }, "nls": { "description": "Build native language support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 425fa43548ac47..d376f627a169c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2362,7 +2362,7 @@ }, "exiv2": { "baseline": "0.27.6", - "port-version": 0 + "port-version": 1 }, "expat": { "baseline": "2.5.0", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index f0619c8d017db2..5808dce835d421 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e3ce02246c1ef4cdc28caed2afa2fe2b394476f", + "version": "0.27.6", + "port-version": 1 + }, { "git-tree": "19442ed87a9f3827ddb22debf6b446e4cdca2d4f", "version": "0.27.6", From ad345ce17a26c56e8829356d9a98048ba0f4433b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 7 Jun 2023 01:17:57 +0200 Subject: [PATCH 231/533] [proj] Update to 9.2.1 (#31769) --- ports/proj/fix-proj4-targets-cmake.patch | 10 +++++----- ports/proj/portfile.cmake | 2 +- ports/proj/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/proj.json | 5 +++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ports/proj/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch index f86346081ec809..d0e132bbcc0125 100644 --- a/ports/proj/fix-proj4-targets-cmake.patch +++ b/ports/proj/fix-proj4-targets-cmake.patch @@ -38,11 +38,11 @@ diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 7d5579ae..0cf96252 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -15,6 +15,7 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4") - - cmake_policy(PUSH) - cmake_policy(SET CMP0012 NEW) +@@ -27,6 +27,7 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4") + endif() + cmake_policy(POP) + +find_dependency(unofficial-sqlite3 CONFIG) - if("@ENABLE_TIFF@") + if(DEFINED PROJ_CONFIG_FIND_TIFF_DEP) find_dependency(TIFF) endif() diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index 2e280823b9bd59..d20d35eef28eb3 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ REF "${VERSION}" - SHA512 a48980b94b6c68738dd5ab70a1de6aa42f325fd612155623195a14774caadcaceff08035c01696458d3dd706b2277d89ea093949a1855fafa9951c59821cb1cb + SHA512 ac6cf14c7a4bf0435b0b6c373b665762f46ea7609fdbffc512efc308441bf0ac7bf4dee2bcf3b60e98a604b2e3f1e7a67fdac9f455c1ad37ad3f705185a2b620 HEAD_REF master PATCHES fix-win-output-name.patch diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index 64bdc76418dd4e..812e350abafdba 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proj", - "version": "9.2.0", + "version": "9.2.1", "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", @@ -13,6 +13,7 @@ { "name": "sqlite3", "host": true, + "default-features": false, "features": [ "tool" ] diff --git a/versions/baseline.json b/versions/baseline.json index d376f627a169c9..215931168a5e73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6409,7 +6409,7 @@ "port-version": 2 }, "proj": { - "baseline": "9.2.0", + "baseline": "9.2.1", "port-version": 0 }, "proj4": { diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 0e195241c88af3..71f1be99ecc496 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7dc980fc3b1ca19e8ca6aa5b1ad625949229b2e", + "version": "9.2.1", + "port-version": 0 + }, { "git-tree": "24665244df24460f20293fc879787852554b16c7", "version": "9.2.0", From 3b9862c0815c4269861b1bfcf5b887e7766e3173 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 6 Jun 2023 19:18:18 -0400 Subject: [PATCH 232/533] [abseil] update to 20230125.3 version (#31764) Protobuf >= 23.0 will require Abseil 20230125.3 or higher. --- ports/abseil/portfile.cmake | 4 ++-- ports/abseil/vcpkg.json | 3 +-- versions/a-/abseil.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 17c2e666cbcdb6..323bd359d48893 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 20230125.0 - SHA512 b3d334215c78b31a2eb10bd9d4a978cd48367866d6daa2065c6c727282bafe19ef7ff5bd7cd4ed5c319d3b04e0711222e08ddbe7621ef1e079fed93a7307112f + REF 20230125.3 + SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70 HEAD_REF master PATCHES fix-dll-support.patch diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index f783cd64412f8c..f0dd58128554bf 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", - "version": "20230125.0", - "port-version": 1, + "version": "20230125.3", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index f73f44a1df7c77..177ae457d73677 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a337fa251c0ac4489d9c0ea1e2f1c9a7d019eb5", + "version": "20230125.3", + "port-version": 0 + }, { "git-tree": "a88e9003e0d38c2cfbcc676931a0204d749e6629", "version": "20230125.0", diff --git a/versions/baseline.json b/versions/baseline.json index 215931168a5e73..050a33ca4aec53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -17,8 +17,8 @@ "port-version": 0 }, "abseil": { - "baseline": "20230125.0", - "port-version": 1 + "baseline": "20230125.3", + "port-version": 0 }, "absent": { "baseline": "0.3.1", From a7c59801589e2bc371f2b095c77c659da2612193 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 7 Jun 2023 01:21:01 +0200 Subject: [PATCH 233/533] [gdal] Avoid abseil headers (#31816) --- ports/gdal/portfile.cmake | 3 +++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 511fe7f17e5e2b..22f989ff7dc49d 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -12,6 +12,9 @@ vcpkg_from_github( # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") +# Avoid abseil, no matter if vcpkg or system +vcpkg_replace_string("${SOURCE_PATH}/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h" [[__has_include("absl/strings/string_view.h")]] "(0)") + # Cf. cmake/helpers/CheckDependentLibraries.cmake # The default for all `GDAL_USE_` dependencies is `OFF`. # Here, we explicitly control dependencies provided via vpcpkg. diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 9f678b98cd6306..42b6ea96380859 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.7.0", - "port-version": 2, + "port-version": 3, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 050a33ca4aec53..60d24d2bdf4d07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2722,7 +2722,7 @@ }, "gdal": { "baseline": "3.7.0", - "port-version": 2 + "port-version": 3 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index a067e14cfef789..07d6fde518f92e 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35cbea48f44c5d0836cd0b6f171396eae2745177", + "version-semver": "3.7.0", + "port-version": 3 + }, { "git-tree": "f287b8dfcfba6e4f2d8ee8cdba0e63f0ae326fd7", "version-semver": "3.7.0", From 7dc475291af88927f5ad43bbc43e80c757a50410 Mon Sep 17 00:00:00 2001 From: Doug Cook <45909143+idigdoug@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:22:02 -0700 Subject: [PATCH 234/533] New port: libtracepoint-decode (#31839) * New port: libtracepoint-decode (decoder for perf.data) Library for decoding tracepoints, e.g. from Linux perf.data files. * Version 1.0 for new port: libtracepoint-decode --- ports/libtracepoint-decode/portfile.cmake | 21 +++++++++++++++++++++ ports/libtracepoint-decode/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libtracepoint-decode.json | 9 +++++++++ 4 files changed, 52 insertions(+) create mode 100644 ports/libtracepoint-decode/portfile.cmake create mode 100644 ports/libtracepoint-decode/vcpkg.json create mode 100644 versions/l-/libtracepoint-decode.json diff --git a/ports/libtracepoint-decode/portfile.cmake b/ports/libtracepoint-decode/portfile.cmake new file mode 100644 index 00000000000000..da094600d0c1d8 --- /dev/null +++ b/ports/libtracepoint-decode/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF abf1f6d3e32546aeaab75ed3cea45b54b94fbd50 + SHA512 ac67bbd8184a29c8058a7b2cde51db9a14f97326396ba894f56a36d4219bebbc580f64a3ed5f182df4a0111ad97294a6b780bd44181d37e0fda1be16a6e23dea + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libtracepoint-decode-cpp") + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_cmake_config_fixup( + PACKAGE_NAME tracepoint-decode + CONFIG_PATH lib/cmake/tracepoint-decode) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libtracepoint-decode/vcpkg.json b/ports/libtracepoint-decode/vcpkg.json new file mode 100644 index 00000000000000..bc6ce21fd20d61 --- /dev/null +++ b/ports/libtracepoint-decode/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libtracepoint-decode", + "version": "1.0.0", + "description": "Tracepoint decoding classes for C++", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux | windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 60d24d2bdf4d07..823e7e193bbdf7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4640,6 +4640,10 @@ "baseline": "1.0.0", "port-version": 0 }, + "libtracepoint-decode": { + "baseline": "1.0.0", + "port-version": 0 + }, "libu2f-server": { "baseline": "1.1.0", "port-version": 5 diff --git a/versions/l-/libtracepoint-decode.json b/versions/l-/libtracepoint-decode.json new file mode 100644 index 00000000000000..b7dbc0d841d290 --- /dev/null +++ b/versions/l-/libtracepoint-decode.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6bd99da97aa18ca05fd3a67eb77f6df1ea210d2e", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 75059166857a374297e5edd6e1e7a60912907a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 7 Jun 2023 01:24:14 +0200 Subject: [PATCH 235/533] [unordered-dense] New port (#31856) * [unordered-dense] New port * [unordered-dense] Update version files * [unordered-dense] Add missing version file * [unordered-dense] Add license * [unordered-dense] Update version files --- ports/unordered-dense/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/unordered-dense/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/u-/unordered-dense.json | 9 +++++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/unordered-dense/portfile.cmake create mode 100644 ports/unordered-dense/vcpkg.json create mode 100644 versions/u-/unordered-dense.json diff --git a/ports/unordered-dense/portfile.cmake b/ports/unordered-dense/portfile.cmake new file mode 100644 index 00000000000000..d67232df6695b3 --- /dev/null +++ b/ports/unordered-dense/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_minimum_required(VERSION 2023-04-07) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinus/unordered_dense + REF v${VERSION} + SHA512 105eb88deeb89c9424973d2b5425a6e176f3f66a45f11cf6ed520cce177918cd5345e840d10561f6f790b6cc11b7b6e1357bd2fc4d199254a360de88ce553fe0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME unordered_dense + CONFIG_PATH lib/cmake/unordered_dense +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/unordered-dense/vcpkg.json b/ports/unordered-dense/vcpkg.json new file mode 100644 index 00000000000000..03fc9c0bb60b71 --- /dev/null +++ b/ports/unordered-dense/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "unordered-dense", + "version": "4.0.1", + "description": "A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion", + "homepage": "https://github.com/martinus/unordered_dense", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 823e7e193bbdf7..69273ea543d995 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8248,6 +8248,10 @@ "baseline": "2.3.11", "port-version": 2 }, + "unordered-dense": { + "baseline": "4.0.1", + "port-version": 0 + }, "unqlite": { "baseline": "1.1.9", "port-version": 2 diff --git a/versions/u-/unordered-dense.json b/versions/u-/unordered-dense.json new file mode 100644 index 00000000000000..b89eb6e826d9d8 --- /dev/null +++ b/versions/u-/unordered-dense.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "404e82b0f085a6d68323630f530c04e86b5eeb2b", + "version": "4.0.1", + "port-version": 0 + } + ] +} From c9a1f2179161d5bf2b1eebd293f106d89db4a83f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 7 Jun 2023 09:30:10 -0700 Subject: [PATCH 236/533] [Exiv2] remove duplicate option (#31868) * [Exiv2] Remove option * update version --------- Co-authored-by: Zhao Liu --- ports/exiv2/portfile.cmake | 1 - ports/exiv2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/exiv2.json | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index efd905215c4ac9..24ce46d51ea077 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -37,7 +37,6 @@ vcpkg_cmake_configure( -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF - -DEXIV2_ENABLE_BMFF=OFF -DEXIV2_TEAM_EXTRA_WARNINGS=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF -DEXIV2_TEAM_PACKAGING=OFF diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index f8b4bab47e259b..9a8885609d25cd 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "exiv2", "version": "0.27.6", - "port-version": 1, + "port-version": 2, "description": "Image metadata library and tools", "homepage": "https://exiv2.org", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 69273ea543d995..0aabb2e59e68d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2362,7 +2362,7 @@ }, "exiv2": { "baseline": "0.27.6", - "port-version": 1 + "port-version": 2 }, "expat": { "baseline": "2.5.0", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 5808dce835d421..d585377481253f 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9616cd1c578515f6aa85ab9dc6e00cdbbda31371", + "version": "0.27.6", + "port-version": 2 + }, { "git-tree": "4e3ce02246c1ef4cdc28caed2afa2fe2b394476f", "version": "0.27.6", From 4446d6e055766660b2bf19c9647e27b3f0d9bd57 Mon Sep 17 00:00:00 2001 From: Maks Naumov Date: Wed, 7 Jun 2023 19:31:06 +0300 Subject: [PATCH 237/533] [activemq-cpp] Fix activemq-cppConfig.cmake syntax error (#31865) --- ports/activemq-cpp/activemq-cppConfig.cmake | 2 +- ports/activemq-cpp/vcpkg.json | 2 +- versions/a-/activemq-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/activemq-cpp/activemq-cppConfig.cmake b/ports/activemq-cpp/activemq-cppConfig.cmake index 715a1630d9ac5e..0a1178414c44a4 100644 --- a/ports/activemq-cpp/activemq-cppConfig.cmake +++ b/ports/activemq-cpp/activemq-cppConfig.cmake @@ -62,7 +62,7 @@ macro(_activemq_cpp_windows_dependencies) endif() list(JOIN _ACTIVEMQ_CPP_MISSINGS ", " _ACTIVEMQ_CPP_MISSINGS_STR) list(LENGTH _ACTIVEMQ_CPP_MISSINGS _ACTIVEMQ_CPP_MISSINGS_COUNT) - if(_ACTIVEMQ_CPP_MISSINGS_COUNT EQUALS 1) + if(_ACTIVEMQ_CPP_MISSINGS_COUNT EQUAL 1) set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependency: ${_ACTIVEMQ_CPP_MISSINGS_STR}") else() set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependencies: ${_ACTIVEMQ_CPP_MISSINGS_STR}") diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index 9c30eca47c76ad..47d9a75400cebd 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 13, + "port-version": 14, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", "supports": "!(uwp | osx)", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 27d32b9f1f4ef3..83fbee9d2249ff 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7af309821bf9e2fdfaaf67e38eae1a073b4d1acc", + "version-semver": "3.9.5", + "port-version": 14 + }, { "git-tree": "75c1e838f461bba7a78802919b2ec16bdbfd154e", "version-semver": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index 0aabb2e59e68d6..b6ccec2116dc08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -34,7 +34,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 13 + "port-version": 14 }, "ada-url": { "baseline": "2.4.2", From 120f81c4d4a77e26f7e81eb3a93fb3f644e04844 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Wed, 7 Jun 2023 09:34:22 -0700 Subject: [PATCH 238/533] [kenlm] Update port (#31863) * [kenlm] Update port * x-add-version * remove unused patches * Overwrite version * Use imported targets for Boost to fix build issue on Windows * Update ports/kenlm/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update version * Update versions/k-/kenlm.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kenlm/fix-boost-imported-targets.patch | 33 ++++++++++++++++++++ ports/kenlm/fix-const-overloaded.patch | 14 --------- ports/kenlm/include_functional.patch | 12 ------- ports/kenlm/portfile.cmake | 9 +++--- ports/kenlm/vcpkg.json | 12 +++---- versions/baseline.json | 4 +-- versions/k-/kenlm.json | 5 +++ 7 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 ports/kenlm/fix-boost-imported-targets.patch delete mode 100644 ports/kenlm/fix-const-overloaded.patch delete mode 100644 ports/kenlm/include_functional.patch diff --git a/ports/kenlm/fix-boost-imported-targets.patch b/ports/kenlm/fix-boost-imported-targets.patch new file mode 100644 index 00000000000000..f1987ca4362109 --- /dev/null +++ b/ports/kenlm/fix-boost-imported-targets.patch @@ -0,0 +1,33 @@ +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 7a96ef5..0708d8a 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -85,7 +85,10 @@ set_target_properties(kenlm_util PROPERTIES POSITION_INDEPENDENT_CODE ON) + target_link_libraries(kenlm_util + PUBLIC + # Boost is required for building binaries and tests +- "$" ++ $ ++ $ ++ $ ++ $ + PRIVATE + Threads::Threads + ${RT}) +diff --git a/util/stream/CMakeLists.txt b/util/stream/CMakeLists.txt +index be2fe00..a7e7df5 100644 +--- a/util/stream/CMakeLists.txt ++++ b/util/stream/CMakeLists.txt +@@ -35,5 +35,11 @@ if(BUILD_TESTING) + ) + + AddTests(TESTS ${KENLM_BOOST_TESTS_LIST} +- LIBRARIES kenlm_util ${Boost_LIBRARIES} Threads::Threads) ++ LIBRARIES ++ kenlm_util ++ Boost::program_options ++ Boost::system ++ Boost::thread ++ Boost::unit_test_framework ++ Threads::Threads) + endif() diff --git a/ports/kenlm/fix-const-overloaded.patch b/ports/kenlm/fix-const-overloaded.patch deleted file mode 100644 index 2a77b335f858a3..00000000000000 --- a/ports/kenlm/fix-const-overloaded.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/util/proxy_iterator.hh b/util/proxy_iterator.hh -index 8aa697b..9de2663 100644 ---- a/util/proxy_iterator.hh -+++ b/util/proxy_iterator.hh -@@ -77,8 +77,7 @@ template class ProxyIterator { - - std::ptrdiff_t operator-(const S &other) const { return I() - other.I(); } - -- Proxy operator*() { return p_; } -- const Proxy operator*() const { return p_; } -+ Proxy operator*() const { return p_; } - Proxy *operator->() { return &p_; } - const Proxy *operator->() const { return &p_; } - Proxy operator[](std::ptrdiff_t amount) const { return *(*this + amount); } diff --git a/ports/kenlm/include_functional.patch b/ports/kenlm/include_functional.patch deleted file mode 100644 index 6659b3c0abc39f..00000000000000 --- a/ports/kenlm/include_functional.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/util/string_piece_hash.hh b/util/string_piece_hash.hh -index 6ff6f88..16808cd 100644 ---- a/util/string_piece_hash.hh -+++ b/util/string_piece_hash.hh -@@ -1,6 +1,7 @@ - #ifndef UTIL_STRING_PIECE_HASH_H - #define UTIL_STRING_PIECE_HASH_H - -+#include - #include "util/have.hh" - #include "util/string_piece.hh" - diff --git a/ports/kenlm/portfile.cmake b/ports/kenlm/portfile.cmake index 371929d501428b..15917d9253459d 100644 --- a/ports/kenlm/portfile.cmake +++ b/ports/kenlm/portfile.cmake @@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kpu/kenlm - REF 1f054617eca14eae921e987b4b4eeb2b1d91de6b - SHA512 c18f9c22fbbb1f54ebe9c3b771fb2d7c09d502141d1b3645cff9db44cc51b3c976311ff0db79b60f410622579d043f185c56a4c7386e1b0ba8708e433238968b + REF 5bf7b46558e1c5595bf3b8c9b0b1f9d8d257040a + SHA512 04b645d09e60b65cb1e5065a1623ad01737f0dd9415cf620288ace0db10b1c424d72f304b34c52fa08684f3fecdaad9db91088134f34ed374cb1eb9d58c635b5 HEAD_REF master PATCHES fix-boost.patch - fix-const-overloaded.patch - include_functional.patch # Upstream PR https://github.com/kpu/kenlm/pull/428, please remove this patch when updating this port. + fix-boost-imported-targets.patch ) file(REMOVE "${SOURCE_PATH}/cmake/modules/FindEigen3.cmake") @@ -28,6 +27,7 @@ vcpkg_cmake_configure( -DCOMPILE_TESTS=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) set(KENLM_TOOLS count_ngrams filter fragment kenlm_benchmark lmplz phrase_table_vocab query build_binary) if (NOT VCPKG_TARGET_IS_WINDOWS) @@ -41,6 +41,7 @@ vcpkg_copy_tools(TOOL_NAMES ${KENLM_TOOLS} AUTO_CLEAN) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Copyright and License vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE") diff --git a/ports/kenlm/vcpkg.json b/ports/kenlm/vcpkg.json index 7d0fde56e6cf5f..4eaffd89e6077a 100644 --- a/ports/kenlm/vcpkg.json +++ b/ports/kenlm/vcpkg.json @@ -1,8 +1,8 @@ { "name": "kenlm", - "version": "20200924", - "port-version": 4, + "version": "20230531", "description": "KenLM: Faster and Smaller Language Model Queries", + "license": "LGPL-2.1", "supports": "!(arm64 & windows)", "dependencies": [ "boost-interprocess", @@ -12,15 +12,15 @@ "boost-test", "boost-thread", "bzip2", - { - "name": "eigen3", - "platform": "!windows" - }, "liblzma", { "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index b6ccec2116dc08..f1399507caef9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3529,8 +3529,8 @@ "port-version": 0 }, "kenlm": { - "baseline": "20200924", - "port-version": 4 + "baseline": "20230531", + "port-version": 0 }, "keystone": { "baseline": "0.9.2", diff --git a/versions/k-/kenlm.json b/versions/k-/kenlm.json index 7440dcb49d805f..b0d7dbb03de4aa 100644 --- a/versions/k-/kenlm.json +++ b/versions/k-/kenlm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb9e0ae36b74ecd5bfb6a8855e761138eeda9185", + "version": "20230531", + "port-version": 0 + }, { "git-tree": "6f1bed68940353855027de67f5f6d33c5dbe8617", "version": "20200924", From af3e30dde2ea77c311d9855e65ebb6f73e3eb266 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 8 Jun 2023 00:36:42 +0800 Subject: [PATCH 239/533] [mathgl] Fix GSL linakge (#31854) * fix link gsl * update version --- ports/mathgl/fix_link_gsl.patch | 37 +++++++++++++++++++++++++++++++++ ports/mathgl/portfile.cmake | 1 + ports/mathgl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mathgl.json | 5 +++++ 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 ports/mathgl/fix_link_gsl.patch diff --git a/ports/mathgl/fix_link_gsl.patch b/ports/mathgl/fix_link_gsl.patch new file mode 100644 index 00000000000000..7715f808ac2d8a --- /dev/null +++ b/ports/mathgl/fix_link_gsl.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c931e2..4987f2d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -485,25 +485,13 @@ endif(enable-openmp) + + if(enable-gsl) + set(MGL_HAVE_GSL 1) +- find_library(GSL_LIB gsl) +- find_library(GSL_CBLAS_LIB gslcblas) +- find_path(GSL_INCLUDE_DIR gsl/gsl_fft_complex.h) +- if(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR) +- message(SEND_ERROR "${GSL_LIB}") +- message(SEND_ERROR "${GSL_CBLAS_LIB}") +- message(SEND_ERROR "${GSL_INCLUDE_DIR}") +- message(SEND_ERROR "Couldn't find GSL libraries.") +- else(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR) +- set(CMAKE_REQUIRED_INCLUDES ${GSL_INCLUDE_DIR}) +- set(CMAKE_REQUIRED_LIBRARIES ${GSL_LIB} ${GSL_CBLAS_LIB}) +- CHECK_CXX_SOURCE_COMPILES("#include +- int main(){gsl_multifit_fdfsolver *s=0;gsl_matrix *J = 0; +- gsl_multifit_fdfsolver_jac(s, J);}" MGL_HAVE_GSL2) +- unset(CMAKE_REQUIRED_INCLUDES) +- unset(CMAKE_REQUIRED_LIBRARIES) +- endif(NOT GSL_LIB OR NOT GSL_CBLAS_LIB OR NOT GSL_INCLUDE_DIR) +- set(MGL_DEP_LIBS ${GSL_LIB} ${GSL_CBLAS_LIB} ${MGL_DEP_LIBS}) +- include_directories(${GSL_INCLUDE_DIR}) ++ find_package(GSL REQUIRED) ++ set(MGL_DEP_LIBS GSL::gsl GSL::gslcblas ${MGL_DEP_LIBS}) ++ set(CMAKE_REQUIRED_LIBRARIES GSL::gsl GSL::gslcblas) ++ CHECK_CXX_SOURCE_COMPILES("#include ++ int main(){gsl_multifit_fdfsolver *s=0;gsl_matrix *J = 0; ++ gsl_multifit_fdfsolver_jac(s, J);}" MGL_HAVE_GSL2) ++ unset(CMAKE_REQUIRED_LIBRARIES) + else(enable-gsl) + set(MGL_HAVE_GSL 0) + endif(enable-gsl) diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index dff022719e63fd..708e5badae9cf5 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_sourceforge( fix-mgllab.patch include_functional.patch fix-include-property.patch + fix_link_gsl.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/addons/getopt") diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index dd59023718bb7d..fc8363383d622e 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mathgl", "version": "8.0.1", - "port-version": 2, + "port-version": 3, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "license": "GPL-3.0-only", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index f1399507caef9e..b52d1c7de4bae7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5154,7 +5154,7 @@ }, "mathgl": { "baseline": "8.0.1", - "port-version": 2 + "port-version": 3 }, "matio": { "baseline": "1.5.23", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index d696bec6456c37..b82208067f1323 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c1da85e695d3767410b3acf59567da2faf32ea2", + "version": "8.0.1", + "port-version": 3 + }, { "git-tree": "34ffe72f88b0fa47c8bf8ad235ed3cf109560f65", "version": "8.0.1", From 8f721da26e864d0927e0c21336f336f9f0d0cbe2 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 8 Jun 2023 00:40:40 +0800 Subject: [PATCH 240/533] [redis-plus-plus]Update version to 1.3.8 (#31851) * [redis-plus-plus]Update version to 1.3.8 * version * fix file absolute path * version --- ports/redis-plus-plus/fix-absolute-path.patch | 13 +++++++++++++ ports/redis-plus-plus/portfile.cmake | 5 +++-- ports/redis-plus-plus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/redis-plus-plus.json | 5 +++++ 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 ports/redis-plus-plus/fix-absolute-path.patch diff --git a/ports/redis-plus-plus/fix-absolute-path.patch b/ports/redis-plus-plus/fix-absolute-path.patch new file mode 100644 index 00000000000000..16c0ebbfa9f93f --- /dev/null +++ b/ports/redis-plus-plus/fix-absolute-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a075aca..8657ef7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -168,7 +168,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB}) + + CHECK_SYMBOL_EXISTS(redisEnableKeepAliveWithInterval ${HIREDIS_FEATURE_TEST_HEADER} REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval) + +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h) ++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/hiredis_features.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_SOURCE_DIR}/hiredis_features.h") + + # Restore CMAKE_REQUIRED_LIBRARIES + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACK}) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index 59bfb981978808..fb1b9b789eaa18 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus - REF f3b19a8a1f609d1a1b79002802e5cf8c336dc262 # 1.3.7 - SHA512 c99a4506be06224ebc4adaa29d5eeff0f6efae8b99e48ac02c26cec4a86fb46237a7d380ddb89eddc3d2e75c0c567e9b68610bcf271a0c708bca8ca6a5641075 + REF 4368319fb668204f345da05b9dd79762506c67b6 # 1.3.8 + SHA512 37774078fb98992c4b4be276c91a2b6a8b8810d62a5087184d1fa2c05db77de15058d5139747578f7a2f9219351c05de32740b63c153ea902493d4b5d05c2d68 HEAD_REF master PATCHES fix-conversion.patch fix-dependency-libuv.patch + fix-absolute-path.patch ) if("cxx17" IN_LIST FEATURES) diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 93ee982c1d0f7a..7d4cf1ffb5f61c 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "redis-plus-plus", - "version-semver": "1.3.7", + "version-semver": "1.3.8", "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b52d1c7de4bae7..9b046ddd2fb5f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7065,7 +7065,7 @@ "port-version": 0 }, "redis-plus-plus": { - "baseline": "1.3.7", + "baseline": "1.3.8", "port-version": 0 }, "refl-cpp": { diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 11bfa678f10c6a..05ed755fca84fc 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c359e3bd938ceb9f3f5cde1b8aa4e435c9123534", + "version-semver": "1.3.8", + "port-version": 0 + }, { "git-tree": "6a48ccb1b618d7dedeeb50bde2ecc413b63c3742", "version-semver": "1.3.7", From b33cf57de82c857a4fedd440a048303afab013e3 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 7 Jun 2023 09:43:34 -0700 Subject: [PATCH 241/533] [vsg] Fix build error when the Vulkan component glslangValidator is already installed (#31843) * [vsg] Fix build error when the Vulkan component glslangValidator is already installed * update version --- ports/vsg/devendor-glslang.patch | 12 ++++++------ ports/vsg/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/v-/vsg.json | 5 +++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/vsg/devendor-glslang.patch b/ports/vsg/devendor-glslang.patch index 356d4c4041a4d8..562bbaaddafe0a 100644 --- a/ports/vsg/devendor-glslang.patch +++ b/ports/vsg/devendor-glslang.patch @@ -16,7 +16,7 @@ index 61da709f..472bc6af 100644 if (Git_FOUND) diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt -index 4154312f..49d63b97 100644 +index 4154312..7afcdd4 100644 --- a/src/vsg/CMakeLists.txt +++ b/src/vsg/CMakeLists.txt @@ -226,7 +226,7 @@ set(SOURCES @@ -28,10 +28,10 @@ index 4154312f..49d63b97 100644 # include glslang source code directly into the VulkanScenegraph library build. include(../glslang/build_vars.cmake) -@@ -236,6 +236,14 @@ endif() +@@ -234,6 +234,14 @@ endif() + + # set up library dependencies set(LIBRARIES PUBLIC - Vulkan::Vulkan - Threads::Threads + glslang::glslang + glslang::OSDependent + glslang::MachineIndependent @@ -40,9 +40,9 @@ index 4154312f..49d63b97 100644 + glslang::OGLCompiler + glslang::SPVRemapper + glslang::SPIRV + Vulkan::Vulkan + Threads::Threads ) - - # Check for std::atomic @@ -364,9 +372,6 @@ target_include_directories(vsg PUBLIC $ diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json index dd3b617dc1b1e7..b4f4cc38448756 100644 --- a/ports/vsg/vcpkg.json +++ b/ports/vsg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vsg", "version": "1.0.5", + "port-version": 1, "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", "homepage": "http://www.vulkanscenegraph.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9b046ddd2fb5f5..acadfd3f01d5c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8478,7 +8478,7 @@ }, "vsg": { "baseline": "1.0.5", - "port-version": 0 + "port-version": 1 }, "vtk": { "baseline": "9.2.0-pv5.11.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index 440b6c40114975..8a332addfca937 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2ade86b1dee203ecaa4a401e76d80a205b6c71f", + "version": "1.0.5", + "port-version": 1 + }, { "git-tree": "0542d7bb873d65fa6ecbf2c3a02d7a2c7221d34a", "version": "1.0.5", From 6d6f3164e60d62325fc667bb68ac89568857b6d7 Mon Sep 17 00:00:00 2001 From: Alex Dewar Date: Wed, 7 Jun 2023 17:45:38 +0100 Subject: [PATCH 242/533] [crossguid] Fix compilation on gcc v13 (#31835) * [crossguid] Fix compilation on gcc v13 Crossguid no longer compiles with gcc v13 (tested on Linux), due to a missing include (cstdint). There is an upstream pull request to fix the issue which has been open for some time but not yet merged [1]. Let's patch the sources in vcpkg until upstream fixes it. Fixes #31834. [1] https://github.com/graeme-hill/crossguid/pull/67 * [crossguid] Bump port-version --- ports/crossguid/missing-include-cstdint.patch | 12 ++++++++++++ ports/crossguid/portfile.cmake | 1 + ports/crossguid/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crossguid.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/crossguid/missing-include-cstdint.patch diff --git a/ports/crossguid/missing-include-cstdint.patch b/ports/crossguid/missing-include-cstdint.patch new file mode 100644 index 00000000000000..a93011591c1b33 --- /dev/null +++ b/ports/crossguid/missing-include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include + #endif + ++#include + #include + #include + #include diff --git a/ports/crossguid/portfile.cmake b/ports/crossguid/portfile.cmake index 5be5064d167d64..00b670ea465167 100644 --- a/ports/crossguid/portfile.cmake +++ b/ports/crossguid/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES warnings.patch + missing-include-cstdint.patch ) vcpkg_cmake_configure( diff --git a/ports/crossguid/vcpkg.json b/ports/crossguid/vcpkg.json index aa9aecd85893ad..ebdac5380942f1 100644 --- a/ports/crossguid/vcpkg.json +++ b/ports/crossguid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crossguid", "version-date": "2021-10-22", - "port-version": 2, + "port-version": 3, "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index acadfd3f01d5c1..a362e386a447be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1882,7 +1882,7 @@ }, "crossguid": { "baseline": "2021-10-22", - "port-version": 2 + "port-version": 3 }, "crow": { "baseline": "1.0-5", diff --git a/versions/c-/crossguid.json b/versions/c-/crossguid.json index ce2ce308a90300..8a0904314f9ed1 100644 --- a/versions/c-/crossguid.json +++ b/versions/c-/crossguid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39a8ec44dcb709796a0ecdc4c170f67ad5ad1175", + "version-date": "2021-10-22", + "port-version": 3 + }, { "git-tree": "93714099ddf83b2f3437a080c8acc08ff74cbe37", "version-date": "2021-10-22", From 22c84a2965f8993addcf41eac9dae6ab15ad4a01 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 8 Jun 2023 01:47:52 +0900 Subject: [PATCH 243/533] [harfbuzz] update to 7.3.0 (#31788) * [harfbuzz] update to 7.3.0 (microsoft/vcpkg#31787) * [harfbuzz] regenerate version registry (microsoft/vcpkg#31787) --- ports/harfbuzz/portfile.cmake | 2 +- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index e18f5436835708..24ea90ed4e6140 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 da9596b55a12fa5b721947012090018b4676573d8687850617cd67a07af539ddf2a7bb6bdf7245dfcf70547209296f46737600328c096f27f660f0f303fa622c + SHA512 47238586c399ede1095c60b7e065718308c396cab645fd5bd5c75e15357c068ff001b2b6624d44c7f6538b65faf549c0224bdb62131a1cea78418f3f57113c7e HEAD_REF master ) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 5a67f97f438fbc..45b50dea66f4f2 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "7.2.0", + "version": "7.3.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index a362e386a447be..ef361b40eca141 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3077,7 +3077,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "7.2.0", + "baseline": "7.3.0", "port-version": 0 }, "hash-library": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 495a0b63c4b6f6..12ea472ac7c28e 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b0e10a3d5e7e49990e7a19f29cdba04571725f4", + "version": "7.3.0", + "port-version": 0 + }, { "git-tree": "6715cbef7e30e10a6888a737e49a3f971b08f24c", "version": "7.2.0", From 0f8a0f084a8d1bf35700dd797ae5e4bb8aa52f1a Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 8 Jun 2023 01:49:58 +0900 Subject: [PATCH 244/533] [glib] Update glib to 2.76.3 (#31786) * [glib] Update glib to 2.76.3 (microsoft/vcpkg#31785) * [glib] regenerate versions repository (microsoft/vcpkg#31785) --- ports/glib/portfile.cmake | 2 +- ports/glib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index a2cb255d6fc69d..28815e7cc514cf 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 + SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 782e3eaa6aa46a..d70885e2a1dbbc 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glib", - "version": "2.76.2", + "version": "2.76.3", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index ef361b40eca141..1d70cb1aa5274f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2841,7 +2841,7 @@ "port-version": 2 }, "glib": { - "baseline": "2.76.2", + "baseline": "2.76.3", "port-version": 0 }, "glibmm": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index c43230b997fc3b..f5eba925391826 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32c3e0235a72e62db8c1b248e3096c1d51415ba7", + "version": "2.76.3", + "port-version": 0 + }, { "git-tree": "219fb684c85e933ff56764423c86055a7a23ee62", "version": "2.76.2", From 02cf0c23a2ab5822f87a4e3e34e44c8a8229cccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 7 Jun 2023 20:53:30 +0200 Subject: [PATCH 245/533] [imgui] Update to 1.89.6 (#31761) * [imgui] Update to 1.89.6 * [imgui] Update version files --- ports/imgui/CMakeLists.txt | 4 ++-- ports/imgui/portfile.cmake | 6 +++--- ports/imgui/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/imgui.json | 5 +++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index f7a5f30923882d..5c1c507ae6cf3e 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -92,7 +92,7 @@ endif() if(IMGUI_BUILD_SDL2_RENDERER_BINDING) find_package(SDL2 CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.cpp) endif() if(IMGUI_BUILD_VULKAN_BINDING) @@ -203,7 +203,7 @@ if(NOT IMGUI_SKIP_HEADERS) endif() if(IMGUI_BUILD_SDL2_RENDERER_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.h DESTINATION include) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.h DESTINATION include) endif() if(IMGUI_BUILD_VULKAN_BINDING) diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index cd61c07d7db7de..a20684baf98765 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,8 +4,8 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF 9e30fb0ec1b44dc1b041db6bdd53b130b2a18509 - SHA512 f863bc1cb7482695061bf7012ae71ede87a74d08f7f3abc6360775ed70f14506142c5c751ae398086dcb3d3005a456af9b0267c62953a041502017468151ec35 + REF 823a1385a269d923d35b82b2f470f3ae1fa8b5a3 + SHA512 fcb93d5a02d80c81f53ef097d8462625fb6b81687a87930ef8e56b54a5b7288d263e3e9cee88a831e0b972cbd5b22043442261bbd1da874cbe4a414fcea33725 HEAD_REF docking ) else() @@ -13,7 +13,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF v${VERSION} - SHA512 2284baf8628924b8c71f4d6beb78144ec919fd037bf37740244e417804858282d80be0acdc3e3c6273c9a5c1825f3754e2bedc208ff4ef486daf5f326fe3498e + SHA512 d48a2763eb9102874b41ae426e0e883e71e3d37f1a9bfcaf64ef8189ae23ea8cc688a49587daba072630f203e738b1c74bad34505be95e7aeb1de1161021bb8e HEAD_REF master ) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index a22b2b18618ab1..bf8d21c9397c1e 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,7 +1,6 @@ { "name": "imgui", - "version": "1.89.4", - "port-version": 1, + "version": "1.89.6", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1d70cb1aa5274f..407bdc7c4d44a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3313,8 +3313,8 @@ "port-version": 0 }, "imgui": { - "baseline": "1.89.4", - "port-version": 1 + "baseline": "1.89.6", + "port-version": 0 }, "imgui-sfml": { "baseline": "2.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index c5b951ff357748..c219c04502519c 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0250b6b7e1c8c70d405ba160e85ee153118fb23e", + "version": "1.89.6", + "port-version": 0 + }, { "git-tree": "68cf6847418f27dbd3ae70c557b1ef1357875fa1", "version": "1.89.4", From 2e7fdb7b6802922e72e9fce741681224284a6c32 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 8 Jun 2023 02:57:58 +0800 Subject: [PATCH 246/533] [kissfft] Update to 131.1.0 (#31744) * [kissfft] Update to 131.1.0 * [kissfft] Bump version * [kissfft] Fix * [kissfft] Overwrite version * [kissfft] Remove unused patch * [kissfft] Overwrite version * [kissfft] Fix description * [kissfft] Overwrite version * [kissfft] Add usage * [kissfft] Fix OpenMP * [kissfft] Overwrite version * [kissfft] Build for all data types * [kissfft] Overwrite version * [kissfft] LOGFILE_BASE * [kissfft] Update usage * [kissfft] Overwrite version * [kissfft] Fix linkage, update usage * [kissfft] Overwrite version * [kissfft] Fix tool names * [kissfft] Overwrite version --- ports/kissfft/CMakeLists.txt | 68 -------------------- ports/kissfft/exports.def | 15 ----- ports/kissfft/fix-install-dirs.patch | 15 +++++ ports/kissfft/fix-linkage.patch | 13 ++++ ports/kissfft/portfile.cmake | 96 +++++++++++++++++++++++----- ports/kissfft/usage | 11 ++++ ports/kissfft/vcpkg.json | 18 +++++- versions/baseline.json | 2 +- versions/k-/kissfft.json | 5 ++ 9 files changed, 140 insertions(+), 103 deletions(-) delete mode 100644 ports/kissfft/CMakeLists.txt delete mode 100644 ports/kissfft/exports.def create mode 100644 ports/kissfft/fix-install-dirs.patch create mode 100644 ports/kissfft/fix-linkage.patch create mode 100644 ports/kissfft/usage diff --git a/ports/kissfft/CMakeLists.txt b/ports/kissfft/CMakeLists.txt deleted file mode 100644 index d209dfbb04bafd..00000000000000 --- a/ports/kissfft/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -cmake_minimum_required(VERSION 3.14) - -project(kissfft LANGUAGES C) - -include(GNUInstallDirs) - -option(KF_USE_SIMD "Use SIMD" OFF) -option(KF_INSTALL_HEADERS "Install header files" ON) - -if (KF_USE_SIMD) - set(KF_SCALAR_TYPE "__m128" CACHE STRING "Definition of kiss_fft_scalar") -else () - set(KF_SCALAR_TYPE "float" CACHE STRING "Definition of kiss_fft_scalar") -endif () - -# TODO: FIXED_POINT -# TODO: -msse - -set(kissfft_sources kiss_fft.c kiss_fftr.c kiss_fftnd.c kiss_fftndr.c) - -if (WIN32 AND BUILD_SHARED_LIBS) - list(APPEND kissfft_sources exports.def) -endif () - -add_library(kissfft ${kissfft_sources}) - -if (BUILD_SHARED_LIBS) - set_property( - TARGET kissfft - PROPERTY POSITION_INDEPENDENT_CODE ON - ) -endif () - -target_include_directories( - kissfft - PUBLIC - $ -) - -target_compile_definitions( - kissfft - PUBLIC - $<$:USE_SIMD> - kiss_fft_scalar=${KF_SCALAR_TYPE} -) - -if (KF_INSTALL_HEADERS) - install( - FILES - _kiss_fft_guts.h - kiss_fft.h - kiss_fftr.h - kiss_fftnd.h - kiss_fftndr.h - kissfft.hh - kissfft_i32.hh - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) -endif () - -install(TARGETS kissfft EXPORT unofficial-kissfft-config) - -install( - EXPORT unofficial-kissfft-config - NAMESPACE unofficial::kissfft:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-kissfft - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -) diff --git a/ports/kissfft/exports.def b/ports/kissfft/exports.def deleted file mode 100644 index 53984a6fe00e7c..00000000000000 --- a/ports/kissfft/exports.def +++ /dev/null @@ -1,15 +0,0 @@ -EXPORTS - kiss_fft_alloc - kiss_fft - kiss_fftr_alloc - kiss_fftr - kiss_fftri - kiss_fft - kiss_fftnd_alloc - kiss_fftnd - kiss_fftndr_alloc - kiss_fftndr - kiss_fftndri - kiss_fft_stride - kiss_fft_cleanup - kiss_fft_next_fast_size diff --git a/ports/kissfft/fix-install-dirs.patch b/ports/kissfft/fix-install-dirs.patch new file mode 100644 index 00000000000000..f9c1bfd49193c3 --- /dev/null +++ b/ports/kissfft/fix-install-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0213798..c4d7d3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,9 +105,7 @@ endif() + # Add GNUInstallDirs for GNU infrastructure before target)include_directories + # + +-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" AND NOT CMAKE_CROSSCOMPILING) +- include(GNUInstallDirs) +-endif() ++include(GNUInstallDirs) + + # + # Declare PKGINCLUDEDIR for kissfft include path diff --git a/ports/kissfft/fix-linkage.patch b/ports/kissfft/fix-linkage.patch new file mode 100644 index 00000000000000..9e91f5fb32256b --- /dev/null +++ b/ports/kissfft/fix-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/kissfft-config.cmake.in b/kissfft-config.cmake.in +index cd7139a..c387fe6 100644 +--- a/kissfft-config.cmake.in ++++ b/kissfft-config.cmake.in +@@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 3.3) + + # Set include glob of config files using SHARED/static component, BUILD_SHARED_LIBS by default + set(_kissfft_shared_detected OFF) +-set(_kissfft_shared ${BUILD_SHARED_LIBS}) ++set(_kissfft_shared @BUILD_SHARED_LIBS@) + if("SHARED" IN_LIST kissfft_FIND_COMPONENTS) + set(_kissfft_shared_detected ON) + set(_kissfft_shared ON) diff --git a/ports/kissfft/portfile.cmake b/ports/kissfft/portfile.cmake index ccb77514b736b6..9372b9e8b2c16c 100644 --- a/ports/kissfft/portfile.cmake +++ b/ports/kissfft/portfile.cmake @@ -1,28 +1,90 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mborgerding/kissfft - REF 8f47a67f595a6641c566087bf5277034be64f24d - SHA512 ae39438b6d029296a440e1421f30731f371364107744fe9bad68e835e939f9a06d63016a99f5395a490ee0b1b1c33d46faafc651d91f13b8733d366e04dc861a + REF "${VERSION}" + SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708 HEAD_REF master + PATCHES + fix-install-dirs.patch + fix-linkage.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KISSFFT_STATIC) -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS_DEBUG - -DKF_INSTALL_HEADERS=OFF - OPTIONS_RELEASE - -DKF_INSTALL_HEADERS=ON +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp KISSFFT_OPENMP + tools KISSFFT_TOOLS ) -vcpkg_cmake_install() -vcpkg_copy_pdbs() +if("tools" IN_LIST FEATURES) + vcpkg_find_acquire_program(PKGCONFIG) +endif() -vcpkg_cmake_config_fixup( - PACKAGE_NAME unofficial-${PORT} - CONFIG_PATH lib/cmake/unofficial-${PORT} -) +set(datatypes float double int16_t int32_t) + +foreach(datatype IN LISTS datatypes) + vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKISSFFT_DATATYPE=${datatype} + -DKISSFFT_PKGCONFIG=ON + -DKISSFFT_TEST=OFF + -DKISSFFT_STATIC=${KISSFFT_STATIC} + ${FEATURE_OPTIONS} + LOGFILE_BASE "config-${TARGET_TRIPLET}-${datatype}" + ) + + vcpkg_cmake_build( + LOGFILE_BASE "install-${TARGET_TRIPLET}-${datatype}" + TARGET install + ) + + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/kissfft") + + vcpkg_copy_pdbs() +endforeach() + +vcpkg_fixup_pkgconfig() + +if("tools" IN_LIST FEATURES) + set(tool_names) + + foreach(datatype IN LISTS datatypes) + if("openmp" IN_LIST FEATURES) + list(APPEND tool_names + "fastconv-${datatype}-openmp" + "fastconvr-${datatype}-openmp" + "fft-${datatype}-openmp" + "psdpng-${datatype}-openmp" + ) + else() + list(APPEND tool_names + "fastconv-${datatype}" + "fastconvr-${datatype}" + "fft-${datatype}" + "psdpng-${datatype}" + ) + endif() + endforeach() + + vcpkg_copy_tools( + TOOL_NAMES ${tool_names} + AUTO_CLEAN + ) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/kissfft/kiss_fft.h" + "#ifdef KISS_FFT_SHARED" + "#if 1 //#ifdef KISS_FFT_SHARED" + ) +endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/kissfft") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/kissfft/usage b/ports/kissfft/usage new file mode 100644 index 00000000000000..d803db852689c8 --- /dev/null +++ b/ports/kissfft/usage @@ -0,0 +1,11 @@ +kissfft provides CMake targets: + + # Using distinct targets + find_package(kissfft CONFIG REQUIRED) + target_link_libraries(main PRIVATE kissfft::kissfft-float) + # Alternative targets: kissfft::kissfft-double, kissfft::int16_t, kissfft::int32_t + + # Using a distinct package component + find_package(kissfft CONFIG REQUIRED COMPONENTS float) + target_link_libraries(main PRIVATE kissfft::kissfft) + # Alternative components: double, int16_t, int32_t diff --git a/ports/kissfft/vcpkg.json b/ports/kissfft/vcpkg.json index 48e6b5c19c8b12..932d5e984a7fa3 100644 --- a/ports/kissfft/vcpkg.json +++ b/ports/kissfft/vcpkg.json @@ -1,8 +1,9 @@ { "name": "kissfft", - "version-date": "2021-11-14", + "version": "131.1.0", "description": "A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid", "homepage": "https://github.com/mborgerding/kissfft", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", @@ -12,5 +13,18 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "openmp": { + "description": "Build kissfft with OpenMP support", + "supports": "!windows" + }, + "tools": { + "description": "Build kissfft tools", + "supports": "linux | osx", + "dependencies": [ + "libpng" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 407bdc7c4d44a2..fffbd7cdca8f88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3697,7 +3697,7 @@ "port-version": 6 }, "kissfft": { - "baseline": "2021-11-14", + "baseline": "131.1.0", "port-version": 0 }, "kissnet": { diff --git a/versions/k-/kissfft.json b/versions/k-/kissfft.json index 83643505536553..fc863e23cf52ab 100644 --- a/versions/k-/kissfft.json +++ b/versions/k-/kissfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0a9f47bf62471468dd9f73727f03e580fca14c4", + "version": "131.1.0", + "port-version": 0 + }, { "git-tree": "f55a890b3e3bf5068dfdcf921ceb36080a146d9d", "version-date": "2021-11-14", From 037ef821daeb028882c8e73edb198dc2eb02758f Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Wed, 7 Jun 2023 21:00:50 +0200 Subject: [PATCH 247/533] [rubberband] Update to 3.2.1 and use recommended sleef dependecy where supported (#31732) * Select fastest available FFT library depending on the platform * Update to rubberband 3.2.1 * Also added arm64 in the portfile.cmake condition to match arm in the vcpkg.json * Use FFTW backend on x86_windows due to Microsoft Visual Studio bug --- ports/rubberband/portfile.cmake | 13 +++++++++++-- ports/rubberband/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/r-/rubberband.json | 5 +++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake index 53b0b38fff9690..524ccda086bf1d 100644 --- a/ports/rubberband/portfile.cmake +++ b/ports/rubberband/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO breakfastquay/rubberband REF "v${VERSION}" - SHA512 953d705e4a69ed40732644b8039dae02ddf596216e484ce8625fdde796e0de35fe6ac6c4f180eabc457c98b63c3fba212afa74b731eac570bea1902b667f506f + SHA512 811a8dbf05fbee3e4631b49fee9fd0e23ea750ac24a9a16f20e6a7ea07e683783a9edf980c43e732b64c229db29ade3575938c4e6f9db8c4255b220eb30d9dcc HEAD_REF default ) @@ -13,10 +13,19 @@ else() set(CLI_FEATURE disabled) endif() +# Select fastest available FFT library according https://github.com/breakfastquay/rubberband/blob/default/COMPILING.md#fft-libraries-supported +if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + set(FFT_LIB "fftw") +elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(FFT_LIB "fftw") +else() + set(FFT_LIB "sleef") +endif() + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -Dfft=fftw # 'auto', 'builtin', 'kissfft', 'fftw', sleef', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') + -Dfft=${FFT_LIB} # 'auto', 'builtin', 'kissfft', 'fftw', sleef', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') -Dresampler=libsamplerate # 'auto', 'builtin', 'libsamplerate', 'speex', 'libspeexdsp', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.' -Dipp_path= # 'Path to Intel IPP libraries, if selected for any of the other options.' -Dextra_include_dirs= # 'Additional local header directories to search for dependencies.' diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json index 7b816552967673..f5a571f48f7570 100644 --- a/ports/rubberband/vcpkg.json +++ b/ports/rubberband/vcpkg.json @@ -1,13 +1,20 @@ { "name": "rubberband", - "version": "3.2.0", + "version": "3.2.1", "description": "A high quality software library for audio time-stretching and pitch-shifting.", "homepage": "https://www.breakfastquay.com/rubberband/", "license": "GPL-2.0-or-later", "supports": "!uwp & !(windows & static)", "dependencies": [ - "fftw3", + { + "name": "fftw3", + "platform": "(arm & windows) | (x86 & windows) | (arm64 & osx)" + }, "libsamplerate", + { + "name": "sleef", + "platform": "!(arm & windows) & !(x86 & windows) & !(arm64 & osx)" + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index fffbd7cdca8f88..d9f4adc1c9b3ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7213,7 +7213,7 @@ "port-version": 0 }, "rubberband": { - "baseline": "3.2.0", + "baseline": "3.2.1", "port-version": 0 }, "rxcpp": { diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json index f682f9dd3549a6..b4460f4ca53162 100644 --- a/versions/r-/rubberband.json +++ b/versions/r-/rubberband.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66dc21d5c29b7406cf1408081b8d99d6df217d4b", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "2cdedb774d373326dd7b2f2d138280653f97c89b", "version": "3.2.0", From 1e334d770ac71a89d1c36d51019e60dd08b68f76 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 7 Jun 2023 21:11:55 +0200 Subject: [PATCH 248/533] [ngtcp2] enable arm with uwp and update to 0.16.0 (#30593) * ngtcp2: update to 0.15.0 * ngtcp2: ngtcp2 now build with ARM32 (uwp) * ngtcp2: update to 0.16.0 --- ports/ngtcp2/portfile.cmake | 2 +- ports/ngtcp2/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/n-/ngtcp2.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index b09868e9a25444..0b6fd5578fcaec 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 a942ea7789cc306e5a07aaf66bc1af4cb722c0facca7cb2de80e6fb8a30a88cd1beba50dd06164d9547a64d2273fe98d8bb22ab64323b1922002c45d5e714fc7 + SHA512 59fd3b1dacd34d6945acb4b2f4d7e9ea4b62496f4b834d24e4f3d5366a73976c26420baaab87de48cba0fcb64a9c18634ead7b2f839ac4687b4b066f58b938f6 HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 05506b0d7048a4..cb23175221331f 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,10 +1,9 @@ { "name": "ngtcp2", - "version": "0.14.1", + "version": "0.16.0", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", - "supports": "!(arm & uwp)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index d9f4adc1c9b3ee..bd3b4dd5d47285 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5629,7 +5629,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "0.14.1", + "baseline": "0.16.0", "port-version": 0 }, "nifly": { diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index d0d9fcf57ad17e..31aaa9b2365848 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c23d20c06e58c61401f02c07a05bce9cf6a3eb4", + "version": "0.16.0", + "port-version": 0 + }, { "git-tree": "ae54f702f177016f67025862105af12921ccb325", "version": "0.14.1", From 1ce35e99be83cb63da85c40ab17b13735bd51073 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 8 Jun 2023 18:55:04 +0200 Subject: [PATCH 249/533] Update stale.yml (#31886) Fix typo --- .github/workflows/stale.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index a1a4a58e3fc889..7e2aa987b49cf4 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -23,8 +23,8 @@ jobs: days-before-close: 14 - uses: actions/stale@v6 with: - close-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment." - ony-of-labels: 'category:new-port' + stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment." + any-of-labels: 'category:new-port' close-issue-label: 'new-port-unresolved' days-before-issue-stale: 60 days-before-pr-stale: -1 From 2e43a34b443df7f1783b27cd54db296af421c81a Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 8 Jun 2023 19:55:57 +0300 Subject: [PATCH 250/533] [qt5] Update to 5.15.10 (#31878) --- ports/qt5-3d/vcpkg.json | 2 +- ports/qt5-activeqt/portfile.cmake | 8 +- ports/qt5-activeqt/vcpkg.json | 5 +- ports/qt5-androidextras/vcpkg.json | 2 +- .../cmake/qt_download_submodule.cmake | 13 +-- ports/qt5-base/cmake/qt_port_hashes.cmake | 82 ++++++++-------- ports/qt5-base/vcpkg.json | 3 +- ports/qt5-charts/vcpkg.json | 2 +- ports/qt5-connectivity/vcpkg.json | 2 +- ports/qt5-datavis3d/vcpkg.json | 2 +- ports/qt5-declarative/vcpkg.json | 3 +- ports/qt5-doc/vcpkg.json | 2 +- ports/qt5-gamepad/vcpkg.json | 2 +- ports/qt5-graphicaleffects/vcpkg.json | 2 +- ports/qt5-imageformats/vcpkg.json | 3 +- ports/qt5-location/vcpkg.json | 3 +- ports/qt5-macextras/vcpkg.json | 2 +- ports/qt5-mqtt/vcpkg.json | 2 +- ports/qt5-multimedia/vcpkg.json | 2 +- ports/qt5-networkauth/vcpkg.json | 2 +- ports/qt5-purchasing/vcpkg.json | 2 +- ports/qt5-quickcontrols/vcpkg.json | 2 +- ports/qt5-quickcontrols2/vcpkg.json | 2 +- ports/qt5-remoteobjects/vcpkg.json | 2 +- ports/qt5-script/vcpkg.json | 2 +- ports/qt5-scxml/vcpkg.json | 2 +- ports/qt5-sensors/vcpkg.json | 2 +- ports/qt5-serialbus/vcpkg.json | 2 +- ports/qt5-serialport/vcpkg.json | 2 +- ports/qt5-speech/vcpkg.json | 2 +- ports/qt5-svg/vcpkg.json | 3 +- ports/qt5-tools/vcpkg.json | 2 +- ports/qt5-translations/vcpkg.json | 2 +- ports/qt5-virtualkeyboard/vcpkg.json | 3 +- ports/qt5-wayland/vcpkg.json | 2 +- ports/qt5-webchannel/vcpkg.json | 2 +- ports/qt5-webengine/vcpkg.json | 2 +- ports/qt5-webglplugin/vcpkg.json | 2 +- ports/qt5-websockets/vcpkg.json | 2 +- ports/qt5-webview/vcpkg.json | 2 +- ports/qt5-winextras/vcpkg.json | 2 +- ports/qt5-x11extras/vcpkg.json | 2 +- ports/qt5-xmlpatterns/vcpkg.json | 2 +- ports/qt5/vcpkg.json | 2 +- versions/baseline.json | 94 +++++++++---------- versions/q-/qt5-3d.json | 5 + versions/q-/qt5-activeqt.json | 5 + versions/q-/qt5-androidextras.json | 5 + versions/q-/qt5-base.json | 5 + versions/q-/qt5-charts.json | 5 + versions/q-/qt5-connectivity.json | 5 + versions/q-/qt5-datavis3d.json | 5 + versions/q-/qt5-declarative.json | 5 + versions/q-/qt5-doc.json | 5 + versions/q-/qt5-gamepad.json | 5 + versions/q-/qt5-graphicaleffects.json | 5 + versions/q-/qt5-imageformats.json | 5 + versions/q-/qt5-location.json | 5 + versions/q-/qt5-macextras.json | 5 + versions/q-/qt5-mqtt.json | 5 + versions/q-/qt5-multimedia.json | 5 + versions/q-/qt5-networkauth.json | 5 + versions/q-/qt5-purchasing.json | 5 + versions/q-/qt5-quickcontrols.json | 5 + versions/q-/qt5-quickcontrols2.json | 5 + versions/q-/qt5-remoteobjects.json | 5 + versions/q-/qt5-script.json | 5 + versions/q-/qt5-scxml.json | 5 + versions/q-/qt5-sensors.json | 5 + versions/q-/qt5-serialbus.json | 5 + versions/q-/qt5-serialport.json | 5 + versions/q-/qt5-speech.json | 5 + versions/q-/qt5-svg.json | 5 + versions/q-/qt5-tools.json | 5 + versions/q-/qt5-translations.json | 5 + versions/q-/qt5-virtualkeyboard.json | 5 + versions/q-/qt5-wayland.json | 5 + versions/q-/qt5-webchannel.json | 5 + versions/q-/qt5-webengine.json | 5 + versions/q-/qt5-webglplugin.json | 5 + versions/q-/qt5-websockets.json | 5 + versions/q-/qt5-webview.json | 5 + versions/q-/qt5-winextras.json | 5 + versions/q-/qt5-x11extras.json | 5 + versions/q-/qt5-xmlpatterns.json | 5 + versions/q-/qt5.json | 5 + 86 files changed, 344 insertions(+), 149 deletions(-) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 7528557f389e01..782d5d1c914761 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake index a73a605512c32c..d11e2a0f6eb54c 100644 --- a/ports/qt5-activeqt/portfile.cmake +++ b/ports/qt5-activeqt/portfile.cmake @@ -1,6 +1,2 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "qt5-activeqt only support Windows.") -endif() - -include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake") +qt_submodule_installation() diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index cb3e6eb5ed387e..cdce229a192fcc 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 ActiveQt Module - ActiveX components", "license": null, "supports": "windows", @@ -8,7 +8,6 @@ { "name": "qt5-base", "default-features": false - }, - "qt5-declarative" + } ] } diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 6c2d9fb38bdc47..339df96c58fa75 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 androidextras Module;", "license": null, "supports": "android", diff --git a/ports/qt5-base/cmake/qt_download_submodule.cmake b/ports/qt5-base/cmake/qt_download_submodule.cmake index 5c8aff03326f1e..9b5491dc079894 100644 --- a/ports/qt5-base/cmake/qt_download_submodule.cmake +++ b/ports/qt5-base/cmake/qt_download_submodule.cmake @@ -5,18 +5,19 @@ endfunction() function(qt_download_submodule) cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "PATCHES;BUILD_OPTIONS;BUILD_OPTIONS_RELEASE;BUILD_OPTIONS_DEBUG" ${ARGN}) - + if(NOT DEFINED _csc_OUT_SOURCE_PATH) message(FATAL_ERROR "qt_download_module requires parameter OUT_SOURCE_PATH to be set! Please correct the portfile!") endif() - + vcpkg_buildpath_length_warning(37) qt_get_submodule_name(NAME) set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}") set(ARCHIVE_NAME "${NAME}-everywhere-opensource-src-${FULL_VERSION}.tar.xz") - set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" - "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + set(URLS + "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + "https://mirrors.ocf.berkeley.edu/qt/archive/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" ) vcpkg_download_distfile(ARCHIVE_FILE URLS ${URLS} @@ -37,5 +38,5 @@ function(qt_download_submodule) ) endif() - set(${_csc_OUT_SOURCE_PATH} ${SOURCE_PATH} PARENT_SCOPE) -endfunction() \ No newline at end of file + set(${_csc_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index bb3409c25a285d..e61050013c4b69 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,53 +1,53 @@ # Every update requires an update of these hashes and the version within the control file of each of the 32 ports. # So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 9) +set(QT_PATCH_VER 10) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-3d 4c88af3855c22ab6dd17fca835eabc0facec446e254b329f76b7c61002bc4b47e7029aba6336e47b89c30c2dd50090e925042af8199f1fbb1f65558784cdc9ce) -set(QT_HASH_qt5-activeqt b4d728bc1a28a15c3fc14d40a6dd2801c898d17a9c18c773b794abb629432efd6888cb56517a8fac0764eeacc436040d4406e05f322a43b84fafa036c2ba5d2c) -set(QT_HASH_qt5-androidextras 9ca134cafaa5fc84a15781bf85fa69aaa47ea4b21099c35da842743c9781417fc7cda06f0dd3f9f8d25ae710bcbe40917a4723428809c03054801dd932be7d31) -set(QT_HASH_qt5-base 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3) -set(QT_HASH_qt5-charts b8b4390121780c4a562eaa563920a38637930a473e5b8e10fbb485c80c9a049825c73ff1c1786a869bc9603bb03d74b6d666064e6f98006edc5dba366c25f316) -set(QT_HASH_qt5-connectivity e47621e95aa4ca8438787c4333fdaec6aef828372eb73029836256c03eb6c0faed41f89ab928d28cf1113ca53c8a94d69d07bd1dc06fa90272f0286244b49fde) -set(QT_HASH_qt5-datavis3d 154d7253c69c32a76b12200b25d6edaa0c671d5293abdcf09972c1525f366279a02fec7f9b6e73fb98d0d9919b3635cb3e9c32b54c43f056ecf06ba27b44459d) -set(QT_HASH_qt5-declarative ada3e32f42270899d92c46f0c0b8cd78028cf2e658ac60b3745c804ec494fb1fc6f31a670668074433b3e702f81524415ef132a757ca80151eb13d0a19352af7) -set(QT_HASH_qt5-doc 05bcfdb39bd55d5b9741413c3cef601743f7b2cbca716b87b2655cc5e60c273ad58831572c7215b2f41258d2c92ab07348d5adfb1b10b5720b917891bee7bcc1) -set(QT_HASH_qt5-gamepad f6ee08fc3872b078fb64e63a074b0230674dd670cf087b864c16ec3ecdbf374374257eb18aeae1e8e2c16850fddb3f4fef99efc4ddd597ab66b2a9fc8158cb93) -set(QT_HASH_qt5-graphicaleffects ea9a9cf069ab5df82ac29842f093ef4b795ccd6a4bb7ca3c0ff538bfe2ed6473e24a7b8e7b9c28cf8ad7550b2314515567e5f53b7d913ae96593f0b2cdbad2b8) -set(QT_HASH_qt5-imageformats 9713c781200c8abb1a6f1a2dfb851fc38dcb2428ca3dbf29aa392d938671978804a67587bbbc5a5f75703cc754da4673dd9a4b567c9c03ed61d329889156c437) -set(QT_HASH_qt5-location 37517c304240921c600e2aad19baff0efbb5e01c5cc78e5370fb4b084f2a6ba4da94d39ddcbcd33a5f0af37f017d39bb775a40cda195e16697aa70c9d17b6bcf) -set(QT_HASH_qt5-macextras 14a42b108d2afa1d95fb42a2b87be3f25da0b2a3ac8b004eb31e2c634943b5ffb6db0de37d6df734080977ef80f3601e283dd5727ef7cc61f247714ac9095299) -set(QT_HASH_qt5-mqtt 9d77abfc15754f09d74c08f97e1b3eb43cce7bbb6b5da7e3c385741e62b93a8761b084d314edf332a18901b7ce312bd896428951191caf62208ba533adbca0af) -set(QT_HASH_qt5-multimedia f167e7910c19a55858a4b8e53c293908ef50e8a299b5dc6a346c2c877b4f65aa6da17807ec3f297530515b4558c74e97d54d6013c27400c1c4964c7c4dbef6cd) -set(QT_HASH_qt5-networkauth 9857f0e368e0c2bb4dfa772653a17cd34754e95ae64414f70ca78c1ec3a38ac850c462db9aa5fee4ee9143cd2fe0a5485fc0948cc3459a4842e221ab08356356) -set(QT_HASH_qt5-purchasing 771a9e9100cd6b8bd872e05def2eefe942a5bcb3832e61e3251c38100fcbdaaa6aac543c5c70b82379bd4d888a71ae0feac22765245ca169ee34a41af4b05b84) -set(QT_HASH_qt5-quickcontrols 62c732414aa3660ae6c702a533e3ed090a293a6ecfc0bcc75b54d3dc9e0ecb657002e3f840107a07a1d749938148c0e63cd9f1021831f6c44ab133f9780b9c88) -set(QT_HASH_qt5-quickcontrols2 f77a59cb6704438bc7b81f816454dad56bebdf4ce7f015c21a05b09f0c508525750a0cf232da8d7428464aa68de9a2bcbd000906fa781aff1e60e8ee5d70802e) -set(QT_HASH_qt5-remoteobjects 1ab0bf1ec6d251f0b4b406380c2870c21c4fbd47868b212efc46546d7059831aebba32caf85de6a51c96edc6bb40c3fdc2b3b7b733f2501e1ccb4c04ab0197fc) -set(QT_HASH_qt5-script 83a69b3f428fe8322c4ff5bf96736f8e76c0825b06742ef000c22bd0c71598c648b03481f40d86d5233d74096b34c5158a576731a06f12e01b680fd42e31c602) -set(QT_HASH_qt5-scxml f6c6bdcb651055fd3a9b18fae1860f0d72afe83a08b387cb1393d0b1966eaaf1d8ce4530e6faa3a4e4a18d97a8e36937303b99e29d7dba17b6bcda61a5eb9872) -set(QT_HASH_qt5-sensors beba10a61e6d9f31dc9f24826b4a01b48fa656d424a97164c59d7be9a9e063f1b0820f95c157651ca0cac60d6f9aa188b90a122be565bcb488e7f0e42887140d) -set(QT_HASH_qt5-serialbus f044929a2a4e8401fbd84a3e160f070c7af75bf6dd44e7353160ed30bb453853c0d8b421e03b73309d249dc149ef19192721f8152881ddc37f0be2e410884cfe) -set(QT_HASH_qt5-serialport e22d20a0b20d0dc8c6bce3dcf1137b2cce28e370df9d0250f2a777dd73153d0156b0c6cfe88bc4257cdc209fbf640c8a06fada147d40ee638deb716148812da3) -set(QT_HASH_qt5-speech c614798cca4485d9880fe8bc19df563b29673f8fc111ce8129e8e1a8f1c8f769f76c9a7754e8cde43e7223ef7fed899bff9e91bcebe113281eb44f39aa7bfe4a) -set(QT_HASH_qt5-svg e091c059492662fad713d1f99bfa5e21a8f8e77e24b067d176a6e732b420a22e3777fa99a880c6f992a19b2e5b16c01f131da875d9e08e6a515108b468192fe5) -set(QT_HASH_qt5-tools ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067) -set(QT_HASH_qt5-translations 58168e68529bd84f363d5c46182be45f5ef143e44c6878326a2d05ada7b70adc812c8d024ca8650ac52a1e2d6dc22788b57d4f5527de7d8619d34ebbba71165b) -set(QT_HASH_qt5-virtualkeyboard d9169a5d5b09d8854ce6b402a7333e8a561272aeb05ffb3a8055ea6e9a18b2d79ac404c85d57e4b78db0c6ef61352e2d7fddd8c510ff1cdaaa6665a9a20fd96e) -set(QT_HASH_qt5-wayland d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978) -set(QT_HASH_qt5-webchannel 6b9c38c3d22708a14402282d4134475336cce2874887ece00316866cbc59714e395924cc9a449653ab050431c4ece5e0eb454ce2f4c13252bae7abd8fae93bb4) -set(QT_HASH_qt5-webengine 7142ac2e59e4aa2bedbe35e6242c1359fc9c51bd7db9f31d89f01dc2843f38bf7f80869e603a57190791a97aef9ba1064eb0f90cf09e5293f61f250c455cb07a) -set(QT_HASH_qt5-webglplugin 647832ee6351c0fec45eaf5b737aaac74f7c76bc72126faa49f67523b1e0ef965209842de5b4e3256f8df30999bb7d67160e5181d9f3df1d6d7dbb3ac8502dc7) -set(QT_HASH_qt5-websockets 3e9b63656c16893a67d62f452c70decfca160ab192b3da2f25f3f72e513a58e3ec678ad05e618d1e48c05708f55d38ca02d4b1f3efdbea5e544f5cec16f6a5ac) -set(QT_HASH_qt5-webview 15d9b7f446d5b579e596b8e7766fc24380d5f92547186a4de08708f40c1847e690c679312130518470a40a86baea686a38a2a0c237affd13bdc5302e3c313c6f) -set(QT_HASH_qt5-winextras 249fa333d2e0eb38417af40740bd7721aec9eb706e0c98ab43589ca892679689201e4ba9e89586b5c388126a57cb84965932cd113a6c4e638fe10a4f5ff9ddbb) -set(QT_HASH_qt5-x11extras 695e23626f1d3b51fa4d20d0845be749581b0cdf3633598f457cfac4d790e3d52881f5e51e35a95d42f481a73ddc7d50a22d562c65a0bca2a9e586615ab6ec7b) -set(QT_HASH_qt5-xmlpatterns 60cdee139c04dbd2c381f65fcd579af0b2b6f40234870a782c8b7342c8d0caf92fef94acb959260e4ef615b2c60b5527cd44b8efa85f04ceb4a3659a47a0ee89) +set(QT_HASH_qt5-3d 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f) +set(QT_HASH_qt5-activeqt 67ebe2eb0b45c128d9e57305f378900d21348d75960800e7848134452c1c01688219b36e712bceff76e942ce05e5100881194409627a7902a6d613938656550b) +set(QT_HASH_qt5-androidextras 9001f6cee644efcbfe5df1a7f97e8426364cc1a86cc7b5ae897aed05436920992325c8ff708a4de796ae02ab38af5c6cc20388f5d682bcd7fd43aa8d5775c5ae) +set(QT_HASH_qt5-base 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef) +set(QT_HASH_qt5-charts 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961) +set(QT_HASH_qt5-connectivity 3bc1c701f1e80794a410f0784c8955be42cb800c315d686da1a1e8429dbb72799bba2da59592f9edcd686c326df26fee4bf4e74b49feb96119e6aa29e982059f) +set(QT_HASH_qt5-datavis3d 414f4c86a55a9f2db745691f01f0d7ad6bbdddf56a04a280fd11f5b1bcd590ff34a8b35e178eaef15e1b1a1813cb148ac5bddfbb8fcb05de6ed5492666cccaf9) +set(QT_HASH_qt5-declarative 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8) +set(QT_HASH_qt5-doc 5c2751c1736c1c6818a7806ed14a81856115dfd8f46508dcea9b8023df638d34e96171c383cbdd3b7c307f97297e97da13503032225d8135e1a52b2fef5722e8) +set(QT_HASH_qt5-gamepad 20f06a11b8e7057e11b2f061ba088f1721cf94a20bed21e52eb0d7c6e20cd8f74ae2d0fe47748466c4a3dd63f9843afc94f74fb3076849e80ad8e71017fb3605) +set(QT_HASH_qt5-graphicaleffects a7e1326c10bd3bbce0f5b3e664dc42e5573de7add44ac852417aba9170a4e21c173679a65ea4ed403782fa954652b896266611887664488a99d42a8b3c8f7504) +set(QT_HASH_qt5-imageformats 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de) +set(QT_HASH_qt5-location e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4) +set(QT_HASH_qt5-macextras 6eea905dab769183bacba4eac04f8de9c006dfda2034bd2025361445781a5379b2cc038ca6af95206f52fe6a2a11d73b36f96b0b716e93445973b9fb20337167) +set(QT_HASH_qt5-mqtt 5ca3b7ab7865f09eb0d5d300854b9fc7cd1534090a17462fcdbecee25f831e8d3a0de2adb151ae6f810f9df0ef30146f22a902275636554f6b77660e9bf00440) +set(QT_HASH_qt5-multimedia a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e) +set(QT_HASH_qt5-networkauth bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a) +set(QT_HASH_qt5-purchasing 9758325cf7bbdc8428a1ec9254749c27d6397a72d4fe164dc8ce0da08d09aa9c0ec0edb67879d6aa54500a47096154b252292b200d0bc516de425bfaad4f9ca8) +set(QT_HASH_qt5-quickcontrols fe7faf770adad9820ae897b5822b5dcba095dfc267411dd92d0b46daf7f84f87b3d9f2f9f90a90c030b09dcdc30549647f3f42039ac09e9207b5c1462116ed10) +set(QT_HASH_qt5-quickcontrols2 87e1590223c36b1191f4d976cab946c7d688228032a4a32e699a87ee844d64ed60f93c3c0c148374f4ac6ca619bbf583492cb9b57823b15dd0b9811ca270f390) +set(QT_HASH_qt5-remoteobjects 980884aaa65cd3462d9359f4def9e15a1d395569a14ee6c7c70f71a3d0445031baaa5a91541df01d6b7d6ca48bade2ae2c4ceebb306a97eefdc500c2f7d3eee6) +set(QT_HASH_qt5-script 3748cc8c90c2f96a21e6b0c8ffacca11d023e37091f6f5a05608f7f787f81619a7aac5c8074360486e28033a28601c1d347e499bc387a36f50c4cec2be30e782) +set(QT_HASH_qt5-scxml 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923) +set(QT_HASH_qt5-sensors 9950b0f8b90727a051299c5b7e7852819c165bcdb1cbe2f8bd7386768175c387ab838918e7d6f1dcf2a7d6d32bb1559dfda225c57e8b9b5b4ffeac5f3db432ac) +set(QT_HASH_qt5-serialbus 914a6ec2d51f89f84bc3425185cc35d497595c8f5378ff475ce784bc744fe1a9054feeaeed8d4205abc5f4de256d9511e8e1be3076066eed424848724325f513) +set(QT_HASH_qt5-serialport 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e) +set(QT_HASH_qt5-speech b938c8baba11aa9a40a2ec5492df32c511164686aa2649d78023beccc8b23f1e0a77193672f7bc7d7f72aeb7b59fe30972683f5a4e22e1e39da9744ecd40201d) +set(QT_HASH_qt5-svg 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7) +set(QT_HASH_qt5-tools 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1) +set(QT_HASH_qt5-translations 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22) +set(QT_HASH_qt5-virtualkeyboard 6d539af5e5a336f2bf4ac1e6006268e50b426f6bb174019f742847da86f8cd5c8eb2c5f353255b5d1bba9c9c7a7b035bcb12e0063be5b31e45741ea9bd478582) +set(QT_HASH_qt5-wayland 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899) +set(QT_HASH_qt5-webchannel ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc) +set(QT_HASH_qt5-webengine e35d0cab5f66a148420206616b3517e62b8320572beac53650096c0db58db8b4942d52a3abf4f0d6db1450de27befeb92f8b632c1277b0939464c1407a904b1b) +set(QT_HASH_qt5-webglplugin f47dc98f94ee422bdfce70663e24af3155047cb3ee1a914cb4d5f0d269de43bdb5f68376e04d0a9701c2f95ffe19c29f5c38db6441ec2144ccb41beb45924f1e) +set(QT_HASH_qt5-websockets b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3) +set(QT_HASH_qt5-webview 258e2146a74083b2a7e48f8875f601df8f6135cdd4bb7c35c3d8b61bec0e5937942e74c36e971565ced9c070e3f1303a3950b7f2a87b148e8abb516bd0ce7a25) +set(QT_HASH_qt5-winextras dec47ca62e83a0794dc2f096a6fdccc45a1e43912af7f8a67ffd4aaed047d1887c85e411daba8a5a71d38e4ed3fbef1e2142a314aee1416a3a91a75c61f58706) +set(QT_HASH_qt5-x11extras 460345ad1fc7812a5bc71c097eb31c37a94acaaf94a79cfbfe3317142b4c515832ce2bf46b9bfcc9c9f669587a76492fb172dd55bfc27ca1570780772438f8b7) +set(QT_HASH_qt5-xmlpatterns 308203fafdd572998563a30b3289002f848c05b6de5a18545dc06489f97aa197c32f37019880b068c152e678ff5254ebe33333b581572811111c45a5ccb4a243) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 0ea26af9e08924..724f7b1a4f813c 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-base", - "version": "5.15.9", - "port-version": 3, + "version": "5.15.10", "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index 11b513e885252e..ff1f5737a0e422 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", "license": null, "dependencies": [ diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index acad64bd0d641c..30e607a3e06af1 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index eb075aab45b313..ab129f728804bc 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", "license": null, "dependencies": [ diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index ef52ef3c70241c..d6c8ddba76685e 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.9", - "port-version": 1, + "version": "5.15.10", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index 01e63806a15a5f..0d7aafe81c893c 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 4713ad14aa9286..9d757785e72ad3 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index 9594e1f23aadf7..ef0df010942726 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index 16df8c3290a116..d9ec973cac4c94 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.9", - "port-version": 1, + "version": "5.15.10", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index d6300500d7c04b..9048df7d7b5dc9 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-location", - "version": "5.15.9", - "port-version": 1, + "version": "5.15.10", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", "license": null, "dependencies": [ diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index 856458fbf9aa62..16146b0b71e5ed 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", "license": null, "supports": "osx", diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index 7681b47b1cc941..9d3619a24015ad 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index b3c1da79f59c52..c349d61d73033a 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 4b93f4bf695910..dd059c25f891f9 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index 8d321193ca368c..fa3a509ed635b6 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index 4444c0ab43a3dc..a45d8e0987d3d2 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index 49626086ff03f9..7ee321220f8ab6 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 17eb3cd04cea1a..fb38de4d9780cd 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", "license": null, "dependencies": [ diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index 2b686cc2845c9d..ecafd394eb9507 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index 79ebc709aadcdb..feb59ba6a8fdee 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", "license": null, "dependencies": [ diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index b34ea02dab6ced..9fea767a039036 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index e2ff3418f89df0..36174611d70eb0 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 98b2a3c9b0519c..a09f5ecf0a2c28 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index bf26488a78bdad..cc493f9849ae66 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 003b1fa77f22c8..989f2e177f4ad3 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.9", - "port-version": 1, + "version": "5.15.10", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index ba55ae9a5610fc..b3abd450cc7680 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index e0684e721dc725..2fc8ed1482c6a8 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index ec2a394076f792..a8941978315fe2 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.9", - "port-version": 1, + "version": "5.15.10", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", "license": null, "dependencies": [ diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index f3136dffc5abf9..3c5035539d92dc 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index 04575ff35e4a05..5cc07a85dc471b 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", "license": null, "dependencies": [ diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index c734aa85b33f23..364b52cf0acfe2 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index c804008753a343..6476a176f2dbe2 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Webglplugin Module", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index e8cc4ef4e94e52..9e71b76e48ce4d 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", "license": null, "dependencies": [ diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index fd53a15524ab4e..7a993eb0a80c33 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "license": null, "dependencies": [ diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 6121f828d70f4f..724ae378c92b6b 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", "license": null, "supports": "windows", diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index 5be1a0e5c72ac5..af3b84383b5411 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 x11extras Module;", "license": null, "supports": "!windows", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index 7a4a54553d4503..12d0f5e98f2437 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", "license": null, "dependencies": [ diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index de6acce4c02af5..e30614eaef3b4f 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5", - "version": "5.15.9", + "version": "5.15.10", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index bd3b4dd5d47285..c35dd2c96e2c38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6545,67 +6545,67 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.9", - "port-version": 3 + "baseline": "5.15.10", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 2 }, "qt5-charts": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.9", - "port-version": 1 + "baseline": "5.15.10", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.9", - "port-version": 1 + "baseline": "5.15.10", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.9", - "port-version": 1 + "baseline": "5.15.10", + "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-modularscripts": { @@ -6613,107 +6613,107 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.9", - "port-version": 1 + "baseline": "5.15.10", + "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.9", - "port-version": 1 + "baseline": "5.15.10", + "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.9", + "baseline": "5.15.10", "port-version": 0 }, "qt5compat": { diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 84061810715676..6b3eddc47d02fc 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3476fd00f9a99f7993cb70835c78fc9d998f1974", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "f4cd3a7a30f7ffa9d3bd66371293a0427f3d2fa9", "version": "5.15.9", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index b7fc7ddaaf0386..2a6eb937ea93bf 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7862807b3cdd0a4647ba2f9db4eb3c1338536e9e", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "76aaf6a6e40ee58a40a88ae725c230623cfd0762", "version": "5.15.9", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index ab1a07b1ff35c4..dc85eeafc339c2 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11a9fee7235b0de6c54f4b1ee65e103bc94a6075", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "e877be0fe4f6fbb37edc7f97f90fcddb32dc7913", "version": "5.15.9", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index c3dac43b92cb6d..5e97804505fc5d 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a90de4f154709723b9a837d25b1572ca33f2a8b4", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "9107483664812c119937623d402bea6395c24cd3", "version": "5.15.9", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 8550d717fca2aa..470a52be7d7ccf 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21cff64c27a49de9aeebf975fa890c7de64b2ede", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "98ec3df0bc18cf346f84be63fe575377f87ab053", "version": "5.15.9", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 01266a2ae89812..16777143387321 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b9f8ae492cb7fb0ad32863279bfd1796779a043", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "b92dc1593710e8d95fd2c43788bb9d5788bc0d83", "version": "5.15.9", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 1bc8f47108a910..1813793f887d50 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "734a01140c22505395e27032cdbadebbdb0d1cdc", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "d35ff571bdff05dbbb479eee33741e289137abdd", "version": "5.15.9", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index d178b2371d962f..6bba68e9e4c63f 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "141dbdc4e7d234f55b336444a9e0a7f5add2e32b", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "d3485a7652a098831fc278dd06952308704ed906", "version": "5.15.9", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index e6f0243eca84f1..b60ede1f0c308f 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "260c42f72e3b608905415b0570f98a354264d9e0", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "c3f3b6a93468d062c26ccfb117d42bc988fb20a0", "version": "5.15.9", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 2a98703c6886aa..b3870620a87e8b 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "556adf6709fe319be9960166e72a30c03372d370", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "f26357a04aa8c322ef4eb762501e153c6aaf2fa3", "version": "5.15.9", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 52bedcde79ab02..065e27e4a63c0d 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53cf70df24a80e1b6c72b85f9d6ff8c4765b7af2", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "cc31ed992b42598677d387fc1d8736b312c957e5", "version": "5.15.9", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index ba72baeefbd950..8bf01c71c0380a 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39d5acff58afd279f8249487ea29263910b24220", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "2f076f78b7733120039477509c1472f270ad3e88", "version": "5.15.9", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index d99c39748d9815..216dd8c7bec027 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc2aca1d6bd39aba9d6e45651d8f2908e3a555c8", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "dcf89830b5916153b3bb982f389b3d034ed3e0fd", "version": "5.15.9", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index 03a891d465722c..ab158ecdbfb269 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12b1fde22a5acf67e0ac9e5066ff280363131c14", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "055e2050aaf199ae2b8ada774ae2ec5c76dc1141", "version": "5.15.9", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index b78da3ab3c40b7..33c3cb2603445a 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "398e7c0eab3505667a21ba09a66acbaf434f2469", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "bada513b94e08f849d485063acaf985344960091", "version": "5.15.9", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 364b6a797956a4..f9f4681f94e08d 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6c4649e892aeb5e8c154336702ee48f0dfcfcf9", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "79586b3e3936c0f3f7e4ec1ed42cadb7fb464050", "version": "5.15.9", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 7701c0222516bd..80c87368431a46 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dae7f812fc32b8659a16029d431fe0fe0156681e", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "bd367c42034978d2fe8e73265e9dbd18eb18cbdd", "version": "5.15.9", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 17e48b946c8edf..762e02785d7769 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9769b05f79a109d7fcd2ace8c3500638504f586b", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "50f67d52fdd3dd85f8d02b7b14074a7dcf573ead", "version": "5.15.9", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index a03cad29dabecc..19a8ac2bff3cdb 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "342b8c5a23f4f9690bedb464a32e171dbb5ef2e4", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "e50966048714ac6d7e309ff3f7b07f848d6c4cbe", "version": "5.15.9", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index 10f202bdf65dda..d686cac46f968f 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e22bfd152605c0559014192e82b46e465e16dac6", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "bc05632d8e9b8d4914b3787433fe508dade58f55", "version": "5.15.9", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index 8082bf31226a38..bc69d8c1d5f48d 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f93d74b2bcca02aee5e9e4e7e0126f5c445aeaa", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "2a24133acd1d8a33e3cbdca79de311b291d18b0a", "version": "5.15.9", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index c5fd74142cdd30..674877136587fb 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf51477b296f65a9b1548f1f895fb123aba0c792", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "d15191c2760ad90868e2f1f9b430a378f3b049f8", "version": "5.15.9", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 1480086ce39387..dc2078c350dfc9 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26f667cea870335a6f46ca414baa020c8f6aba35", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "85edf08e60bcd7025af68908b62fd39dccc22b4e", "version": "5.15.9", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 24758e8bdcc546..172bd3ec20b857 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbca7fa67ff94eee8d6e3de297d737170190ff6f", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "36b4ecf4a66c6c8152157e94c91626d559d17fee", "version": "5.15.9", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index 7a69d206a6592a..b14917d7083741 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66becab038e0bc1ebd91613c96f32203edfd2933", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "5cadf58b50b49925073fafb754be7da26b893630", "version": "5.15.9", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 98a177ba8acdb9..b0f268596e1202 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "051b6d588faeba97c3ee9e53e96c5a619ac38352", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "3db00ae0c957077673d439f3c84d58680dd76090", "version": "5.15.9", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 7700f7b0e7e130..192022a7a7bc56 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3530341f63252d313281374bb000e761889a0de6", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "0a8a7c0b36409296d3d03d3b346ee684f9342e77", "version": "5.15.9", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index c382d4e1897517..3d36f2e75e7e16 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "632ca34b395881412e1694d350f605a2dd6d54f0", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "a16175a9771d1e7556bcfb785956f0ce5afc26fb", "version": "5.15.9", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index bfe14462ec9c20..e07d5bd22f132e 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "994691ced838ba1d2eab1f5531e9ebfc4bd046f1", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "504602318bcd6faffa35b309bbf083860792bab6", "version": "5.15.9", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index dfe797641d7450..fbb33fad50acfd 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a8ae0c894141bd285fa02a23a9d4eb6f40604aa", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "d7cbb16a11e55adb2e957a5ed4828e7b2d1037b9", "version": "5.15.9", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 69a438b06c00fc..cecdc6dd54322a 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eca137a635e6a4aa62a40609dc1a09029ca02733", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "5653adcb47c0b00c694d7a311c893da13fc3a2a2", "version": "5.15.9", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 273aa485687bae..5a384bc6772b40 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f45281462dfeef2426bd9e6cc4d15d87fdd5f888", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "955af6470f524a9537ae0d2d72e7857497c46a9c", "version": "5.15.9", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 45bea32368bc80..09bf79c553a18b 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "688b1af87eb544cc7828bfa75df01c0dc2efe4d8", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "7f5d72f36efa8cdd8b1d248b124f99f4a0e58fb0", "version": "5.15.9", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index f019ea7a368970..634dba081ce648 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f088e5761d91d1539ecb60aed67afcdb197dccef", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "47b6255a30e17081a1a9c0201c243ce6d908cca9", "version": "5.15.9", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index ed05b4f2221eb7..520cabfb43f208 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d056d88bfc82130467bf524e8c7285850b71c594", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "75f0da5f93d565350bc869ac119786e63354a520", "version": "5.15.9", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index c63d1e953dfa45..5f2317b6c4326d 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13d815c2479b4a47f6b617ff2e1de3379d0a44b7", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "b3c4b86102dc85ea933fb02679306d4a514174c7", "version": "5.15.9", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index bfd7bf9e927dd9..fe439a429bf2ce 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d70201641dafec375d2ac778fce87a73c5f451b3", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "2e9fa2103c4b8f738ba8786e9c2a5bacb4bd935c", "version": "5.15.9", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index a7619418bfe3f3..5011282158d114 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e40a0af7bdebc43925450f1e51e2c2f8b49a067", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "ea585f612f4470a52c850b68664f95fea52c766e", "version": "5.15.9", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 525ff14bc47c0b..cb55edaa388ba7 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2042c06d5c6007ed72d9df7f8dae8d1148eb1cc", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "ac580d5217fcefbe07addb7cf42bc7fb03eba7eb", "version": "5.15.9", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 73ea9e8a1f41d7..49afb77b66f6d7 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "510fff85661604ebc087feee170a857bc08d31d9", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "a4a3d14b71ff33f5aef8316c46fc2b0c79f7ea60", "version": "5.15.9", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 22cc49cba246d4..ee969ff2156edc 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50fe0254b5caf977970fd69dfed756799a54120c", + "version": "5.15.10", + "port-version": 0 + }, { "git-tree": "1b194230fb11eb7bf37092591a917b024ac96a9b", "version": "5.15.9", From 44eab3705d0209b3486f7fbdfa9e4afec6cbbe4b Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Thu, 8 Jun 2023 18:57:13 +0200 Subject: [PATCH 251/533] nghttp2: update to 1.54.0 (#31877) --- ports/nghttp2/portfile.cmake | 2 +- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index bfe68aa02f5c8f..a5afb8f3c50df8 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF v${VERSION} - SHA512 7cd9bd2c1e3b0b97fd9c1a57559a91faa10ad046a38e65bc040cb7b31f2c65a92941125364c52c84f79cbb0be460795e8f067761598be0ae0e7ad7f17c3cd243 + SHA512 0ec50178068276cde624c47a634beda0b96ef1529970fddb20cf7a9b4b30d792827ffe16f16f5b7e210d0b7913be5d25e6c6704f6f7fb9a1b5a85f63aeaba6bc HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index b630bd0bc25832..a37baafec8cfac 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.53.0", + "version": "1.54.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c35dd2c96e2c38..d27aa92e0e43e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5613,7 +5613,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.53.0", + "baseline": "1.54.0", "port-version": 0 }, "nghttp2-asio": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 1056bec407c52a..839a76e7841450 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bc602a9f1721052cae35a9c91b829df65398f86", + "version": "1.54.0", + "port-version": 0 + }, { "git-tree": "0eb9ce7e6486785e3b3581274097e4d0e34ad828", "version": "1.53.0", From 282e4f61d49709bcad1ff88a3c41582f815b1711 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 8 Jun 2023 09:57:58 -0700 Subject: [PATCH 252/533] [imgui] Fix deps of feature allegro5-binding (#31871) * [imgui] Fix feature allegro5-binding deps * update version * Update imgui.json --- ports/allegro5/export-targets.patch | 14 +++++++++++--- ports/allegro5/vcpkg.json | 2 +- ports/imgui/CMakeLists.txt | 4 ++-- ports/imgui/imgui-config.cmake.in | 4 ++++ ports/imgui/vcpkg.json | 1 + versions/a-/allegro5.json | 5 +++++ versions/baseline.json | 4 ++-- versions/i-/imgui.json | 5 +++++ 8 files changed, 31 insertions(+), 8 deletions(-) diff --git a/ports/allegro5/export-targets.patch b/ports/allegro5/export-targets.patch index 53dc57b7df00be..21ad6d3b5c3d26 100644 --- a/ports/allegro5/export-targets.patch +++ b/ports/allegro5/export-targets.patch @@ -28,10 +28,18 @@ index 7c5720b..72880c4 100644 # # Documentation diff --git a/cmake/Common.cmake b/cmake/Common.cmake -index 74edef8..0cf1edb 100644 +index b95479f..4093a47 100644 --- a/cmake/Common.cmake +++ b/cmake/Common.cmake -@@ -220,6 +220,7 @@ endfunction(set_our_framework_properties) +@@ -166,6 +166,7 @@ function(add_our_library target framework_name sources extra_flags link_with) + # Library dependencies are transitive by default. Any target which links + # with this target will therefore pull in these dependencies automatically. + target_link_libraries(${target} ${link_with}) ++ target_include_directories(${target} PUBLIC "$") + + # Set list of dependencies that the user would need to explicitly link with + # if static linking. +@@ -220,6 +221,7 @@ endfunction(set_our_framework_properties) function(install_our_library target filename) install(TARGETS ${target} @@ -39,7 +47,7 @@ index 74edef8..0cf1edb 100644 LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}" FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}" -@@ -227,6 +228,10 @@ function(install_our_library target filename) +@@ -227,6 +229,10 @@ function(install_our_library target filename) # Doesn't work, see below. # PUBLIC_HEADER DESTINATION "include" ) diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json index 3c5f701c628df7..e265058d1ca5cd 100644 --- a/ports/allegro5/vcpkg.json +++ b/ports/allegro5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "allegro5", "version": "5.2.6.0", - "port-version": 3, + "port-version": 4, "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.", "homepage": "https://github.com/liballeg/allegro5", "license": "BSD-3-Clause AND Zlib", diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 5c1c507ae6cf3e..08508f314e53be 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -31,8 +31,8 @@ target_sources( target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) if(IMGUI_BUILD_ALLEGRO5_BINDING) - find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) - target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) + find_package(unofficial-allegro5 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PRIVATE unofficial-allegro5::allegro unofficial-allegro5::allegro_ttf unofficial-allegro5::allegro_font unofficial-allegro5::allegro_main) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index ab1148fe3f5cae..721bcf8845d0fd 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -26,4 +26,8 @@ if (@IMGUI_FREETYPE@) find_dependency(freetype CONFIG) endif() +if (@IMGUI_BUILD_ALLEGRO5_BINDING@) + find_dependency(unofficial-allegro5 CONFIG) +endif() + include("${CMAKE_CURRENT_LIST_DIR}/imgui-targets.cmake") diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index bf8d21c9397c1e..f3eb99d7411088 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.89.6", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/versions/a-/allegro5.json b/versions/a-/allegro5.json index 006def03d7057d..eeb137a4b36704 100644 --- a/versions/a-/allegro5.json +++ b/versions/a-/allegro5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50ae858c1ef5e8d94fa850e2857b7a449cc5f55", + "version": "5.2.6.0", + "port-version": 4 + }, { "git-tree": "09b555503c34ca7a0052436996b19bb4deb5d701", "version": "5.2.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index d27aa92e0e43e3..bdc1fb79e4c20f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -82,7 +82,7 @@ }, "allegro5": { "baseline": "5.2.6.0", - "port-version": 3 + "port-version": 4 }, "alpaca": { "baseline": "0.2.0", @@ -3314,7 +3314,7 @@ }, "imgui": { "baseline": "1.89.6", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index c219c04502519c..d5b4434c71102d 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6ac001e889c4162a36f628cbfd921aadcb1b602", + "version": "1.89.6", + "port-version": 1 + }, { "git-tree": "0250b6b7e1c8c70d405ba160e85ee153118fb23e", "version": "1.89.6", From faac1ea237c6fd433c3b09574099c2cfd67b9d46 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Thu, 8 Jun 2023 10:00:49 -0700 Subject: [PATCH 253/533] [flashlight-text] New port (#31859) * [flashlight-text] New port * Format and fix vcpkg.json, x-add-version * Export dll symbols on Windows * Only pass opt to export all symbols on Windows * Update version database * Rename flag * Update version database * Update ports/flashlight-text/portfile.cmake Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * Update ports/flashlight-text/vcpkg.json Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * Update version * Update to v0.0.4, remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * Update version database * Use in portfile * Update version database * Fix CMake config install location * Update package version * Omit config fixup arg * Update version --------- Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/flashlight-text/portfile.cmake | 33 ++++++++++++++++++++++++++++ ports/flashlight-text/vcpkg.json | 25 +++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/f-/flashlight-text.json | 14 ++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 ports/flashlight-text/portfile.cmake create mode 100644 ports/flashlight-text/vcpkg.json create mode 100644 versions/f-/flashlight-text.json diff --git a/ports/flashlight-text/portfile.cmake b/ports/flashlight-text/portfile.cmake new file mode 100644 index 00000000000000..2b6a5efea1c20a --- /dev/null +++ b/ports/flashlight-text/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO flashlight/text + REF v${VERSION} + SHA512 d9ed9b687c441e356b19a035ecef1abc76d90e3e0d8a9c32899bd7a81e379a9ae51bc6d68e7bae10cf83b87ec76289afbd81909d70799ca8d24f996e8667ad85 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + kenlm FL_TEXT_USE_KENLM +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFL_TEXT_BUILD_TESTS=OFF + -DFL_TEXT_BUILD_STANDALONE=OFF + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/${PORT}" + OPTIONS_RELEASE + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT}" + +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/flashlight-text/vcpkg.json b/ports/flashlight-text/vcpkg.json new file mode 100644 index 00000000000000..39fdad28bb2a69 --- /dev/null +++ b/ports/flashlight-text/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "flashlight-text", + "version": "0.0.4", + "description": "Flashlight Text is a library for tokenization, beam search, and text processing.", + "homepage": "https://github.com/flashlight/text", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "kenlm": { + "description": "Build with KenLM", + "dependencies": [ + "kenlm" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index bdc1fb79e4c20f..65eb76817908e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2516,6 +2516,10 @@ "baseline": "0.3", "port-version": 6 }, + "flashlight-text": { + "baseline": "0.0.4", + "port-version": 0 + }, "flat": { "baseline": "2022-08-30", "port-version": 0 diff --git a/versions/f-/flashlight-text.json b/versions/f-/flashlight-text.json new file mode 100644 index 00000000000000..d15068ac343b42 --- /dev/null +++ b/versions/f-/flashlight-text.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "fdf18ae36763962256b235eec31becbe02f2534d", + "version": "0.0.4", + "port-version": 0 + }, + { + "git-tree": "6386901fa48bce946fdc5775a1c1b784e0a97175", + "version": "0.0.3", + "port-version": 0 + } + ] +} From 431dcee14571a8daa0e66e543717ecb90cffea0e Mon Sep 17 00:00:00 2001 From: Karlson2k Date: Thu, 8 Jun 2023 20:14:17 +0300 Subject: [PATCH 254/533] [libmicrohttpd] update and various fixes (#31740) * [libmicrohttpd] Update to version 0.9.77 * [libmicrohttpd] Remove unneeded dependency Gettext is used by upstream only to build files for distribution. Gettext is not used by the library itself. * [libmicrohttpd] Add ARM support The ARM is supported by upstream for a long time, VC support for ARM was added in the version 0.9.77. * [libmicrohttpd] Use universal project for VC builds * [libmicrohttpd] Exclude wrong lib headers * [libmicrohttpd] Support release/debug for non-VC builds * [libmicrohttpd] Add license * [libmicrohttpd] Add "https" feature * [libmicrohttpd] Use right function for license file * [libmicrohttpd] Fix "supports" libmicrohttpd VC projects support only static library with static runtime or dynamic library with dynamic runtime * [libmicrohttpd] Update version database --- ports/libmicrohttpd/portfile.cmake | 29 ++++++++++++++++++----------- ports/libmicrohttpd/vcpkg.json | 19 +++++++++++-------- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 ++-- versions/l-/libmicrohttpd.json | 5 +++++ 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index c6aa53b0c99285..1a1e991d555e42 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -1,11 +1,9 @@ -set(MICROHTTPD_VERSION 0.9.75) - vcpkg_download_distfile(ARCHIVE URLS - "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" - "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" - FILENAME "libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" - SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c + "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${VERSION}.tar.gz" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${VERSION}.tar.gz" + FILENAME "libmicrohttpd-${VERSION}.tar.gz" + SHA512 001025c023dd94c4a0cf017ed575e65a577b5ce595e7e450346bfb75def77eaa8a4cfbeffb9f4b912e34165c2cfca147c02c895e067a4f6c5a321a12035758a5 ) vcpkg_extract_source_archive( @@ -22,25 +20,34 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH w32/VS2015/libmicrohttpd.vcxproj + PROJECT_SUBPATH w32/VS-Any-Version/libmicrohttpd.vcxproj RELEASE_CONFIGURATION "Release-${CFG_SUFFIX}" DEBUG_CONFIGURATION "Debug-${CFG_SUFFIX}" ) - file(GLOB MICROHTTPD_HEADERS "${SOURCE_PATH}/src/include/microhttpd*.h") + file(GLOB MICROHTTPD_HEADERS "${SOURCE_PATH}/src/include/microhttpd.h") file(COPY ${MICROHTTPD_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") else() + vcpkg_list(SET config_args) if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ENV{LIBS} "$ENV{LIBS} -framework Foundation -framework AppKit") # TODO: Get this from the extracted cmake vars somehow endif() + if("https" IN_LIST FEATURES) + vcpkg_list(APPEND config_args "--enable-https") + else() + vcpkg_list(APPEND config_args "--disable-https") + endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" OPTIONS --disable-doc + --disable-nls --disable-examples --disable-curl - --disable-https - --with-gnutls=no + ${config_args} + OPTIONS_DEBUG --enable-asserts + OPTIONS_RELEASE --disable-asserts ) vcpkg_install_make() @@ -49,4 +56,4 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libmicrohttpd/vcpkg.json b/ports/libmicrohttpd/vcpkg.json index a43d4d0e735a9b..2698b692ed55fe 100644 --- a/ports/libmicrohttpd/vcpkg.json +++ b/ports/libmicrohttpd/vcpkg.json @@ -1,14 +1,17 @@ { "name": "libmicrohttpd", - "version": "0.9.75", - "port-version": 1, + "version": "0.9.77", "description": "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application", "homepage": "https://www.gnu.org/software/libmicrohttpd/", - "supports": "!(arm | uwp)", - "dependencies": [ - { - "name": "gettext", - "platform": "!windows" + "license": "LGPL-2.1-or-later", + "supports": "!uwp & !(windows & !mingw & ((static & !staticcrt) | (!static & staticcrt)))", + "features": { + "https": { + "description": "Enable HTTPS protocol support", + "supports": "!windows | mingw", + "dependencies": [ + "libgnutls" + ] } - ] + } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7d7f71aa5e796c..aa3f2df280fc8e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -754,7 +754,6 @@ libmesh:x64-linux=skip # Build fails since PIC is not enabled and some configuration tests do not work properly on UWP libmicrodns:arm-uwp=fail libmicrodns:x64-uwp=fail -libmicrohttpd:x64-windows-static-md=fail libmikmod:arm-neon-android=fail libmikmod:arm64-android=fail libmikmod:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 65eb76817908e2..8aea3767f401c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4265,8 +4265,8 @@ "port-version": 0 }, "libmicrohttpd": { - "baseline": "0.9.75", - "port-version": 1 + "baseline": "0.9.77", + "port-version": 0 }, "libmikmod": { "baseline": "3.3.11.1", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index fec429522ee43c..33ff1494504c24 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99533d05bd2e457102ebabc8c74a065bc62eb900", + "version": "0.9.77", + "port-version": 0 + }, { "git-tree": "f1b42f3ba710ee2202398b46cc349adfa90cd3d9", "version": "0.9.75", From db2071b44938c0fb7943a94c8ab912e4e182a60b Mon Sep 17 00:00:00 2001 From: Pierre Gergondet Date: Fri, 9 Jun 2023 02:21:51 +0900 Subject: [PATCH 255/533] [nanomsg] Remove nanomsg_BINDIR check as needed (#31553) --- ports/nanomsg/portfile.cmake | 3 ++- ports/nanomsg/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nanomsg.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake index 2f48e9c48331b5..8ae77273c5ce19 100644 --- a/ports/nanomsg/portfile.cmake +++ b/ports/nanomsg/portfile.cmake @@ -49,7 +49,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") "defined(NN_STATIC_LIB)" "1 // defined(NN_STATIC_LIB)" ) - +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake "set_and_check(nanomsg_BINDIR \${PACKAGE_PREFIX_DIR}/bin)" diff --git a/ports/nanomsg/vcpkg.json b/ports/nanomsg/vcpkg.json index 4754f58e307bac..d8c8ea4c2449e4 100644 --- a/ports/nanomsg/vcpkg.json +++ b/ports/nanomsg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nanomsg", "version-semver": "1.2.0", + "port-version": 1, "description": [ "A simple high-performance implementation of several \"scalability protocols\".", "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket." diff --git a/versions/baseline.json b/versions/baseline.json index 8aea3767f401c2..94593186b3d1a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5538,7 +5538,7 @@ }, "nanomsg": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "nanopb": { "baseline": "0.4.7", diff --git a/versions/n-/nanomsg.json b/versions/n-/nanomsg.json index 5850fbc6c9711b..fb3861debc920a 100644 --- a/versions/n-/nanomsg.json +++ b/versions/n-/nanomsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "776c37386c83ec3b242fb17bf418f4a22e5cc300", + "version-semver": "1.2.0", + "port-version": 1 + }, { "git-tree": "9c6dee5730547fccf7eae09ec55d2cea5fb593d1", "version-semver": "1.2.0", From 638b1588be3a265a9c7ad5b212cef72a1cad336a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 8 Jun 2023 11:17:29 -0700 Subject: [PATCH 256/533] Update vcpkg-tool to 2023-06-07 + xbox triplets cleanup (#31723) * Update vcpkg-tool to 2023-05-31 + xbox triplets cleanup https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-30 + https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-31 + https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-07 Clean up xbox triplets following teaching vcpkg.exe about xbox more directly. Also deletes the seemingly-no-longer-used vcpkg_get_dep_info.cmake and vcpkg_get_tags.cmake. Also: [redis-plus-plus] Add DISABLE_PARALLEL_CONFIGURE due to source tree write. --- ports/kf5i18n/portfile.cmake | 11 +++++++ ports/kf5i18n/vcpkg.json | 1 + ports/qtbase/portfile.cmake | 16 +++++++++ ports/qtbase/vcpkg.json | 1 + ports/redis-plus-plus/portfile.cmake | 1 + ports/redis-plus-plus/vcpkg.json | 1 + ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 4 +++ ports/wt/portfile.cmake | 4 ++- ports/wt/vcpkg.json | 1 + scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++--- scripts/cmake/vcpkg_common_definitions.cmake | 4 +++ scripts/cmake/vcpkg_configure_cmake.cmake | 4 +++ scripts/test_ports/cmake-user/portfile.cmake | 4 +++ scripts/toolchains/xbox.cmake | 6 ++-- scripts/vcpkg_get_dep_info.cmake | 19 ----------- scripts/vcpkg_get_tags.cmake | 33 ------------------- .../community/x64-xbox-scarlett-static.cmake | 8 +---- triplets/community/x64-xbox-scarlett.cmake | 8 +---- .../community/x64-xbox-xboxone-static.cmake | 8 +---- triplets/community/x64-xbox-xboxone.cmake | 8 +---- versions/baseline.json | 10 +++--- versions/k-/kf5i18n.json | 5 +++ versions/q-/qtbase.json | 5 +++ versions/r-/redis-plus-plus.json | 5 +++ versions/v-/vcpkg-cmake.json | 5 +++ versions/w-/wt.json | 5 +++ 28 files changed, 94 insertions(+), 97 deletions(-) delete mode 100644 scripts/vcpkg_get_dep_info.cmake delete mode 100644 scripts/vcpkg_get_tags.cmake diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index df311afab355d2..f4de6dfbfa3a04 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -38,3 +38,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) +# The following pattern has an absolute path, but is still ultimately relocatable, so skip absolute paths check: +# share\KF5I18n\KF5I18nMacros.cmake +# # The Python executable used for building ki18n will be used as a fallback +# # solution if it cannot be found in $PATH when building applications. +# set(_KI18N_PYTHON_EXECUTABLE "C:/Dev/vcpkg-downloads/tools/python/python-3.10.7-x64/python.exe") +# +# find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python) +# if(NOT KI18N_PYTHON_EXECUTABLE) +# set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}") +# endif() +set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 0ac9cf73782396..3f447ef49b1c58 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.98.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index cc7e2974ffa91f..74e3f901c67c89 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -470,3 +470,19 @@ endif() if(VCPKG_CROSSCOMPILING) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6/Qt6Dependencies.cmake" "${CURRENT_HOST_INSTALLED_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}") endif() + +# The following pattern exists in qt-cmake scripts, but is still relocatable, so disable the absolute paths check. +# warning: There should be no absolute paths, such as the following, in an installed package: +# Absolute paths were found in the following files: +# packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake-private +# packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake-private +# packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake +# packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake +# +# # Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +# original_cmake_path="/home/bion/vcpkg/downloads/tools/cmake-3.25.1-linux/cmake-3.25.1-linux-x86_64/bin/cmake" +# cmake_path=$original_cmake_path +# if ! test -f "$cmake_path"; then +# cmake_path="cmake" +# fi +set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index dfece584e0abc7..4aba737df1439b 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.5.1", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index fb1b9b789eaa18..3d4b152a8ca017 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -29,6 +29,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DREDIS_PLUS_PLUS_USE_TLS=OFF -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC} diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 7d4cf1ffb5f61c..2f3b575f26cf91 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "redis-plus-plus", "version-semver": "1.3.8", + "port-version": 1, "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 7052cc9831f498..79c63522ed89b3 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-12-22", + "version-date": "2023-05-04", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 746991f983d67d..d7e673751d5cc3 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -132,6 +132,10 @@ function(vcpkg_cmake_configure) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET) + vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index 907d0d0c36b7b3..6b437fe1384ee5 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -89,7 +89,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/var" "${CURRENT_PACKAGES_DIR}/debug/var") # RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646 -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "") +file(READ "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" W_CONFIG_H) +string(REGEX REPLACE "([\r\n])#define RUNDIR[^\r\n]+" "\\1// RUNDIR intentionally unset by vcpkg" W_CONFIG_H "${W_CONFIG_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "${W_CONFIG_H}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 5a5c0ceda8b9d0..79a25672709a72 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wt", "version": "4.9.1", + "port-version": 1, "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "license": "GPL-2.0-only", diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 5a360e047b3ef7..c37d661c4c26af 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-04-07' +$versionDate = '2023-06-07' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4960766360b605..1f392ff9e5abb3 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-04-07" +vcpkgToolReleaseTag="2023-06-07" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="2a2805aa251a9523311c813e9e68896f18805fed4ace301c603f4afac3940b27d4ef1d3b4572c8f93ce4d13ac613720275b9e21e39cc5d19115d2fc849bfe2bb" + vcpkgToolReleaseSha="109879edb5e47e329532034afdd7edcc658be790555fe45fee20e0791457e0a42ff930a1450aa1f6faaa98732ed6a6abea2f53f5e5547adce987d8fa0c124df1" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="d8dc48e6dc866f4ebe3919c0bf1377769d6c6f1ad2dab7fc09da9b26f7dac3ab3b06affb585ece7ba72e2fdeacdc77b8df31ad08cff49e4c060b7647fc1cc22a" + vcpkgToolReleaseSha="96ed9b3e4ac58b61f54147b2533fd563bebe69721aa972974c0de354a31092c4cc24094372d37d9eb7968433fffa0e29c5e5dfd80cfdf7a76d0db373b0890fad" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="f26aaf5f503b9fd0a8b206230df19af966390d7087a9f3342f24c2d5e73f1f1bd81cba2695a89c87015ec822bd41bf836c2a9ef9f0e11acc61d6d9593aa8fae9" + vcpkgToolReleaseSha="7bc383231533262b436610ddce21946ff4f558afe2763cac03f186593e4be50c9377ebf8af6ecae5783a0589fa5f2ec540da70544d53f348fc23c731782de629" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="89dc32154e22f6a51fa18a8ea22c16263533546469f73cdb4ee168ab7c68ebc2b2a93177284dc03ecf2d2ca438f9fd583def48844788942e98ea45027e8ec2fa" + vcpkgToolReleaseSha="148b85bd92fd9b53f66d0718b9bdf12d1a698cc5b15e491e093c170acd8aa59ae02fd65da0d79901ed9fa179e2bf3d9a1db046bb34e194f6c982ac6e2d7b73a0" fi # Do the download or build. diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 58730a89780d14..b248208a2fb8e9 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -2,6 +2,10 @@ string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILI #Helper variable to identify the Target system. VCPKG_TARGET_IS_ if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "") set(VCPKG_TARGET_IS_WINDOWS ON) + + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET AND NOT "${VCPKG_XBOX_CONSOLE_TARGET}" STREQUAL "") + set(VCPKG_TARGET_IS_XBOX ON) + endif() elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(VCPKG_TARGET_IS_WINDOWS ON) set(VCPKG_TARGET_IS_UWP ON) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 24c64a6ec11264..b051bf8216a9df 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -185,6 +185,10 @@ function(vcpkg_configure_cmake) endif() endif() + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET) + vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}") + endif() + if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index ab30c4ccd8a4ea..d9154ebc09d6f1 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -129,6 +129,10 @@ function(test_cmake_project) list(APPEND base_options "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() endif() + + if(DEFINED VCPKG_XBOX_CONSOLE_TARGET) + list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}") + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND base_options -DBUILD_SHARED_LIBS=ON) diff --git a/scripts/toolchains/xbox.cmake b/scripts/toolchains/xbox.cmake index f96c8586ccb9eb..7bacf33679298a 100644 --- a/scripts/toolchains/xbox.cmake +++ b/scripts/toolchains/xbox.cmake @@ -12,14 +12,12 @@ endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +else() + set(CMAKE_SYSTEM_VERSION "10.0" CACHE STRING "" FORCE) endif() set(CMAKE_CROSSCOMPILING ON CACHE STRING "") -if(NOT DEFINED CMAKE_SYSTEM_VERSION) - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") -endif() - # Add the Microsoft GDK if present if (DEFINED ENV{GRDKLatest}) cmake_path(SET _vcpkg_grdk "$ENV{GRDKLatest}") diff --git a/scripts/vcpkg_get_dep_info.cmake b/scripts/vcpkg_get_dep_info.cmake deleted file mode 100644 index 92212b82d02ac1..00000000000000 --- a/scripts/vcpkg_get_dep_info.cmake +++ /dev/null @@ -1,19 +0,0 @@ -function(vcpkg_get_dep_info PORT VCPKG_TRIPLET_ID) - message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") - vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) - - # GUID used as a flag - "cut here line" - message("c35112b6-d1ba-415b-aa5d-81de856ef8eb -VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} -VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} -VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} -VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} -VCPKG_DEP_INFO_OVERRIDE_VARS=${VCPKG_DEP_INFO_OVERRIDE_VARS} -CMAKE_HOST_SYSTEM_NAME=${CMAKE_HOST_SYSTEM_NAME} -CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR} -CMAKE_HOST_SYSTEM_VERSION=${CMAKE_HOST_SYSTEM_VERSION} -CMAKE_HOST_SYSTEM=${CMAKE_HOST_SYSTEM} -e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f -8c504940-be29-4cba-9f8f-6cd83e9d87b7") -endfunction() diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake deleted file mode 100644 index 6a948d129eb597..00000000000000 --- a/scripts/vcpkg_get_tags.cmake +++ /dev/null @@ -1,33 +0,0 @@ -function(vcpkg_get_tags PORT FEATURES VCPKG_TRIPLET_ID VCPKG_ABI_SETTINGS_FILE) - message("d8187afd-ea4a-4fc3-9aa4-a6782e1ed9af") - vcpkg_triplet_file(${VCPKG_TRIPLET_ID}) - - # GUID used as a flag - "cut here line" - message("c35112b6-d1ba-415b-aa5d-81de856ef8eb -VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE} -VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME} -VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION} -VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET} -VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH} -VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} -VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE} -VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} -VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} -VCPKG_DISABLE_COMPILER_TRACKING=${VCPKG_DISABLE_COMPILER_TRACKING} -e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") - - # Just to enforce the user didn't set it in the triplet file - if (DEFINED VCPKG_PUBLIC_ABI_OVERRIDE) - set(VCPKG_PUBLIC_ABI_OVERRIDE) - message(WARNING "VCPKG_PUBLIC_ABI_OVERRIDE set in the triplet will be ignored.") - endif() - include("${VCPKG_ABI_SETTINGS_FILE}" OPTIONAL) - - message("c35112b6-d1ba-415b-aa5d-81de856ef8eb -VCPKG_PUBLIC_ABI_OVERRIDE=${VCPKG_PUBLIC_ABI_OVERRIDE} -VCPKG_ENV_PASSTHROUGH=${VCPKG_ENV_PASSTHROUGH} -VCPKG_ENV_PASSTHROUGH_UNTRACKED=${VCPKG_ENV_PASSTHROUGH_UNTRACKED} -VCPKG_LOAD_VCVARS_ENV=${VCPKG_LOAD_VCVARS_ENV} -e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f -8c504940-be29-4cba-9f8f-6cd83e9d87b7") -endfunction() diff --git a/triplets/community/x64-xbox-scarlett-static.cmake b/triplets/community/x64-xbox-scarlett-static.cmake index e7c6877089abf4..acf742674fab9b 100644 --- a/triplets/community/x64-xbox-scarlett-static.cmake +++ b/triplets/community/x64-xbox-scarlett-static.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET scarlett) diff --git a/triplets/community/x64-xbox-scarlett.cmake b/triplets/community/x64-xbox-scarlett.cmake index 5faeb7cad1f9a3..0cf353b3a8e5fa 100644 --- a/triplets/community/x64-xbox-scarlett.cmake +++ b/triplets/community/x64-xbox-scarlett.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET scarlett) diff --git a/triplets/community/x64-xbox-xboxone-static.cmake b/triplets/community/x64-xbox-xboxone-static.cmake index a08e675b5611c6..1202acc8b55f7d 100644 --- a/triplets/community/x64-xbox-xboxone-static.cmake +++ b/triplets/community/x64-xbox-xboxone-static.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET xboxone) diff --git a/triplets/community/x64-xbox-xboxone.cmake b/triplets/community/x64-xbox-xboxone.cmake index b9838cd073214f..36061fc775cea5 100644 --- a/triplets/community/x64-xbox-xboxone.cmake +++ b/triplets/community/x64-xbox-xboxone.cmake @@ -1,10 +1,4 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest) -set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone") -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake") -set(VCPKG_LOAD_VCVARS_ENV ON) -set(VCPKG_TARGET_IS_XBOX ON) -set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox) +set(VCPKG_XBOX_CONSOLE_TARGET xboxone) diff --git a/versions/baseline.json b/versions/baseline.json index 94593186b3d1a0..02f82bef826128 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3606,7 +3606,7 @@ }, "kf5i18n": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5iconthemes": { "baseline": "5.98.0", @@ -6738,7 +6738,7 @@ }, "qtbase": { "baseline": "6.5.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.5.1", @@ -7070,7 +7070,7 @@ }, "redis-plus-plus": { "baseline": "1.3.8", - "port-version": 0 + "port-version": 1 }, "refl-cpp": { "baseline": "0.12.3", @@ -8369,7 +8369,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-12-22", + "baseline": "2023-05-04", "port-version": 0 }, "vcpkg-cmake-config": { @@ -8654,7 +8654,7 @@ }, "wt": { "baseline": "4.9.1", - "port-version": 0 + "port-version": 1 }, "wtl": { "baseline": "10.0.10320", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 86c7ac0fc38bfc..d2e337d4d10a2c 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2263f5dbba39bdf456b8f1606f29ab4dc6e66cb", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "8ce72b628f7998df3f90bcf7f9d313d9242ad5d8", "version": "5.98.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 60c606d6e81025..e8484b8ca9e109 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5e0f416352dc6207bf48ac656e3747140232a31", + "version": "6.5.1", + "port-version": 1 + }, { "git-tree": "ce56d3e7af720645f1c4be18d11e659c1d3e48bf", "version": "6.5.1", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 05ed755fca84fc..21de4ee44595f3 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6be6c4d075dc736952132603d31f0ca568a0edde", + "version-semver": "1.3.8", + "port-version": 1 + }, { "git-tree": "c359e3bd938ceb9f3f5cde1b8aa4e435c9123534", "version-semver": "1.3.8", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 50bf5211394920..9d8b6f876bc125 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88a7058fc7fa73a9c4c99cfcae9d79e2abf87a5a", + "version-date": "2023-05-04", + "port-version": 0 + }, { "git-tree": "1913f86defd2140d0a6751be2d51952e4090efa4", "version-date": "2022-12-22", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index 604e5150992c8b..890377e897afa1 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dd116caa8830e2d131b0d3ffbcde1002aa12333", + "version": "4.9.1", + "port-version": 1 + }, { "git-tree": "3c2ab01f0b1932d0a5f62632fe26a28ea4a25faa", "version": "4.9.1", From 85c222bc31ce1a747c98f0dd74ab47baab91744c Mon Sep 17 00:00:00 2001 From: Andrew Kornilov Date: Fri, 9 Jun 2023 21:21:26 +0300 Subject: [PATCH 257/533] [raygui] Update to 3.6 (#31896) * [raygui] Update to 3.6 * [raygui] Update version --- ports/raygui/portfile.cmake | 2 +- ports/raygui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/raygui.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/raygui/portfile.cmake b/ports/raygui/portfile.cmake index c02130aeac6fae..37cd2e82f27b3a 100644 --- a/ports/raygui/portfile.cmake +++ b/ports/raygui/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raygui REF "${VERSION}" - SHA512 09643f3661879a9130122351d0f9310f1ecde5dd1242d15f7b9c61e80dc9acfc3e6b85682ae7079c8579fd39340da8c5dfdea62aabc6cc72a966dea675ddfd38 + SHA512 c1d970d98fb721203934fcc3b50d8185271c43e426112bfd0d350899b76586e1cc82dacf4e676827725cff75bc35c7e7e51acbfb8db47f92ad67ee58c9560778 HEAD_REF master ) diff --git a/ports/raygui/vcpkg.json b/ports/raygui/vcpkg.json index 30e2351422728f..ba505ad1ae6ba2 100644 --- a/ports/raygui/vcpkg.json +++ b/ports/raygui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "raygui", - "version": "3.2", + "version": "3.6", "description": "A simple and easy-to-use immediate-mode gui library", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib" diff --git a/versions/baseline.json b/versions/baseline.json index 02f82bef826128..7b5f7dedc46833 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7005,7 +7005,7 @@ "port-version": 4 }, "raygui": { - "baseline": "3.2", + "baseline": "3.6", "port-version": 0 }, "raylib": { diff --git a/versions/r-/raygui.json b/versions/r-/raygui.json index 052aa4c03879cc..dc8c8ed6bc911c 100644 --- a/versions/r-/raygui.json +++ b/versions/r-/raygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9de0bb8aebc0b8a41b4c973b5820ace3c0015ad3", + "version": "3.6", + "port-version": 0 + }, { "git-tree": "96eade6012fdd28a62fd21748edfd06d63674317", "version": "3.2", From 8cebe3c2194af89aa73b36043de36fcdecf53a50 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 10 Jun 2023 16:27:26 +0800 Subject: [PATCH 258/533] [libunifex]: disable build tests and examples (#31862) * fix dependency * gtest no longer feature * fix deps --- ports/libunifex/portfile.cmake | 4 ++-- ports/libunifex/vcpkg.json | 8 +------- versions/baseline.json | 2 +- versions/l-/libunifex.json | 5 +++++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ports/libunifex/portfile.cmake b/ports/libunifex/portfile.cmake index 5f01083429625a..b1c80085878dc0 100644 --- a/ports/libunifex/portfile.cmake +++ b/ports/libunifex/portfile.cmake @@ -13,8 +13,6 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - test BUILD_TESTING - test UNIFEX_BUILD_EXAMPLES coroutines CXX_COROUTINES_HAVE_COROUTINES ) @@ -23,6 +21,8 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD:STRING=20 + -DBUILD_TESTING=OFF + -DUNIFEX_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json index 94d2bac6cfbadf..f7e5de17199724 100644 --- a/ports/libunifex/vcpkg.json +++ b/ports/libunifex/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libunifex", "version-date": "2023-01-25", - "port-version": 1, + "port-version": 2, "description": "Unified Executors", "homepage": "https://github.com/facebookexperimental/libunifex", "dependencies": [ @@ -21,12 +21,6 @@ "features": { "coroutines": { "description": "Support coroutine" - }, - "test": { - "description": "Build test/example programs", - "dependencies": [ - "gtest" - ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 7b5f7dedc46833..1ee70fbe3f1ada 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4670,7 +4670,7 @@ }, "libunifex": { "baseline": "2023-01-25", - "port-version": 1 + "port-version": 2 }, "libunistring": { "baseline": "1.1", diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json index f1091579496460..4fffaa2729157f 100644 --- a/versions/l-/libunifex.json +++ b/versions/l-/libunifex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cc9469cbd38b11cc3966599bcb60c29d4dc34bc", + "version-date": "2023-01-25", + "port-version": 2 + }, { "git-tree": "f3613daa6d59dd1ebb7077c181171b9f60f21ced", "version-date": "2023-01-25", From cb0a4e862b010823e2e9377355d6e1ccc8e833fa Mon Sep 17 00:00:00 2001 From: eao197 Date: Sat, 10 Jun 2023 11:49:02 +0300 Subject: [PATCH 259/533] [SObjectizer] update to 5.7.5 (#31752) * SObjectizer updated to v.5.7.5. * vcpkg's x-add-version for SObjectizer-5.7.5. --- ports/sobjectizer/portfile.cmake | 2 +- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sobjectizer.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index a98071ea25f97c..31045fd9bd011b 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer REF "v.${VERSION}" - SHA512 7bdd89ac3fefa2df4813872f34ab74183352addbb559c06d04f943a71de779add115da030ef96ba29708672a1daa6e72ccba72de39c4c02cbea173ea029874ad + SHA512 274c9e207e373e2b023ea4810b57b1d31e7411c940407e5d5c5bbb876624638fc4326f08e9c589b7216af6ecf74f279029f978782f81ad452046357facbd153e ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index af737b50221270..29e7cc7c073072 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.4.3", + "version": "5.7.5", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1ee70fbe3f1ada..51d02cd7fc334b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7561,7 +7561,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.4.3", + "baseline": "5.7.5", "port-version": 0 }, "soci": { diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index c2ff686142a113..7c5e1ad753d784 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dcf8c753611ce387e21d981d5a7df8079cfe704", + "version": "5.7.5", + "port-version": 0 + }, { "git-tree": "52eda985aee5e14e16a47573154b39f069824d49", "version": "5.7.4.3", From a960fde0b60b6392d70375fe513dfa7eb083cc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Ke=C3=9Fler?= Date: Sat, 10 Jun 2023 10:49:42 +0200 Subject: [PATCH 260/533] [gtk3] Bump version to 3.24.38 (#31910) --- ports/gtk3/cairo-cpp-linkage.patch | 2 +- ports/gtk3/portfile.cmake | 2 +- ports/gtk3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtk3.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gtk3/cairo-cpp-linkage.patch b/ports/gtk3/cairo-cpp-linkage.patch index ac7341551725d1..c36a7aaeb3fb41 100644 --- a/ports/gtk3/cairo-cpp-linkage.patch +++ b/ports/gtk3/cairo-cpp-linkage.patch @@ -57,6 +57,6 @@ index 287f0cb..d35106f 100644 @@ -1,4 +1,4 @@ -project('gtk+', 'c', +project('gtk+', 'c', 'cpp', - version: '3.24.37', + version: '3.24.38', default_options: [ 'buildtype=debugoptimized', diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index 9d95ec093e70e9..400aefd6ffbef9 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org REPO GNOME/gtk REF "${VERSION}" - SHA512 3021b65649c29d390a21580dc39ca1e7fa845d760c95a6178213cd890f5d8c6d68fe8a5600b283001e279a4bb2ec99f9b210c7abfa493701f7276f015059a9a1 + SHA512 ffb52ee34074be6e88fda40a025044b653d05b69c35819eed159a020a6f1c881a83735aa7bec943470c465328bb3bb20b34afeb3b98cdcfca9d2eaaed3ab61ef PATCHES 0001-build.patch cairo-cpp-linkage.patch diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index 596564e475ce69..72194a9c875aec 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk3", - "version": "3.24.37", + "version": "3.24.38", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 51d02cd7fc334b..65191f5b8449a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3001,7 +3001,7 @@ "port-version": 0 }, "gtk3": { - "baseline": "3.24.37", + "baseline": "3.24.38", "port-version": 0 }, "gtkmm": { diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index af1ed2e08b3a12..45103fa371a34d 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63636acf7b77eead112fc9faa84680d1df97acd3", + "version": "3.24.38", + "port-version": 0 + }, { "git-tree": "f4e197166d448971a8856734debc428f05b456cb", "version": "3.24.37", From 63366443439398a62afc9a63b34b9a3ba63b1cae Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Sat, 10 Jun 2023 13:06:14 -0700 Subject: [PATCH 261/533] Update vcpkg-tool to 2023-06-08. (#31900) https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-08 --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index c37d661c4c26af..1674786749e76a 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-06-07' +$versionDate = '2023-06-08' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1f392ff9e5abb3..50f31c7541ba34 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-06-07" +vcpkgToolReleaseTag="2023-06-08" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="109879edb5e47e329532034afdd7edcc658be790555fe45fee20e0791457e0a42ff930a1450aa1f6faaa98732ed6a6abea2f53f5e5547adce987d8fa0c124df1" + vcpkgToolReleaseSha="d094a52e23f7ddd18b91790f9c08b1f7974c724f5f161d758a8d6d8db9d8a1946e7f819cc1bef3663702337db075610cb021d53b8a9d68a16ac2dc4fca8980aa" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="96ed9b3e4ac58b61f54147b2533fd563bebe69721aa972974c0de354a31092c4cc24094372d37d9eb7968433fffa0e29c5e5dfd80cfdf7a76d0db373b0890fad" + vcpkgToolReleaseSha="e027fdaac7a0517cf8222a7a8991283173f4004dc521163c1db8716cb5a36f8f0bfc043dd508464535187408534c8efad14710d2c7fc6be291c90ecc856f011c" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="7bc383231533262b436610ddce21946ff4f558afe2763cac03f186593e4be50c9377ebf8af6ecae5783a0589fa5f2ec540da70544d53f348fc23c731782de629" + vcpkgToolReleaseSha="c517fc369d7c2f0132de9c90e9960becb58dbd8936ec39699a69d148a60a01e7416c00dfc44d34c99d7bc41dcba50b6b5707969f757ed46514494ca08e948187" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="148b85bd92fd9b53f66d0718b9bdf12d1a698cc5b15e491e093c170acd8aa59ae02fd65da0d79901ed9fa179e2bf3d9a1db046bb34e194f6c982ac6e2d7b73a0" + vcpkgToolReleaseSha="85afece575943969502e2fd21cd91dc4ba1629d4b90ea6db66ba1c59f0abac5aa8d4a82a12f73088a6a3601e6b524b03de1a50b32250709a223715200a7fa2fd" fi # Do the download or build. From 13d7255093675e87bac24baf1084cd028a74b0f8 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 12 Jun 2023 15:07:05 -0700 Subject: [PATCH 262/533] [pbc] Add usage (#27049) * [pbc] Add usage * x-add-version * fix * x-add-version * update config file * update version --- ports/pbc/portfile.cmake | 19 +++++++++---------- ports/pbc/unofficial-pbc-config.cmake | 25 +++++++++++++++++++++++++ ports/pbc/vcpkg.json | 1 + versions/p-/pbc.json | 2 +- 4 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 ports/pbc/unofficial-pbc-config.cmake diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake index 6a2d35fe432b8b..1fd27f8a4ab015 100644 --- a/ports/pbc/portfile.cmake +++ b/ports/pbc/portfile.cmake @@ -1,17 +1,15 @@ -set(PBC_VERSION 0.5.14) - if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile( ARCHIVE - URLS "https://crypto.stanford.edu/pbc/files/pbc-${PBC_VERSION}.tar.gz" - FILENAME pbc-${PBC_VERSION}.tar.gz + URLS "https://crypto.stanford.edu/pbc/files/pbc-${VERSION}.tar.gz" + FILENAME pbc-${VERSION}.tar.gz SHA512 d75d4ceb3f67ee62c7ca41e2a91ee914fbffaeb70256675aed6734d586950ea8e64e2f16dc069d71481eddb703624df8d46497005fb58e75cf098dd7e7961333 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE ${ARCHIVE} - SOURCE_BASE ${PBC_VERSION} + SOURCE_BASE "${VERSION}" PATCHES linux.patch ) @@ -27,7 +25,7 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) set(OPTIONS ${SHARED_STATIC} LEX=${FLEX} YACC=${BISON}\ -y) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG COPY_SOURCE OPTIONS @@ -36,8 +34,8 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_install_make() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info) - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/info") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") else() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -105,9 +103,10 @@ else() OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" OPTIONS /p:SolutionDir=../ - ALLOW_ROOT_INCLUDES ON + ALLOW_ROOT_INCLUDES ) # clean up mpir stuff - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mpir.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/mpir.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pbc-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") endif() diff --git a/ports/pbc/unofficial-pbc-config.cmake b/ports/pbc/unofficial-pbc-config.cmake new file mode 100644 index 00000000000000..5e71df0c02c3ce --- /dev/null +++ b/ports/pbc/unofficial-pbc-config.cmake @@ -0,0 +1,25 @@ +if(NOT TARGET unofficial::pbc::pbc) + get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + + add_library(unofficial::pbc::pbc UNKNOWN IMPORTED) + + set_target_properties(unofficial::pbc::pbc PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + find_library(PBC_LIBRARY_DEBUG NAMES pbclib libpbc PATHS "${_IMPORT_PREFIX}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(EXISTS "${PBC_LIBRARY_DEBUG}") + set_property(TARGET unofficial::pbc::pbc APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::pbc::pbc PROPERTIES IMPORTED_LOCATION_DEBUG "${PBC_LIBRARY_DEBUG}") + endif() + + find_library(PBC_LIBRARY_RELEASE NAMES pbclib libpbc PATHS "${_IMPORT_PREFIX}/" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(EXISTS "${PBC_LIBRARY_RELEASE}") + set_property(TARGET unofficial::pbc::pbc APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::pbc::pbc PROPERTIES IMPORTED_LOCATION_RELEASE "${PBC_LIBRARY_RELEASE}") + endif() + + unset(_IMPORT_PREFIX) +endif() diff --git a/ports/pbc/vcpkg.json b/ports/pbc/vcpkg.json index 55136eac45d6fa..5a440a2089d722 100644 --- a/ports/pbc/vcpkg.json +++ b/ports/pbc/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 7, "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", "homepage": "https://crypto.stanford.edu/pbc", + "license": "LGPL-3.0", "supports": "!uwp & !arm", "dependencies": [ { diff --git a/versions/p-/pbc.json b/versions/p-/pbc.json index 60bc59d6f56546..5da6ca4359ba54 100644 --- a/versions/p-/pbc.json +++ b/versions/p-/pbc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8622a50777b672d1eb2066d3110c8cb503da84ba", + "git-tree": "23f4f1804aaa515560fdd3efa19485c9714d2a20", "version": "0.5.14", "port-version": 7 }, From 4467a9a690f3377f50f412155685919f13ed9332 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Tue, 13 Jun 2023 07:55:46 +0900 Subject: [PATCH 263/533] [gtk] Update to 4.10.4 (#31943) * [gtk] Update to 4.10.4 (microsoft/vcpkg#31942) * [gtk] Regenerate version registries (microsoft/vcpkg#31942) --- ports/gtk/portfile.cmake | 4 ++-- ports/gtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtk.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index f02521e5f93bcb..7686e98720de94 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF 06b3ced8e7fc936caed43379b120d75be09713ca #v4.10.3 - SHA512 3fe7da84993bab8afbd0725b06e10546fbbb550a1e2b356431c152b5392fc1e94e400430f1b6a2c39bdddf8fecbe34fb65794bd1bf41c9bdca4e40e12136ac91 + REF 55bc7808cc7796b06c27b1e64f608cd83b9b18ec #v4.10.4 + SHA512 70859173ffc52e4fad4997157c6eb59cdb4dd8395cad8fa24931f0bf5396a800c20de09be88355c2c5e7c055bddb54f6e7cb92cc1b9c77c2da0896f52a39dceb HEAD_REF master # branch name PATCHES 0001-build.patch diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 88c72157b0eae4..b964d379abcfc7 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk", - "version": "4.10.3", + "version": "4.10.4", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 65191f5b8449a8..17b829c4e14cb5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2997,7 +2997,7 @@ "port-version": 0 }, "gtk": { - "baseline": "4.10.3", + "baseline": "4.10.4", "port-version": 0 }, "gtk3": { diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 79c4e4c2ac7d42..9b4167ae00d513 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d527905d8bda9bb0f59ab326013dcfc0154613a7", + "version": "4.10.4", + "port-version": 0 + }, { "git-tree": "f6542974036eeeb96bcfa2f343a58dc9a07c54b3", "version": "4.10.3", From 85ee7ef3cd80ef0d3e1862f79fae6f37c3f8de7e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 13 Jun 2023 00:57:18 +0200 Subject: [PATCH 264/533] [pcre2] Update to 10.42 (#31929) * [pcre2] Update to 10.42 * CI --- ports/pcre2/portfile.cmake | 4 ++-- ports/pcre2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/pcre2.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 6287bc7c9dd2d8..b247e97d8c8a30 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PCRE2Project/pcre2 - REF pcre2-10.40 - SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93 + REF "pcre2-${VERSION}" + SHA512 3d0ee66e23809d3da2fe2bf4ed6e20b0fb96c293a91668935f6319e8d02e480eeef33da01e08a7436a18a1a85a116d83186b953520f394c866aad3cea73c7f5c HEAD_REF master PATCHES pcre2-10.35_fix-uwp.patch diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index 8b6338038f9fdc..20d912a98f01a3 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pcre2", - "version": "10.40", - "port-version": 2, + "version": "10.42", "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", "homepage": "https://github.com/PCRE2Project/pcre2", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 17b829c4e14cb5..0b650bd683f749 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6185,8 +6185,8 @@ "port-version": 5 }, "pcre2": { - "baseline": "10.40", - "port-version": 2 + "baseline": "10.42", + "port-version": 0 }, "pdal": { "baseline": "2.5.3", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index a9ce1fd02b295c..6783b13a459603 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "148d5898b3c1925fd8e82663589917255172d5c9", + "version": "10.42", + "port-version": 0 + }, { "git-tree": "533fc8ada3da33f695eb499fe8190a5e9b24a5c8", "version": "10.40", From ef97891996e8d7a25e8e86fd1b684b3248604934 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 13 Jun 2023 01:29:54 +0200 Subject: [PATCH 265/533] [vcpkg_find_fortran] Update msys2 packages (#31926) * [vcpkg_find_fortran] Update msys2 packages * [vcpkg-ci-msys2] Process x86 gfortran on x64 --- scripts/cmake/vcpkg_find_fortran.cmake | 138 ++++++++++-------- .../test_ports/vcpkg-ci-msys2/portfile.cmake | 15 ++ 2 files changed, 89 insertions(+), 64 deletions(-) diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index 2f1c497222cf63..cc0e02ad52eeba 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -19,77 +19,87 @@ function(vcpkg_find_fortran out_var) set(mingw_path mingw32) set(machine_flag -m32) vcpkg_acquire_msys(msys_root + NO_DEFAULT_PACKAGES DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-11.2.0-8-any.pkg.tar.zst" - 9337dafdeb4f5eaf41bf13441c345b999dd0561b4fc757a67b4e362c3e0afea5828cd68b35d2823c545d74ea81b2c34bd1624f97817690a2931f3a890b5273bd - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" - 3e6396eb4dcbe730bb63f4534e25b654008be49f0e113cf34cfb640dba3f67b508a6f5c78f7ab1cc57686936e709bc37a1fdbc20df5ee17fd708a21c1b844af4 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-11.2.0-8-any.pkg.tar.zst" - bdf253bb627cfc108407ea0d1f5fc643da0b229a8f7fcc346fcdf7709e0ffbf8d1f75bdea755116c6b30834d1c764496a23c0546ef1048075d312136c6ebe9d9 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.1-3-any.pkg.tar.zst" - 10787443380a89a3491596946354645899daad07bc159ffcee96243cb51637dfbc163d52751ffd14682b66be8fd65c0379c642df16132f16a80709c4af921bac - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - 85980183879da0d0ea74b9ad1fdfb09e5ed9d2e2212877d47d0f621ce721566e205be0b1913a643d0a95b256441e0bafd803fa9c848a8203dffd7d72109e32c2 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst" - f4cda83c26bf4225a8c387e0710ea086896e9c89e7863b9a2947982636664b64ffa880cbddfe6d85f8cf7cb3be18296b04874026cdf8b1b702a2820dad135ba4 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst" - 038a1cc6bb080d415b9fc19965a1f1c9419f5c42023e29c87f97b4f630c152602abb706036aa3e0f02e337e9d7ab3a43bd7b1234b3775a43ffceb348e79bac1a - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-11.2.0-8-any.pkg.tar.zst" - a6183f0fc80c2e37316b6eb60fdbdccc30b865053dad270c9c96e93cd6fdb2af28a75f981ac1de2fdc22a47494cdb54b8d41d4ecffdf1b1d3a54e85437c20dcf - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.37-4-any.pkg.tar.zst" - 1c2fbb8b94778c562aed01010c06c804d1cc2c446837879e4f1187470259adaecd86699b084c69e254d98201333db69a55126ea2cd0c188e55c9af849c37315a - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - 495834d72313021b7553d92a897932f5efc66a0f6f79ebeec574ecd7ddd23e0eed9aacb32601007606abb10b44ba7c7c1ccf6d3437a4338839b2d7b1792327f9 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - 7959ae9267306c862b8b23be2ab21498f6e7890c936feae3ec9cf5607434e87e446f7c75ff7bd975f23aa24eb1c23d6068957f6af4e8c358f5f4861db64248b8 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst" - fe48d0d3c582fee1edb178425c6daf619d86362442c729047b3c356be26491164f92be1d87950429d2faca4ed3cf76cb4aafef1af3c87b780eee85ee85a4b4c5 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz" - 5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-9-any.pkg.tar.zst" - 3e461e835641a2a755a42221011871f8a1ed5fa4b6b23c74db286e29bbcfa2fcd30d4a7c41216728df62c9131dbc1e554720da633ed6b2ba3d6f2b6d5d50a300 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.5.2-1-any.pkg.tar.zst" - 8e27911a2a5884faa95e1c55058ca15f233d432ed8aa607b04a019758aa21f1357bd5de5ce8709fa47f4fbed6eb00fdfd94e7e2d82023bbc1f1653e95f439e0a + # root package + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-fortran-13.1.0-6-any.pkg.tar.zst" + 7eb61f1d9216c3a9e2bd88afaf82c6057eb72f20ff19bc8e5bfef5cbb851247a480887cb2dc27c610e9f9c0e1830683c0c0be9521f252d106068fc3bbf2e13e3 + # dependencies, alphabetically + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-binutils-2.40-4-any.pkg.tar.zst" + 4ebba5195f34f9a3dc67f640f793e4916f0e82680dbba010bb3720faab3a08e1b7fe800959fd523cf250d5bd3ba5df9a07ead4c40c02e89002e4df61d824d7cd + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + 4705c51aed87b74c32f8ea93f0a5ed2011de10ae1d1111c11b05ac6f1621fb99b204a3eb4d19778701f9378990522e65ae514186489acb14d10cc25007f5715b + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-13.1.0-6-any.pkg.tar.zst" + add77dc0d7554316cbcb1042630c03757db92176bccf5b506b51eeccccb13f5c9b0a5bcdfb8cfccb5c4f776c97820f2e4ed1f537f6520f6f3179ee87860a8c1f + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libgfortran-13.1.0-6-any.pkg.tar.zst" + e65603558e13bf8135050a014dfe2ab0d0fa34f4f34a4d13996b75a88247f64abf57842f592f590992e531253f68c6b392adb4ce03e41631e81db7ae9eaff2c7 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-13.1.0-6-any.pkg.tar.zst" + d85674dc026dae7f79d232b36d731fa147d1644b3bde90f5c529875272bd9cec8012530c84ed2490ee4dc913dd9bda169684d340ba87380b8b4963950b55c7de + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gmp-6.2.1-5-any.pkg.tar.zst" + d576eb3457e26d61cd5b12b62734fbf740d26ab4127db033505474bcf4b701e06f2414121931d49b1665c5c95521c42ae08955c12e1a715e22d4c9d9eea42e27 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-headers-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + 8e866a3b22039fae102af371e4ea0e75dc6ffe9c89798345e5d334b386c1f48295dd54fcd8e537f30313a72d38da95d8d98cb129a5fa3bff3aa66722e3fa697f + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-isl-0.26-1-any.pkg.tar.zst" + 2011de9ac6ed85fa4346f9c9b39136854f049a9e21fb2fbd8db066ccf443301a65ab0c7aa7daed6730d5163ca70ebf25fd39209bd5226f2b70f000ce9de0df8d + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libiconv-1.17-3-any.pkg.tar.zst" + 36ec45b311ac0e281c5272516b2138364b1b1c0db78a83b26218d50c643345fdb3f75bf4935e8520d839c99f2ec4cb72a324017f11a717bdab06f8c243ccb108 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + 60eccb7030039f7a42a6c6377d2cad9957c2f4693ecfa7672417a145fae21a62129475279deece9eb3e892a69a6f3d6d7e10e3fb9deda47e123e3e3d4f610d9d + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpc-1.3.1-1-any.pkg.tar.zst" + e2597ccdd430530e98c6c4b34deed4d8d423dad144691e5ebe353f8d3f0fde3ad231347086843e5a97b74b5218bc3994bbd3b65db81a68c7b3fcd02e17e9f435 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpfr-4.2.0.p9-1-any.pkg.tar.zst" + e9f1f5727989919950958bc82841c7072cc0ba8a50c8781c0953267acc192dc8dfb4fd6bde599eb505ff6dd2ac94e28ac71e46c5e1c839f0546faa2f86c3e042 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-windows-default-manifest-6.4-4-any.pkg.tar.zst" + 103f8437e13fb2a839c5eb89f49f5888c71f7934771cf3b2dcca46d520277fe7f7d4841c9d415b454a6a581c6d1f806d6be7f614027df0484f2642ef2563e889 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-winpthreads-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + 0622f9595709a17c464f2be01b19a40dfb218c36f779e35ef883ae80db26bac4eb2b2ef35d5e87cf5db5a1fe79a8390c586b7248224f468b9f0beadd516cf540 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zlib-1.2.13-3-any.pkg.tar.zst" + 3f4136bbe96025d897848fc30c087cea70c6713684e23a804928bf5957d70f708876a47318ddd9d3841debb57e7f3e550756e3c4e99698f91dd1ab27da837787 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zstd-1.5.5-1-any.pkg.tar.zst" + 415be9f2ef78d72109f5888c31248b328ba96f1e2472d488bf45da4fe969875e0e3020a77ceb10cd885f50a18954105e06ce9d122d8c47dc9848944ea71ac49c ) elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") set(mingw_path mingw64) set(machine_flag -m64) vcpkg_acquire_msys(msys_root + NO_DEFAULT_PACKAGES DIRECT_PACKAGES - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-11.2.0-8-any.pkg.tar.zst" - d56483e090f86410b87526dda7774e010d0bd6beda97edcaeb1dead1128fd5ad870bc761a8a190759c48d58c2526b6975fb849f9c03a6be193741a0fd0bf2812 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.2.0-8-any.pkg.tar.zst" - 8537b55633bc83d81d528378590e417ffe8c26b6c327d8b6d7ba50a8b5f4e090fbe2dc500deb834120edf25ac3c493055f4de2dc64bde061be23ce0f625a8893 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.2.0-8-any.pkg.tar.zst" - 2481f7c8db7cca549911bc71715af86ca287ffed6d673c9a6c3a4c792b68899a129dd959214af7067f434e74fc518c43749e7d928cbd2232ab4fbc65880dad98 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gmp-6.2.1-3-any.pkg.tar.zst" - d0d4ed1a046b64f437e72bbcf722b30311dde5f5e768a520141423fc0a3127b116bd62cfd4b5cf5c01a71ee0f9cf6479fcc31277904652d8f6ddbf16e33e0b72 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - a2c9e60d23b1310a6cec1fadd2b15a8c07223f3fe90d41b1579e9fc27ee2b0b408456291a55fad54a156e6a247efc20f6fcc247cc567e64fe190938aa3b672e9 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - be03433e6006166e5b4794f2a01730cdb6c9f19fa96bd10a8bc50cf06ad389cbc66d44ea3eda46f53c3b2c89e2fc86aec21a372828e9527b24480c87ed88348c - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpc-1.2.1-1-any.pkg.tar.zst" - f2c137dbb0b6feea68dde9739c38b44dcb570324e3947adf991028e8f63c9ff50a11f47be15b90279ff40bcac7f320d952cfc14e69ba8d02cf8190c848d976a1 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-mpfr-4.1.0.p13-1-any.pkg.tar.zst" - a1425169c1570dbd736c31d50bedfab88636bf9565376e2da566be67fcc771e6c76f95895f382d81097e7c0580acb42aa49e34dec5d7a868d73a5dc6a7461c95 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-11.2.0-8-any.pkg.tar.zst" - 26ab2cab684206978a254f1e1595b1ce688e6db12e57ed1d243a5f1b3b21b314f640c7c6fe90eedccb6b9788e1886415ca3290d03b1e71f67f8a99108068336a - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst" - f09ea70810fb337d7f3ec673342ab90df511e6af451e273fe88fe41a2f30bd972b79c830b61bb5388743d00a0ba7885503e143987413db5170c4befffef66303 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - 63d081fedd1f70e8d58670d4d0698535a67f04c31caf02d0b23026ac23fc5064e9423d73c79854bbce41cc99dd0b70e4137af3a609e05cdd867fdcea120d356e - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-9.0.0.6373.5be8fcd83-1-any.pkg.tar.zst" - 05860f2bcfacf54089b750099f9ddc52d9b4b8ae8f69028a198dfb51fab09c37a941ae551e5d361a2a11302d48bd4fa95c44131ddee4c1df5a14f28013398f63 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" - 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz" - 77d02121416e42ff32a702e21266ce9031b4d8fc9ecdb5dc049d92570b658b3099b65d167ca156367d17a76e53e172ca52d468e440c2cdfd14701da210ffea37 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-9-any.pkg.tar.zst" - f386d3a8d8c169a62a4580af074b7fdc0760ef0fde22ef7020a349382dd374a9e946606c757d12da1c1fe68baf5e2eaf459446e653477035a63e0e20df8f4aa0 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.5.2-1-any.pkg.tar.zst" - 38ec5ca99c5b955bf8a892a3edaf4e18572977736809b7671c554526b13cb4e53d45c5b83e37e0fb7628483ba98831b3203e3e404dac720d5b2ed95cfe4505c4 + # root package + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-fortran-13.1.0-6-any.pkg.tar.zst" + 8c72bb5d15fead9559487d14279d802b1948c5a911efdb1cf3908dae8e63c26bd1e539870b7a0bbe73e4229485b66094852c0a49e4f8da8c92a9615885fcfd76 + # dependencies, alphabetically + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.40-4-any.pkg.tar.zst" + 2f51c5fbb292df0655c8f30dbbb9891eb40bef1152de68e3e05e1dd614c5b5f91c35547ef737e95d6bc83aa2336a96589a83badb068301d478a09e3f769d0e85 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + 0016ed126b6d666872796852200af8e5f7e6156986e419bd5a40693ceafae5ce0d3fb341f05ada6640725ee104c4ddc8df295447a5e78bcf67ddcbe26455bdfd + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.1.0-6-any.pkg.tar.zst" + 9b838c1f38ff311645f9ffeb2e129c637c98fec87c4442607c29284ae91964586d702d7cd194f47c730fe0bcb039dbcaf958b89485cd8d7b73de66f15b68fd1c + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.1.0-6-any.pkg.tar.zst" + 313841c9df8be664fe4bc37c528ebc7aeaf1c828aa561e7014dc329a03a57263cdf3f232021210f749139eac78a7e66c4b367f2a160f9123abe53af41efe8c2c + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.1.0-6-any.pkg.tar.zst" + 526c64dcab261e5ed453f3fb455a05e4241f0fec358bc988c46e3f6c3007dec9f9ab9580dbfd3a0b009d606cadc517f58e7f1ff487cfb802b52396b014f36b50 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst" + 7d884ef1186bd6942f7a7ace28963aae679bb6c6c77c05f186323c44b11894b80f53203a6fad55a0ae112fec41b4e1a624e67021e5f2f529a7fedf35c2755245 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + f5fcce6b2460a35a1d3f22ecd7028e3989cedac948eacb49ccf534418c0cc221f02392aaa62bc137e0298e38c9887642301c7098ef122035ad349f4055d418f9 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-isl-0.26-1-any.pkg.tar.zst" + 2c715b50807ea2c134784210553d0c725f8eeb1221d64f0510c76f7538098d8400ac1ef329656a2fcb0bda270f9e1d82917d00b9ba11a985ce64ae7c3bf24977 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst" + 57221118a6ed975ddde322e0d34487d4752c18c62c6184e9ed77ca14fe0a3a78a78aefe628cda3285294a5564d87cd057c56f4864b12fa8580d68b8e8a805e16 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + 5c8c36bf5b5517f66615aca412570af41e079d2325443051743de0408d7827e24ca9bff38a6dc0c5bb0aa1f5989ebd36eafbd3f593f7e9e766f45c3f1bfb4a40 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-1-any.pkg.tar.zst" + 57b86866e2439baa21f296ecb5bdfd624a155dbd260ffe157165e2f8b20bc6fbd5cc446d25dee61e9ed8c28aca941e6f478be3c2d70393f160ed5fd8438e9683 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0.p9-1-any.pkg.tar.zst" + a247bdc1d1715cd63d3cf026d429811bd11ed000b4047e36b3452d647892136c9f754eb63c692134e856aca129e063cfb409306ff0e766755c51982c9bd4f9ba + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-windows-default-manifest-6.4-4-any.pkg.tar.zst" + d7e1e4c79f6c7db3bd97305ff89e407a32d3ce9f2a18083b9674538d018651e889efb6fdef00cc79c78f8c07852eab63d7fc705e9567b1ad5684f0a704adeaf3 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" + bd30fa84ebe6ff734534e133c023aff7c86b6931a053296896b0bcccb939d854e47b5a0365878ab94258553fbb4f12b42db2841fb39bb6c739e0e154029ea76c + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst" + c07bea5fcc78016da74756612827b662b5dd4901d27f3a3390acc3c39b767806f48b09bd231140a40e3cd7aba76e5d869ed18278c720277e55f831f0c7809d54 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.5-1-any.pkg.tar.zst" + bc03e39ac48f40e53e2cbff9d48770d8267793608aa6698ddd01371872544e2c023f4be68c638aa349a4c006b6967ac9bf45ce927cf4e4a156c39fa7cb8c27d1 ) else() message(FATAL_ERROR "Unknown architecture '${VCPKG_TARGET_ARCHITECTURE}' for MinGW Fortran build!") diff --git a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake index 222727ca95ffd7..845f94e5295214 100644 --- a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake @@ -330,7 +330,22 @@ set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") vcpkg_find_acquire_program(PKGCONFIG) analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_acquire_program(PKGCONFIG).cmake" DIRECT_ONLY) +set(PATH_BAK "$ENV{PATH}") +set(CMAKE_Fortran_COMPILER "") set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") include("${SCRIPTS}/cmake/vcpkg_find_fortran.cmake") vcpkg_find_fortran(FORTRAN) analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_fortran.cmake" DIRECT_ONLY) +set(ENV{PATH} "${PATH_BAK}") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + # Don't do this in regular ports. + message(STATUS "*** Simulating an x86 target triplet") + set(VCPKG_TARGET_ARCHITECTURE "x86") + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "") + set(CMAKE_Fortran_COMPILER "") + set(Z_VCPKG_MSYS_PACKAGES_RESOLVED "" CACHE INTERNAL "") + vcpkg_find_fortran(FORTRAN_x86) + analyze_package_list(Z_VCPKG_MSYS_PACKAGES_RESOLVED "vcpkg_find_fortran.cmake" DIRECT_ONLY) + set(VCPKG_TARGET_ARCHITECTURE "x64") + set(ENV{PATH} "${PATH_BAK}") +endif() From 66444e13a86da7087ee24c342f91801cc6eb9877 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 13 Jun 2023 01:31:42 +0200 Subject: [PATCH 266/533] [vcpkg_find_acquire_program(PKGCONFIG)] Switch to pkgconf, add arm64 (#31924) * [vcpkg-ci-msys2] Add clangarm64 support UCRT binaries for ARM64, built with clang. * [vcpkg_find_acquire_program(PKGCONFIG)] Switch to pkgconf, add arm64 * CI --- ...cpkg_find_acquire_program(PKGCONFIG).cmake | 30 +++++++++++-------- .../test_ports/vcpkg-ci-msys2/portfile.cmake | 5 +++- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake index 0ba1a611d90448..559d3dc6f73539 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake @@ -17,19 +17,25 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") set(version_command --version) elseif(CMAKE_HOST_WIN32) if(NOT EXISTS "${PKGCONFIG}") - set(VERSION 0.29.2-3) - set(program_version git-9.0.0.6373.5be8fcd83-1) - vcpkg_acquire_msys( - PKGCONFIG_ROOT - NO_DEFAULT_PACKAGES - DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" - 0c086bf306b6a18988cc982b3c3828c4d922a1b60fd24e17c3bead4e296ee6de48ce148bc6f9214af98be6a86cb39c37003d2dcb6561800fdf7d0d1028cf73a4 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" - c89c27b5afe4cf5fdaaa354544f070c45ace5e9d2f2ebb4b956a148f61681f050e67976894e6f52e42e708dadbf730fee176ac9add3c9864c21249034c342810 - ) + set(program_version 1.8.0) + if("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "ARM64") + vcpkg_acquire_msys(PKGCONFIG_ROOT + NO_DEFAULT_PACKAGES + DIRECT_PACKAGES + "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~1.8.0-2-any.pkg.tar.zst" + f682bbeb4588a169a26d3c9c1ce258c0022954fa11a64e05cd803bcbb8c4e2442022c0c6bc7e54d3324359c80ea67904187d4cb3b682914f5f14a03251daae7c + ) + set("${program}" "${PKGCONFIG_ROOT}/clangarm64/bin/pkg-config.exe" CACHE INTERNAL "") + else() + vcpkg_acquire_msys(PKGCONFIG_ROOT + NO_DEFAULT_PACKAGES + DIRECT_PACKAGES + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~1.8.0-2-any.pkg.tar.zst" + e5217d9c55ede4c15706b4873761cc6e987eabc1308120a3e8406571ae2993907f3776f2b2bba18d7aaec80ef97227696058cedc1b67a773530dc1e6077b95e6 + ) + set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") + endif() endif() - set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") set("${program}" "${${program}}" PARENT_SCOPE) return() else() diff --git a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake index 845f94e5295214..61162aae0905c3 100644 --- a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake @@ -3,6 +3,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(msys_repo_url "https://mirror.msys2.org/msys/x86_64") set(mingw64_repo_url "https://mirror.msys2.org/mingw/mingw64") set(mingw32_repo_url "https://mirror.msys2.org/mingw/mingw32") +set(clangarm64_repo_url "https://mirror.msys2.org/mingw/clangarm64") # Ignore these updates (e.g. for known problems) vcpkg_list(SET ignored_packages @@ -165,6 +166,8 @@ function(analyze_package_list list_var script) set(repo "mingw64") elseif(name MATCHES "^mingw-w64-i686") set(repo "mingw32") + elseif(name MATCHES "^mingw-w64-clang-aarch64") + set(repo "clangarm64") endif() file(GLOB files "${${repo}_repo_files}/${name}-*/desc") @@ -305,7 +308,7 @@ endfunction() message(STATUS "*** Downloading current msys2 package lists") string(TIMESTAMP stamp "%Y-%m-%d" UTC) -foreach(repo IN ITEMS msys mingw32 mingw64) +foreach(repo IN ITEMS msys mingw32 mingw64 clangarm64) string(REPLACE "/" "-" local_file "msys2-${stamp}-${repo}.files") set(archive "${DOWNLOADS}/${local_file}") vcpkg_download_distfile(repo_files_archive From a1ba7080ce1d046d675d7cf762fc48106e7430e5 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Tue, 13 Jun 2023 03:33:29 +0400 Subject: [PATCH 267/533] [magic-enum] Update to v0.9.2 (#31923) * [magic-enum] Update to v0.9.1 * x-add-version --all --- ports/magic-enum/portfile.cmake | 4 ++-- ports/magic-enum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index e365fe10cffcae..85a494e55b5021 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.9.1 - SHA512 d76acfec5c8bdd1c22d1e278bc28965c8a15ec119b9671bf1bc49c143171f3ec9924e7f7b2e5ca689674f862f81600f7e92ace04f95f9cd96eeeed519fdf55d5 + REF v0.9.2 + SHA512 5c88ebcb30282bea5c2b38d17a6ee6a9014e5d282f2c08e92f398f30d9846cbd5a09599270afe82e927069bad9c50d691fa53a82da059f77dc1c01b179e65689 HEAD_REF master ) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 6e7b955570ceef..cfcf4fc2b65520 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.9.1", + "version": "0.9.2", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0b650bd683f749..8c7d9390772ae7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5073,7 +5073,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.9.1", + "baseline": "0.9.2", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 882c31994ba436..7223e6ef8605ac 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52780f8b8e0c2f55c3841e133c813f2bc739abcc", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "d423a24705ddc48956d0c7683f3f8e418ae44b0d", "version": "0.9.1", From 55846bb4dfc521909115a3880ae30fb5f02f64cd Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 13 Jun 2023 01:44:41 +0200 Subject: [PATCH 268/533] [vulkan-memory-allocator] add cstdio import for gcc13 (#31920) * [vulkan-memory-allocator] add cstdio import for gcc13 * version --- ports/vulkan-memory-allocator/gcc13.patch | 15 +++++++++++++++ ports/vulkan-memory-allocator/portfile.cmake | 2 ++ ports/vulkan-memory-allocator/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vulkan-memory-allocator.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/vulkan-memory-allocator/gcc13.patch diff --git a/ports/vulkan-memory-allocator/gcc13.patch b/ports/vulkan-memory-allocator/gcc13.patch new file mode 100644 index 00000000000000..e76153fcd4f924 --- /dev/null +++ b/ports/vulkan-memory-allocator/gcc13.patch @@ -0,0 +1,15 @@ +diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h +index 60f5720..31164bc 100644 +--- a/include/vk_mem_alloc.h ++++ b/include/vk_mem_alloc.h +@@ -2578,6 +2578,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + #include // For std::popcount + #endif + ++#if VMA_STATS_STRING_ENABLED ++ #include // For snprintf ++#endif ++ + /******************************************************************************* + CONFIGURATION SECTION + diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index c64df48a794323..84377d7d66476e 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF a6bfc237255a6bac1513f7c1ebde6d8aed6b5191 #v3.0.1 SHA512 14361ff201fd660c22b60de54c648ff20a2e2a7f65105f66853a9a4dbffbeca2ae42098dcb1528bb4e524639b92fa4ff27ebd3940c42ccfaf7c99c08bdd0d8ce HEAD_REF master + PATCHES + gcc13.patch # https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c84ca784ea0943efc7d2e6e0f3bdaac ) file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json index ec3a725743f04b..f0353db8156a5d 100644 --- a/ports/vulkan-memory-allocator/vcpkg.json +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vulkan-memory-allocator", "version": "3.0.1", - "port-version": 1, + "port-version": 2, "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8c7d9390772ae7..7aebd2686ba1c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8510,7 +8510,7 @@ }, "vulkan-memory-allocator": { "baseline": "3.0.1", - "port-version": 1 + "port-version": 2 }, "vulkan-memory-allocator-hpp": { "baseline": "3.0.1", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 0c9d5deed3cfc1..d8d04a0d56126b 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0295d831ef2217a424c4739767ecde90e5bc7554", + "version": "3.0.1", + "port-version": 2 + }, { "git-tree": "49c724c78cf76e8858c92ce7b1acdc52fd9bf62b", "version": "3.0.1", From 1f627e6a74b3265c5fd7726baa06265f655284b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Tue, 13 Jun 2023 01:45:12 +0200 Subject: [PATCH 269/533] [blake3] Add version 1.4.0 (#31919) --- ports/blake3/portfile.cmake | 32 +------------------------------- ports/blake3/vcpkg.json | 3 +-- versions/b-/blake3.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake index 23e2bcdd87940e..2004ba4924f57f 100644 --- a/ports/blake3/portfile.cmake +++ b/ports/blake3/portfile.cmake @@ -2,40 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE3-team/BLAKE3 REF "${VERSION}" - SHA512 3ea57a86af7357582479ed5d762d368ee52421636c72723b08f528f9bf53637bad0058c5aded0b9a1b9479f374f5d3b110677e00c2b1124a47bfcdac800c2836 + SHA512 e2a3a4811a0a8c88492efb74123dcbe26176fd307e1ba527b67001ae076970a36fd26282d4cd728c875ab228827962564a00ff0c3a8d99e2f12a29bbf431c547 HEAD_REF main ) -# these four files are included in the next release -vcpkg_download_distfile( - CMAKELISTS_SOURCE_PATH - URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/CMakeLists.txt - FILENAME blake3-CMakeLists.txt - SHA512 598699b90053fdbe381843f886c213f5e6d03281a9b8c1403726c300e83a9da353879da7170637024663af576e54f74a307049577360ded90d25e11bd852edde -) -vcpkg_download_distfile( - CMAKECONFIGIN_SOURCE_PATH - URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3-config.cmake.in - FILENAME blake3-config.cmake.in - SHA512 f9bdb41bd4e4930ab31624f484f895fbda57066a4b3e0a38e7ffefab7343779d1c356fbaf6231643fd069f7a176b840f234f74d9f9ee4167cc430d7bfec0f40f -) -vcpkg_download_distfile( - PKGCONFIGIN_SOURCE_PATH - URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/libblake3.pc.in - FILENAME libblake3.pc.in - SHA512 cfbaea63368e655c3ac3357f791b6332ae0241f3fd4f98e19c48f28e633e25a5b1125d1cc6b4815edfd013a76379dffcf9723852a7b76f2910d19dc77e538fa2 -) -vcpkg_download_distfile( # we need the dllexport macro (otherwise these files are identical) - BLAKE3_H_SOURCE_PATH - URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3.h - FILENAME blake3.h - SHA512 0f9852ff0e527e8fe0d567408c5c100ee3707a1b942ac1fbd78208a68ecfd32814729b5082720278d25d4cf45eb1020fcf3e4199cab0a67a6ca6af4321bcbc3e -) -file(COPY_FILE "${CMAKELISTS_SOURCE_PATH}" "${SOURCE_PATH}/c/CMakeLists.txt") -file(COPY_FILE "${CMAKECONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3-config.cmake.in") -file(COPY_FILE "${PKGCONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/libblake3.pc.in") -file(COPY_FILE "${BLAKE3_H_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3.h") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/c" ) diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json index cc5f7d369f51f2..273e8ca6f03a39 100644 --- a/ports/blake3/vcpkg.json +++ b/ports/blake3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "blake3", - "version": "1.3.3", - "port-version": 1, + "version": "1.4.0", "description": "BLAKE3 cryptographic hash function.", "homepage": "https://github.com/BLAKE3-team/BLAKE3", "license": "CC0-1.0 OR Apache-2.0", diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json index 41456f9181b710..4b6a259b1bc74e 100644 --- a/versions/b-/blake3.json +++ b/versions/b-/blake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a198a87b5478bee28b2e4d35ed9787cf3950faef", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "13ac9cc003839e6730587218103f4912e7886311", "version": "1.3.3", diff --git a/versions/baseline.json b/versions/baseline.json index 7aebd2686ba1c7..d246179909fcc0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -585,8 +585,8 @@ "port-version": 0 }, "blake3": { - "baseline": "1.3.3", - "port-version": 1 + "baseline": "1.4.0", + "port-version": 0 }, "blas": { "baseline": "2023-03-25", From d0745d16a900c2e28217ac60f543b2927319d887 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 13 Jun 2023 07:46:11 +0800 Subject: [PATCH 270/533] [foonathan-memory]: update to 0.7-3 (#31905) * Bump foonathan-memory version. * Remove port-version. Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Changed REF to version tag. * Updates git-tree. * Removes commented lines. * Update ports/foonathan-memory/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * [foonathan_memory]: update to 0.7-3 * fix deps * fix deps * fix deps * fix deps * fix deps * CI --------- Co-authored-by: Correia, Marco Co-authored-by: Marco Correia Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ...foonathan-memory-include-install-dir.patch | 22 +++++++++++++ ports/foonathan-memory/portfile.cmake | 32 ++++++------------- ports/foonathan-memory/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/f-/foonathan-memory.json | 5 +++ 5 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch diff --git a/ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch b/ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch new file mode 100644 index 00000000000000..29e76ed2e4f411 --- /dev/null +++ b/ports/foonathan-memory/fix-foonathan-memory-include-install-dir.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ddbc459..06c4165 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ set(CMAKE_DEBUG_POSTFIX "-dbg") + if(UNIX OR VXWORKS) + include(GNUInstallDirs) + +- set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/foonathan_memory") ++ set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") + set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}") + set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") + set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") +@@ -29,7 +29,7 @@ if(UNIX OR VXWORKS) + set(FOONATHAN_MEMORY_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/foonathan_memory/cmake") + set(FOONATHAN_MEMORY_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/foonathan_memory") + elseif(WIN32) +- set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/foonathan_memory") ++ set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/") + set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "bin") + set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "bin") + set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "lib") diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index ee298c35b70d7e..0a07586c1feb5c 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO foonathan/memory - REF 885a9d97bebe9a2f131d21d3c0928c42ab377c8b - SHA512 7ce78a6e67d590a41b7f8a3d4ae0f6c1fa157c561b718a63973dffc000df74a9f0a0d7955a099e84fbeb3cf4085092eb866a6b8cec8bafd50bdcee94d069f65d + REF "v0.7-3" + SHA512 302a046e204d1cd396a4a36b559d3360d17801d99f0f22b58314ff66706ae86ce4f364731004c1c293e01567a9510229cda7fc4978e0e47740176026d47e8403 HEAD_REF master + PATCHES + fix-foonathan-memory-include-install-dir.patch ) vcpkg_from_github( @@ -34,8 +36,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME foonathan_memory) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/foonathan_memory/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/foonathan_memory/cmake PACKAGE_NAME foonathan_memory) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake") vcpkg_cmake_config_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory) endif() @@ -44,29 +46,13 @@ vcpkg_copy_pdbs() # Place header files into the right folders # The original layout is not a problem for CMake-based project. -file(COPY - "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" -) -file(GLOB - COMP_INCLUDE_FILES - "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp" -) file(COPY ${COMP_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan" ) -file(COPY - "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp" - DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan/memory" -) -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/include/foonathan_memory" -) -vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake" - "\${_IMPORT_PREFIX}/include/foonathan_memory/comp;\${_IMPORT_PREFIX}/include/foonathan_memory" - "\${_IMPORT_PREFIX}/include" +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/lib/foonathan_memory" + "${CURRENT_PACKAGES_DIR}/debug/lib/foonathan_memory" ) # Place header files into the right folders - Done! diff --git a/ports/foonathan-memory/vcpkg.json b/ports/foonathan-memory/vcpkg.json index 333df5096d3220..14815c5fe386ad 100644 --- a/ports/foonathan-memory/vcpkg.json +++ b/ports/foonathan-memory/vcpkg.json @@ -1,9 +1,9 @@ { "name": "foonathan-memory", - "version-date": "2019-07-21", - "port-version": 4, + "version": "0.7.3", "description": "STL compatible C++ memory allocator library", "homepage": "https://foonathan.net/doc/memory/", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index d246179909fcc0..6ea2c9886a36b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2585,8 +2585,8 @@ "port-version": 0 }, "foonathan-memory": { - "baseline": "2019-07-21", - "port-version": 4 + "baseline": "0.7.3", + "port-version": 0 }, "forest": { "baseline": "12.1.0", diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json index 1bd9d34210d172..3b7abd69e921d7 100644 --- a/versions/f-/foonathan-memory.json +++ b/versions/f-/foonathan-memory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d8f014667fd2e794d0e4dab67adc193731b246", + "version": "0.7.3", + "port-version": 0 + }, { "git-tree": "815422e5bf77feefa4e1c277832d307b6bb47438", "version-date": "2019-07-21", From 8ca0f46acc0e00467cb48a622ece6ca41e53da35 Mon Sep 17 00:00:00 2001 From: simon987 Date: Mon, 12 Jun 2023 19:51:16 -0400 Subject: [PATCH 271/533] [libmupdf] Update mupdf to 1.22.1 (#31880) * Update libupdf to 1.22.1 * update versions * Update ports/libmupdf/vcpkg.json Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * Update ports/libmupdf/vcpkg.json Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> * Update versions * Update versions/l-/libmupdf.json Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --------- Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/libmupdf/portfile.cmake | 5 +-- .../use-if-instead-of-ifdef-in-writer.patch | 39 ------------------- ports/libmupdf/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/l-/libmupdf.json | 5 +++ 5 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index 3ef0146ba631d5..450bc9d0c0c045 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArtifexSoftware/mupdf - REF 61b63d734a7b9df618f6b45dda2466aed442f7f0 # 1.19.0-rc2 - SHA512 16661c012e18ac72b24c46caf5c02515c29a05e0a8dcf95076eff3a1f2e87c225245037480ed37068858fe6e04ff4a404f69877599b208ab9265d054ec117820 + REF "${VERSION}" + SHA512 8109630f4dba31ff05458b69626c99ab36ddd47be42c03dd1f3962bf2be5d520be97a1c7e97a72307faa57a96c1ff50e8e3a593c519e47e5eb71897e7e373825 HEAD_REF master PATCHES dont-generate-extract-3rd-party-things.patch - use-if-instead-of-ifdef-in-writer.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch b/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch deleted file mode 100644 index 25dff596006d17..00000000000000 --- a/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/source/fitz/writer.c -+++ b/source/fitz/writer.c -@@ -169,7 +169,7 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f - format = strrchr(path, '.'); - while (format) - { --#ifdef FZ_ENABLE_OCR_OUTPUT -+#if FZ_ENABLE_OCR_OUTPUT - if (is_extension(format, "ocr")) - return fz_new_pdfocr_writer(ctx, path, options); - #endif -@@ -219,11 +219,11 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f - if (is_extension(format, "stext.json")) - return fz_new_text_writer(ctx, "stext.json", path, options); - --#ifdef FZ_ENABLE_ODT_OUTPUT -+#if FZ_ENABLE_ODT_OUTPUT - if (is_extension(format, "odt")) - return fz_new_odt_writer(ctx, path, options); - #endif --#ifdef FZ_ENABLE_DOCX_OUTPUT -+#if FZ_ENABLE_DOCX_OUTPUT - if (is_extension(format, "docx")) - return fz_new_docx_writer(ctx, path, options); - #endif -@@ -267,11 +267,11 @@ fz_new_document_writer_with_output(fz_context *ctx, fz_output *out, const char * - if (is_extension(format, "stext.json")) - return fz_new_text_writer_with_output(ctx, "stext.json", out, options); - --#ifdef FZ_ENABLE_ODT_OUTPUT -+#if FZ_ENABLE_ODT_OUTPUT - if (is_extension(format, "odt")) - return fz_new_odt_writer_with_output(ctx, out, options); - #endif --#ifdef FZ_ENABLE_DOCX_OUTPUT -+#if FZ_ENABLE_DOCX_OUTPUT - if (is_extension(format, "docx")) - return fz_new_docx_writer_with_output(ctx, out, options); - #endif diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json index d6c2cd491311c4..5aa9dac50ab1d4 100644 --- a/ports/libmupdf/vcpkg.json +++ b/ports/libmupdf/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libmupdf", - "version": "1.19.0-rc2", - "port-version": 1, + "version": "1.22.1", "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", + "license": "AGPL-3.0-only", "supports": "!osx", "dependencies": [ "curl", diff --git a/versions/baseline.json b/versions/baseline.json index 6ea2c9886a36b7..7355bce7b1bc75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4305,8 +4305,8 @@ "port-version": 0 }, "libmupdf": { - "baseline": "1.19.0-rc2", - "port-version": 1 + "baseline": "1.22.1", + "port-version": 0 }, "libmysql": { "baseline": "8.0.32", diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index 67e2b7dc0e84c1..585c4b5dd4c73e 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1684ff15eed2c86ba792de4e92d21b2ea58c188", + "version": "1.22.1", + "port-version": 0 + }, { "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959", "version": "1.19.0-rc2", From 61f14c4a4e5d338782f4b16825f4153e4760d4a1 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Mon, 12 Jun 2023 19:54:44 -0400 Subject: [PATCH 272/533] [vsg] Update to v1.0.6 (#31874) * [vsg] Update to v1.0.6 * Fix library visibility * Find glslang --- ports/vsg/devendor-glslang.patch | 27 +++++++++++++++++++++------ ports/vsg/portfile.cmake | 2 +- ports/vsg/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/v-/vsg.json | 5 +++++ 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/ports/vsg/devendor-glslang.patch b/ports/vsg/devendor-glslang.patch index 562bbaaddafe0a..6cfe5604ccb788 100644 --- a/ports/vsg/devendor-glslang.patch +++ b/ports/vsg/devendor-glslang.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61da709f..472bc6af 100644 +index 6e7ec437..db4d30f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,9 +37,11 @@ find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED) @@ -16,10 +16,10 @@ index 61da709f..472bc6af 100644 if (Git_FOUND) diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt -index 4154312..7afcdd4 100644 +index 3d9625e4..96285e99 100644 --- a/src/vsg/CMakeLists.txt +++ b/src/vsg/CMakeLists.txt -@@ -226,7 +226,7 @@ set(SOURCES +@@ -227,14 +227,24 @@ set(SOURCES utils/LoadPagedLOD.cpp ) @@ -28,10 +28,12 @@ index 4154312..7afcdd4 100644 # include glslang source code directly into the VulkanScenegraph library build. include(../glslang/build_vars.cmake) -@@ -234,6 +234,14 @@ endif() + endif() # set up library dependencies - set(LIBRARIES PUBLIC +-set(LIBRARIES PUBLIC ++set(LIBRARIES ++ PRIVATE + glslang::glslang + glslang::OSDependent + glslang::MachineIndependent @@ -40,10 +42,11 @@ index 4154312..7afcdd4 100644 + glslang::OGLCompiler + glslang::SPVRemapper + glslang::SPIRV ++ PUBLIC Vulkan::Vulkan Threads::Threads ) -@@ -364,9 +372,6 @@ target_include_directories(vsg +@@ -365,9 +375,6 @@ target_include_directories(vsg PUBLIC $ $ @@ -66,3 +69,15 @@ index 71a7f09f..803f26a1 100644 # include # include #endif +diff --git a/src/vsg/vsgConfig.cmake.in b/src/vsg/vsgConfig.cmake.in +index 7ea0de02..4f7e77bd 100644 +--- a/src/vsg/vsgConfig.cmake.in ++++ b/src/vsg/vsgConfig.cmake.in +@@ -2,6 +2,7 @@ include(CMakeFindDependencyMacro) + + find_package(Vulkan @Vulkan_MIN_VERSION@ REQUIRED) + find_dependency(Threads) ++find_dependency(glslang) + + @FIND_DEPENDENCY_WINDOWING@ + include("${CMAKE_CURRENT_LIST_DIR}/vsgTargets.cmake") diff --git a/ports/vsg/portfile.cmake b/ports/vsg/portfile.cmake index 5efaaff6af1958..2674789f768bc2 100644 --- a/ports/vsg/portfile.cmake +++ b/ports/vsg/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vsg-dev/VulkanSceneGraph REF "v${VERSION}" - SHA512 da5c9448da6bd2bd6edcb82ed1ac67aded9c3fd957fb7d3c78bb741d8993a5e90b134433237a63bf1a6eb23b30a1e6b4ea2115416f8d32464bd04925d8dbcd34 + SHA512 b5f00190689473402157dfed34234359129a6b62f8eb0c118358af36639dcafce6c747c43d83b8602f3d06c011d3fcc98f27a95282be0a7601795ebe88921dbb HEAD_REF master PATCHES devendor-glslang.patch ) diff --git a/ports/vsg/vcpkg.json b/ports/vsg/vcpkg.json index b4f4cc38448756..b31f8157d5e078 100644 --- a/ports/vsg/vcpkg.json +++ b/ports/vsg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vsg", - "version": "1.0.5", - "port-version": 1, + "version": "1.0.6", "description": "A modern, cross platform, high performance scene graph library built upon Vulkan.", "homepage": "http://www.vulkanscenegraph.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7355bce7b1bc75..09c765f1d3ef75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8481,8 +8481,8 @@ "port-version": 2 }, "vsg": { - "baseline": "1.0.5", - "port-version": 1 + "baseline": "1.0.6", + "port-version": 0 }, "vtk": { "baseline": "9.2.0-pv5.11.0", diff --git a/versions/v-/vsg.json b/versions/v-/vsg.json index 8a332addfca937..e661ead044c227 100644 --- a/versions/v-/vsg.json +++ b/versions/v-/vsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "083510fe30c973a53fe65f4565d7c4159fdff36a", + "version": "1.0.6", + "port-version": 0 + }, { "git-tree": "c2ade86b1dee203ecaa4a401e76d80a205b6c71f", "version": "1.0.5", From 1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Thomas?= Date: Tue, 13 Jun 2023 01:55:21 +0200 Subject: [PATCH 273/533] [nrf-ble-driver] Fix incorrect tag, version number & compilation with gcc-11.2.0 (#31873) * [nrf-ble-driver] fix compilation with gcc 11.2.0 PR: https://github.com/NordicSemiconductor/pc-ble-driver/pull/272 * [nrf-ble-driver] fix version & use correct tag - Fixed version inconsistency (#28036) - Used correct tag with precompiled hex files --- .../gcc-11.2.0-compilation.patch | 22 +++++++++++++++++++ ports/nrf-ble-driver/portfile.cmake | 9 ++++---- ports/nrf-ble-driver/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nrf-ble-driver.json | 5 +++++ 5 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 ports/nrf-ble-driver/gcc-11.2.0-compilation.patch diff --git a/ports/nrf-ble-driver/gcc-11.2.0-compilation.patch b/ports/nrf-ble-driver/gcc-11.2.0-compilation.patch new file mode 100644 index 00000000000000..5fc659e342e504 --- /dev/null +++ b/ports/nrf-ble-driver/gcc-11.2.0-compilation.patch @@ -0,0 +1,22 @@ +From 00791acc7c23ac2421102edd42a7fa562cc98bfd Mon Sep 17 00:00:00 2001 +From: Krzysztof Rosinski +Date: Wed, 29 Dec 2021 09:47:40 +0100 +Subject: [PATCH] fix compilation issue (gcc-11.2.0) + +error: 'sleep_for' is not a member of 'std::this_thread' +--- + src/common/transport/uart_transport.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/transport/uart_transport.cpp b/src/common/transport/uart_transport.cpp +index 1f063ff2..96e045fb 100644 +--- a/src/common/transport/uart_transport.cpp ++++ b/src/common/transport/uart_transport.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #if defined(__APPLE__) + #include diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake index 0cc7a6834db833..ad997c97122106 100644 --- a/ports/nrf-ble-driver/portfile.cmake +++ b/ports/nrf-ble-driver/portfile.cmake @@ -9,12 +9,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NordicSemiconductor/pc-ble-driver - REF v4.1.4 - SHA512 8f35e757dddc27c9b11cdb3b9920562bbe09ceac715d65957e56ec8479e8ffedf12df2f976e484ed0d24b9325d9ef2b8ad6576cccefd2de8d7fa6fa8d58b03e5 + REF v${VERSION}-hex + SHA512 1e8b5882aa3754a29a8f0ec11b8e70390db7ddf7bc50e1318adaaf4cd1ba2b787129d8003f8076ad39c35ec887ef3aeadbcb23fa5100b2be24956d118370cb84 HEAD_REF master PATCHES 001-arm64-support.patch support-arm64-osx.diff # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/271 + gcc-11.2.0-compilation.patch # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/272 ) # Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH. @@ -34,8 +35,8 @@ vcpkg_cmake_configure( OPTIONS -DDISABLE_EXAMPLES=ON -DDISABLE_TESTS=ON - -DNRF_BLE_DRIVER_VERSION=4.1.2 - -DCONNECTIVITY_VERSION=4.1.2 + -DNRF_BLE_DRIVER_VERSION=${VERSION} + -DCONNECTIVITY_VERSION=${VERSION} ${OPTIONS} MAYBE_UNUSED_VARIABLES DISABLE_EXAMPLES diff --git a/ports/nrf-ble-driver/vcpkg.json b/ports/nrf-ble-driver/vcpkg.json index 7db000b64b96d3..fac748f0e687e1 100644 --- a/ports/nrf-ble-driver/vcpkg.json +++ b/ports/nrf-ble-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nrf-ble-driver", "version": "4.1.4", + "port-version": 1, "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", "homepage": "https://github.com/NordicSemiconductor/pc-ble-driver", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 09c765f1d3ef75..7695d773b20f2f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5694,7 +5694,7 @@ }, "nrf-ble-driver": { "baseline": "4.1.4", - "port-version": 0 + "port-version": 1 }, "nspr": { "baseline": "4.35", diff --git a/versions/n-/nrf-ble-driver.json b/versions/n-/nrf-ble-driver.json index d7907e56dec107..5edfed930d2c72 100644 --- a/versions/n-/nrf-ble-driver.json +++ b/versions/n-/nrf-ble-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eaac577bc7f0f8d3bf2cc6281f96d848937ccaa", + "version": "4.1.4", + "port-version": 1 + }, { "git-tree": "f7eb0b4a2be63dfe15611d96725869023f7b438c", "version": "4.1.4", From 22b3afdab7098e4dffa884de56c3bd9c2b0636e0 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 09:08:53 -0700 Subject: [PATCH 274/533] Remove [vcpkg-meson] (#31951) --- ports/libxkbcommon/vcpkg.json | 6 +++++- ports/tool-meson/portfile.cmake | 4 ---- ports/tool-meson/vcpkg.json | 12 ------------ versions/baseline.json | 6 +----- versions/l-/libxkbcommon.json | 5 +++++ 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 ports/tool-meson/portfile.cmake delete mode 100644 ports/tool-meson/vcpkg.json diff --git a/ports/libxkbcommon/vcpkg.json b/ports/libxkbcommon/vcpkg.json index ffd8259ae2c0c3..a3f5bfce922d41 100644 --- a/ports/libxkbcommon/vcpkg.json +++ b/ports/libxkbcommon/vcpkg.json @@ -1,13 +1,17 @@ { "name": "libxkbcommon", "version": "1.4.1", + "port-version": 1, "description": "keymap handling library for toolkits and window systems", "homepage": "https://xkbcommon.org/", "license": null, "dependencies": [ "getopt", "libx11", - "tool-meson", + { + "name": "vcpkg-tool-meson", + "host": true + }, { "name": "wayland", "platform": "linux" diff --git a/ports/tool-meson/portfile.cmake b/ports/tool-meson/portfile.cmake deleted file mode 100644 index ed3c452cce531f..00000000000000 --- a/ports/tool-meson/portfile.cmake +++ /dev/null @@ -1,4 +0,0 @@ -#deprecated port. -> new port "vcpkg-tool-meson" for better grouping with other vcpkg tools -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -vcpkg_find_acquire_program(MESON) -message(STATUS "Using meson: ${MESON}") \ No newline at end of file diff --git a/ports/tool-meson/vcpkg.json b/ports/tool-meson/vcpkg.json deleted file mode 100644 index 4601eda681b897..00000000000000 --- a/ports/tool-meson/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "tool-meson", - "version-date": "2022-01-21", - "description": "Meson build system", - "homepage": "https://github.com/mesonbuild/meson", - "dependencies": [ - { - "name": "vcpkg-tool-meson", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 7695d773b20f2f..6d27341f91ba29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4794,7 +4794,7 @@ }, "libxkbcommon": { "baseline": "1.4.1", - "port-version": 0 + "port-version": 1 }, "libxkbfile": { "baseline": "1.1.0", @@ -8128,10 +8128,6 @@ "baseline": "3.1.0", "port-version": 0 }, - "tool-meson": { - "baseline": "2022-01-21", - "port-version": 0 - }, "torch-th": { "baseline": "2019-04-19", "port-version": 4 diff --git a/versions/l-/libxkbcommon.json b/versions/l-/libxkbcommon.json index 5cdbd5a145c8f3..f1216f558e1081 100644 --- a/versions/l-/libxkbcommon.json +++ b/versions/l-/libxkbcommon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5024c3a86021f781de98ec7351ae6c6f48df704", + "version": "1.4.1", + "port-version": 1 + }, { "git-tree": "41ae34eb1eb104faea75a726f115e0e774c17d65", "version": "1.4.1", From c35a7c03fee71cef8d2f53d33cd71c0117f77dcb Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Tue, 13 Jun 2023 15:40:25 -0500 Subject: [PATCH 275/533] [flashlight-sequence] New port (#31914) * [flashlight-sequence] New port * Update version database * Temporarily switch to fork to test OpenMP configurability * Update version database * Update origin to 0.0.1 tag * Update ports/flashlight-sequence/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update version --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/flashlight-sequence/portfile.cmake | 33 ++++++++++++++++++++++++ ports/flashlight-sequence/vcpkg.json | 28 ++++++++++++++++++++ versions/baseline.json | 4 +++ versions/f-/flashlight-sequence.json | 9 +++++++ 4 files changed, 74 insertions(+) create mode 100644 ports/flashlight-sequence/portfile.cmake create mode 100644 ports/flashlight-sequence/vcpkg.json create mode 100644 versions/f-/flashlight-sequence.json diff --git a/ports/flashlight-sequence/portfile.cmake b/ports/flashlight-sequence/portfile.cmake new file mode 100644 index 00000000000000..3e591dd3638be2 --- /dev/null +++ b/ports/flashlight-sequence/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO flashlight/sequence + REF v${VERSION} + SHA512 215bb4988fbdd31573965c3c5d88d40b247cbca49f092dcdb89b5f2ca422d5774e941de843433fd3effd8f09569a7e0c2cc61364b5f0a210f156933e4c00f16b + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp FL_SEQUENCE_USE_OPENMP + cuda FL_SEQUENCE_USE_CUDA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFL_SEQUENCE_BUILD_TESTS=OFF + -DFL_SEQUENCE_BUILD_STANDALONE=OFF + ${FEATURE_OPTIONS} + OPTIONS_DEBUG + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/${PORT}" + OPTIONS_RELEASE + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/flashlight-sequence/vcpkg.json b/ports/flashlight-sequence/vcpkg.json new file mode 100644 index 00000000000000..96db8ea65658dc --- /dev/null +++ b/ports/flashlight-sequence/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "flashlight-sequence", + "version": "0.0.1", + "description": "Flashlight Sequence is a library containing fast implementations of sequence loss algorithms.", + "homepage": "https://github.com/flashlight/sequence", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cuda": { + "description": "Build CUDA components", + "dependencies": [ + "cuda" + ] + }, + "openmp": { + "description": "Build with OpenMP" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 6d27341f91ba29..d3a8283182f4db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2516,6 +2516,10 @@ "baseline": "0.3", "port-version": 6 }, + "flashlight-sequence": { + "baseline": "0.0.1", + "port-version": 0 + }, "flashlight-text": { "baseline": "0.0.4", "port-version": 0 diff --git a/versions/f-/flashlight-sequence.json b/versions/f-/flashlight-sequence.json new file mode 100644 index 00000000000000..85310ded353d6f --- /dev/null +++ b/versions/f-/flashlight-sequence.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0391c7bfa30bca396dadf39e7d9844cc7b43b38a", + "version": "0.0.1", + "port-version": 0 + } + ] +} From 2730506cb240d491a3b35574bbe94298f8d8f5d3 Mon Sep 17 00:00:00 2001 From: Daniel Ju <41210545+daniel-ju@users.noreply.github.com> Date: Tue, 13 Jun 2023 16:32:45 -0500 Subject: [PATCH 276/533] Update faiss to v1.7.4 (#31974) * Update faiss port to 1.7.4 * Run 'vcpkg x-add-version faiss' --- ports/faiss/portfile.cmake | 4 ++-- ports/faiss/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/faiss.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/faiss/portfile.cmake b/ports/faiss/portfile.cmake index f4ed1b36ea0aab..1d4f7ee2d47f42 100644 --- a/ports/faiss/portfile.cmake +++ b/ports/faiss/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookresearch/faiss - REF v1.7.3 - SHA512 97649772049365363329a70d3baee1b1bd9787ad6b8cbc6ae33108cb7a470a3a0115cdfd2642acd6540808aa1c34a1e8f1216e882a4c1fd67a6d1bc38d4b6a5c + REF v1.7.4 + SHA512 9622fb989cb2e1879450c2ad257cb55d0c0c639f54f0815e4781f4e4b2ae2f01779f5c8c0738ae9a29fde7e418587e6a92e91240d36c1ca051a6228bfb777638 HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/faiss/vcpkg.json b/ports/faiss/vcpkg.json index 56d8997a919caa..95345e887c0ec4 100644 --- a/ports/faiss/vcpkg.json +++ b/ports/faiss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "faiss", - "version": "1.7.3", + "version": "1.7.4", "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.", "homepage": "https://github.com/facebookresearch/faiss", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d3a8283182f4db..4fd24feb75cd20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2393,7 +2393,7 @@ "port-version": 2 }, "faiss": { - "baseline": "1.7.3", + "baseline": "1.7.4", "port-version": 0 }, "fakeit": { diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json index ef8aae6089c6a8..ca5567ba59b53f 100644 --- a/versions/f-/faiss.json +++ b/versions/f-/faiss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2f2e6695629b11c85f79e4fc8b962134396a953", + "version": "1.7.4", + "port-version": 0 + }, { "git-tree": "f346ac31428205c546269f8107390836185f0d72", "version": "1.7.3", From d9f54117ede678a3eae8e89612b984bb8fc74146 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 13 Jun 2023 23:37:40 +0200 Subject: [PATCH 277/533] [qtbase] no absolute paths (#31762) --- ports/qtbase/portfile.cmake | 29 ++++++++++++++--------------- ports/qtbase/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 74e3f901c67c89..ccd4731ce3789a 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -471,18 +471,17 @@ if(VCPKG_CROSSCOMPILING) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6/Qt6Dependencies.cmake" "${CURRENT_HOST_INSTALLED_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}") endif() -# The following pattern exists in qt-cmake scripts, but is still relocatable, so disable the absolute paths check. -# warning: There should be no absolute paths, such as the following, in an installed package: -# Absolute paths were found in the following files: -# packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake-private -# packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake-private -# packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake -# packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake -# -# # Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. -# original_cmake_path="/home/bion/vcpkg/downloads/tools/cmake-3.25.1-linux/cmake-3.25.1-linux-x86_64/bin/cmake" -# cmake_path=$original_cmake_path -# if ! test -f "$cmake_path"; then -# cmake_path="cmake" -# fi -set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) +function(remove_original_cmake_path file) + file(READ "${file}" _contents) + string(REGEX REPLACE "original_cmake_path=[^\n]*" "original_cmake_path=''" _contents "${_contents}") + file(WRITE "${file}" "${_contents}") +endfunction() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + foreach(file "qt-cmake" "qt-cmake-private") + remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${file}") + if(NOT VCPKG_BUILD_TYPE) + remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/${file}") + endif() + endforeach() +endif() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 4aba737df1439b..63ade33299e9bb 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.5.1", - "port-version": 1, + "port-version": 2, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4fd24feb75cd20..d6de21bf4542e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6742,7 +6742,7 @@ }, "qtbase": { "baseline": "6.5.1", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.5.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index e8484b8ca9e109..c19a17da90cf89 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "384ddcfe175f58d6f498c91f6b8e790bb6ad70ac", + "version": "6.5.1", + "port-version": 2 + }, { "git-tree": "f5e0f416352dc6207bf48ac656e3747140232a31", "version": "6.5.1", From dcd04502ecb573e0f0480870435a0677678fdec8 Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Tue, 13 Jun 2023 14:58:22 -0700 Subject: [PATCH 278/533] [qt5-base] Remove duplicate flags qt (#31634) * remove GMAKE_CXXFLAGS_RELEASE from qmodule.pri * version db * version * version * remove check for qmodule.pri * version db --- ports/qt5-base/cmake/qt_build_submodule.cmake | 5 +++++ ports/qt5-base/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 24e6385cfbdb6a..9801136a9246d4 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -123,4 +123,9 @@ function(qt_build_submodule SOURCE_PATH) endif() endif() + # Remove duplicate flags from qmodule.pri issue -> https://github.com/microsoft/vcpkg/issues/28835 + file(READ "${CURRENT_INSTALLED_DIR}/tools/qt5/mkspecs/qmodule.pri" QMODULE_PRI_CONTENT) + string(REGEX REPLACE "QMAKE_CXXFLAGS_RELEASE\\+=[^\n]*\n" "QMAKE_CXXFLAGS_RELEASE=\n" QMODULE_PRI_CONTENT ${QMODULE_PRI_CONTENT}) + file(WRITE "${CURRENT_INSTALLED_DIR}/tools/qt5/mkspecs/qmodule.pri" "${QMODULE_PRI_CONTENT}") + endfunction() \ No newline at end of file diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 724f7b1a4f813c..e6c83a8010bd23 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-base", "version": "5.15.10", + "port-version": 1, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d6de21bf4542e3..fb1aa5420b47dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6570,7 +6570,7 @@ }, "qt5-base": { "baseline": "5.15.10", - "port-version": 0 + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 5e97804505fc5d..beac80539cf816 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3088e8df941cddfdc7dd5a5b6efae7386cb3d388", + "version": "5.15.10", + "port-version": 1 + }, { "git-tree": "a90de4f154709723b9a837d25b1572ca33f2a8b4", "version": "5.15.10", From d6116fe596f9c2e8b5fba6bb0c9104dae7fcfc70 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 19:01:06 -0700 Subject: [PATCH 279/533] [minisat] Fix missing headers (#31977) --- ports/minisat-master-keying/portfile.cmake | 13 +++++++++++-- ports/minisat-master-keying/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/minisat-master-keying.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ports/minisat-master-keying/portfile.cmake b/ports/minisat-master-keying/portfile.cmake index 3b487e3c0d4c6f..a88e29b663cf4e 100644 --- a/ports/minisat-master-keying/portfile.cmake +++ b/ports/minisat-master-keying/portfile.cmake @@ -1,11 +1,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile( + ADD_MISSING_HEADERS + URLS https://github.com/master-keying/minisat/commit/dde8a20c9c5ab0d2333ba7a338a7f4a769632b75.patch?full_index=1 + SHA512 14b1ea9e72d969b0931a6ee571e4d7a591b6bdadd6b9c1e3696d902ab85caf22e0a65e4aadff3c16e55b2d5b04fa9f007bc015b6e914425c9932ca731f8445f2 + FILENAME dde8a20c9c5ab0d2333ba7a338a7f4a769632b75.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO master-keying/minisat - REF v2.3.6 - SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1 + REF v2.3.6 + SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1 HEAD_REF master + PATCHES + "${ADD_MISSING_HEADERS}" ) vcpkg_cmake_configure( diff --git a/ports/minisat-master-keying/vcpkg.json b/ports/minisat-master-keying/vcpkg.json index c2a89562efa7a5..7b5a96c462229a 100644 --- a/ports/minisat-master-keying/vcpkg.json +++ b/ports/minisat-master-keying/vcpkg.json @@ -1,6 +1,7 @@ { "name": "minisat-master-keying", "version": "2.3.6", + "port-version": 1, "description": [ "A minimalistic high-performance SAT solver", "This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat." diff --git a/versions/baseline.json b/versions/baseline.json index fb1aa5420b47dd..b0a5f7e4174cd2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5298,7 +5298,7 @@ }, "minisat-master-keying": { "baseline": "2.3.6", - "port-version": 0 + "port-version": 1 }, "minitrace": { "baseline": "2023-04-23", diff --git a/versions/m-/minisat-master-keying.json b/versions/m-/minisat-master-keying.json index 9012522e499cb9..34bcb247cfbe4c 100644 --- a/versions/m-/minisat-master-keying.json +++ b/versions/m-/minisat-master-keying.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96e49304f51f7f37b5813ccb64cb6469a3301425", + "version": "2.3.6", + "port-version": 1 + }, { "git-tree": "e7f174538407ae3f279ab4c7d2025a8545d220c9", "version": "2.3.6", From e4d7f8b32b68fcd11124722338b36500aa7447ae Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 19:05:18 -0700 Subject: [PATCH 280/533] [chipmunk] Workaround sysctl.h not existing on Ubuntu 22.04 (#31966) * [chipmunk] Workaround sysctl.h not existing on Ubuntu 22.04. * Add quotes. --- ports/chipmunk/portfile.cmake | 9 +++++++++ ports/chipmunk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/chipmunk.json | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/chipmunk/portfile.cmake b/ports/chipmunk/portfile.cmake index 3cd705c308370e..cac2a863137fc5 100644 --- a/ports/chipmunk/portfile.cmake +++ b/ports/chipmunk/portfile.cmake @@ -1,9 +1,18 @@ +vcpkg_download_distfile( + SYSCTL_REMOVED_PATCH + URLS https://github.com/slembcke/Chipmunk2D/commit/9a051e6fb970c7afe09ce2d564c163b81df050a8.patch?full_index=1 + SHA512 54ec8766529d301ea35e8e0e7f7e9803101454d0f3655f7be87b6c81414a71e6fd269c14cf1d89902eebea78bb20526b0e4da4c53cf660d169ebabe46dadd059 + FILENAME 9a051e6fb970c7afe09ce2d564c163b81df050a8.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO slembcke/Chipmunk2D REF 87340c216bf97554dc552371bbdecf283f7c540e SHA512 9094017755e9c140aa5bf8a1b5502077ae4fb2b0a3e12f1114e86d8591a6188f89822ecc578a2b5e95f61c555018f1b3273fe50e833fe2daf30e94b180a3d07c HEAD_REF master + PATCHES + "${SYSCTL_REMOVED_PATCH}" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) diff --git a/ports/chipmunk/vcpkg.json b/ports/chipmunk/vcpkg.json index 768c44d33ae00c..808b1eae11048c 100644 --- a/ports/chipmunk/vcpkg.json +++ b/ports/chipmunk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chipmunk", "version": "7.0.3", - "port-version": 4, + "port-version": 5, "description": "A fast and lightweight 2D game physics library.", "homepage": "https://github.com/slembcke/Chipmunk2D", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b0a5f7e4174cd2..3020b3df5baadc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1490,7 +1490,7 @@ }, "chipmunk": { "baseline": "7.0.3", - "port-version": 4 + "port-version": 5 }, "chmlib": { "baseline": "0.40", diff --git a/versions/c-/chipmunk.json b/versions/c-/chipmunk.json index 7867eeddcd5e6b..1ca82e7e73343a 100644 --- a/versions/c-/chipmunk.json +++ b/versions/c-/chipmunk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "949b207c326b9ded582e3360db0375bfbde8e136", + "version": "7.0.3", + "port-version": 5 + }, { "git-tree": "0e48ba1fd1de2d9df5d51fa83d6563777053a9e2", "version": "7.0.3", From bb2642e663cb6443edd256d8c610b6173fc5b740 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 19:05:57 -0700 Subject: [PATCH 281/533] [live555] Update (#31972) --- ports/live555/portfile.cmake | 6 +++--- ports/live555/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 2f3ed3834f7515..fedfdb368e955d 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.05.10.tar.gz" - FILENAME "live.2023.05.10.tar.gz" - SHA512 2997305d5b338466ba765c2969f7fab59907e6e4cabf5fa6d12b1c2b450f9dd543dc59936717352e9a3fc98d6a9bdf316d3a67fc690eebbf62482c21f21634ea + URLS "http://live555.com/liveMedia/public/live.2023.06.10.tar.gz" + FILENAME "live.2023.06.10.tar.gz" + SHA512 634f90db6339ebef6c6bc28f382034150e04e1bcc26d651da8823de7ed8a62bd648737fdf8be0c2734ba17a2516033af48e85b256170eaf30a2c484ede2d2004 ) vcpkg_extract_source_archive( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 2ab6c7e2978939..302aae21807201 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,6 @@ { "name": "live555", - "version-date": "2023-05-10", + "version-date": "2023-06-10", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3020b3df5baadc..cd6056865f8a38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4929,7 +4929,7 @@ "port-version": 2 }, "live555": { - "baseline": "2023-05-10", + "baseline": "2023-06-10", "port-version": 0 }, "llfio": { diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 2774f145069f25..965579f0a868de 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "087f65196bb8a0fe3a7e8012e3e2970106e085fd", + "version-date": "2023-06-10", + "port-version": 0 + }, { "git-tree": "4042dde466ab9adcd96e5271751a65a8b67270f7", "version-date": "2023-05-10", From 8773f4a10b768d182707d3bca1f03f59846fe1b5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 19:07:45 -0700 Subject: [PATCH 282/533] [gppanel] Fix missing headers (#31968) * Fix missing headers in gppanel. Submitted upstream as https://github.com/woollybah/gppanel/pull/5 * Version DB --- ports/gppanel/fix-missing-headers.patch | 14 ++++++++++++++ ports/gppanel/portfile.cmake | 1 + ports/gppanel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gppanel.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/gppanel/fix-missing-headers.patch diff --git a/ports/gppanel/fix-missing-headers.patch b/ports/gppanel/fix-missing-headers.patch new file mode 100644 index 00000000000000..62474987dc2086 --- /dev/null +++ b/ports/gppanel/fix-missing-headers.patch @@ -0,0 +1,14 @@ +diff --git a/include/baseXYData.h b/include/baseXYData.h +index 2877e4f..f018b35 100644 +--- a/include/baseXYData.h ++++ b/include/baseXYData.h +@@ -5,6 +5,9 @@ + #include "CMinMax.h" + #include "xyMultimapLabel.h" + #include ++#include ++#include ++#include + + //This possible to handle a lot of data quicker + //plot just second 1000 point to display.. diff --git a/ports/gppanel/portfile.cmake b/ports/gppanel/portfile.cmake index f4c719f3358273..47befccaf72f7b 100644 --- a/ports/gppanel/portfile.cmake +++ b/ports/gppanel/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES 00001-fix-build.patch use-complex-header.patch + fix-missing-headers.patch # https://github.com/woollybah/gppanel/pull/5 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/gppanel/vcpkg.json b/ports/gppanel/vcpkg.json index 0ffcd4063f9591..3e6d8ee05bb7e5 100644 --- a/ports/gppanel/vcpkg.json +++ b/ports/gppanel/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gppanel", "version-date": "2020-05-20", - "port-version": 2, + "port-version": 3, "description": "gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine.", "homepage": "https://github.com/woollybah/gppanel", "license": "GPL-2.0-or-later WITH WxWindows-exception-3.1", diff --git a/versions/baseline.json b/versions/baseline.json index cd6056865f8a38..e58c001b7d88a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2938,7 +2938,7 @@ }, "gppanel": { "baseline": "2020-05-20", - "port-version": 2 + "port-version": 3 }, "grantlee": { "baseline": "5.3.1", diff --git a/versions/g-/gppanel.json b/versions/g-/gppanel.json index d83b8975280ae2..659f7557935ea5 100644 --- a/versions/g-/gppanel.json +++ b/versions/g-/gppanel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba97170231ed485d5ba3dfbfe2ed7a66c0260517", + "version-date": "2020-05-20", + "port-version": 3 + }, { "git-tree": "9e5dbacb2efcf80443e7d7c42bc2c98b3622a7c8", "version-date": "2020-05-20", From 27d2b9a4c3def58f16a513b14168bc25bd3a1f13 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:10:09 +0800 Subject: [PATCH 283/533] [openscap] update to 1.3.7 (#31917) * [openscap] update to 1.3.6 * update version * update evrsion * Fix conflict * update evrsion * CI [skip actions] * fix xmlsec dependency * fix deps * fix deps * fix deps * fix deps * fix deps * CI * version 1.3.7 * update to 1.3.7 * world * CI * fix deps * fix deps * CI * fix deps * CI --------- Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/openscap/fix-build.patch | 77 +++++++------------ .../openscap/fix-buildflag-and-install.patch | 26 +++++++ ports/openscap/portfile.cmake | 13 ++-- ports/openscap/vcpkg.json | 19 +---- versions/baseline.json | 4 +- versions/o-/openscap.json | 5 ++ 6 files changed, 68 insertions(+), 76 deletions(-) create mode 100644 ports/openscap/fix-buildflag-and-install.patch diff --git a/ports/openscap/fix-build.patch b/ports/openscap/fix-build.patch index e40932ecbe7059..cf6b2703eac061 100644 --- a/ports/openscap/fix-build.patch +++ b/ports/openscap/fix-build.patch @@ -1,28 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4de5b57..5f483a3 100644 +index 72d9aec..8938931 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -140,15 +140,25 @@ find_package(SWIG) - find_package(LibXml2 REQUIRED) - find_package(LibXslt REQUIRED) - find_package(BZip2) -+find_package(OpenSSL REQUIRED) -+find_package(ZLIB REQUIRED) - - # PThread +@@ -164,12 +164,19 @@ if (WIN32 AND NOT MINGW) + else() + find_package(Threads REQUIRED) + endif() -set(CMAKE_THREAD_PREFER_PTHREAD) -set(THREADS_PREFER_PTHREAD_FLAG) --set(THREADS_USE_PTHREADS_WIN32 true) --find_package(Threads REQUIRED) +-set(THREADS_USE_PTHREADS_WIN32 TRUE) -check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP) -check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) -check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP) +if (WIN32) + set(CMAKE_THREAD_PREFER_PTHREAD) + set(THREADS_PREFER_PTHREAD_FLAG) -+ set(THREADS_USE_PTHREADS_WIN32 true) -+ find_package(pthread CONFIG REQUIRED) -+ set(CMAKE_THREAD_LIBS_INIT ${PThreads4W_LIBRARY}) ++ set(THREADS_USE_PTHREADS_WIN32 TRUE) + check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP) + check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) + check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP) @@ -35,7 +28,7 @@ index 4de5b57..5f483a3 100644 # WITH_CRYPTO set(WITH_CRYPTO "gcrypt" CACHE STRING "gcrypt|nss3") -@@ -373,19 +383,9 @@ message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}") +@@ -475,19 +482,9 @@ message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}") # ---------- PATHS @@ -57,30 +50,26 @@ index 4de5b57..5f483a3 100644 +set(OSCAP_DEFAULT_CPE_PATH share/openscap/cpe) set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)") - # ---------- RPATHS for linking + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e9339c6..9347087 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -134,4 +134,8 @@ else() + set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + +-install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION}) ++install(TARGETS openscap ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt -index 2a3f373..781d05a 100644 +index 93ce1f2..f500e1d 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt -@@ -6,27 +6,32 @@ if(ENABLE_OSCAP_UTIL) - add_executable(oscap ${UTILS_SOURCES}) - target_link_libraries(oscap openscap) - if(WIN32) -- set(OSCAP_UTIL_DESTINATION ".") -+ find_path(GETOPT_INCLUDE_DIR getopt.h) -+ include(SelectLibraryConfigurations) -+ find_library(GETOPT_LIBRARY_RELEASE NAMES getopt) -+ find_library(GETOPT_LIBRARY_DEBUG NAMES getopt PATH_SUFFIXES debug/lib) -+ select_library_configurations(GETOPT) -+ -+ message("GETOPT_INCLUDE_DIR: ${GETOPT_INCLUDE_DIR}") -+ message("GETOPT_LIBRARY: ${GETOPT_LIBRARY}") -+ -+ target_include_directories(oscap PRIVATE ${GETOPT_INCLUDE_DIR}) -+ target_link_libraries(oscap PRIVATE ${GETOPT_LIBRARY}) -+ -+ set(OSCAP_UTIL_DESTINATION tools) - # Install the 'oscap' utility +@@ -29,22 +29,15 @@ if(ENABLE_OSCAP_UTIL) install(TARGETS "oscap" DESTINATION ${OSCAP_UTIL_DESTINATION} ) @@ -103,19 +92,5 @@ index 2a3f373..781d05a 100644 - DESTINATION "${CMAKE_INSTALL_MANDIR}/man8" + DESTINATION share/openscap/man8 ) - endif() - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9e18613..e84a21f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -125,4 +125,8 @@ else() - set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() --install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION}) -+install(TARGETS openscap -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) + add_custom_target(oscap-chrootable-nocap diff --git a/ports/openscap/fix-buildflag-and-install.patch b/ports/openscap/fix-buildflag-and-install.patch new file mode 100644 index 00000000000000..c0f6971ca5f33d --- /dev/null +++ b/ports/openscap/fix-buildflag-and-install.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8938931..d111896 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,9 +148,7 @@ if (APPLE) + endif() + find_package(OpenSSL REQUIRED) + add_definitions(${XMLSEC_DEFINITIONS}) +-if (WIN32) + add_compile_definitions("XMLSEC_CRYPTO_OPENSSL") +-endif() + find_package(BZip2) + + # PThread +@@ -610,11 +608,6 @@ if(NOT WIN32) + if(WITH_SYSTEMD) + if(ENABLE_OSCAP_REMEDIATE_SERVICE) + # systemd service for offline (boot-time) remediation +- configure_file("oscap-remediate.service.in" "oscap-remediate.service" @ONLY) +- install(FILES +- ${CMAKE_CURRENT_BINARY_DIR}/oscap-remediate.service +- DESTINATION ${SYSTEMD_UNITDIR} +- ) + endif() + endif() + endif() diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake index 243e30d414e030..e62abda1d99be6 100644 --- a/ports/openscap/portfile.cmake +++ b/ports/openscap/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenSCAP/openscap - REF 3a4c635691380fa990a226acc8558db35d7ebabc #1.3.1 - SHA512 12681d43b2ce067c5a5c4eb47e14d91d6e9362b1f98f1d35b05d79ad84c7ee8c29f438eaae8e8465033155e500bb0f936eb79af46fab15e4a07e03c6be8b655d + REF ${VERSION} + SHA512 88d095f350cb1b27f30222c809835ad9f182589a4410ea66f6389d9140804a45767b70176bcd52a0ad6b248ccf63153f09e44f93e70b3002d45cc445642a458f HEAD_REF dev PATCHES fix-build.patch + fix-buildflag-and-install.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake") @@ -15,9 +16,6 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - docs ENABLE_DOCS - tests ENABLE_TESTS - util ENABLE_OSCAP_UTIL python ENABLE_PYTHON3 ) @@ -34,7 +32,10 @@ vcpkg_cmake_configure( -DENABLE_OSCAP_UTIL_VM=OFF -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF + -DENABLE_OSCAP_UTIL=OFF -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON + -DENABLE_TESTS=OFF + -DENABLE_DOCS=OFF ) vcpkg_cmake_install() @@ -45,4 +46,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() #Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json index 2468acc1851e13..3a3f1e51b1189c 100644 --- a/ports/openscap/vcpkg.json +++ b/ports/openscap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openscap", - "version": "1.3.1", - "port-version": 4, + "version": "1.3.7", "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "homepage": "https://github.com/OpenSCAP/openscap", "license": "LGPL-2.1-or-later", @@ -19,26 +18,12 @@ "name": "vcpkg-cmake", "host": true }, + "xmlsec", "zlib" ], "features": { - "docs": { - "description": "install docs" - }, "python": { "description": "build with python3" - }, - "tests": { - "description": "build with tests" - }, - "util": { - "description": "build available utils", - "dependencies": [ - { - "name": "getopt-win32", - "platform": "windows" - } - ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index e58c001b7d88a3..22db8a5c3e62c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5993,8 +5993,8 @@ "port-version": 14 }, "openscap": { - "baseline": "1.3.1", - "port-version": 4 + "baseline": "1.3.7", + "port-version": 0 }, "openslide": { "baseline": "3.4.1", diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json index 0799d6036f6a28..8a858c188be499 100644 --- a/versions/o-/openscap.json +++ b/versions/o-/openscap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "453f57565bf1882caf7355c14c079725153cd844", + "version": "1.3.7", + "port-version": 0 + }, { "git-tree": "e19b3163cda0978696c4a2b6fc6db92800051398", "version": "1.3.1", From a75e0a81863e7b0512bf764810084ddce7fe8a54 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 20:11:37 -0700 Subject: [PATCH 284/533] [mathgl] URL Encode (#31976) Workaround on Ubuntu 22.04: error: https://sourceforge.net/projects/mathgl/files/mathgl/mathgl 8.0/mathgl-8.0.1.tar.gz/download: curl failed to download with exit code 3 curl: (3) URL using bad/illegal format or missing URL --- ports/mathgl/portfile.cmake | 2 +- ports/mathgl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mathgl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index 708e5badae9cf5..6eaf3884ce8273 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO mathgl/mathgl - REF "mathgl 8.0" + REF "mathgl%208.0" FILENAME "mathgl-${VERSION}.tar.gz" SHA512 1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2 PATCHES diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index fc8363383d622e..4e0adcc11b03f4 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mathgl", "version": "8.0.1", - "port-version": 3, + "port-version": 4, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "license": "GPL-3.0-only", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 22db8a5c3e62c1..209fe6d4272119 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5162,7 +5162,7 @@ }, "mathgl": { "baseline": "8.0.1", - "port-version": 3 + "port-version": 4 }, "matio": { "baseline": "1.5.23", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index b82208067f1323..46a51b7c4c1e70 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "629d09b4394436b3821f1871eaa6caa27bf04be0", + "version": "8.0.1", + "port-version": 4 + }, { "git-tree": "2c1da85e695d3767410b3acf59567da2faf32ea2", "version": "8.0.1", From 987e164326f3d9abe78497a14325bb347ebe203d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 20:13:45 -0700 Subject: [PATCH 285/533] [libbf] Add missing headers (#31970) --- ports/libbf/portfile.cmake | 17 +++++++++++++++++ ports/libbf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libbf.json | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake index 7aa235a24f71cb..01b732c57ad54a 100644 --- a/ports/libbf/portfile.cmake +++ b/ports/libbf/portfile.cmake @@ -1,9 +1,26 @@ +vcpkg_download_distfile( + STDEXCEPT_PATCH + URLS https://github.com/mavam/libbf/commit/7720a2cdfdf211ac10d5f9c5b0988e1cae03d3ba.patch?full_index=1 + SHA512 0f414bec3797361ad8c0cd2c869d21ee9c8f05609d2c00295e0b7cf252ca42ad2230bfece7dde839ac5d47221b54034446056337f16739a346510a14b383566c + FILENAME 7720a2cdfdf211ac10d5f9c5b0988e1cae03d3ba.patch +) + +vcpkg_download_distfile( + ALGORITHM_PATCH + URLS https://github.com/mavam/libbf/commit/b2168dc4590a0251ec40ada4ab835eb3aec893e7.patch?full_index=1 + SHA512 549163cec577d611c382d50f2dfbd99716f54d2d95b675ebd1cde5842e795b64272116cc0997c1415dad916cb7d1f538bd275d4f57013224af1eb9af7cfdf2e6 + FILENAME b2168dc4590a0251ec40ada4ab835eb3aec893e7.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mavam/libbf REF v1.0.0 SHA512 04db7adbeb4bc6b20aed7f2676840499ed1afe499b4cab67f27d4a0ad234c1fb06eced24259f37870ec4760fe74d6d6307b5d11b3cd928b975661eb2966d4db8 HEAD_REF master + PATCHES + "${STDEXCEPT_PATCH}" + "${ALGORITHM_PATCH}" ) vcpkg_cmake_configure( diff --git a/ports/libbf/vcpkg.json b/ports/libbf/vcpkg.json index ec43ed92aef425..1433d345360f34 100644 --- a/ports/libbf/vcpkg.json +++ b/ports/libbf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libbf", "version": "1.0.0", - "port-version": 3, + "port-version": 4, "description": "Bloom filters for C++11.", "license": "BSD-3-Clause", "supports": "!windows", diff --git a/versions/baseline.json b/versions/baseline.json index 209fe6d4272119..b79416e1036664 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3874,7 +3874,7 @@ }, "libbf": { "baseline": "1.0.0", - "port-version": 3 + "port-version": 4 }, "libbson": { "baseline": "1.22.2", diff --git a/versions/l-/libbf.json b/versions/l-/libbf.json index 183b294f445170..708156bd096e55 100644 --- a/versions/l-/libbf.json +++ b/versions/l-/libbf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "741e60d3785dedb5bcb187e5e049bf97494e3822", + "version": "1.0.0", + "port-version": 4 + }, { "git-tree": "3c699adb88cb4cf15b0fb52cb9e506bc91672bf2", "version": "1.0.0", From 7f461d51b2e8118991056f61a1f6e819e908b85c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 20:15:13 -0700 Subject: [PATCH 286/533] [hareflow] Fix missing headers (#31969) --- ports/hareflow/fix-missing-headers.patch | 25 ++++++++++++++++++++++++ ports/hareflow/portfile.cmake | 2 ++ ports/hareflow/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/hareflow.json | 5 +++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/hareflow/fix-missing-headers.patch diff --git a/ports/hareflow/fix-missing-headers.patch b/ports/hareflow/fix-missing-headers.patch new file mode 100644 index 00000000000000..0a1b268afc8598 --- /dev/null +++ b/ports/hareflow/fix-missing-headers.patch @@ -0,0 +1,25 @@ +diff --git a/include/hareflow/logging.h b/include/hareflow/logging.h +index e67bd8f..cd5a402 100644 +--- a/include/hareflow/logging.h ++++ b/include/hareflow/logging.h +@@ -3,6 +3,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + +diff --git a/src/client_impl.cpp b/src/client_impl.cpp +index f77042e..05af90d 100644 +--- a/src/client_impl.cpp ++++ b/src/client_impl.cpp +@@ -1,5 +1,6 @@ + #include "hareflow/detail/client_impl.h" + ++#include + #include + + #include "hareflow/codec.h" diff --git a/ports/hareflow/portfile.cmake b/ports/hareflow/portfile.cmake index aca8ed9c0b1203..545d1b0731daba 100644 --- a/ports/hareflow/portfile.cmake +++ b/ports/hareflow/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF a59406398c60d4908a9f894c187ef90370119594 # 0.1.0 SHA512 ed9e3b54f879fed65cf7765b37951a0da04e99b09950316d9108ea35917d05b4733c5cb8f3c161e42f1baab5978affd4522e5b5028861b3f7d6cc0bfe0a40363 HEAD_REF main + PATCHES + fix-missing-headers.patch # https://github.com/coveooss/hareflow/pull/9 ) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) diff --git a/ports/hareflow/vcpkg.json b/ports/hareflow/vcpkg.json index 7452a5ffe49101..cce00f3d48de20 100644 --- a/ports/hareflow/vcpkg.json +++ b/ports/hareflow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hareflow", "version-semver": "0.1.0", + "port-version": 1, "description": "Hareflow: A RabbitMQ C++ stream client.", "homepage": "https://github.com/coveooss/hareflow", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b79416e1036664..1191a4e458f201 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3082,7 +3082,7 @@ }, "hareflow": { "baseline": "0.1.0", - "port-version": 0 + "port-version": 1 }, "harfbuzz": { "baseline": "7.3.0", diff --git a/versions/h-/hareflow.json b/versions/h-/hareflow.json index 1eeae5b863f4cb..4a66938005bfda 100644 --- a/versions/h-/hareflow.json +++ b/versions/h-/hareflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bd1ffea6cb09dc32a66641bbe120501d1e9f9ac", + "version-semver": "0.1.0", + "port-version": 1 + }, { "git-tree": "80c6cc2de2019b438b3eb7caecc26277e5cc836c", "version-semver": "0.1.0", From 3e8c7ff5d67ae01154430c27c77ee2755894bc83 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 13 Jun 2023 20:16:01 -0700 Subject: [PATCH 287/533] [braft] Fix GCC11 (#31965) * [braft] Fix GCC11. * Add quotes. --- ports/braft/portfile.cmake | 9 +++++++++ ports/braft/vcpkg.json | 3 ++- versions/b-/braft.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/braft/portfile.cmake b/ports/braft/portfile.cmake index c35fae993fef41..6e5875b1d67b4a 100644 --- a/ports/braft/portfile.cmake +++ b/ports/braft/portfile.cmake @@ -1,3 +1,10 @@ +vcpkg_download_distfile( + GCC_11_PATCH + URLS https://github.com/baidu/braft/commit/361ef01185b88baf90b7926f992c8e71fc4aefc2.patch?full_index=1 + SHA512 245470404885cc8a903893fbcde201b892d0b160d7c1f09758f20c83a0d8f476f4512ee8091aa7a1d3798c8315eb0dae8e9a8da7af8425df62ab6f837b025392 + FILENAME 361ef01185b88baf90b7926f992c8e71fc4aefc2.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baidu/braft @@ -8,6 +15,7 @@ vcpkg_from_github( fix-build.patch fix-dependency.patch export-target.patch + "${GCC_11_PATCH}" ) vcpkg_cmake_configure( @@ -16,6 +24,7 @@ vcpkg_cmake_configure( -DBRPC_WITH_GLOG=ON -DBUILD_TOOLS=OFF ) + vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/braft/vcpkg.json b/ports/braft/vcpkg.json index fc1294cab09445..19bfa4481e075d 100644 --- a/ports/braft/vcpkg.json +++ b/ports/braft/vcpkg.json @@ -1,7 +1,8 @@ { "name": "braft", "version-date": "2021-26-04", - "description": "Consesus algorithm library", + "port-version": 1, + "description": "Consensus algorithm library", "homepage": "https://github.com/baidu/braft", "license": "Apache-2.0", "supports": "!windows", diff --git a/versions/b-/braft.json b/versions/b-/braft.json index 9744235f2fa060..524955541b33c5 100644 --- a/versions/b-/braft.json +++ b/versions/b-/braft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "774dbc3ef386eed16fd345f23109f94a899f39e8", + "version-date": "2021-26-04", + "port-version": 1 + }, { "git-tree": "d9afe1afea46ce35f64aaed5c2702c34113fe683", "version-date": "2021-26-04", diff --git a/versions/baseline.json b/versions/baseline.json index 1191a4e458f201..3b3ac037803eab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1250,7 +1250,7 @@ }, "braft": { "baseline": "2021-26-04", - "port-version": 0 + "port-version": 1 }, "breakpad": { "baseline": "2022-07-12", From 18953298382003b5056b054adee9174a79582018 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:16:43 +0800 Subject: [PATCH 288/533] [mapnik] Fix compile errors using gcc13 (#31959) * Fix compile errors using gcc13 * update version --- ports/mapnik/portfile.cmake | 4 ++-- ports/mapnik/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/mapnik.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 02cdf7c88cd8de..f1baeab41a111a 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 4e064b8b8e324c4df7f2ae21dd72ccb85e1d4140 - SHA512 4db329cad90058abc1a3430fded6fac5a49334f8feffb8510bd965a28dee630adf150174c933e61c76e93f6f107397e97929c863c97603d8dcef28f1a25f4628 + REF 123232ffde565af38afd06fe3e8edd9bfdce93bc + SHA512 b940312688fcece8bb52b8b687fcc60eaac159d4737966eacacbafbde6fbd3245f9acf170d55a664a781908282cb21347bd4b79bd08b8ab2461270ef453b10c5 HEAD_REF master ) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 1abc972c153e86..7506aa800d4557 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mapnik", - "version-date": "2023-01-17", - "port-version": 1, + "version-date": "2023-06-12", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 3b3ac037803eab..b6f2ea9f7e9c33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5133,8 +5133,8 @@ "port-version": 0 }, "mapnik": { - "baseline": "2023-01-17", - "port-version": 1 + "baseline": "2023-06-12", + "port-version": 0 }, "marble": { "baseline": "22.04.0", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 47fb0a87037ac2..5aa68b9bc16f0c 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55a1af72282030a832c73b5fe9bedb2089b1b08c", + "version-date": "2023-06-12", + "port-version": 0 + }, { "git-tree": "5d63cf0864443e19122d1901bc944a89274aba0c", "version-date": "2023-01-17", From 4cca179bd748431a1c2e7318082698fe2020d5e1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 14 Jun 2023 05:48:27 +0200 Subject: [PATCH 289/533] [shaderc, spirv-tools] Fix cmake config, add usage, minor fixes (#31912) * [spirv-tools] Lower-case dirs for cmake config * Simplify CMake config fixup * Add usage * Update versions * [shaderc] Minor fixes * Fix package imports in build and exported config * Add usage - shaderc_util is a private lib The port never installed this lib's headers. * Fix pc file installation * Update versions * [spirv-tools] Add tools feature * [spirv-tools] Fix exported cmake config * [shaderc] Fis SPIRV-Tools target * Fix tools feature --- ports/shaderc/cmake-config-export.patch | 70 +++++++++++++++ ports/shaderc/cmake-project-include.cmake | 16 ++++ ports/shaderc/fix-build-type.patch | 18 +++- ports/shaderc/fix-export-cmakefiles.patch | 93 -------------------- ports/shaderc/fix-install-shaderc_util.patch | 18 ---- ports/shaderc/glslang/CMakeLists.txt | 22 ----- ports/shaderc/portfile.cmake | 14 ++- ports/shaderc/spirv-tools/CMakeLists.txt | 8 -- ports/shaderc/usage | 4 + ports/shaderc/vcpkg.json | 2 +- ports/spirv-tools/cmake-config-dir.diff | 13 +++ ports/spirv-tools/fix-tool-deps.diff | 18 ++++ ports/spirv-tools/portfile.cmake | 87 ++++++------------ ports/spirv-tools/spirv-tools-shared.diff | 35 ++++++++ ports/spirv-tools/usage | 22 +++++ ports/spirv-tools/vcpkg.json | 8 +- versions/baseline.json | 4 +- versions/s-/shaderc.json | 5 ++ versions/s-/spirv-tools.json | 5 ++ 19 files changed, 249 insertions(+), 213 deletions(-) create mode 100644 ports/shaderc/cmake-config-export.patch create mode 100644 ports/shaderc/cmake-project-include.cmake delete mode 100644 ports/shaderc/fix-export-cmakefiles.patch delete mode 100644 ports/shaderc/fix-install-shaderc_util.patch delete mode 100644 ports/shaderc/glslang/CMakeLists.txt delete mode 100644 ports/shaderc/spirv-tools/CMakeLists.txt create mode 100644 ports/shaderc/usage create mode 100644 ports/spirv-tools/cmake-config-dir.diff create mode 100644 ports/spirv-tools/fix-tool-deps.diff create mode 100644 ports/spirv-tools/spirv-tools-shared.diff create mode 100644 ports/spirv-tools/usage diff --git a/ports/shaderc/cmake-config-export.patch b/ports/shaderc/cmake-config-export.patch new file mode 100644 index 00000000000000..0bf837bb0b3a3f --- /dev/null +++ b/ports/shaderc/cmake-config-export.patch @@ -0,0 +1,70 @@ +diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt +index d3bc639..6432a9b 100644 +--- a/libshaderc/CMakeLists.txt ++++ b/libshaderc/CMakeLists.txt +@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS) + add_library(shaderc STATIC ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc) + target_include_directories(shaderc +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + set(shaderc_install_target shaderc) +@@ -37,7 +39,9 @@ else() + add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) + shaderc_default_compile_options(shaderc_shared) + target_include_directories(shaderc_shared +- PUBLIC include ++ PUBLIC ++ $ ++ $ + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) + target_compile_definitions(shaderc_shared +@@ -60,9 +64,14 @@ if(SHADERC_ENABLE_INSTALL) + ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) + + install(TARGETS ${shaderc_install_target} shaderc_util ++ EXPORT unofficial-shaderc-targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(EXPORT unofficial-shaderc-targets ++ NAMESPACE unofficial::shaderc:: ++ DESTINATION share/unofficial-shaderc ++ ) + endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) +@@ -79,6 +88,15 @@ else() + target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) + endif() + ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" [[ ++include(CMakeFindDependencyMacro) ++find_dependency(glslang CONFIG) ++find_dependency(SPIRV-Tools CONFIG) ++find_dependency(SPIRV-Tools-opt CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc-targets.cmake") ++]]) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc) ++ + shaderc_add_tests( + TEST_PREFIX shaderc + LINK_LIBS shaderc +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 99ce3c4..3d5a222 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -39,7 +39,7 @@ add_library(shaderc_util STATIC + + shaderc_default_compile_options(shaderc_util) + target_include_directories(shaderc_util +- PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) ++ PUBLIC $ PRIVATE ${glslang_SOURCE_DIR}) + # We use parts of Glslang's HLSL compilation interface, which + # now requires this preprocessor definition. + add_definitions(-DENABLE_HLSL) diff --git a/ports/shaderc/cmake-project-include.cmake b/ports/shaderc/cmake-project-include.cmake new file mode 100644 index 00000000000000..215ded6449b7b5 --- /dev/null +++ b/ports/shaderc/cmake-project-include.cmake @@ -0,0 +1,16 @@ +set(SHADERC_GLSLANG_DIR "" CACHE STRING "unused") +find_package(glslang CONFIG REQUIRED) +add_library(glslang ALIAS glslang::glslang) +add_library(HLSL ALIAS glslang::HLSL) +add_library(MachineIndependent ALIAS glslang::MachineIndependent) +add_library(OSDependent ALIAS glslang::OSDependent) +add_library(OGLCompiler ALIAS glslang::OGLCompiler) +add_library(SPIRV ALIAS glslang::SPIRV) + +find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h REQUIRED) +set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) + +set(SHADERC_SPIRV_TOOLS_DIR "" CACHE STRING "unused") +find_package(SPIRV-Tools CONFIG REQUIRED) +add_library(SPIRV-Tools ALIAS SPIRV-Tools-static) # as linked by SPIRV-Tools-opt +find_package(SPIRV-Tools-opt CONFIG REQUIRED) diff --git a/ports/shaderc/fix-build-type.patch b/ports/shaderc/fix-build-type.patch index 8e5cd22db15ee2..3e3f500e046e73 100644 --- a/ports/shaderc/fix-build-type.patch +++ b/ports/shaderc/fix-build-type.patch @@ -1,5 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52ebd1c..f73252f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -144,6 +144,8 @@ function(define_pkg_config_file NAME LIBS) + endif() + endfunction() + ++if(BUILD_SHARED_LIBS) + define_pkg_config_file(shaderc -lshaderc_shared) ++else() + define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util") +-define_pkg_config_file(shaderc_combined -lshaderc_combined) ++endif() diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index 3ada419..f3277f0 100644 +index 3ada419..d3bc639 100644 --- a/libshaderc/CMakeLists.txt +++ b/libshaderc/CMakeLists.txt @@ -24,13 +24,16 @@ set(SHADERC_SOURCES @@ -33,7 +47,7 @@ index 3ada419..f3277f0 100644 ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) - install(TARGETS shaderc shaderc_shared -+ install(TARGETS ${shaderc_install_target} ++ install(TARGETS ${shaderc_install_target} shaderc_util LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/ports/shaderc/fix-export-cmakefiles.patch b/ports/shaderc/fix-export-cmakefiles.patch deleted file mode 100644 index 75e3aba8149806..00000000000000 --- a/ports/shaderc/fix-export-cmakefiles.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index f3277f0..5fd58ef 100644 ---- a/libshaderc/CMakeLists.txt -+++ b/libshaderc/CMakeLists.txt -@@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS) - add_library(shaderc STATIC ${SHADERC_SOURCES}) - shaderc_default_compile_options(shaderc) - target_include_directories(shaderc -- PUBLIC include -+ PUBLIC -+ $ -+ $ - PRIVATE ${glslang_SOURCE_DIR} - ${SPIRV-Headers_SOURCE_DIR}/include) - set(shaderc_install_target shaderc) -@@ -37,7 +39,9 @@ else() - add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) - shaderc_default_compile_options(shaderc_shared) - target_include_directories(shaderc_shared -- PUBLIC include -+ PUBLIC -+ $ -+ $ - PRIVATE ${glslang_SOURCE_DIR} - ${SPIRV-Headers_SOURCE_DIR}/include) - target_compile_definitions(shaderc_shared -@@ -59,10 +63,14 @@ if(SHADERC_ENABLE_INSTALL) - DESTINATION - ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) - -- install(TARGETS ${shaderc_install_target} -+ install(TARGETS ${shaderc_install_target} EXPORT unofficial-shadercTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(EXPORT unofficial-shadercTargets -+ NAMESPACE unofficial::shaderc:: -+ DESTINATION share/unofficial-shaderc -+ ) - endif(SHADERC_ENABLE_INSTALL) - - find_package(Threads) -@@ -79,6 +87,11 @@ else() - target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) - endif() - -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" -+[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shadercTargets.cmake")]]) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake" @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc-config.cmake DESTINATION share/unofficial-shaderc) -+ - shaderc_add_tests( - TEST_PREFIX shaderc - LINK_LIBS shaderc -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 4926203..b152d7b 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -39,7 +39,10 @@ add_library(shaderc_util STATIC - - shaderc_default_compile_options(shaderc_util) - target_include_directories(shaderc_util -- PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) -+ PUBLIC -+ $ -+ $ -+ PRIVATE ${glslang_SOURCE_DIR}) - # We use parts of Glslang's HLSL compilation interface, which - # now requires this preprocessor definition. - add_definitions(-DENABLE_HLSL) -@@ -50,12 +53,21 @@ target_link_libraries(shaderc_util PRIVATE - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) - - if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) -- install(TARGETS shaderc_util -+ install(TARGETS shaderc_util EXPORT unofficial-shaderc_utilTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(EXPORT unofficial-shaderc_utilTargets -+ NAMESPACE unofficial::shaderc_util:: -+ DESTINATION share/unofficial-shaderc_util -+ ) - endif(SHADERC_ENABLE_INSTALL) - -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" -+[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-shaderc_utilTargets.cmake")]]) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake" @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-shaderc_util-config.cmake DESTINATION share/unofficial-shaderc_util) -+ - shaderc_add_tests( - TEST_PREFIX shaderc_util - LINK_LIBS shaderc_util diff --git a/ports/shaderc/fix-install-shaderc_util.patch b/ports/shaderc/fix-install-shaderc_util.patch deleted file mode 100644 index 7601f3020d3a57..00000000000000 --- a/ports/shaderc/fix-install-shaderc_util.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 99ce3c4..4926203 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -49,6 +49,13 @@ target_link_libraries(shaderc_util PRIVATE - glslang OSDependent OGLCompiler HLSL glslang SPIRV - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) - -+if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) -+ install(TARGETS shaderc_util -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif(SHADERC_ENABLE_INSTALL) -+ - shaderc_add_tests( - TEST_PREFIX shaderc_util - LINK_LIBS shaderc_util diff --git a/ports/shaderc/glslang/CMakeLists.txt b/ports/shaderc/glslang/CMakeLists.txt deleted file mode 100644 index 3b31564f9f8367..00000000000000 --- a/ports/shaderc/glslang/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -cmake_minimum_required(VERSION 3.11) - -find_package(glslang CONFIG REQUIRED) - -set_property(TARGET glslang::glslang PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET glslang::OSDependent PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET glslang::OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET glslang::HLSL PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET glslang::SPIRV PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET glslang::MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) - -add_library(glslang ALIAS glslang::glslang) -add_library(OSDependent ALIAS glslang::OSDependent) -add_library(OGLCompiler ALIAS glslang::OGLCompiler) -add_library(HLSL ALIAS glslang::HLSL) -add_library(SPIRV ALIAS glslang::SPIRV) -add_library(MachineIndependent ALIAS glslang::MachineIndependent) - -find_package(Threads REQUIRED) - -find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h) -set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index 12d2a62e52a0f8..b009c060e43d97 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -10,42 +10,40 @@ vcpkg_from_github( PATCHES disable-update-version.patch fix-build-type.patch - fix-install-shaderc_util.patch - fix-export-cmakefiles.patch + cmake-config-export.patch # NOTE: This should be removed when shaderc gets updated to use glslang 11.12.0 fix-tbuiltinresource-for-glslang-11-12.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src") -set(OPTIONS) +set(OPTIONS "") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND OPTIONS -DSHADERC_ENABLE_SHARED_CRT=ON) endif() # shaderc uses python to manipulate copyright information vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) +get_filename_component(PYTHON3_EXE_PATH "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} - -DSHADERC_SKIP_TESTS=true - -DSHADERC_GLSLANG_DIR=${CMAKE_CURRENT_LIST_DIR}/glslang - -DSHADERC_SPIRV_TOOLS_DIR=${CMAKE_CURRENT_LIST_DIR}/spirv-tools + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DSHADERC_ENABLE_EXAMPLES=OFF + -DSHADERC_SKIP_TESTS=true ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc CONFIG_PATH share/unofficial-shaderc) -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-shaderc_util CONFIG_PATH share/unofficial-shaderc_util) vcpkg_copy_tools(TOOL_NAMES glslc AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/shaderc/spirv-tools/CMakeLists.txt b/ports/shaderc/spirv-tools/CMakeLists.txt deleted file mode 100644 index d9e0136012b6a2..00000000000000 --- a/ports/shaderc/spirv-tools/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -find_library(SPIRVTOOLSOPT SPIRV-Tools-opt) -find_library(SPIRVTOOLS SPIRV-Tools) - -add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL) -set_property(TARGET SPIRV-Tools-opt PROPERTY IMPORTED_LOCATION "${SPIRVTOOLSOPT}") - -add_library(SPIRV-Tools STATIC IMPORTED GLOBAL) -set_property(TARGET SPIRV-Tools PROPERTY IMPORTED_LOCATION "${SPIRVTOOLS}") diff --git a/ports/shaderc/usage b/ports/shaderc/usage new file mode 100644 index 00000000000000..8918c015579b7b --- /dev/null +++ b/ports/shaderc/usage @@ -0,0 +1,4 @@ +shaderc provides CMake targets: + + find_package(unofficial-shaderc CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::shaderc::shaderc) diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index b3c400f80cc9fa..37b54a2558e4b2 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shaderc", "version": "2021.1", - "port-version": 3, + "port-version": 4, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", "license": "Apache-2.0", diff --git a/ports/spirv-tools/cmake-config-dir.diff b/ports/spirv-tools/cmake-config-dir.diff new file mode 100644 index 00000000000000..306269540adbae --- /dev/null +++ b/ports/spirv-tools/cmake-config-dir.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b8fe92..8f3f91a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -269,7 +269,7 @@ else() + endif() + + if(ENABLE_SPIRV_TOOLS_INSTALL) +- if(WIN32) ++ if(0) + macro(spvtools_config_package_dir TARGET PATH) + set(${PATH} ${TARGET}/cmake) + endmacro() diff --git a/ports/spirv-tools/fix-tool-deps.diff b/ports/spirv-tools/fix-tool-deps.diff new file mode 100644 index 00000000000000..ab6fd1227158a6 --- /dev/null +++ b/ports/spirv-tools/fix-tool-deps.diff @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2cf1e40..5f2a86c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,8 +280,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) + endif() + + macro(spvtools_generate_config_file TARGET) ++ set(sgcf_find_extra "") ++ if(NOT "${TARGET}" STREQUAL "SPIRV-Tools-opt") ++ set(sgcf_find_extra "find_dependency(SPIRV-Tools-opt)\n") ++ endif() + file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake + "include(CMakeFindDependencyMacro)\n" ++ ${sgcf_find_extra} + "find_dependency(${SPIRV_TOOLS})\n" + "include(\${CMAKE_CURRENT_LIST_DIR}/${TARGET}Targets.cmake)\n" + "set(${TARGET}_LIBRARIES ${TARGET})\n" diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 717a75a3c3f280..2e0a0228bfc2fd 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -3,86 +3,57 @@ vcpkg_from_github( REPO KhronosGroup/SPIRV-Tools REF v2022.4 SHA512 d93e97e168c50f545cc42418603ffc5fa6299bb3cc30d927444e4de0d955abc5dd481c9662a59cd49fc379da6bcc6df6fb747947e3dc144cee9b489aff7c4785 + PATCHES + cmake-config-dir.diff + spirv-tools-shared.diff + fix-tool-deps.diff ) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") -if(VCPKG_TARGET_IS_IOS) - message(STATUS "Using iOS trplet. Executables won't be created...") - set(TOOLS_INSTALL OFF) - set(SKIP_EXECUTABLES ON) -else() - set(TOOLS_INSTALL ON) - set(SKIP_EXECUTABLES OFF) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + tools SPIRV_SKIP_EXECUTABLES +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR} - -DSPIRV_WERROR=OFF + ${FEATURE_OPTIONS} + "-DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR}" -DSPIRV_SKIP_TESTS=ON - -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} - -DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL} -DSPIRV_TOOLS_BUILD_STATIC=ON - -DENABLE_SPIRV_TOOLS_INSTALL=ON + -DSPIRV_WERROR=OFF + OPTIONS_DEBUG + -DSPIRV_SKIP_EXECUTABLES=ON ) vcpkg_cmake_install() - # the directory name is capitalized as opposed to the port name -if(WIN32) - vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools/cmake PACKAGE_NAME SPIRV-Tools) - vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-link/cmake PACKAGE_NAME SPIRV-Tools-link) - vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-lint/cmake PACKAGE_NAME SPIRV-Tools-lint) - vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-opt/cmake PACKAGE_NAME SPIRV-Tools-opt) - vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-reduce/cmake PACKAGE_NAME SPIRV-Tools-reduce) -else() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME SPIRV-Tools DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME SPIRV-Tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME SPIRV-Tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME SPIRV-Tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME SPIRV-Tools-reduce) # now delete -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME spirv-tools DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME spirv-tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME spirv-tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME spirv-tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME spirv-tools-reduce) # now delete vcpkg_fixup_pkgconfig() -if(TOOLS_INSTALL) - vcpkg_copy_tools( - TOOL_NAMES - spirv-as - spirv-cfg - spirv-dis - spirv-link - spirv-lint - spirv-opt - spirv-reduce - spirv-val - AUTO_CLEAN - ) +if("tools" IN_LIST FEATURES) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/spirv-lesspipe.sh" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/spirv-lesspipe.sh") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/spirv-lesspipe.sh") + set(tools spirv-as spirv-cfg spirv-dis spirv-link spirv-lint spirv-opt spirv-val) + if(NOT VCPKG_TARGET_IS_IOS) + list(APPEND tools spirv-reduce) + endif() + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) endif() -if(WIN32) - file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools" - "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-link" - "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-lint" - "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-opt" - "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-reduce" - "${CURRENT_PACKAGES_DIR}/SPIRV-Tools" - "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-link" - "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-lint" - "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-opt" - "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-reduce" - ) -endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # lesspipe.sh is the only file there - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spirv-tools/spirv-tools-shared.diff b/ports/spirv-tools/spirv-tools-shared.diff new file mode 100644 index 00000000000000..75ce3f8a9628c7 --- /dev/null +++ b/ports/spirv-tools/spirv-tools-shared.diff @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8f3f91a..2cf1e40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -389,10 +389,14 @@ add_custom_target(spirv-tools-shared-pkg-config ALL + + # Install pkg-config file + if (ENABLE_SPIRV_TOOLS_INSTALL) ++ set(shared_pc "") ++ if(BUILD_SHARED_LIBS) ++ set(shared_pc "${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc") ++ endif() + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc +- ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc ++ ${shared_pc} + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 668579a..7874c1a 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -421,6 +421,10 @@ if (ANDROID) + endif() + + if(ENABLE_SPIRV_TOOLS_INSTALL) ++ if(NOT BUILD_SHARED_LIBS) ++ set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES EXCLUDE_FROM_ALL 1) ++ list(REMOVE_ITEM SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared) ++ endif() + install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/spirv-tools/usage b/ports/spirv-tools/usage new file mode 100644 index 00000000000000..1890e6de9abdd3 --- /dev/null +++ b/ports/spirv-tools/usage @@ -0,0 +1,22 @@ +spirv-tools provides CMake targets: + + find_package(SPIRV-Tools CONFIG REQUIRED) + # The static libary is always available. + # It offers full public symbol visibility. + target_link_libraries(main PRIVATE SPIRV-Tools-static) + # In triplets with dynamic library linkage, there is also a shared libary. + target_link_libraries(main PRIVATE SPIRV-Tools-shared) + + # The following libraries are static and depend on SPIRV-Tools-static. + + find_package(SPIRV-Tools-link CONFIG REQUIRED) + target_link_libraries(main PRIVATE SPIRV-Tools-link) + + find_package(SPIRV-Tools-lint CONFIG REQUIRED) + target_link_libraries(main PRIVATE SPIRV-Tools-lint) + + find_package(SPIRV-Tools-opt CONFIG REQUIRED) + target_link_libraries(main PRIVATE SPIRV-Tools-opt) + + find_package(SPIRV-Tools-reduce CONFIG REQUIRED) + target_link_libraries(main PRIVATE SPIRV-Tools-reduce) diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index dc13d98125498f..605b708cf9084c 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "spirv-tools", "version": "2022.4", + "port-version": 1, "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", "license": "Apache-2.0", @@ -14,5 +15,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build tools." + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index b6f2ea9f7e9c33..0a9a0795af568b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7434,7 +7434,7 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 3 + "port-version": 4 }, "shaderwriter": { "baseline": "2.6.0", @@ -7698,7 +7698,7 @@ }, "spirv-tools": { "baseline": "2022.4", - "port-version": 0 + "port-version": 1 }, "spix": { "baseline": "0.5", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 9ae975b85bc75f..4c592b030f376c 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a6e1c8ff08a6437170e17cc7b9c6c0bc0113ba2", + "version": "2021.1", + "port-version": 4 + }, { "git-tree": "b33d795ee7bc7bb9a02f904dc4d8e08e5f5f4900", "version": "2021.1", diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index d8482f5fa8e64b..0266269c8d20b8 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "082a2b7ca21aeafe82dc89765facb7c34675b7b9", + "version": "2022.4", + "port-version": 1 + }, { "git-tree": "38e7ee249f19adf3574548ce895be13919960fdf", "version": "2022.4", From 45287bdd9d2b8c46c7404d1bdad43a47645281cf Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:49:59 +0800 Subject: [PATCH 290/533] [zydis,polyhook2] update to v4.0, 2023-05-16 (#31909) * [zydis] update to v4.0 * update version * revert patch formating * update version * fix eror * fix hash * [polyhook2]: update to 2023.05.16 * CI [skip actions] * CI --------- Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/polyhook2/portfile.cmake | 4 +- ports/polyhook2/vcpkg.json | 2 +- ports/zydis/fix-arm64-build.patch | 26 ---------- ports/zydis/portfile.cmake | 9 ++-- ports/zydis/vcpkg.json | 3 +- ports/zydis/zycore.patch | 79 ++++++++++++++++++++----------- versions/baseline.json | 6 +-- versions/p-/polyhook2.json | 5 ++ versions/z-/zydis.json | 5 ++ 9 files changed, 73 insertions(+), 66 deletions(-) delete mode 100644 ports/zydis/fix-arm64-build.patch diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index 45900a41fa56ce..01923d5460b4fc 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevemk14ebr/PolyHook_2_0 - REF 71d273463a3c4e30ec0a4031c4b477b85ea773fb - SHA512 5092453ee55d679bb88ac8d98bbfadbe2aca9eb211b8d7a5bce4e6bb377dd292518d4861fd5281c51915f9ba609b6f2b0c0e0271f92cc0da148ee8d3225d1081 + REF 1ff1d0285fc28bfd206aa0a38ae93022a5ad9be1 + SHA512 056b5ce76683e130e053e1f62ccc3fbd060670ac74e0235f100d16bba36707bad5e84d2100fd2cc3a67a7c294eeaf5fb72a213f3d3af099013fe13c92575cc8b HEAD_REF master ) diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json index d4990b6f8f0108..5a5ae96c637d31 100644 --- a/ports/polyhook2/vcpkg.json +++ b/ports/polyhook2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "polyhook2", - "version-date": "2023-02-24", + "version-date": "2023-05-16", "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", "license": "MIT", diff --git a/ports/zydis/fix-arm64-build.patch b/ports/zydis/fix-arm64-build.patch deleted file mode 100644 index f93f72e982cd6a..00000000000000 --- a/ports/zydis/fix-arm64-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/Zydis/ShortString.h b/include/Zydis/ShortString.h -index bed45af6..566d673a 100644 ---- a/include/Zydis/ShortString.h -+++ b/include/Zydis/ShortString.h -@@ -45,7 +45,9 @@ extern "C" { - /* Enums and types */ - /* ============================================================================================== */ - --#pragma pack(push, 1) -+#if !(defined(ZYAN_AARCH64) && defined(ZYAN_APPLE)) -+# pragma pack(push, 1) -+#endif - - /** - * Defines the `ZydisShortString` struct. -@@ -67,7 +69,9 @@ typedef struct ZydisShortString_ - ZyanU8 size; - } ZydisShortString; - --#pragma pack(pop) -+#if !(defined(ZYAN_AARCH64) && defined(ZYAN_APPLE)) -+# pragma pack(pop) -+#endif - - /* ============================================================================================== */ - /* Macros */ diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake index 5e7e642950e99f..27ee6d782a5b0c 100644 --- a/ports/zydis/portfile.cmake +++ b/ports/zydis/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zyantific/zydis - REF 4022f22f9280650082a9480519c86a6e2afde2f3 #v3.2.1 - SHA512 da3ff582d3c4cbb5e4053cd468f181550f02d0a1713a39944266e6d1b0e3249e24461f87171ef99e249e6d5b2fc39fcca402518c569399ae5d4a64e0d3dc4b3b + REF "v${VERSION}" + SHA512 334284bccfb6ce61cc530fd479d6278db3e4df1fb52b311acd7d21558843c9bf14e74a199cd937041d434260b65c506c07ae1a37243d2240eb9443ae5e56e000 HEAD_REF master PATCHES zycore.patch - fix-arm64-build.patch # from https://github.com/zyantific/zydis/pull/259 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB) @@ -14,7 +13,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}" + -DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB} -DZYDIS_BUILD_EXAMPLES=OFF OPTIONS_DEBUG -DZYDIS_BUILD_TOOLS=OFF @@ -34,4 +33,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zydis/vcpkg.json b/ports/zydis/vcpkg.json index 43b27b13b72bfc..84dacdc119f79b 100644 --- a/ports/zydis/vcpkg.json +++ b/ports/zydis/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zydis", - "version-semver": "3.2.1", - "port-version": 3, + "version-semver": "4.0.0", "description": "Fast and lightweight x86/x86-64 disassembler library.", "homepage": "https://zydis.re", "license": "MIT", diff --git a/ports/zydis/zycore.patch b/ports/zydis/zycore.patch index d58b8dcc1cfb84..5e62c7f29c4513 100644 --- a/ports/zydis/zycore.patch +++ b/ports/zydis/zycore.patch @@ -1,41 +1,66 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9898f424..8cba0e96 100644 +index 5e812fb..64c6e97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -54,8 +54,7 @@ set(ZYDIS_ZYCORE_PATH - # =============================================================================================== # +@@ -78,8 +78,7 @@ if (ZYAN_SYSTEM_ZYCORE) + find_package(Zycore) + else () + # Try to initialize the Zycore submodule using Git +- if (NOT EXISTS "${ZYAN_ZYCORE_PATH}/CMakeLists.txt" AND +- "${ZYAN_ZYCORE_PATH}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/dependencies/zycore") ++ if (0) + find_package(Git QUIET) + if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") + execute_process( +@@ -89,7 +88,7 @@ else () + endif() + endif () - # Try to initialize the Zycore submodule using Git --if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt" AND -- "${ZYDIS_ZYCORE_PATH}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/dependencies/zycore") -+if (0) - find_package(Git QUIET) - if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") - execute_process( -@@ -65,7 +64,7 @@ if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt" AND - endif() - endif () +- if (NOT EXISTS "${ZYAN_ZYCORE_PATH}/CMakeLists.txt") ++ if (0) + message( + FATAL_ERROR + "Can't find zycore submodule. Please make sure to clone the repo recursively.\n" +@@ -101,7 +100,7 @@ else () + ) + endif () --if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt") -+if (0) - message( - FATAL_ERROR - "Can't find zycore submodule. Please make sure to clone the repo recursively.\n" -@@ -77,7 +76,7 @@ if (NOT EXISTS "${ZYDIS_ZYCORE_PATH}/CMakeLists.txt") - ) +- add_subdirectory(${ZYAN_ZYCORE_PATH} "zycore" EXCLUDE_FROM_ALL) ++ find_package(zycore CONFIG REQUIRED) endif () --add_subdirectory(${ZYDIS_ZYCORE_PATH} "zycore" EXCLUDE_FROM_ALL) -+find_package(zycore CONFIG REQUIRED) - # =============================================================================================== # - # Library configuration # -@@ -89,7 +88,7 @@ else () - add_library("Zydis" STATIC) +@@ -115,7 +114,7 @@ else () + target_compile_definitions("Zydis" PUBLIC "ZYDIS_STATIC_BUILD") endif () -target_link_libraries("Zydis" PUBLIC "Zycore") -+target_link_libraries(Zydis PUBLIC Zycore::Zycore) ++target_link_libraries("Zydis" PUBLIC Zycore::Zycore) target_include_directories("Zydis" PUBLIC $ +@@ -383,14 +382,16 @@ if (ZYDIS_BUILD_TOOLS AND NOT ZYAN_NO_LIBC) + target_compile_definitions("ZydisFuzzReEncoding" PRIVATE "ZYDIS_LIBFUZZER") + endif () + +- add_executable("ZydisTestEncoderAbsolute" +- "tools/ZydisTestEncoderAbsolute.c") +- target_link_libraries("ZydisTestEncoderAbsolute" "Zydis") +- set_target_properties("ZydisTestEncoderAbsolute" PROPERTIES FOLDER "Tools") +- target_compile_definitions("ZydisTestEncoderAbsolute" PRIVATE "_CRT_SECURE_NO_WARNINGS") +- zyan_set_common_flags("ZydisTestEncoderAbsolute") +- zyan_maybe_enable_wpo("ZydisTestEncoderAbsolute") +- _maybe_set_emscripten_cfg("ZydisTestEncoderAbsolute") ++ if (NOT ZYDIS_BUILD_SHARED_LIB) ++ add_executable("ZydisTestEncoderAbsolute" ++ "tools/ZydisTestEncoderAbsolute.c") ++ target_link_libraries("ZydisTestEncoderAbsolute" "Zydis") ++ set_target_properties("ZydisTestEncoderAbsolute" PROPERTIES FOLDER "Tools") ++ target_compile_definitions("ZydisTestEncoderAbsolute" PRIVATE "_CRT_SECURE_NO_WARNINGS") ++ zyan_set_common_flags("ZydisTestEncoderAbsolute") ++ zyan_maybe_enable_wpo("ZydisTestEncoderAbsolute") ++ _maybe_set_emscripten_cfg("ZydisTestEncoderAbsolute") ++ endif () + endif () + + add_executable("ZydisInfo" "tools/ZydisInfo.c") diff --git a/versions/baseline.json b/versions/baseline.json index 0a9a0795af568b..e4c034e1bd3488 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6361,7 +6361,7 @@ "port-version": 12 }, "polyhook2": { - "baseline": "2023-02-24", + "baseline": "2023-05-16", "port-version": 0 }, "polymorphic-value": { @@ -8949,8 +8949,8 @@ "port-version": 1 }, "zydis": { - "baseline": "3.2.1", - "port-version": 3 + "baseline": "4.0.0", + "port-version": 0 }, "zyre": { "baseline": "2019-07-07", diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index 50169532d607e2..6caad9cf4ccfe3 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e46e50c70de16dfea86f4a7a8ceea6d19b3c46b", + "version-date": "2023-05-16", + "port-version": 0 + }, { "git-tree": "61f26f962dfbb071aeb0f22c4cfe15e100c0524c", "version-date": "2023-02-24", diff --git a/versions/z-/zydis.json b/versions/z-/zydis.json index e73ace1389c5ae..ce8b1d994265eb 100644 --- a/versions/z-/zydis.json +++ b/versions/z-/zydis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e5b3e4b01d2ff55d68c2f591d0dd523224844c5", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "88c0a32f293fa4ee48ce2fa89369c9fdceff200f", "version-semver": "3.2.1", From f69780b5c9107239fc17f389be936f7faf9fb30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= <70097935+omarhogni@users.noreply.github.com> Date: Wed, 14 Jun 2023 03:51:38 +0000 Subject: [PATCH 291/533] [soem]Update version to latest. (#31889) * Switch soem to version-date for rolling head library * update database * Remove unused patches and correct port-version * update database * review changes * database update * Update license to use new function * update database * Disable Werror soem * update database --- ports/soem/disable-werror.patch | 24 ++++------------- ports/soem/portfile.cmake | 9 ++++--- ports/soem/vcpkg.json | 3 +-- ports/soem/winpcap.patch | 48 +++++++++++++++++---------------- versions/baseline.json | 4 +-- versions/s-/soem.json | 5 ++++ 6 files changed, 44 insertions(+), 49 deletions(-) diff --git a/ports/soem/disable-werror.patch b/ports/soem/disable-werror.patch index 7c1fd96850f875..18a664f5308f0d 100644 --- a/ports/soem/disable-werror.patch +++ b/ports/soem/disable-werror.patch @@ -1,23 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1778965..4c481b7 100644 +index 7fa930c..e14b1bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE) - - if(WIN32) - set(OS "win32") -- find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) -- find_library(winpcap_LIBRARY NAMES wpcap) -- find_library(packet_LIBRARY NAMES packet) -- include_directories(${winpcap_INCLUDE_DIRS}) -+ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) -+ find_library(winpcap_LIBRARY NAMES wpcap) -+ find_library(packet_LIBRARY NAMES packet) -+ include_directories(${winpcap_INCLUDE_DIRS}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") -- set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) -+ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) +@@ -31,12 +31,10 @@ if(WIN32) + set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) elseif(UNIX AND NOT APPLE) set(OS "linux") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") @@ -29,7 +15,7 @@ index 1778965..4c481b7 100644 set(OS_LIBS pthread pcap) elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") set(OS "rtk") -@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") +@@ -45,10 +43,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") include_directories(oshw/${OS}/${ARCH}) file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c) set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}") @@ -39,4 +25,4 @@ index 1778965..4c481b7 100644 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format") set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group") elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems") - message("Building for RTEMS") + message(STATUS "Building for RTEMS") diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake index 338222a55dd59e..b0daea2490f155 100644 --- a/ports/soem/portfile.cmake +++ b/ports/soem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenEtherCATsociety/SOEM - REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0 - SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817 + REF a901500618405760a564e64a6816705e29f50f9f + SHA512 d554bc1c3780b1a81402a7fda490f516caba6bd943a28482740b5c9d97e4273a11546e79c92796487ee9901f568cbf1b329d4e1c1d32602fdce0088a77c82443 HEAD_REF master PATCHES winpcap.patch @@ -13,6 +13,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF ) vcpkg_cmake_install() @@ -22,7 +24,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json index eb303eb66db4ed..781494cea2f426 100644 --- a/ports/soem/vcpkg.json +++ b/ports/soem/vcpkg.json @@ -1,7 +1,6 @@ { "name": "soem", - "version": "1.4.0", - "port-version": 4, + "version-date": "2023-06-09", "description": "Simple Open Source EtherCAT Master", "homepage": "https://github.com/OpenEtherCATsociety/SOEM", "supports": "!uwp", diff --git a/ports/soem/winpcap.patch b/ports/soem/winpcap.patch index 215226e6f56fc1..ca795f1fc07afa 100644 --- a/ports/soem/winpcap.patch +++ b/ports/soem/winpcap.patch @@ -1,23 +1,25 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -13,15 +13,13 @@ - - if(WIN32) - set(OS "win32") -- include_directories(oshw/win32/wpcap/Include) -- if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib/x64) -- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) -- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib) -- endif() -+ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) -+ find_library(winpcap_LIBRARY NAMES wpcap) -+ find_library(packet_LIBRARY NAMES packet) -+ include_directories(${winpcap_INCLUDE_DIRS}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") -- set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib) -+ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) - elseif(UNIX AND NOT APPLE) - set(OS "linux") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index baf26bd..7fa930c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,15 +22,13 @@ endif() + + if(WIN32) + set(OS "win32") +- include_directories(oshw/win32/wpcap/Include) +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/x64) +- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) +- link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib) +- endif() ++ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) ++ find_library(winpcap_LIBRARY NAMES wpcap) ++ find_library(packet_LIBRARY NAMES packet) ++ include_directories(${winpcap_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib) ++ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) + elseif(UNIX AND NOT APPLE) + set(OS "linux") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") diff --git a/versions/baseline.json b/versions/baseline.json index e4c034e1bd3488..71ca2a11e34dce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7581,8 +7581,8 @@ "port-version": 1 }, "soem": { - "baseline": "1.4.0", - "port-version": 4 + "baseline": "2023-06-09", + "port-version": 0 }, "soil": { "baseline": "2021-04-22", diff --git a/versions/s-/soem.json b/versions/s-/soem.json index 059c56c68bac97..6b32317372a38c 100644 --- a/versions/s-/soem.json +++ b/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a02a02f57a58361241f7bb0890de819f94e198b3", + "version-date": "2023-06-09", + "port-version": 0 + }, { "git-tree": "442917830f982b5c1cfcf3a74fd251d92ddab6e9", "version": "1.4.0", From 93b7a0d7018e7d6781482bdcd01f10e7d8645938 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:09:57 +0800 Subject: [PATCH 292/533] [tesseract] Fix training-tools feature compilation error (#31888) * fix raining-tools feature compilation error * update version * Remove useless patches * update version * fix TRAINING_TOOLS * update version * fix format * update version * fix format * update version --- ports/tesseract/fix-debug-postfix.patch | 33 ----------------------- ports/tesseract/fix-tools.patch | 31 --------------------- ports/tesseract/fix_static_link_icu.patch | 13 +++++++++ ports/tesseract/portfile.cmake | 15 ++++++----- ports/tesseract/vcpkg.json | 3 +-- versions/baseline.json | 4 +-- versions/t-/tesseract.json | 5 ++++ 7 files changed, 29 insertions(+), 75 deletions(-) delete mode 100644 ports/tesseract/fix-debug-postfix.patch delete mode 100644 ports/tesseract/fix-tools.patch create mode 100644 ports/tesseract/fix_static_link_icu.patch diff --git a/ports/tesseract/fix-debug-postfix.patch b/ports/tesseract/fix-debug-postfix.patch deleted file mode 100644 index 98933b7f56fa0e..00000000000000 --- a/ports/tesseract/fix-debug-postfix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c6845cb..27c1f4a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -812,14 +812,8 @@ set_target_properties(libtesseract - set_target_properties(libtesseract - PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) - --if(WIN32) -- set_target_properties(libtesseract -- PROPERTIES OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}) -- set_target_properties(libtesseract -- PROPERTIES DEBUG_OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}d) --else() -- set_target_properties(libtesseract PROPERTIES OUTPUT_NAME tesseract) --endif() -+set_target_properties(libtesseract -+ PROPERTIES OUTPUT_NAME tesseract$<$:${VERSION_MAJOR}${VERSION_MINOR}$<$:d>>) - - if(SW_BUILD) - target_link_libraries(libtesseract PUBLIC org.sw.demo.danbloomberg.leptonica -@@ -884,8 +878,10 @@ get_target_property(tesseract_NAME libtesseract NAME) - get_target_property(tesseract_VERSION libtesseract VERSION) - get_target_property(tesseract_OUTPUT_NAME libtesseract OUTPUT_NAME) - --configure_file(tesseract.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc -+configure_file(tesseract.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc.in - @ONLY) -+# to resolve generator expression in OUTPUT_NAME -+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc INPUT ${CMAKE_CURRENT_BINARY_DIR}/tesseract.pc.in) - - configure_package_config_file( - cmake/templates/TesseractConfig.cmake.in diff --git a/ports/tesseract/fix-tools.patch b/ports/tesseract/fix-tools.patch deleted file mode 100644 index 09d5b71dfd0373..00000000000000 --- a/ports/tesseract/fix-tools.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt -index a05b216c..faab9bc2 100644 ---- a/src/training/CMakeLists.txt -+++ b/src/training/CMakeLists.txt -@@ -259,13 +259,8 @@ if(ICU_FOUND) - target_link_libraries(unicharset_training - PUBLIC common_training org.sw.demo.unicode.icu.i18n) - else() -- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") - target_link_libraries(unicharset_training PUBLIC common_training - PkgConfig::ICU) -- else() -- target_link_libraries(unicharset_training PUBLIC common_training -- ${ICU_LIBRARIES}) -- endif() - endif() - target_include_directories(unicharset_training - PUBLIC unicharset ${CMAKE_CURRENT_BINARY_DIR}) -@@ -388,11 +383,7 @@ if(ICU_FOUND) - target_include_directories(pango_training BEFORE - PUBLIC ${PANGO_INCLUDE_DIRS}) - target_compile_definitions(pango_training PUBLIC -DPANGO_ENABLE_ENGINE) -- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") -- target_link_libraries(pango_training PUBLIC PkgConfig::PANGO) -- else() -- target_link_libraries(pango_training PUBLIC ${PANGO_LINK_LIBRARIES}) -- endif() -+ target_link_libraries(pango_training PUBLIC PkgConfig::PANGO) - endif() - endif() - target_include_directories(pango_training diff --git a/ports/tesseract/fix_static_link_icu.patch b/ports/tesseract/fix_static_link_icu.patch new file mode 100644 index 00000000000000..8e7c101cc42dc5 --- /dev/null +++ b/ports/tesseract/fix_static_link_icu.patch @@ -0,0 +1,13 @@ +diff --git a/src/training/CMakeLists.txt b/src/training/CMakeLists.txt +index 429ed04..9878fa5 100644 +--- a/src/training/CMakeLists.txt ++++ b/src/training/CMakeLists.txt +@@ -72,7 +72,7 @@ if(NOT SW_BUILD) + if(PKG_CONFIG_FOUND) + pkg_check_modules(ICU REQUIRED IMPORTED_TARGET icu-uc icu-i18n) + else() +- find_package(ICU 52.1 COMPONENTS uc i18n) ++ find_package(ICU 72.1 COMPONENTS uc i18n dt) + endif() + if(ICU_FOUND) + message(">> ICU_FOUND ${ICU_FOUND} ${ICU_VERSION} ${ICU_LIBRARIES} ${ICU_INCLUDE_DIRS}") diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index d45ea9f0d01291..213d88aa270aae 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -5,12 +5,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract - REF 080da83cc51c4ef8b324a7e03146fe0bd7e0944b #5.3.0 - SHA512 77f7e69ca220edb51f0d1e21fae67288759bbefb6868203cd095c4457b16d7319d78cd47dd8e72be3da5aabb357f5f649b8da7fc3f2263faedecf10f556eb431 + REF "${VERSION}" + SHA512 1744106d76eafd0786b99b517707afdd22b7b5cb3dfd7f0af02954539715c981ff0f12d142ee103113ba38dac8476052d6880b81d4c8050de650bf1cee6ba06c PATCHES ${tesseract_patch} - fix-tools.patch # See https://github.com/tesseract-ocr/tesseract/pull/4006 - fix-debug-postfix.patch # See https://github.com/tesseract-ocr/tesseract/pull/4008 + fix_static_link_icu.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -55,9 +54,11 @@ if("training-tools" IN_LIST FEATURES) ambiguous_words classifier_tester combine_tessdata cntraining dawg2wordlist mftraining shapeclustering wordlist2dawg combine_lang_model lstmeval lstmtraining - set_unicharset_properties unicharset_extractor text2image - merge_unicharsets - ) + set_unicharset_properties unicharset_extractor merge_unicharsets + ) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND TRAINING_TOOLS text2image) + endif() vcpkg_copy_tools(TOOL_NAMES ${TRAINING_TOOLS} AUTO_CLEAN) endif() diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index ee2d8ce43e2fd8..2aa8674f239d20 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tesseract", - "version": "5.3.0", - "port-version": 1, + "version": "5.3.1", "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 71ca2a11e34dce..2f045d48fc76a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7941,8 +7941,8 @@ "port-version": 0 }, "tesseract": { - "baseline": "5.3.0", - "port-version": 1 + "baseline": "5.3.1", + "port-version": 0 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index b3bdbbfa4f725a..4ec5c7faee86f9 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeb035e40f678090353d237cc6de1089fb58d89c", + "version": "5.3.1", + "port-version": 0 + }, { "git-tree": "a43b33297fd09c075b57f2441b45cca4291a48a5", "version": "5.3.0", From 95b51560e79ff477e67a2a7fb7b0608cd8eea5ce Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 13 Jun 2023 22:36:21 -0700 Subject: [PATCH 293/533] [linux x86] Set -m32 in Linker flags too (#31811) When cross-compiling for x86 Linux, the -m32 flag must also be passed to the linker otherwise it complains about trying to link code built for the wrong architecture. --- scripts/toolchains/linux.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index 2fac4922deacf7..c39a13ffad6642 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -10,6 +10,7 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") string(APPEND VCPKG_C_FLAGS " -m32") string(APPEND VCPKG_CXX_FLAGS " -m32") + string(APPEND VCPKG_LINKER_FLAGS " -m32") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") From 079419e66be2da46fdff237e1a90b2905e7de920 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 14 Jun 2023 07:53:09 +0200 Subject: [PATCH 294/533] [sqlite3] Update to 3.42.0 (#31703) * [sqlite3] Update to 3.42.0 * version * Add cmake wrapper * Test cmake wrapper * version * Add libsqlite3 to library names * version * WIP * version * restore original * Remove cmake wrapper * version * Remove wrapper * Remove all unused features * version * Remove unused features * version * only remove 1 variable * version * . * version * make json1 default feature * version --- ports/sqlite3/portfile.cmake | 9 +++++---- ports/sqlite3/sqlite3-vcpkg-config.h.in | 2 +- ports/sqlite3/vcpkg.json | 6 ++++-- versions/baseline.json | 4 ++-- versions/s-/sqlite3.json | 5 +++++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index b42f2da21a9941..b37693c0a77157 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -2,9 +2,9 @@ string(REGEX REPLACE "^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)" "\\1,0\\2,0\\3 string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," "\\1\\2\\3\\4" SQLITE_VERSION "${SQLITE_VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://sqlite.org/2022/sqlite-amalgamation-${SQLITE_VERSION}.zip" + URLS "https://sqlite.org/2023/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 863afdabbdbe27baaccc13477e08437ce3b4d7e6f0c51a294d1d71252476af474b6c275729ebe1bc801f004da7ca6775591a30fed1930c3a1920d8118864f1d2 + SHA512 76416dc40dd15611f59d7209087a08c6cf1b7584dee34da4ce11b75acd7f608d794747a7ed87c3ffe16b237699279c2da8f85b009a379e108d39f33bd727e1e1 ) vcpkg_extract_source_archive( @@ -40,7 +40,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS Unused session SQLITE_ENABLE_PREUPDATE_HOOK omit-load-extension SQLITE_OMIT_LOAD_EXTENSION geopoly SQLITE_ENABLE_GEOPOLY - json1 SQLITE_ENABLE_JSON1 + INVERTED_FEATURES + json1 SQLITE_OMIT_JSON ) if(VCPKG_TARGET_IS_WINDOWS) @@ -73,7 +74,6 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -89,6 +89,7 @@ configure_file( ) vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/sqlite3/sqlite3-vcpkg-config.h.in b/ports/sqlite3/sqlite3-vcpkg-config.h.in index a7fd176139fc66..f3705bf5013304 100644 --- a/ports/sqlite3/sqlite3-vcpkg-config.h.in +++ b/ports/sqlite3/sqlite3-vcpkg-config.h.in @@ -22,7 +22,7 @@ #cmakedefine SQLITE_ENABLE_PREUPDATE_HOOK #cmakedefine SQLITE_OMIT_LOAD_EXTENSION #cmakedefine SQLITE_ENABLE_GEOPOLY -#cmakedefine SQLITE_ENABLE_JSON1 +#cmakedefine SQLITE_OMIT_JSON #cmakedefine SQLITE_OS_WIN @SQLITE_OS_WIN@ #cmakedefine SQLITE_OS_WINRT @SQLITE_OS_WINRT@ #define SQLITE_ENABLE_COLUMN_METADATA 1 diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index be282c11e0eb13..1980d3076c35bc 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite3", - "version": "3.40.1", - "port-version": 3, + "version": "3.42.0", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", @@ -15,6 +14,9 @@ "host": true } ], + "default-features": [ + "json1" + ], "features": { "dbstat": { "description": "Enable the DBSTAT virtual table" diff --git a/versions/baseline.json b/versions/baseline.json index 2f045d48fc76a5..cdce86dea56f2c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7729,8 +7729,8 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.40.1", - "port-version": 3 + "baseline": "3.42.0", + "port-version": 0 }, "sqlitecpp": { "baseline": "3.3.0", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 358d74496a04cf..3d2bebe1fefd0b 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1b6deae3ce2f17e1384f02e7da3e7fae3a0865d", + "version": "3.42.0", + "port-version": 0 + }, { "git-tree": "846077eab115952eeb4dda0eaae97a3eb776fa9f", "version": "3.40.1", From a487471068f4cb1cbb4eeb340763cdcc0a75fd68 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 13 Jun 2023 23:03:20 -0700 Subject: [PATCH 295/533] [liblzma] Update to 5.4.3 (#31603) * [liblzma] Update to 5.4.3 * update version --------- Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/liblzma/portfile.cmake | 14 +++++++------- ports/liblzma/vcpkg.json | 3 +-- ports/liblzma/win_output_name.patch | 8 ++++---- versions/baseline.json | 4 ++-- versions/l-/liblzma.json | 5 +++++ 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 8631df28b0f072..7c8f5aa09c0fbd 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -1,9 +1,9 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO lzmautils - FILENAME "xz-${VERSION}.tar.xz" - SHA512 f890ee5207799fbc7bb9ae031f444d39d82275b0e1b8cc7f01fdb9270050e38849bd1269db2a2f12fe87b5e23e03f9e809a5c3456d066c0a56e6f98d728553ea + REPO tukaani-project/xz + REF "v${VERSION}" + SHA512 67292be900a713035d2a3dab4c3b6697cf0db37a78faaa5e0d3f5a96909ef9645c15a6030af94fb7f4224c3ad8eacd1a653ba67dfdeb6372165c1c36e0cf16b7 + HEAD_REF master PATCHES fix_config_include.patch win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. @@ -39,7 +39,7 @@ set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(includedir "\${prefix}/include") set(PACKAGE_URL https://tukaani.org/xz/) -set(PACKAGE_VERSION 5.2.5) +set(PACKAGE_VERSION 5.4.3) if(NOT VCPKG_TARGET_IS_WINDOWS) set(PTHREAD_CFLAGS -pthread) endif() @@ -81,4 +81,4 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index d0ac62bed49588..f20ff049892797 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblzma", - "version-semver": "5.4.1", - "port-version": 1, + "version": "5.4.3", "description": "Compression library with an API similar to that of zlib.", "homepage": "https://tukaani.org/xz/", "license": null, diff --git a/ports/liblzma/win_output_name.patch b/ports/liblzma/win_output_name.patch index 7011475de5853d..9a845bdbaef1d2 100644 --- a/ports/liblzma/win_output_name.patch +++ b/ports/liblzma/win_output_name.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e80b524..cddbccb 100644 +index 0c6d4b7..62a824a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -462,8 +462,11 @@ set_target_properties(liblzma PROPERTIES +@@ -868,8 +868,11 @@ set_target_properties(liblzma PROPERTIES # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. # Avoid the name lzma.dll because it would conflict with LZMA SDK. @@ -13,5 +13,5 @@ index e80b524..cddbccb 100644 + set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma) +endif() - # Create liblzma-config-version.cmake. We use this spelling instead of - # liblzmaConfig.cmake to make find_package work in case insensitive manner + # Create liblzma-config-version.cmake. + # diff --git a/versions/baseline.json b/versions/baseline.json index cdce86dea56f2c..0ee4f90c7fd65a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4237,8 +4237,8 @@ "port-version": 2 }, "liblzma": { - "baseline": "5.4.1", - "port-version": 1 + "baseline": "5.4.3", + "port-version": 0 }, "libmad": { "baseline": "0.15.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 9805c267d17ccd..f596c82a064252 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba357d6805e44b3df1ed4343801f1b61a5d63de0", + "version": "5.4.3", + "port-version": 0 + }, { "git-tree": "9a3ebbf75e1c3adb76d7e71717c1f03bb291036a", "version-semver": "5.4.1", From 2a0afc853e06d4f578dac8368f12592a86469a25 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Jun 2023 10:59:53 -0700 Subject: [PATCH 296/533] [dbow] Remove dynamic exception specs (#31967) --- ports/dbow3/portfile.cmake | 14 +++++++++++--- ports/dbow3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dbow3.json | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/dbow3/portfile.cmake b/ports/dbow3/portfile.cmake index d58ccf9cea2fdd..1feaca835004cb 100644 --- a/ports/dbow3/portfile.cmake +++ b/ports/dbow3/portfile.cmake @@ -1,16 +1,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +# https://github.com/rmsalinas/DBow3/pull/50 , already accepted but not merged as of 2023-06-13 +vcpkg_download_distfile(REMOVE_DYNAMIC_EXCEPTION_SPECS + URLS https://patch-diff.githubusercontent.com/raw/rmsalinas/DBow3/pull/50.patch?full_index=1 + SHA512 e39b9615aa8cfd4cf26b4ec977df823533b187d18ade5447c96fdcea53c9a58b1648e0a9fe78e3833360ba91c27ad56b6d65f944bd6c46f76969a652ba64cb5a + FILENAME 9f9d19930c3ec597bd1ebc2a9c2a84b9fd49674e.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rmsalinas/DBow3 - REF master - SHA512 16e6789b77e8b42428d156ae5efa667861fa8ef2e85b54e3dd1d28e6f8dc7d119e973234c77cac82e775080fb9c859640d04159659a7d63941325e13e40b2814 + REF c5ae539abddcef43ef64fa130555e2d521098369 + SHA512 a1b35d2a524a23c367180574f7ddbcad73161c7fda6c3e7973273ab86092d9c6d89df28925a8e53691cd894f2d6588832604a0dbdba478557695806907bf36eb PATCHES + "${REMOVE_DYNAMIC_EXCEPTION_SPECS}" fix_cmake.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_OPENCV_CONTRIB=ON -DBUILD_EXAMPLES=OFF diff --git a/ports/dbow3/vcpkg.json b/ports/dbow3/vcpkg.json index ddd8ea3cdd205d..5e1bde4638f8fa 100644 --- a/ports/dbow3/vcpkg.json +++ b/ports/dbow3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbow3", "version": "1.0.0", - "port-version": 2, + "port-version": 3, "description": "DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation.", "homepage": "https://github.com/rmsalinas/DBow3", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 0ee4f90c7fd65a..9fef88cf2bbff5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2038,7 +2038,7 @@ }, "dbow3": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "dbus": { "baseline": "1.15.2", diff --git a/versions/d-/dbow3.json b/versions/d-/dbow3.json index 9747e1f563cd91..79c87547516365 100644 --- a/versions/d-/dbow3.json +++ b/versions/d-/dbow3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93b9dd598ac996f1dba459030964ba8fb79ae9dd", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "0942151a7555bcac51e84d94474111ca96ff5974", "version": "1.0.0", From 4c1c6da7188ad8ad27f0d8781debcb3d325195d2 Mon Sep 17 00:00:00 2001 From: ihsan demir Date: Wed, 14 Jun 2023 21:49:47 +0300 Subject: [PATCH 297/533] [hazelcast-cpp-client] Update to new released version 5.3.0 (#31983) * Updated hazelcast-cpp-client version to latest release 5.3.0. * Applied the `./vcpkg x-add-version --all` to update the version database. --- ports/hazelcast-cpp-client/portfile.cmake | 2 +- ports/hazelcast-cpp-client/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/h-/hazelcast-cpp-client.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/hazelcast-cpp-client/portfile.cmake b/ports/hazelcast-cpp-client/portfile.cmake index 0e875292c0ea46..4e4e3da5bef0f6 100644 --- a/ports/hazelcast-cpp-client/portfile.cmake +++ b/ports/hazelcast-cpp-client/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hazelcast/hazelcast-cpp-client REF "v${VERSION}" - SHA512 1e4203b546f3737e7fd2ea7a7ed04fa5b0663e7c319ed796140407d4e56d70e40eb5a9497d9f9eb7be182b038efe36f6ba1a42f10d24d3732cf54886c40db8eb + SHA512 9f6668fe88b1e10e1c91fea26acb12efab464f652d9008e43b06d92413a7bc4b66cd0ef00c0643ddf12c8d29b099cd767209a096e609fa214233dcc3288d194e HEAD_REF master ) diff --git a/ports/hazelcast-cpp-client/vcpkg.json b/ports/hazelcast-cpp-client/vcpkg.json index 76e68ef59d6c58..4f49b1c36a48f5 100644 --- a/ports/hazelcast-cpp-client/vcpkg.json +++ b/ports/hazelcast-cpp-client/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hazelcast-cpp-client", - "version": "5.2.0", + "version": "5.3.0", "description": "C++ client library for Hazelcast in-memory database.", "homepage": "https://github.com/hazelcast/hazelcast-cpp-client", "documentation": "http://hazelcast.github.io/hazelcast-cpp-client/index.html", @@ -31,7 +31,7 @@ "description": "Build examples for Hazelcast C++ client" }, "openssl": { - "description": "Build hazelcast C++ client with SSL support", + "description": "Build Hazelcast C++ client with SSL support", "dependencies": [ "openssl" ] diff --git a/versions/baseline.json b/versions/baseline.json index 9fef88cf2bbff5..3577015b25a861 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3101,7 +3101,7 @@ "port-version": 3 }, "hazelcast-cpp-client": { - "baseline": "5.2.0", + "baseline": "5.3.0", "port-version": 0 }, "hdf5": { diff --git a/versions/h-/hazelcast-cpp-client.json b/versions/h-/hazelcast-cpp-client.json index ddb757f8ed59df..c3b71d6c4f6e45 100644 --- a/versions/h-/hazelcast-cpp-client.json +++ b/versions/h-/hazelcast-cpp-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4940909398dd70e7610c314749ca143bb0c23918", + "version": "5.3.0", + "port-version": 0 + }, { "git-tree": "eda58413d2940bc24bef92485ff1fce31e2e583c", "version": "5.2.0", From bb93597802743a2bff6cb8a168746fc71a0aee30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Fr=C3=B6hlich?= Date: Wed, 14 Jun 2023 20:53:01 +0200 Subject: [PATCH 298/533] [gul14] Update to version 2.9.1 (#31981) --- ports/gul14/portfile.cmake | 4 ++-- ports/gul14/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gul14.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gul14/portfile.cmake b/ports/gul14/portfile.cmake index 7b99b7cf2a2304..1e7938536cc883 100644 --- a/ports/gul14/portfile.cmake +++ b/ports/gul14/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gul-cpp/gul14 - REF v2.8.0 - SHA512 a2a4a401f178c30e4a249905db756820aa7f4eb57901ddc4aea19490087d6eed25d7ac3ae3d52f0e296623c28b893aa5ea8ed1c6699e0505efc33c996058836c + REF v2.9.1 + SHA512 40c980f4d92a4767c4f6200e8625671b8e23ea148005518b88d394064fc371357d1d7d68f1a1a25b72b94999d4b78663b45cdcc71971c594de1be1abe2254ae5 HEAD_REF main ) diff --git a/ports/gul14/vcpkg.json b/ports/gul14/vcpkg.json index 7a7cdd003dd990..09f8c993b1ca61 100644 --- a/ports/gul14/vcpkg.json +++ b/ports/gul14/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gul14", - "version": "2.8.0", + "version": "2.9.1", "description": [ "General Utility Library for C++14.", "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.", diff --git a/versions/baseline.json b/versions/baseline.json index 3577015b25a861..0059cbf1e7c1e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3037,7 +3037,7 @@ "port-version": 0 }, "gul14": { - "baseline": "2.8.0", + "baseline": "2.9.1", "port-version": 0 }, "gumbo": { diff --git a/versions/g-/gul14.json b/versions/g-/gul14.json index 18d586e5c60073..fe02a9624c7af7 100644 --- a/versions/g-/gul14.json +++ b/versions/g-/gul14.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf7849b2344332aa6cdcbee58c03452009ec4bc", + "version": "2.9.1", + "port-version": 0 + }, { "git-tree": "ff0bf240e106cb41da3f21fba4ab9c04aa14463f", "version": "2.8.0", From 1f9118e71243dc2c9838cf95a069c281b44ce38a Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Wed, 14 Jun 2023 15:12:26 -0400 Subject: [PATCH 299/533] [asio] Update to v1.28.0 (#31978) --- ports/asio/portfile.cmake | 4 ++-- ports/asio/vcpkg.json | 5 ++--- versions/a-/asio.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index ee176cca72c9f2..bcc7244a9383a5 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-24-0 - SHA512 a5d6e597e5611b7293375965f37c09cb73e27639ebdda6163557fab8bbff2ddbb301080ad86ff7f97e8ed8454da25176385cfc43103447a4a04e35a9c41aec3e + REF asio-1-28-0 + SHA512 0d635c40a28b6427e2cb6b9c89ab53dba7d3a237df2279148ca05fa899d6f8039a131929230e5ca1dbc7477be784e3da9a6cb68456cbf194178510621556e467 HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 38c777dda3c604..d804b96022996c 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,10 +1,9 @@ { "name": "asio", - "version": "1.24.0", - "port-version": 1, + "version": "1.28.0", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", - "documentation": "https://think-async.com/Asio/asio-1.24.0/doc/", + "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/", "license": "BSL-1.0", "dependencies": [ { diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 4b1f8d3344e6af..74372bc53ea580 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7dde6674d23759f187d73d08f3bd869562a41e8d", + "version": "1.28.0", + "port-version": 0 + }, { "git-tree": "b134a3e21a2ef661aa5e3802cefc22386c095aaa", "version": "1.24.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0059cbf1e7c1e1..49f4841e0cda32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -233,8 +233,8 @@ "port-version": 0 }, "asio": { - "baseline": "1.24.0", - "port-version": 1 + "baseline": "1.28.0", + "port-version": 0 }, "asio-grpc": { "baseline": "2.5.1", From 7c4add38eed78785e111baabc7f3147b3abc4b05 Mon Sep 17 00:00:00 2001 From: Damian Vicino Date: Wed, 14 Jun 2023 15:13:34 -0400 Subject: [PATCH 300/533] Updating alpaca to latest release in github (#31949) --- ports/alpaca/portfile.cmake | 4 ++-- ports/alpaca/vcpkg.json | 2 +- versions/a-/alpaca.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/alpaca/portfile.cmake b/ports/alpaca/portfile.cmake index 78643e9bb64ea0..139d7d00152747 100644 --- a/ports/alpaca/portfile.cmake +++ b/ports/alpaca/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/alpaca - REF v0.2.0 - SHA512 0ac2c1c4f8e0534319bf852bac3852ee3674db7b1a9eda30462821ec4c9ddeeb6ceff09ef5f16eed9131af6c357a09f2cb909a12ea2f135ca7d496d90ff1865d + REF v${VERSION} + SHA512 3c61bd177f4118d8e270df24285d59e294d9eeb25daddac2d39d867188699955422fee92c875961c0fd1a77b46fe8d866310e578fd201e566e57c00539f85cfd HEAD_REF master ) diff --git a/ports/alpaca/vcpkg.json b/ports/alpaca/vcpkg.json index 9cfb77d80af111..9dcb72b8db8af4 100644 --- a/ports/alpaca/vcpkg.json +++ b/ports/alpaca/vcpkg.json @@ -1,6 +1,6 @@ { "name": "alpaca", - "version": "0.2.0", + "version": "0.2.1", "description": "Alpaca is a serialization library written in C++17 - Pack C++ structs into a compact byte-array without any macros or boilerplate code", "homepage": "https://github.com/p-ranav/alpaca", "license": "MIT", diff --git a/versions/a-/alpaca.json b/versions/a-/alpaca.json index 402a7fdb981520..cfbf6b29244342 100644 --- a/versions/a-/alpaca.json +++ b/versions/a-/alpaca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9533d25c8a1eabb24839c4ed613d10be95101b4b", + "version": "0.2.1", + "port-version": 0 + }, { "git-tree": "d8a880634d8e1b510b01820aea947721639c0d14", "version": "0.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 49f4841e0cda32..3df40cee576c87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -85,7 +85,7 @@ "port-version": 4 }, "alpaca": { - "baseline": "0.2.0", + "baseline": "0.2.1", "port-version": 0 }, "alpaka": { From 1be4527b3f30ab4fd01b621a3fc355b49b995ad0 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 14 Jun 2023 21:17:29 +0200 Subject: [PATCH 301/533] [poppler] explicitly control dependencies (#31937) * [poppler] explicitly control dependencies * Fix feature glib * version * rename feature lcms2 to cms * not all find_package calls are always reached * copy pdbs * format * version --- ports/poppler/portfile.cmake | 25 ++++++++++++++++++++++++- ports/poppler/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/p-/poppler.json | 5 +++++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 7cb2bee617227f..2686861545f812 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -16,11 +16,17 @@ set(POPPLER_PC_REQUIRES "freetype2 libjpeg libopenjp2 libpng libtiff-4 poppler-v vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cairo WITH_Cairo + cairo CMAKE_REQUIRE_FIND_PACKAGE_CAIRO curl ENABLE_LIBCURL + curl CMAKE_REQUIRE_FIND_PACKAGE_CURL private-api ENABLE_UNSTABLE_API_ABI_HEADERS zlib ENABLE_ZLIB - glib ENABLE_GLIB + zlib CMAKE_REQUIRE_FIND_PACKAGE_ZLIB + glib ENABLE_GLIB + glib CMAKE_REQUIRE_FIND_PACKAGE_GLIB qt ENABLE_QT6 + qt CMAKE_REQUIRE_FIND_PACKAGE_Qt6 + cms CMAKE_REQUIRE_FIND_PACKAGE_LCMS2 ) if("fontconfig" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") @@ -61,7 +67,23 @@ vcpkg_cmake_configure( -DRUN_GPERF_IF_PRESENT=OFF -DENABLE_RELOCATABLE=OFF # https://gitlab.freedesktop.org/poppler/poppler/-/issues/1209 -DWITH_NSS3=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_ECM=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_OpenJPEG=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_TIFF=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_Boost=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GObjectIntrospection=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GTK=ON ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GObjectIntrospection + CMAKE_DISABLE_FIND_PACKAGE_GTK + CMAKE_REQUIRE_FIND_PACKAGE_CAIRO + CMAKE_REQUIRE_FIND_PACKAGE_CURL + CMAKE_REQUIRE_FIND_PACKAGE_GLIB + CMAKE_REQUIRE_FIND_PACKAGE_LCMS2 + CMAKE_REQUIRE_FIND_PACKAGE_Qt6 ) vcpkg_cmake_install() @@ -73,6 +95,7 @@ if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/poppler.pc" "Libs:" "Requires.private: ${POPPLER_PC_REQUIRES}\nLibs:") endif() vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index a5f712a50a04c1..730c62fb4598da 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poppler", "version": "23.1.0", - "port-version": 2, + "port-version": 3, "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", @@ -38,6 +38,12 @@ } ] }, + "cms": { + "description": "Enable use of LCMS2 as color management system", + "dependencies": [ + "lcms" + ] + }, "curl": { "description": "curl for poppler", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3df40cee576c87..00d37b06c148a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6374,7 +6374,7 @@ }, "poppler": { "baseline": "23.1.0", - "port-version": 2 + "port-version": 3 }, "popsift": { "baseline": "0.9", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 0e45ad338a965f..83cdcbac2389a8 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b2c553e564102940f72ca3c649d651dc8807848", + "version": "23.1.0", + "port-version": 3 + }, { "git-tree": "57de7768cd6196be9140b0d59d19444586b5dfc3", "version": "23.1.0", From 146797a23bd0076bb752670b0632c701acc92232 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 15 Jun 2023 03:31:04 +0800 Subject: [PATCH 302/533] [hiredis] update to 1.1.0 (#31894) * [hiredis] update to 1.1.0 * update version * revert patch format * update version * fix deps * fix deps * fix-duplicate * fix dependency * fix deps * fix portfile * fix deps * why os fail * delete nouse patch * CI [skip actions] * CI [skip actions] * CI [skip actions] * split patch * forget delete one line * forget delete one line * fix example * Revert "fix example" This reverts commit 282f8af68180ddae9d3ee198f36091363e436b0f. * CI [skip actions] * CI [skip actions] * CI [skip actions] * CI [skip actions] * CI [skip actions] * CI [skip actions] * CI [skip actions] * CI * fix deps * CI * fix deps * fix deps --------- Co-authored-by: Jonliu1993 <13720414433@163.com> --- .../hiredis/fix-cmake-conf-install-dir.patch | 22 ++++++++ ports/hiredis/fix-feature-example.patch | 54 ------------------- ports/hiredis/fix-pdb-install.patch | 22 ++++++++ ports/hiredis/portfile.cmake | 17 +++--- ports/hiredis/support-static.patch | 46 ++++++++++++++-- ports/hiredis/vcpkg.json | 11 +--- versions/baseline.json | 4 +- versions/h-/hiredis.json | 5 ++ 8 files changed, 101 insertions(+), 80 deletions(-) create mode 100644 ports/hiredis/fix-cmake-conf-install-dir.patch delete mode 100644 ports/hiredis/fix-feature-example.patch create mode 100644 ports/hiredis/fix-pdb-install.patch diff --git a/ports/hiredis/fix-cmake-conf-install-dir.patch b/ports/hiredis/fix-cmake-conf-install-dir.patch new file mode 100644 index 00000000000000..e1451d45ac8c6a --- /dev/null +++ b/ports/hiredis/fix-cmake-conf-install-dir.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fca0ee8..b67888e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,7 +134,7 @@ export(EXPORT hiredis-targets + if(WIN32) + SET(CMAKE_CONF_INSTALL_DIR share/hiredis) + else() +- SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis) ++ SET(CMAKE_CONF_INSTALL_DIR share/hiredis) + endif() + SET(INCLUDE_INSTALL_DIR include) + include(CMakePackageConfigHelpers) +@@ -216,7 +216,7 @@ IF(ENABLE_SSL) + if(WIN32) + SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl) + else() +- SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis_ssl) ++ SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl) + endif() + configure_package_config_file(hiredis_ssl-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake + INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR} diff --git a/ports/hiredis/fix-feature-example.patch b/ports/hiredis/fix-feature-example.patch deleted file mode 100644 index bff713d2225e3b..00000000000000 --- a/ports/hiredis/fix-feature-example.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index dd3a313..8c69d3a 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -19,16 +19,16 @@ if (LIBEV) - TARGET_LINK_LIBRARIES(example-libev hiredis ev) - ENDIF() - --FIND_PATH(LIBEVENT event.h) --if (LIBEVENT) -+find_package(Libevent CONFIG REQUIRED) -+if (1) - ADD_EXECUTABLE(example-libevent example-libevent) -- TARGET_LINK_LIBRARIES(example-libevent hiredis event) -+ TARGET_LINK_LIBRARIES(example-libevent hiredis libevent::core) - ENDIF() - --FIND_PATH(LIBUV uv.h) --IF (LIBUV) -+find_package(libuv CONFIG REQUIRED) -+IF (1) - ADD_EXECUTABLE(example-libuv example-libuv.c) -- TARGET_LINK_LIBRARIES(example-libuv hiredis uv) -+ TARGET_LINK_LIBRARIES(example-libuv hiredis $,uv_a,uv>) - ENDIF() - - IF (APPLE) -@@ -38,12 +52,24 @@ IF (APPLE) - ENDIF() - - IF (ENABLE_SSL) -+ FIND_PACKAGE(OpenSSL REQUIRED) -+ IF (WIN32) -+ FIND_PACKAGE(pthreads REQUIRED) -+ SET(THREADS_LIBS PThreads4W::PThreads4W) -+ ELSE() -+ FIND_PACKAGE(Threads) -+ SET(THREADS_LIBS ${CMAKE_THREAD_LIBS_INIT}) -+ ENDIF() - ADD_EXECUTABLE(example-ssl example-ssl.c) -- TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl) -+ if(WIN32) -+ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS} crypt32.lib) -+ else() -+ TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl OpenSSL::SSL OpenSSL::Crypto ${THREADS_LIBS}) -+ endif() - ENDIF() - - ADD_EXECUTABLE(example example.c) --TARGET_LINK_LIBRARIES(example hiredis) -+TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBRARIES}) - - ADD_EXECUTABLE(example-push example-push.c) - TARGET_LINK_LIBRARIES(example-push hiredis) diff --git a/ports/hiredis/fix-pdb-install.patch b/ports/hiredis/fix-pdb-install.patch new file mode 100644 index 00000000000000..6ce20c802d055f --- /dev/null +++ b/ports/hiredis/fix-pdb-install.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d175f0a..fca0ee8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ INSTALL(TARGETS hiredis + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +-if (MSVC) ++if (MSVC AND BUILD_SHARED_LIBS) + INSTALL(FILES $ + DESTINATION ${CMAKE_INSTALL_BINDIR} + CONFIGURATIONS Debug RelWithDebInfo) +@@ -197,7 +197,7 @@ IF(ENABLE_SSL) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +- if (MSVC) ++ if (MSVC AND BUILD_SHARED_LIBS) + INSTALL(FILES $ + DESTINATION ${CMAKE_INSTALL_BINDIR} + CONFIGURATIONS Debug RelWithDebInfo) diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 0eb8f9b566f460..073a132e152594 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -1,30 +1,27 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(HIREDIS_PATCHES support-static.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redis/hiredis - REF v1.0.2 - SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b + REF "v${VERSION}" + SHA512 9dad012c144ed24de6aa413a3a10d19a9d0d9ece18dbc388406cd86c5b98cb66c76c586cb559c601ed13a75051d8921dc2882534cc3605513fde47d57276c3bb HEAD_REF master PATCHES - fix-feature-example.patch fix-timeval.patch - fix-include-path.patch fix-ssize_t.patch - ${HIREDIS_PATCHES} + support-static.patch + fix-pdb-install.patch + fix-cmake-conf-install-dir.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ssl ENABLE_SSL - example ENABLE_EXAMPLES ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DENABLE_EXAMPLES=OFF + -DDISABLE_TESTS=ON ) vcpkg_cmake_install() diff --git a/ports/hiredis/support-static.patch b/ports/hiredis/support-static.patch index 47ea4bef666f00..009c5a9d82ca70 100644 --- a/ports/hiredis/support-static.patch +++ b/ports/hiredis/support-static.patch @@ -1,17 +1,55 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e78894..87aba5b 100644 +index 3d52d0c..d175f0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,4 +22,4 @@ PROJECT(hiredis VERSION "${VERSION}") +@@ -44,14 +44,13 @@ IF(WIN32) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN) ENDIF() -ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) +ADD_LIBRARY(hiredis ${hiredis_sources}) + ADD_LIBRARY(hiredis_static STATIC ${hiredis_sources}) ++SET_TARGET_PROPERTIES(hiredis_static PROPERTIES EXCLUDE_FROM_ALL TRUE) + ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) + ADD_LIBRARY(hiredis::hiredis_static ALIAS hiredis_static) -@@ -60,5 +60,5 @@ IF(ENABLE_SSL) - SET(hiredis_ssl_sources + IF(NOT MSVC) +- SET_TARGET_PROPERTIES(hiredis_static +- PROPERTIES OUTPUT_NAME hiredis) + ENDIF() + + SET_TARGET_PROPERTIES(hiredis +@@ -103,7 +102,7 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV ON) + + include(CPack) + +-INSTALL(TARGETS hiredis hiredis_static ++INSTALL(TARGETS hiredis + EXPORT hiredis-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -161,13 +160,12 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources ssl.c) - ADD_LIBRARY(hiredis_ssl SHARED + ADD_LIBRARY(hiredis_ssl ${hiredis_ssl_sources}) + ADD_LIBRARY(hiredis_ssl_static STATIC + ${hiredis_ssl_sources}) ++ SET_TARGET_PROPERTIES(hiredis_ssl_static PROPERTIES EXCLUDE_FROM_ALL TRUE) + IF(NOT MSVC) +- SET_TARGET_PROPERTIES(hiredis_ssl_static +- PROPERTIES OUTPUT_NAME hiredis_ssl) + ENDIF() + + IF (APPLE) +@@ -193,7 +191,7 @@ IF(ENABLE_SSL) + ENDIF() + CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY) +- INSTALL(TARGETS hiredis_ssl hiredis_ssl_static ++ INSTALL(TARGETS hiredis_ssl + EXPORT hiredis_ssl-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 8e0ecadab0a018..d0583174d06b71 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hiredis", - "version": "1.0.2", - "port-version": 5, + "version": "1.1.0", "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", "license": "BSD-3-Clause", @@ -16,14 +15,6 @@ } ], "features": { - "example": { - "description": "Build example", - "dependencies": [ - "libevent", - "libuv", - "pthread" - ] - }, "ssl": { "description": "Build hiredis_ssl for SSL support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 00d37b06c148a0..3b1ece5cf67c30 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3149,8 +3149,8 @@ "port-version": 0 }, "hiredis": { - "baseline": "1.0.2", - "port-version": 5 + "baseline": "1.1.0", + "port-version": 0 }, "hnswlib": { "baseline": "0.7.0", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index f121db33c680c7..244958e539f1fb 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "863fe622cf3050ab1722a81950283e9a354da473", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "413b1dbea0dd87e4a12a646ba12411d319e5bf38", "version": "1.0.2", From 3056fed522595f00a95b6fd8ea7427da91e5edda Mon Sep 17 00:00:00 2001 From: endingly Date: Thu, 15 Jun 2023 03:35:23 +0800 Subject: [PATCH 303/533] [games101-cgl] new port (#31831) * [games101-cgl] new port * [games101-cgl] update version file * [games101-cgl] update version dataset * Updated the logic for installing the source code repository * Updated the logic for installing the source code repository * Update ports/games101-cgl/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * modify installation behavior * add git-tree id * Update version database * add usage * modify download hash * update version data --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/games101-cgl/portfile.cmake | 21 +++++++++++++++++++++ ports/games101-cgl/usage | 7 +++++++ ports/games101-cgl/vcpkg.json | 21 +++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/games101-cgl.json | 9 +++++++++ 5 files changed, 62 insertions(+) create mode 100644 ports/games101-cgl/portfile.cmake create mode 100644 ports/games101-cgl/usage create mode 100644 ports/games101-cgl/vcpkg.json create mode 100644 versions/g-/games101-cgl.json diff --git a/ports/games101-cgl/portfile.cmake b/ports/games101-cgl/portfile.cmake new file mode 100644 index 00000000000000..708d56b62736fd --- /dev/null +++ b/ports/games101-cgl/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO endingly/games101-cgl + REF v${VERSION} + SHA512 609bc549a5bb20254fa8ae8a765b688352d017bf4f1fa278385b534da3c75eb81fc893dd1736db7efd0ab13c62de3597ccb678a3c2a6f31c0ee6549f6d5c9f3d + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/games101-cgl/usage b/ports/games101-cgl/usage new file mode 100644 index 00000000000000..77f4156d822b44 --- /dev/null +++ b/ports/games101-cgl/usage @@ -0,0 +1,7 @@ +The package games101-cgl provides CMake targets: + + find_package(games101-cgl CONFIG REQUIRED) + target_link_libraries(main PRIVATE games101-cgl) + + And include header file like: + #include diff --git a/ports/games101-cgl/vcpkg.json b/ports/games101-cgl/vcpkg.json new file mode 100644 index 00000000000000..d17b44b8f89b0b --- /dev/null +++ b/ports/games101-cgl/vcpkg.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "games101-cgl", + "version": "0.1.0", + "description": "The package is for Games101's homework8 subproject.", + "homepage": "https://github.com/endingly/games101-cgl", + "license": "MIT", + "dependencies": [ + "freetype", + "glew", + "glfw3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 3b1ece5cf67c30..9a242003511fd8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2708,6 +2708,10 @@ "baseline": "1.4.1", "port-version": 1 }, + "games101-cgl": { + "baseline": "0.1.0", + "port-version": 0 + }, "gamma": { "baseline": "gamma-2018-01-27", "port-version": 6 diff --git a/versions/g-/games101-cgl.json b/versions/g-/games101-cgl.json new file mode 100644 index 00000000000000..ae210f8545a00a --- /dev/null +++ b/versions/g-/games101-cgl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "976ee066a06bc29768e1fd575da2e7d622cf6465", + "version": "0.1.0", + "port-version": 0 + } + ] +} From 2774d2bd27b05bf7f94d6f7b341d5d703ad93c5e Mon Sep 17 00:00:00 2001 From: Michael MIGLIORE Date: Wed, 14 Jun 2023 21:39:27 +0200 Subject: [PATCH 304/533] [usd] Improve CMake and fix Linux (#31807) Co-authored-by: Zhao Liu --- ports/usd/portfile.cmake | 69 +++++++++++++++++++++------------------- ports/usd/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/usd.json | 5 +++ 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index 7ba53a44444b27..854ddb23f1be85 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) message(STATUS [=[ -The usd port does not work the the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines, +The usd port does not work with the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines, and does not expect to be updated to work with current versions soon. See https://github.com/PixarAnimationStudios/USD/issues/1600 @@ -43,6 +43,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +# The CMake files installation is not standard in USD and will install pxrConfig.cmake in the prefix root and +# pxrTargets.cmake in "cmake" so we are moving pxrConfig.cmake in the same folder and patch the path to pxrTargets.cmake +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/pxrConfig.cmake "/cmake/pxrTargets.cmake" "/pxrTargets.cmake") + file( RENAME "${CURRENT_PACKAGES_DIR}/pxrConfig.cmake" @@ -50,39 +54,40 @@ file( vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME pxr) -vcpkg_copy_pdbs() - # Remove duplicates in debug folder file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/pxrConfig.cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# Move all dlls to bin -file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) -file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) -foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL}) - string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM}) - file(RENAME ${CURRENT_FROM} ${CURRENT_TO}) -endforeach() - -function(file_replace_regex filename match_string replace_string) - file(READ ${filename} _contents) - string(REGEX REPLACE "${match_string}" "${replace_string}" _contents "${_contents}") - file(WRITE ${filename} "${_contents}") -endfunction() - -# fix dll path for cmake -file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrConfig.cmake "/cmake/pxrTargets.cmake" "/pxrTargets.cmake") -file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll") -file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll") - -# fix plugInfo.json for runtime -file(GLOB_RECURSE PLUGINFO_FILES ${CURRENT_PACKAGES_DIR}/lib/usd/*/resources/plugInfo.json) -file(GLOB_RECURSE PLUGINFO_FILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/usd/*/resources/plugInfo.json) -foreach(PLUGINFO ${PLUGINFO_FILES} ${PLUGINFO_FILES_DEBUG}) - file_replace_regex(${PLUGINFO} [=["LibraryPath": "../../([a-zA-Z0-9_]+).dll"]=] [=["LibraryPath": "../../../bin/\1.dll"]=]) -endforeach() +vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE.txt) + +if(VCPKG_TARGET_IS_WINDOWS) + # Move all dlls to bin + file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL}) + string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM}) + file(RENAME ${CURRENT_FROM} ${CURRENT_TO}) + endforeach() + + vcpkg_copy_pdbs() + + function(file_replace_regex filename match_string replace_string) + file(READ ${filename} _contents) + string(REGEX REPLACE "${match_string}" "${replace_string}" _contents "${_contents}") + file(WRITE ${filename} "${_contents}") + endfunction() + + # fix dll path for cmake + file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-debug.cmake "debug/lib/([a-zA-Z0-9_]+)\\.dll" "debug/bin/\\1.dll") + file_replace_regex(${CURRENT_PACKAGES_DIR}/share/pxr/pxrTargets-release.cmake "lib/([a-zA-Z0-9_]+)\\.dll" "bin/\\1.dll") + + # fix plugInfo.json for runtime + file(GLOB_RECURSE PLUGINFO_FILES ${CURRENT_PACKAGES_DIR}/lib/usd/*/resources/plugInfo.json) + file(GLOB_RECURSE PLUGINFO_FILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/usd/*/resources/plugInfo.json) + foreach(PLUGINFO ${PLUGINFO_FILES} ${PLUGINFO_FILES_DEBUG}) + file_replace_regex(${PLUGINFO} [=["LibraryPath": "../../([a-zA-Z0-9_]+).dll"]=] [=["LibraryPath": "../../../bin/\1.dll"]=]) + endforeach() +endif() diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index 5cd95382f3029f..be8e363dfa4bc5 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "usd", "version": "23.5", - "port-version": 1, + "port-version": 2, "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 9a242003511fd8..8d246b92eb0acf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8294,7 +8294,7 @@ }, "usd": { "baseline": "23.5", - "port-version": 1 + "port-version": 2 }, "usockets": { "baseline": "0.8.6", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 5ca746912cc955..9a872953e7f54e 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5cb814be5a5aec9d600aeb98cd2126f407ca062", + "version": "23.5", + "port-version": 2 + }, { "git-tree": "cfe836715c8cf43db76006deffa234cecf77745c", "version": "23.5", From 382746822d965898c3574479e10a480f9c7a51a1 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 15 Jun 2023 03:50:43 +0800 Subject: [PATCH 305/533] [matplotplusplus,nodesoup] update to v1.2.0,add new port (#31796) * [matplotplusplus] update to 2023-02-17 * [matplotplusplus] fix installation of matplot_opengl * [matplotplusplus] remove the opengl patch as it merged upstream * [matplotplusplus] try to fix filesystem for osx * fix deps * fix deps * fix deps * [matplotplusplus]: update to v1.2.0 * fix deps * disable sanitizer * fix opengl feature * fix-dependencies * [nodesoup]: add new port * nodesoup * fix deps * fix nodesoup namespace * fix deps * fix deps * fix * fix * fix deps * fix deps * fix deps * fix deps --------- Co-authored-by: Amin Yahyaabadi --- ports/matplotplusplus/fix-dependencies.patch | 140 +++++++++++++++++- .../install-3rd-libraries.patch | 15 -- ports/matplotplusplus/portfile.cmake | 24 +-- ports/matplotplusplus/usage | 4 + ports/matplotplusplus/vcpkg.json | 4 +- ports/nodesoup/fix-cmakelists.patch | 28 ++++ ports/nodesoup/portfile.cmake | 27 ++++ ports/nodesoup/usage | 4 + ports/nodesoup/vcpkg.json | 16 ++ versions/baseline.json | 8 +- versions/m-/matplotplusplus.json | 5 + versions/n-/nodesoup.json | 9 ++ 12 files changed, 251 insertions(+), 33 deletions(-) delete mode 100644 ports/matplotplusplus/install-3rd-libraries.patch create mode 100644 ports/matplotplusplus/usage create mode 100644 ports/nodesoup/fix-cmakelists.patch create mode 100644 ports/nodesoup/portfile.cmake create mode 100644 ports/nodesoup/usage create mode 100644 ports/nodesoup/vcpkg.json create mode 100644 versions/n-/nodesoup.json diff --git a/ports/matplotplusplus/fix-dependencies.patch b/ports/matplotplusplus/fix-dependencies.patch index 89ef9fba8180bd..7a7f48f126e3d8 100644 --- a/ports/matplotplusplus/fix-dependencies.patch +++ b/ports/matplotplusplus/fix-dependencies.patch @@ -1,8 +1,81 @@ +diff --git a/Matplot++Config.cmake.in b/Matplot++Config.cmake.in +index fc9ceca..1601015 100644 +--- a/Matplot++Config.cmake.in ++++ b/Matplot++Config.cmake.in +@@ -1,4 +1,5 @@ + @PACKAGE_INIT@ ++include(CMakeFindDependencyMacro) + + # How this Matplot++ installation was built + set(MATPLOT_BUILT_SHARED "@MATPLOTPP_BUILD_SHARED_LIBS@") +@@ -10,12 +11,44 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL MATPLOT_BUILT_CXX_COMPILER_ID) + message(WARNING "This installation of Matplot++ was built with ${MATPLOT_BUILT_CXX_COMPILER_ID}.") + endif() + ++if ("@MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND@") ++ find_dependency(glad CONFIG) ++ find_dependency(glfw3 CONFIG) ++endif() ++find_dependency(nodesoup CONFIG ) ++if ("@WITH_JPEG@") ++find_dependency(JPEG) ++endif() ++ ++if ("@WITH_TIFF@") ++find_dependency(TIFF) ++endif() ++ ++if ("@WITH_ZLIB@") ++find_dependency(ZLIB) ++find_dependency(libpng CONFIG) ++endif() ++ ++if ("@WITH_LAPACK@") ++find_dependency(LAPACK) ++endif() ++ ++if ("@WITH_BLAS@") ++find_dependency(BLAS) ++endif() ++ ++if ("@WITH_FFTW3@") ++find_dependency(FFTW3 CONFIG) ++endif() ++ ++if ("@WITH_OPENCV@") ++find_dependency(OpenCV CONFIG) ++endif() ++ + # Find dependencies + if(NOT ${MATPLOT_BUILT_SHARED}) +- include(CMakeFindDependencyMacro) + list(APPEND CMAKE_MODULE_PATH ${MATPLOT_CONFIG_INSTALL_DIR}) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") +- find_dependency(Filesystem COMPONENTS Experimental Final) + list(POP_BACK CMAKE_MODULE_PATH) + endif() + diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt -index ab58bbd..f9fed7e 100644 +index b5656e1..7ff4046 100644 --- a/source/3rd_party/CMakeLists.txt +++ b/source/3rd_party/CMakeLists.txt -@@ -67,57 +67,69 @@ find_package(PkgConfig) +@@ -1,6 +1,7 @@ + ####################################################### + ### NodeSoup ### + ####################################################### ++if(0) + if(WITH_SYSTEM_NODESOUP) + find_path(NODESOUP_INCLUDE_DIR nodesoup.hpp REQUIRED) + find_library(NODESOUP_LIB nodesoup REQUIRED) +@@ -47,6 +48,7 @@ if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++) + endif() + ++endif() + + ####################################################### + ### CImg ### +@@ -69,57 +71,69 @@ find_package(PkgConfig) # Lots of optional packages are not a good idea in general. # It makes the library much less "packagable" (https://youtu.be/sBP17HQAQjk) # and much more difficult to make sure it works on multiple OSs @@ -94,3 +167,66 @@ index ab58bbd..f9fed7e 100644 endif() else() message("No CMAKE_MODULE_PATH path for OpenCV configured") +diff --git a/source/matplot/CMakeLists.txt b/source/matplot/CMakeLists.txt +index fe9ad53..b06ed7e 100644 +--- a/source/matplot/CMakeLists.txt ++++ b/source/matplot/CMakeLists.txt +@@ -1,5 +1,4 @@ + if(NOT MINGW) +-find_package(Filesystem REQUIRED COMPONENTS Experimental Final) + endif() + + ####################################################### +@@ -102,12 +101,13 @@ target_include_directories(matplot + $) + + # Dependencies ++find_package(nodesoup CONFIG REQUIRED) + if(NOT MINGW) +-target_link_libraries_system(matplot +- PRIVATE cimg nodesoup std::filesystem) ++target_link_libraries(matplot ++ PRIVATE cimg nodesoup::nodesoup) + else() +-target_link_libraries_system(matplot +- PRIVATE cimg nodesoup) ++target_link_libraries(matplot ++ PRIVATE cimg nodesoup::nodesoup) + endif() + + # Required compiler features required +@@ -134,7 +134,6 @@ maybe_target_pedantic_warnings(matplot) + # Use experimental filesystem if std::filesystem is not available yet + if(NOT MINGW) + if (CXX_FILESYSTEM_IS_EXPERIMENTAL) +- target_compile_definitions(matplot PRIVATE CXX_FILESYSTEM_IS_EXPERIMENTAL) + endif() + endif() + # Some hack to not depend on FILE* internals +@@ -217,7 +216,7 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND) + find_package(OpenGL REQUIRED) + + # https://github.com/Dav1dde/glad +- find_package(GLAD QUIET) ++ find_package(GLAD name glad CONFIG REQUIRED) + if (NOT GLAD_FOUND AND NOT TARGET glad) + # Use CPM only if not found, to avoid ODR violations + # find_package(GLAD REQUIRE) would suffice if it worked well +@@ -233,7 +232,7 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND) + endif () + + # https://github.com/glfw/glfw +- find_package(glfw3 QUIET) ++ find_package(GLFW3 name glfw3 CONFIG REQUIRED) + if (NOT GLFW3_FOUND AND NOT TARGET glfw) + # Use CPM only if not found, to avoid ODR violations + # find_package(glfw3 REQUIRE) would suffice if it worked well +@@ -247,7 +246,7 @@ if (MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND) + backend/opengl.h + backend/opengl.cpp + ) +- target_link_libraries(matplot_opengl PUBLIC matplot glad glfw ${CMAKE_DL_LIBS}) ++ target_link_libraries(matplot_opengl PUBLIC matplot glad::glad glfw ${CMAKE_DL_LIBS}) + + list(APPEND TARGETS matplot_opengl) + endif() diff --git a/ports/matplotplusplus/install-3rd-libraries.patch b/ports/matplotplusplus/install-3rd-libraries.patch deleted file mode 100644 index d4b139b58d2aa8..00000000000000 --- a/ports/matplotplusplus/install-3rd-libraries.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/source/3rd_party/CMakeLists.txt b/source/3rd_party/CMakeLists.txt -index bef0c08..e7521a7 100644 ---- a/source/3rd_party/CMakeLists.txt -+++ b/source/3rd_party/CMakeLists.txt -@@ -41,7 +41,9 @@ endif() - if(MASTER_PROJECT AND NOT BUILD_SHARED_LIBS) - install(TARGETS nodesoup - EXPORT Matplot++Targets -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/Matplot++) -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - endif() - - diff --git a/ports/matplotplusplus/portfile.cmake b/ports/matplotplusplus/portfile.cmake index 155d0738498244..5531f19ad0c60c 100644 --- a/ports/matplotplusplus/portfile.cmake +++ b/ports/matplotplusplus/portfile.cmake @@ -9,18 +9,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alandefreitas/matplotplusplus - REF 36d8dc6c3b94b7a71c4f129763f2c6ad8fc0b54a - SHA512 ac8902e953a2a9f6bd62e14e2eb0bd42e407bae6c0b2921ad16ce547e4921ba2c8d8a9cc68e75831676dce3cd89cdf8294862710e838510b68e20f8a6cdf806f + REF "v${VERSION}" + SHA512 9193381fd9d4925259f28a03da33231b3da1273237e7510b93da1ca076610455746feb4ea0d8aa9a4a9e46a5f5f344fc1322f7ffc57963837dbe8b0be0b811ac HEAD_REF master PATCHES - install-3rd-libraries.patch # Remove this patch when nodesoup is added in vcpkg - fix-dependencies.patch + fix-dependencies.patch ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - opengl BUILD_EXPERIMENTAL_OPENGL_BACKEND + opengl MATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND jpeg WITH_JPEG tiff WITH_TIFF zlib WITH_ZLIB @@ -33,14 +32,14 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DCPM_USE_LOCAL_PACKAGES=ON - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=OFF - -DBUILD_INSTALLER=ON - -DBUILD_PACKAGE=OFF - -DBUILD_WITH_PEDANTIC_WARNINGS=OFF + -DMATPLOTPP_BUILD_EXAMPLES=OFF + -DMATPLOTPP_BUILD_TESTS=OFF + -DMATPLOTPP_BUILD_INSTALLER=ON + -DMATPLOTPP_BUILD_PACKAGE=OFF + -DMATPLOTPP_BUILD_WITH_PEDANTIC_WARNINGS=OFF -DWITH_SYSTEM_CIMG=ON - -DBUILD_HIGH_RESOLUTION_WORLD_MAP=${BUILD_WORLD_MAP} + -DMATPLOTPP_BUILD_HIGH_RESOLUTION_WORLD_MAP=${BUILD_WORLD_MAP} + -DMATPLOTPP_BUILD_WITH_SANITIZERS=OFF ) vcpkg_cmake_install() @@ -52,3 +51,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME matplot++ CONFIG_PATH lib/cmake/Matplot++) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/matplotplusplus/") diff --git a/ports/matplotplusplus/usage b/ports/matplotplusplus/usage new file mode 100644 index 00000000000000..75a127b3ae5dce --- /dev/null +++ b/ports/matplotplusplus/usage @@ -0,0 +1,4 @@ +The package matplotplusplus provides CMake targets: + + find_package(Matplot++ CONFIG REQUIRED) + target_link_libraries(main PRIVATE Matplot++::cimg Matplot++::matplot) diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json index dce9fa30f52ba6..cd8242c255702d 100644 --- a/ports/matplotplusplus/vcpkg.json +++ b/ports/matplotplusplus/vcpkg.json @@ -1,13 +1,13 @@ { "name": "matplotplusplus", - "version-date": "2021-04-11", - "port-version": 6, + "version": "1.2.0", "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", "supports": "!uwp & !(windows & arm)", "dependencies": [ "cimg", + "nodesoup", { "name": "vcpkg-cmake", "host": true diff --git a/ports/nodesoup/fix-cmakelists.patch b/ports/nodesoup/fix-cmakelists.patch new file mode 100644 index 00000000000000..6ea933f570ba59 --- /dev/null +++ b/ports/nodesoup/fix-cmakelists.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be6aa9d..26e59f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,7 +34,7 @@ install( + ARCHIVE DESTINATION lib + INCLUDES + DESTINATION include +- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nodesoup) ++ PUBLIC_HEADER DESTINATION include) + + include(CMakePackageConfigHelpers) + write_basic_package_version_file( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index dbd43b9..44164c9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -5,7 +5,9 @@ add_library(nodesoup::nodesoup ALIAS nodesoup) + target_include_directories( + nodesoup + PUBLIC $ +- PRIVATE $) ++ $ ++ PRIVATE $ ++) + + target_compile_features(nodesoup PUBLIC cxx_std_14) + diff --git a/ports/nodesoup/portfile.cmake b/ports/nodesoup/portfile.cmake new file mode 100644 index 00000000000000..65f53532001ac6 --- /dev/null +++ b/ports/nodesoup/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO olvb/nodesoup + REF 3158ad082bb0cd1abee75418b12b35522dbca74f + SHA512 be98cd5a1106fb1b6e6cb6b880229f590c2d4c4cc176dcceb2e2226ff3f2344ccb4510fb3a0911e9329701af50f076ee2efb9a3afc9e985b4d9c3fb92c12102d + HEAD_REF master + PATCHES + fix-cmakelists.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_DEMO=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_cmake_config_fixup(PACKAGE_NAME nodesoup CONFIG_PATH lib/cmake/nodesoup) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nodesoup/" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nodesoup/") diff --git a/ports/nodesoup/usage b/ports/nodesoup/usage new file mode 100644 index 00000000000000..652f4dfda32c6d --- /dev/null +++ b/ports/nodesoup/usage @@ -0,0 +1,4 @@ +The package nodesoup provides CMake targets: + + find_package(nodesoup CONFIG REQUIRED) + target_link_libraries(main PRIVATE nodesoup::nodesoup) diff --git a/ports/nodesoup/vcpkg.json b/ports/nodesoup/vcpkg.json new file mode 100644 index 00000000000000..3b7951ddac7cad --- /dev/null +++ b/ports/nodesoup/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nodesoup", + "version-date": "2023-06-12", + "description": "Force-directed graph layout with Fruchterman-Reingold", + "license": "Unlicense", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8d246b92eb0acf..c8133b8aef5ebd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5177,8 +5177,8 @@ "port-version": 2 }, "matplotplusplus": { - "baseline": "2021-04-11", - "port-version": 6 + "baseline": "1.2.0", + "port-version": 0 }, "matroska": { "baseline": "1.7.1", @@ -5692,6 +5692,10 @@ "baseline": "1.0.0", "port-version": 1 }, + "nodesoup": { + "baseline": "2023-06-12", + "port-version": 0 + }, "nonius": { "baseline": "2019-04-20", "port-version": 4 diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json index 8dc2b38c290633..587c8a330f0262 100644 --- a/versions/m-/matplotplusplus.json +++ b/versions/m-/matplotplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e65bffccaa1a5061002c38b7bdf6a0e464caf39", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "8554ae7ec807245bdcd27b44ddebd39608edfe53", "version-date": "2021-04-11", diff --git a/versions/n-/nodesoup.json b/versions/n-/nodesoup.json new file mode 100644 index 00000000000000..9b2e2fabf40687 --- /dev/null +++ b/versions/n-/nodesoup.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "43d30f8e5e0cd4b45a590027d0c9ea5036f0ba40", + "version-date": "2023-06-12", + "port-version": 0 + } + ] +} From 414124abc90cdb85d7abcd328bafaebb2a32bbdb Mon Sep 17 00:00:00 2001 From: Billy Richardson Date: Wed, 14 Jun 2023 13:53:09 -0700 Subject: [PATCH 306/533] Fix broken documentation links in readme (#32009) --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 66518bc8b8d8c1..a59eca8755d7e7 100644 --- a/README.md +++ b/README.md @@ -252,7 +252,7 @@ This will still allow people to not use vcpkg, by passing the `CMAKE_TOOLCHAIN_FILE` directly, but it will make the configure-build step slightly easier. -[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages.md +[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools @@ -282,9 +282,9 @@ depending on the shell you use, then restart your console. # Examples See the [documentation](https://learn.microsoft.com/vcpkg) for specific walkthroughs, -including [installing and using a package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages.md), -[adding a new package from a zipfile](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles.md), -and [adding a new package from a GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos.md). +including [installing and using a package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages), +[adding a new package from a zipfile](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles), +and [adding a new package from a GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos). Our docs are now also available online at our website https://vcpkg.io/. We really appreciate any and all feedback! You can submit an issue in https://github.com/vcpkg/vcpkg.github.io/issues. @@ -323,7 +323,7 @@ by the original developers of those libraries, and download source code and buil official distribution locations. For use behind a firewall, the specific access needed will depend on which ports are being installed. If you must install in in an "air gapped" environment, consider installing once in a non-"air gapped" environment, populating an -[asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching.md) shared with the otherwise "air gapped" environment. +[asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching) shared with the otherwise "air gapped" environment. # Telemetry From ef153db9bc7a7426739b0ff01f156d66a0623426 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Jun 2023 16:23:40 -0700 Subject: [PATCH 307/533] [thor] Update to current master (#32001) This is necessary to build on Ubuntu 22.04 because it includes https://github.com/Bromeon/Thor/commit/d5e641d86b964c4c9294fdf515811f755ccfbd77 --- ports/thor/fix-dependency-sfml.patch | 30 ++++++---------------------- ports/thor/portfile.cmake | 30 ++++++++++++++++++---------- ports/thor/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/thor.json | 5 +++++ 5 files changed, 33 insertions(+), 39 deletions(-) diff --git a/ports/thor/fix-dependency-sfml.patch b/ports/thor/fix-dependency-sfml.patch index 8b6fb09daef902..2ebe6f219c2fca 100644 --- a/ports/thor/fix-dependency-sfml.patch +++ b/ports/thor/fix-dependency-sfml.patch @@ -1,31 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03536be..abcff44 100644 +index 352fea9..01c1695 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -115,11 +115,10 @@ set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules/;${CMAKE_MODULE_PATH +@@ -111,7 +111,7 @@ endif() if(NOT THOR_SHARED_LIBS) set(SFML_STATIC_LIBRARIES TRUE) endif() --find_package(SFML 2 COMPONENTS audio graphics window system) -+find_package(SFML COMPONENTS system window graphics CONFIG REQUIRED) -+set(SFML_LIBRARIES sfml-system sfml-network sfml-graphics sfml-window) - --if(SFML_FOUND) -- include_directories(${SFML_INCLUDE_DIR}) --else() -+if(0) - set(SFML_ROOT "" CACHE PATH "SFML top-level directory") - message("\n-> SFML directory not found. Set SFML_ROOT to SFML's top-level path (containing \"include\" and \"lib\" directories).") - message("-> Make sure the SFML libraries with the same configuration (Release/Debug, Static/Dynamic) exist.\n") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 75e118e..0f90ac8 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -72,6 +72,7 @@ else() - add_library(${THOR_LIB} STATIC ${THOR_SRC}) - set_target_properties(${THOR_LIB} PROPERTIES DEBUG_POSTFIX -s-d) - set_target_properties(${THOR_LIB} PROPERTIES RELEASE_POSTFIX -s) -+ thor_link_sfml(${THOR_LIB}) - endif() - +-find_package(SFML 2.5 COMPONENTS audio graphics window system REQUIRED) ++find_package(SFML COMPONENTS audio graphics window system CONFIG REQUIRED) + if(NOT SFML_FOUND) + set(SFML_DIR "" CACHE PATH "SFML top-level directory") diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake index c45ca4297e3074..780c42dfcbf883 100644 --- a/ports/thor/portfile.cmake +++ b/ports/thor/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Bromeon/Thor - REF v2.0 - SHA512 634fa5286405d9a8a837c082ace98bbb02e609521418935855b9e2fcad57003dbe35088bd771cf6a9292e55d3787f7e463d7a4cca0d0f007509de2520d9a8cf9 - HEAD_REF master - PATCHES fix-dependency-sfml.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO Bromeon/Thor + REF 3e320cb52606f0b44fd9d2bb272b3cb6d01d7f20 + SHA512 de5eeee0f3f7142ffa1fcb7694cf157a65e95af4ad22e3dc7eaa199b98c9fa2dc0dd0635d057c9ba8601a22a6b36ef7d4d420a09ade1c77360c3a6582534f12b + HEAD_REF master + PATCHES + fix-dependency-sfml.patch ) file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") @@ -16,10 +17,12 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS} - -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS} + -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS} + MAYBE_UNUSED_VARIABLES + THOR_STATIC_STD_LIBS # Only on Windows ) vcpkg_cmake_install() @@ -47,7 +50,12 @@ if(LICENSE) file(REMOVE ${LICENSE}) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/Aurora") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/Aurora" + "${CURRENT_PACKAGES_DIR}/cmake" + "${CURRENT_PACKAGES_DIR}/debug/cmake" +) if(NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/thor/vcpkg.json b/ports/thor/vcpkg.json index 5137873664475b..e00041eb925199 100644 --- a/ports/thor/vcpkg.json +++ b/ports/thor/vcpkg.json @@ -1,7 +1,6 @@ { "name": "thor", - "version": "2.0", - "port-version": 6, + "version-date": "2022-04-16", "description": "Extends the multimedia library SFML with higher-level features", "homepage": "https://bromeon.ch/libraries/thor/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index c8133b8aef5ebd..03cb282d6076ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7977,8 +7977,8 @@ "port-version": 2 }, "thor": { - "baseline": "2.0", - "port-version": 6 + "baseline": "2022-04-16", + "port-version": 0 }, "thorvg": { "baseline": "0.9.0", diff --git a/versions/t-/thor.json b/versions/t-/thor.json index 7a5b299f3fe4c8..51714f13651135 100644 --- a/versions/t-/thor.json +++ b/versions/t-/thor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52c5298a73cdd120b4138b72dd84085cf18f53c1", + "version-date": "2022-04-16", + "port-version": 0 + }, { "git-tree": "d337ec42ced0695748c94113eb08515810e3408f", "version": "2.0", From 5e77bc0a8cd2c5707010112e075a144fbf691f3a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Jun 2023 16:25:50 -0700 Subject: [PATCH 308/533] [nifly] Fix missing headers (#31998) --- ports/nifly/portfile.cmake | 10 ++++++++++ ports/nifly/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nifly.json | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ports/nifly/portfile.cmake b/ports/nifly/portfile.cmake index 4c2383be40806c..bb6ee1084f385f 100644 --- a/ports/nifly/portfile.cmake +++ b/ports/nifly/portfile.cmake @@ -1,10 +1,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile( + MISSING_STDINT_H + URLS https://github.com/ousnius/nifly/commit/a16057e349b9cbee53d9618b22d3e235505f0df0.patch?full_index=1 + SHA512 45147c85384deba257e52eda5c2ff0c8dee559edc10b00d6e9964d5cc675669587ef941cea0228816c39846de58e33197e953506b9b73267397c4b36cd1f1374 + FILENAME a16057e349b9cbee53d9618b22d3e235505f0df0.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ousnius/nifly REF 680a3c0435ff78f8189c46de410d0c8aa9c18a06 SHA512 b1bb4a194f95e7bcd66280e1b796d0813cd0b4dc292dae5b168092c2d529f89c966a0f11b364787dfa906556181326b30517b7f734fe85246cde4016e3a1d55b HEAD_REF main + PATCHES + "${MISSING_STDINT_H}" ) vcpkg_cmake_configure( diff --git a/ports/nifly/vcpkg.json b/ports/nifly/vcpkg.json index ab35856778eb0a..e7f56bafe574f4 100644 --- a/ports/nifly/vcpkg.json +++ b/ports/nifly/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nifly", "version": "1.0.0", + "port-version": 1, "description": "A C++ library for working with the NIF file format", "homepage": "https://github.com/ousnius/nifly", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 03cb282d6076ea..e06c4abbbfae3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5646,7 +5646,7 @@ }, "nifly": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "nifticlib": { "baseline": "2020-04-30", diff --git a/versions/n-/nifly.json b/versions/n-/nifly.json index 07e020487d0082..d99c8f08790fbd 100644 --- a/versions/n-/nifly.json +++ b/versions/n-/nifly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65dfaaae3bb9e8549f5b0f0a8b802cc4fae50164", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "208094a8ee378aaa7a4de63e4d7e59401fecdb9b", "version": "1.0.0", From 75ea1b450d0804bd45a728d838885cc61e6d2bf1 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Jun 2023 16:26:08 -0700 Subject: [PATCH 309/533] [unicorn-lib] Fix missing headers (#32002) Necessary to compile on Ubuntu 22.04, submitted upstream as https://github.com/CaptainCrowbar/unicorn-lib/pull/10 --- ports/unicorn-lib/fix-missing-headers.patch | 12 ++++++++++++ ports/unicorn-lib/portfile.cmake | 2 ++ ports/unicorn-lib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/unicorn-lib.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/unicorn-lib/fix-missing-headers.patch diff --git a/ports/unicorn-lib/fix-missing-headers.patch b/ports/unicorn-lib/fix-missing-headers.patch new file mode 100644 index 00000000000000..a64103a125cefe --- /dev/null +++ b/ports/unicorn-lib/fix-missing-headers.patch @@ -0,0 +1,12 @@ +diff --git a/unicorn/utility.hpp b/unicorn/utility.hpp +index e6a57b7..a2afa58 100644 +--- a/unicorn/utility.hpp ++++ b/unicorn/utility.hpp +@@ -54,6 +54,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index 25ef7557fb00e9..d953711f073a8a 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 44e975ffc8dcd8dedbe01a8cbe7812e351f3f74f # 2021-10-28 SHA512 b22264420174c950ca8025e861366118d79a53edce9297d84af9511e255af5971c3719f0b464f4a4886848edea7c2ba4ae32ce9abab135628d64adbde5fa7b0d HEAD_REF master + PATCHES + fix-missing-headers.patch # https://github.com/CaptainCrowbar/unicorn-lib/pull/10 ) file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/unicorn-lib/vcpkg.json b/ports/unicorn-lib/vcpkg.json index d62d1f99253699..46c98ef9a9dec7 100644 --- a/ports/unicorn-lib/vcpkg.json +++ b/ports/unicorn-lib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unicorn-lib", "version-date": "2022-01-24", - "port-version": 1, + "port-version": 2, "description": "Unicode library for C++ by Ross Smith", "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e06c4abbbfae3f..b108a242764f82 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8246,7 +8246,7 @@ }, "unicorn-lib": { "baseline": "2022-01-24", - "port-version": 1 + "port-version": 2 }, "units": { "baseline": "2.3.3", diff --git a/versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json index 976fcb4cc85add..fb371140d042e3 100644 --- a/versions/u-/unicorn-lib.json +++ b/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a392f38ad3deeac937482462e7253e332e4a672", + "version-date": "2022-01-24", + "port-version": 2 + }, { "git-tree": "20329e00e75f4f13bb1b77f3e19c23182861c6cd", "version-date": "2022-01-24", From e61fc593761de7e8594357813b7b0ee2922ec291 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Jun 2023 16:37:01 -0700 Subject: [PATCH 310/533] [sltbench] Fix missing headers (#31999) * [sltbench] Fix missing headers * Fix SHA --- ports/sltbench/portfile.cmake | 27 +++++++++++++++++++-------- ports/sltbench/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sltbench.json | 5 +++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ports/sltbench/portfile.cmake b/ports/sltbench/portfile.cmake index e5923846e5d2d9..4750fdbe9c54e7 100644 --- a/ports/sltbench/portfile.cmake +++ b/ports/sltbench/portfile.cmake @@ -1,11 +1,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile( + MISSING_STDDEF_H + URLS https://github.com/ivafanas/sltbench/commit/ec702203f406d3b1db71dac6bd39337d175cdc2c.patch?full_index=1 + SHA512 ada4ac8519dc7c5537438423d83cee99cd85b84172c402438800f70f6a550875819ea94be8cffcb174a45715e6709e1fd777415424aabf65a1b3e4430b503af1 + FILENAME ec702203f406d3b1db71dac6bd39337d175cdc2c.patch +) + vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ivafanas/sltbench - REF 52c7c7852abc3159185eb79e699ad77fadfc35bd - SHA512 0c66b51f5a950a09df47019775941554538bc3642788f61aaf8c5ec3644d5fef721391f73c3fddfd9529159f9b81c7d7ed76c7995a79f37adaf8d0ff55a99d4b - HEAD_REF master) + OUT_SOURCE_PATH SOURCE_PATH + REPO ivafanas/sltbench + REF 52c7c7852abc3159185eb79e699ad77fadfc35bd + SHA512 0c66b51f5a950a09df47019775941554538bc3642788f61aaf8c5ec3644d5fef721391f73c3fddfd9529159f9b81c7d7ed76c7995a79f37adaf8d0ff55a99d4b + HEAD_REF master + PATCHES + "${MISSING_STDDEF_H}" +) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" WINDOWS_USE_MSBUILD) vcpkg_cmake_install() @@ -14,6 +24,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file( - INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/sltbench/vcpkg.json b/ports/sltbench/vcpkg.json index be9227938f9e20..c969adb98e5235 100644 --- a/ports/sltbench/vcpkg.json +++ b/ports/sltbench/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sltbench", "version": "2.4.0", - "port-version": 2, + "port-version": 3, "description": "C++ benchmark tool. Practical, stable and fast performance testing framework.", "homepage": "https://github.com/ivafanas/sltbench", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b108a242764f82..97ebccf0b3cdfb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7546,7 +7546,7 @@ }, "sltbench": { "baseline": "2.4.0", - "port-version": 2 + "port-version": 3 }, "smf": { "baseline": "0.1.1", diff --git a/versions/s-/sltbench.json b/versions/s-/sltbench.json index d10ea99ab1da0b..7efeddb859c7b0 100644 --- a/versions/s-/sltbench.json +++ b/versions/s-/sltbench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff6317efd629a2f1ec64e3ad14f9d6d11b139d39", + "version": "2.4.0", + "port-version": 3 + }, { "git-tree": "f5a607736f0e3c2bb0a3c0c9c3525dec4cc3c980", "version": "2.4.0", From 678323514f7826dd7c37cd3f7821b1f52316eb6c Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Wed, 14 Jun 2023 22:16:45 -0400 Subject: [PATCH 311/533] [asio,boost-asio] Fix experimental::coro compile error with MSVC (#32004) --- ports/asio/fix_coro_compile_error_msvc.patch | 131 ++++++++++++++++++ ports/asio/portfile.cmake | 1 + ports/asio/vcpkg.json | 1 + .../fix_coro_compile_error_msvc.patch | 131 ++++++++++++++++++ ports/boost-asio/portfile.cmake | 4 +- ports/boost-asio/vcpkg.json | 2 +- versions/a-/asio.json | 5 + versions/b-/boost-asio.json | 5 + versions/baseline.json | 4 +- 9 files changed, 280 insertions(+), 4 deletions(-) create mode 100644 ports/asio/fix_coro_compile_error_msvc.patch create mode 100644 ports/boost-asio/fix_coro_compile_error_msvc.patch diff --git a/ports/asio/fix_coro_compile_error_msvc.patch b/ports/asio/fix_coro_compile_error_msvc.patch new file mode 100644 index 00000000000000..bde1d1d267801c --- /dev/null +++ b/ports/asio/fix_coro_compile_error_msvc.patch @@ -0,0 +1,131 @@ +diff --git a/asio/include/asio/experimental/impl/coro.hpp b/asio/include/asio/experimental/impl/coro.hpp +index a4d8d277..9f01687e 100644 +--- a/asio/include/asio/experimental/impl/coro.hpp ++++ b/asio/include/asio/experimental/impl/coro.hpp +@@ -1069,17 +1069,17 @@ struct coro::initiate_async_resume + std::true_type /* error is noexcept */, + std::true_type /* result is void */) //noexcept + { +- return [this, coro = coro_, ++ return [this, coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- assert(coro); ++ assert(coro_promise_); + +- auto ch = detail::coroutine_handle::from_promise(*coro); ++ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); + assert(ch && !ch.done()); + +- coro->awaited_from = post_coroutine(std::move(exec), std::move(h)); +- coro->reset_error(); ++ coro_promise_->awaited_from = post_coroutine(std::move(exec), std::move(h)); ++ coro_promise_->reset_error(); + ch.resume(); + }; + } +@@ -1090,18 +1090,18 @@ struct coro::initiate_async_resume + std::true_type /* error is noexcept */, + std::false_type /* result is void */) //noexcept + { +- return [coro = coro_, ++ return [coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- assert(coro); ++ assert(coro_promise_); + +- auto ch = detail::coroutine_handle::from_promise(*coro); ++ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); + assert(ch && !ch.done()); + +- coro->awaited_from = detail::post_coroutine( +- exec, std::move(h), coro->result_).handle; +- coro->reset_error(); ++ coro_promise_->awaited_from = detail::post_coroutine( ++ exec, std::move(h), coro_promise_->result_).handle; ++ coro_promise_->reset_error(); + ch.resume(); + }; + } +@@ -1111,16 +1111,16 @@ struct coro::initiate_async_resume + std::false_type /* error is noexcept */, + std::true_type /* result is void */) + { +- return [coro = coro_, ++ return [coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- if (!coro) ++ if (!coro_promise_) + return asio::post(exec, + asio::append(std::move(h), + detail::coro_error::invalid())); + +- auto ch = detail::coroutine_handle::from_promise(*coro); ++ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); + if (!ch) + return asio::post(exec, + asio::append(std::move(h), +@@ -1131,9 +1131,9 @@ struct coro::initiate_async_resume + detail::coro_error::done())); + else + { +- coro->awaited_from = detail::post_coroutine( +- exec, std::move(h), coro->error_).handle; +- coro->reset_error(); ++ coro_promise_->awaited_from = detail::post_coroutine( ++ exec, std::move(h), coro_promise_->error_).handle; ++ coro_promise_->reset_error(); + ch.resume(); + } + }; +@@ -1144,17 +1144,17 @@ struct coro::initiate_async_resume + std::false_type /* error is noexcept */, + std::false_type /* result is void */) + { +- return [coro = coro_, ++ return [coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- if (!coro) ++ if (!coro_promise_) + return asio::post(exec, + asio::append(std::move(h), + detail::coro_error::invalid(), result_type{})); + + auto ch = +- detail::coroutine_handle::from_promise(*coro); ++ detail::coroutine_handle::from_promise(*coro_promise_); + if (!ch) + return asio::post(exec, + asio::append(std::move(h), +@@ -1165,9 +1165,9 @@ struct coro::initiate_async_resume + detail::coro_error::done(), result_type{})); + else + { +- coro->awaited_from = detail::post_coroutine( +- exec, std::move(h), coro->error_, coro->result_).handle; +- coro->reset_error(); ++ coro_promise_->awaited_from = detail::post_coroutine( ++ exec, std::move(h), coro_promise_->error_, coro_promise_->result_).handle; ++ coro_promise_->reset_error(); + ch.resume(); + } + }; +@@ -1203,9 +1203,9 @@ struct coro::initiate_async_resume + [h = handle(exec, std::forward(handler), + std::integral_constant{}, + std::is_void{}), +- in = std::forward(input), coro = coro_]() mutable ++ in = std::forward(input), coro_promise_ = coro_]() mutable + { +- coro->input_ = std::move(in); ++ coro_promise_->input_ = std::move(in); + std::move(h)(); + }); + } diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index bcc7244a9383a5..1fca290e9fd183 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF asio-1-28-0 SHA512 0d635c40a28b6427e2cb6b9c89ab53dba7d3a237df2279148ca05fa899d6f8039a131929230e5ca1dbc7477be784e3da9a6cb68456cbf194178510621556e467 HEAD_REF master + PATCHES fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313 ) # Always use "ASIO_STANDALONE" to avoid boost dependency diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index d804b96022996c..3886e667b79b29 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asio", "version": "1.28.0", + "port-version": 1, "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/", diff --git a/ports/boost-asio/fix_coro_compile_error_msvc.patch b/ports/boost-asio/fix_coro_compile_error_msvc.patch new file mode 100644 index 00000000000000..05c14e190e0e09 --- /dev/null +++ b/ports/boost-asio/fix_coro_compile_error_msvc.patch @@ -0,0 +1,131 @@ +diff --git a/include/boost/asio/experimental/impl/coro.hpp b/include/boost/asio/experimental/impl/coro.hpp +index ec7d956e..ba219453 100644 +--- a/include/boost/asio/experimental/impl/coro.hpp ++++ b/include/boost/asio/experimental/impl/coro.hpp +@@ -1070,17 +1070,17 @@ struct coro::initiate_async_resume + std::true_type /* error is noexcept */, + std::true_type /* result is void */) //noexcept + { +- return [this, coro = coro_, ++ return [this, coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- assert(coro); ++ assert(coro_promise_); + +- auto ch = detail::coroutine_handle::from_promise(*coro); ++ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); + assert(ch && !ch.done()); + +- coro->awaited_from = post_coroutine(std::move(exec), std::move(h)); +- coro->reset_error(); ++ coro_promise_->awaited_from = post_coroutine(std::move(exec), std::move(h)); ++ coro_promise_->reset_error(); + ch.resume(); + }; + } +@@ -1091,18 +1091,18 @@ struct coro::initiate_async_resume + std::true_type /* error is noexcept */, + std::false_type /* result is void */) //noexcept + { +- return [coro = coro_, ++ return [coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- assert(coro); ++ assert(coro_promise_); + +- auto ch = detail::coroutine_handle::from_promise(*coro); ++ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); + assert(ch && !ch.done()); + +- coro->awaited_from = detail::post_coroutine( +- exec, std::move(h), coro->result_).handle; +- coro->reset_error(); ++ coro_promise_->awaited_from = detail::post_coroutine( ++ exec, std::move(h), coro_promise_->result_).handle; ++ coro_promise_->reset_error(); + ch.resume(); + }; + } +@@ -1112,16 +1112,16 @@ struct coro::initiate_async_resume + std::false_type /* error is noexcept */, + std::true_type /* result is void */) + { +- return [coro = coro_, ++ return [coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- if (!coro) ++ if (!coro_promise_) + return boost::asio::post(exec, + boost::asio::append(std::move(h), + detail::coro_error::invalid())); + +- auto ch = detail::coroutine_handle::from_promise(*coro); ++ auto ch = detail::coroutine_handle::from_promise(*coro_promise_); + if (!ch) + return boost::asio::post(exec, + boost::asio::append(std::move(h), +@@ -1132,9 +1132,9 @@ struct coro::initiate_async_resume + detail::coro_error::done())); + else + { +- coro->awaited_from = detail::post_coroutine( +- exec, std::move(h), coro->error_).handle; +- coro->reset_error(); ++ coro_promise_->awaited_from = detail::post_coroutine( ++ exec, std::move(h), coro_promise_->error_).handle; ++ coro_promise_->reset_error(); + ch.resume(); + } + }; +@@ -1145,17 +1145,17 @@ struct coro::initiate_async_resume + std::false_type /* error is noexcept */, + std::false_type /* result is void */) + { +- return [coro = coro_, ++ return [coro_promise_ = coro_, + h = std::forward(handler), + exec = std::move(exec)]() mutable + { +- if (!coro) ++ if (!coro_promise_) + return boost::asio::post(exec, + boost::asio::append(std::move(h), + detail::coro_error::invalid(), result_type{})); + + auto ch = +- detail::coroutine_handle::from_promise(*coro); ++ detail::coroutine_handle::from_promise(*coro_promise_); + if (!ch) + return boost::asio::post(exec, + boost::asio::append(std::move(h), +@@ -1166,9 +1166,9 @@ struct coro::initiate_async_resume + detail::coro_error::done(), result_type{})); + else + { +- coro->awaited_from = detail::post_coroutine( +- exec, std::move(h), coro->error_, coro->result_).handle; +- coro->reset_error(); ++ coro_promise_->awaited_from = detail::post_coroutine( ++ exec, std::move(h), coro_promise_->error_, coro_promise_->result_).handle; ++ coro_promise_->reset_error(); + ch.resume(); + } + }; +@@ -1204,9 +1204,9 @@ struct coro::initiate_async_resume + [h = handle(exec, std::forward(handler), + std::integral_constant{}, + std::is_void{}), +- in = std::forward(input), coro = coro_]() mutable ++ in = std::forward(input), coro_promise_ = coro_]() mutable + { +- coro->input_ = std::move(in); ++ coro_promise_->input_ = std::move(in); + std::move(h)(); + }); + } diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 4a209cdb1fc290..2698ac760ed6b5 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF boost-1.82.0 SHA512 d54fd77ca7996da138b10408df1eae28bbcae0c6475467cc19837bf6f6624c38ad7f9e1eec87ceae27f516583b204fdbaeb04daad7cc28e6aeec02ab5f188731 HEAD_REF master - PATCHES windows_alloca_header.patch + PATCHES + windows_alloca_header.patch + fix_coro_compile_error_msvc.patch #upstream PR: https://github.com/chriskohlhoff/asio/pull/1313 ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 1564ef1d997942..8d131a4be65aab 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-asio", "version": "1.82.0", - "port-version": 2, + "port-version": 3, "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "license": "BSL-1.0", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 74372bc53ea580..440a513e99d113 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "726d66784925af6062a5a8f285c76dab2469572f", + "version": "1.28.0", + "port-version": 1 + }, { "git-tree": "7dde6674d23759f187d73d08f3bd869562a41e8d", "version": "1.28.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index dd9f262928c1e2..1321e4ae80b672 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ae81c27afef052cdab26f3bbadb1154905cfecc", + "version": "1.82.0", + "port-version": 3 + }, { "git-tree": "12dc4325ca29b508676211dfadc95ff688a00395", "version": "1.82.0", diff --git a/versions/baseline.json b/versions/baseline.json index 97ebccf0b3cdfb..01c72fab5a8f38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -234,7 +234,7 @@ }, "asio": { "baseline": "1.28.0", - "port-version": 0 + "port-version": 1 }, "asio-grpc": { "baseline": "2.5.1", @@ -650,7 +650,7 @@ }, "boost-asio": { "baseline": "1.82.0", - "port-version": 2 + "port-version": 3 }, "boost-assert": { "baseline": "1.82.0", From 2ae78bef15dc9e665e46454b4f35d07a692adb3d Mon Sep 17 00:00:00 2001 From: localcc Date: Thu, 15 Jun 2023 04:29:48 +0200 Subject: [PATCH 312/533] [lightningscanner] Update to 1.0.1 (#31996) * [lightningscanner] update to version 1.0.1 * update versions --- ports/lightningscanner/portfile.cmake | 2 +- ports/lightningscanner/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lightningscanner.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/lightningscanner/portfile.cmake b/ports/lightningscanner/portfile.cmake index dd385f02e13c53..ebb2fc656ecbfb 100644 --- a/ports/lightningscanner/portfile.cmake +++ b/ports/lightningscanner/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO localcc/LightningScanner REF v${VERSION} - SHA512 7bd41e049ccdf1dbe39b2ab3c58344822300165482d7c5392fe1cd2b15a40baec9ff080963f7db60f2826ece983a06b921d8a28ba57edf751c2cc7644f0a1150 + SHA512 fa2aefb6a6097544f578a96592b7b2ff58d5bccac7b10a0ab45fbe87e1204b3cbde5c16c64974e7434ea385727fb150b39080bf809f9698d944f75a6c110fe3c ) vcpkg_cmake_configure( diff --git a/ports/lightningscanner/vcpkg.json b/ports/lightningscanner/vcpkg.json index d86eba942e8bd3..7f8d8c63a7eadc 100644 --- a/ports/lightningscanner/vcpkg.json +++ b/ports/lightningscanner/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lightningscanner", - "version": "1.0.0", + "version": "1.0.1", "description": "A lightning-fast memory signature/pattern scanner, capable of scanning gigabytes of data per second.", "homepage": "https://localcc.github.io/LightningScanner/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 01c72fab5a8f38..03e0f15e3e7747 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4905,7 +4905,7 @@ "port-version": 0 }, "lightningscanner": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "lilv": { diff --git a/versions/l-/lightningscanner.json b/versions/l-/lightningscanner.json index 997e21af1b4b1f..dd77c50da5c3b0 100644 --- a/versions/l-/lightningscanner.json +++ b/versions/l-/lightningscanner.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9096d7c2c2c14b7e438e48f6aecd194c2356172", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "25cfcf5944e73bfe349e264a37f98ea36558da18", "version": "1.0.0", From 019fc6b7a42434b31b054c1f89493df0249f9469 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Thu, 15 Jun 2023 11:36:35 +0900 Subject: [PATCH 313/533] [async-mqtt] Add new port (#31902) * [async-mqtt] Add async-mqtt port. * Reflect review comments. Add header-only on the top of file. Use ${VERSION} instead of the literal. Fix indent. Add double qoute to path Remove copyright install. * Set build type to release. * Removed debug directory removal. * Fix async_mqtt installed cmake config. --- ports/async-mqtt/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/async-mqtt/vcpkg.json | 28 ++++++++++++++++++++++++++++ versions/a-/async-mqtt.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 68 insertions(+) create mode 100644 ports/async-mqtt/portfile.cmake create mode 100644 ports/async-mqtt/vcpkg.json create mode 100644 versions/a-/async-mqtt.json diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake new file mode 100644 index 00000000000000..4b1fc1dc0224d9 --- /dev/null +++ b/ports/async-mqtt/portfile.cmake @@ -0,0 +1,27 @@ +set(VCPKG_BUILD_TYPE release) #header-only + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO redboltz/async_mqtt + REF "${VERSION}" + SHA512 54ae476ef1cac600c2a86dcb56d12729b3e75987dbe6eb768754de66e820b46b53dde2a14780f42a1e28c1dbb74615a3426a26cc7492c6c6664160b9e6355c8d + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASYNC_MQTT_BUILD_TOOLS=OFF + -DASYNC_MQTT_BUILD_EXAMPLES=OFF + -DASYNC_MQTT_BUILD_UNIT_TESTS=OFF + -DASYNC_MQTT_BUILD_SYSTEM_TESTS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME async_mqtt_iface CONFIG_PATH "lib/cmake/async_mqtt_iface") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json new file mode 100644 index 00000000000000..c182fb49f075db --- /dev/null +++ b/ports/async-mqtt/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "async-mqtt", + "version": "1.0.2", + "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", + "homepage": "https://github.com/redboltz/async_mqtt", + "license": "BSL-1.0", + "dependencies": [ + "boost-any", + "boost-asio", + "boost-assert", + "boost-beast", + "boost-container", + "boost-container-hash", + "boost-endian", + "boost-log", + "boost-multi-index", + "boost-numeric-conversion", + "boost-system", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json new file mode 100644 index 00000000000000..0c20deb131c4b0 --- /dev/null +++ b/versions/a-/async-mqtt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "035119f49547730765ec2a296355d550b8ac7920", + "version": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 03e0f15e3e7747..1ef63b039078c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -256,6 +256,10 @@ "baseline": "5.2.5", "port-version": 0 }, + "async-mqtt": { + "baseline": "1.0.2", + "port-version": 0 + }, "asynch": { "baseline": "2019-09-21", "port-version": 3 From dc6188d0eb3f9fd7b53f4e21b1878ea868e34c02 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Thu, 15 Jun 2023 06:14:01 +0300 Subject: [PATCH 314/533] [flecs] update to 3.2.4 (#31985) * [flecs] update to 3.2.4 * [flecs] update version database --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 8d5eed2fbf69f8..4d5d8dec3ba6bf 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 7daa7e1c984b59e749e9e8bed0ddc0d6e848206cc804c29792ae7d2090d685eba279bf0dd9463cfc9577e2c10c66b9fa0c473947828b865652b15d806d50ac91 + SHA512 fd87868e75425749e42f615903a3084ee2cbc00f5e59b55cd8b3d11cdfcf0bb580deb12e2fec96f9519179a45523ebd28c804a8207251ba6535e3825d94f2049 HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 2f102932e5e514..503fb1c3dca9b0 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.3", + "version": "3.2.4", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1ef63b039078c2..623f0f74bd019d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2537,7 +2537,7 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.3", + "baseline": "3.2.4", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 11c6a4a8a48fc5..8a84797ea76945 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df4249183060e697a375b85bc597932f93d47499", + "version": "3.2.4", + "port-version": 0 + }, { "git-tree": "a231eef7e805676077c2db021b773fbe143413b2", "version": "3.2.3", From 1f47615e52af0df2929efceed25f8aef4b59cf96 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 15 Jun 2023 10:39:13 -0700 Subject: [PATCH 315/533] [mdl-sdk] Workaround broken gcc-11 (#32008) --- ports/mdl-sdk/010-workaround-gcc-bit.patch | 13 +++++++++++++ ports/mdl-sdk/portfile.cmake | 20 ++++++++++++++++++++ ports/mdl-sdk/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mdl-sdk.json | 5 +++++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ports/mdl-sdk/010-workaround-gcc-bit.patch diff --git a/ports/mdl-sdk/010-workaround-gcc-bit.patch b/ports/mdl-sdk/010-workaround-gcc-bit.patch new file mode 100644 index 00000000000000..9583a46813d390 --- /dev/null +++ b/ports/mdl-sdk/010-workaround-gcc-bit.patch @@ -0,0 +1,13 @@ +diff --git a/include/mi/base/types.h b/include/mi/base/types.h +index a6faabe..47f836b 100644 +--- a/include/mi/base/types.h ++++ b/include/mi/base/types.h +@@ -349,7 +349,7 @@ namespace { + /// float fval( 0.0f ); + /// Uint32 uval( binary_cast(fval) ); + /// \endcode +-#if (defined(_WIN32) && defined(_HAS_CXX20) && _HAS_CXX20) || (defined(__GNUC__) && (__GNUC__ >= 11 )) ++#if (defined(_WIN32) && defined(_HAS_CXX20) && _HAS_CXX20) || (defined(__GNUC__) && (__GNUC__ >= 12 )) + #include + template constexpr T binary_cast(const S& src) noexcept { return std::bit_cast(src); } + #else diff --git a/ports/mdl-sdk/portfile.cmake b/ports/mdl-sdk/portfile.cmake index 316a78a2735a6d..4d342e856d326e 100644 --- a/ports/mdl-sdk/portfile.cmake +++ b/ports/mdl-sdk/portfile.cmake @@ -65,6 +65,25 @@ endif() # MDL-SDK +# The patch "workaround gcc bit" works around included with gcc included with Ubuntu 22.04 +# failing to compile as used here, with errors originating *inside* like: +# [156/1742] /usr/bin/c++ -DBIT64=1 -DDEBUG -DHAS_SSE -DMDL_SOURCE_RELEASE -DMI_PLATFORM=\"linux-x86-64-gcc\" -DMI_PLATFORM_UNIX -DX86=1 -D_DEBUG -I/home/bion/vcpkg/buildtrees/mdl-sdk/x64-linux-dbg/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src -fPIC -g -fPIC -fno-strict-aliasing -march=nocona -gdwarf-3 -gstrict-dwarf -Wall -Wvla -Wno-init-list-lifetime -Wno-placement-new -Wno-parentheses -Wno-sign-compare -Wno-narrowing -Wno-unused-but-set-variable -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unknown-pragmas -std=gnu++17 -MD -MT src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -MF src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o.d -o src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -c /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.cpp +# FAILED: src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o +# /usr/bin/c++ -DBIT64=1 -DDEBUG -DHAS_SSE -DMDL_SOURCE_RELEASE -DMI_PLATFORM=\"linux-x86-64-gcc\" -DMI_PLATFORM_UNIX -DX86=1 -D_DEBUG -I/home/bion/vcpkg/buildtrees/mdl-sdk/x64-linux-dbg/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include -I/home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src -fPIC -g -fPIC -fno-strict-aliasing -march=nocona -gdwarf-3 -gstrict-dwarf -Wall -Wvla -Wno-init-list-lifetime -Wno-placement-new -Wno-parentheses -Wno-sign-compare -Wno-narrowing -Wno-unused-but-set-variable -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unknown-pragmas -std=gnu++17 -MD -MT src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -MF src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o.d -o src/base/system/main/CMakeFiles/base-system-main.dir/module_registration_entry.cpp.o -c /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.cpp +# In file included from /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/types.h:37, +# from /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.h:39, +# from /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/src/base/system/main/module_registration_entry.cpp:34: +# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h: In function ‘constexpr T mi::base::binary_cast(const S&)’: +# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h:356:89: error: ‘bit_cast’ is not a member of ‘mi::base::std’ +# 356 | template constexpr T binary_cast(const S& src) noexcept { return std::bit_cast(src); } +# | ^~~~~~~~ +# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h:356:99: error: expected primary-expression before ‘,’ token +# 356 | template constexpr T binary_cast(const S& src) noexcept { return std::bit_cast(src); } +# | ^ +# /home/bion/vcpkg/buildtrees/mdl-sdk/src/830ab63109-115b19fca8/include/mi/base/types.h:356:101: error: expected primary-expression before ‘>’ token +# 356 | template constexpr T binary_cast(const S& src) noexcept { return std::bit_cast(src); } +# | ^ + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIA/MDL-SDK @@ -81,6 +100,7 @@ vcpkg_from_github( 007-plugin-options.patch 008-build-static-llvm.patch 009-include-priority-vendored-llvm.patch + 010-workaround-gcc-bit.patch ) string(COMPARE NOTEQUAL "${VCPKG_CRT_LINKAGE}" "static" _MVSC_CRT_LINKAGE_OPTION) diff --git a/ports/mdl-sdk/vcpkg.json b/ports/mdl-sdk/vcpkg.json index 1b2b4809397513..514e56b98490ec 100644 --- a/ports/mdl-sdk/vcpkg.json +++ b/ports/mdl-sdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mdl-sdk", "version": "2021.1.2", + "port-version": 1, "description": "NVIDIA Material Definition Language SDK", "homepage": "https://github.com/NVIDIA/MDL-SDK", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 623f0f74bd019d..b96092b8f5d1f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5202,7 +5202,7 @@ }, "mdl-sdk": { "baseline": "2021.1.2", - "port-version": 0 + "port-version": 1 }, "mdns": { "baseline": "1.4.2", diff --git a/versions/m-/mdl-sdk.json b/versions/m-/mdl-sdk.json index 5befda98fa3794..b464e3f1aeac54 100644 --- a/versions/m-/mdl-sdk.json +++ b/versions/m-/mdl-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b540090b50df32e1bdcab5953994590e0fb37bd", + "version": "2021.1.2", + "port-version": 1 + }, { "git-tree": "1ea6f971b1824f51c7beed4983f54733b24f1bed", "version": "2021.1.2", From 5d2a0a9814db499f6ba2e847ca7ab5912badcdbf Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 15 Jun 2023 14:49:00 -0700 Subject: [PATCH 316/533] Update xbox supports expressions for failing ports with copyleft licenses (#31770) * Xbox triplets should not support ports with only copyleft licenses * Reverted ports that build with xbox currently * Fix conflict and rebase * Update baseline * Update baseline --- ports/7zip/vcpkg.json | 3 +- ports/arb/vcpkg.json | 3 +- ports/atk/vcpkg.json | 3 +- ports/atkmm/vcpkg.json | 3 +- ports/aubio/vcpkg.json | 2 + ports/avisynthplus/vcpkg.json | 4 +- ports/boinc/vcpkg.json | 3 +- ports/bxzstr/vcpkg.json | 2 + ports/cairo/vcpkg.json | 2 + ports/cairomm/vcpkg.json | 3 +- ports/cctag/vcpkg.json | 4 +- ports/cgal/vcpkg.json | 2 + ports/chromaprint/vcpkg.json | 3 +- ports/cserialport/vcpkg.json | 3 +- ports/czmq/vcpkg.json | 3 +- ports/discordcoreapi/vcpkg.json | 3 +- ports/epsilon/vcpkg.json | 4 +- ports/exiv2/vcpkg.json | 4 +- ports/fluidsynth/vcpkg.json | 3 +- ports/freealut/vcpkg.json | 4 +- ports/freetds/vcpkg.json | 4 +- ports/gdk-pixbuf/vcpkg.json | 2 + ports/gettext-libintl/vcpkg.json | 2 + ports/gettext/vcpkg.json | 3 +- ports/glib/vcpkg.json | 3 +- ports/glibmm/vcpkg.json | 3 +- ports/glpk/vcpkg.json | 3 +- ports/gmime/vcpkg.json | 4 +- ports/gmp/vcpkg.json | 3 +- ports/gppanel/vcpkg.json | 3 +- ports/grantlee/vcpkg.json | 4 +- ports/gst-rtsp-server/vcpkg.json | 3 +- ports/gstreamer/vcpkg.json | 4 +- ports/gtk/vcpkg.json | 2 + ports/gtkmm/vcpkg.json | 3 +- ports/gul14/vcpkg.json | 3 +- ports/hunspell/vcpkg.json | 4 +- ports/ideviceinstaller/vcpkg.json | 4 +- ports/idyntree/vcpkg.json | 2 + ports/igraph/vcpkg.json | 2 + ports/jsonifier/vcpkg.json | 3 +- ports/kf5archive/vcpkg.json | 2 + ports/kfr/vcpkg.json | 3 +- ports/lcm/vcpkg.json | 4 +- ports/libadwaita/vcpkg.json | 2 + ports/libalkimia/vcpkg.json | 3 +- ports/libao/vcpkg.json | 4 +- ports/libcsv/vcpkg.json | 4 +- ports/libdatachannel/vcpkg.json | 3 +- ports/libde265/vcpkg.json | 4 +- ports/libdjinterop/vcpkg.json | 2 + ports/libfreenect2/vcpkg.json | 3 +- ports/libheif/vcpkg.json | 2 + ports/libhsplasma/vcpkg.json | 3 +- ports/libimobiledevice/vcpkg.json | 3 +- ports/libirecovery/vcpkg.json | 4 +- ports/libleidenalg/vcpkg.json | 2 + ports/libmariadb/vcpkg.json | 4 +- ports/libmesh/vcpkg.json | 5 +- ports/libmicrodns/vcpkg.json | 2 + ports/libmikmod/vcpkg.json | 4 +- ports/libmodbus/vcpkg.json | 4 +- ports/libmysql/vcpkg.json | 4 +- ports/libnice-gst/vcpkg.json | 3 +- ports/libnice/vcpkg.json | 2 + ports/libofx/vcpkg.json | 3 +- ports/libpff/vcpkg.json | 4 +- ports/libproxy/vcpkg.json | 4 +- ports/libqcow/vcpkg.json | 3 +- ports/libqglviewer/vcpkg.json | 2 + ports/libraw/vcpkg.json | 3 +- ports/libredwg/vcpkg.json | 2 + ports/libsbml/vcpkg.json | 3 +- ports/libsndfile/vcpkg.json | 2 + ports/libsrt/vcpkg.json | 4 +- ports/libssh/vcpkg.json | 4 +- ports/libunistring/vcpkg.json | 3 +- ports/libusb-win32/vcpkg.json | 4 +- ports/libxmp/vcpkg.json | 2 + ports/libzim/vcpkg.json | 4 +- ports/live555/vcpkg.json | 2 + ports/mapnik/vcpkg.json | 2 + ports/marble/vcpkg.json | 4 +- ports/mathgl/vcpkg.json | 4 +- ports/mchehab-zbar/vcpkg.json | 4 +- ports/moos-core/vcpkg.json | 3 +- ports/mpfr/vcpkg.json | 2 + ports/mpg123/vcpkg.json | 2 + ports/nspr/vcpkg.json | 4 +- ports/nss/vcpkg.json | 4 +- ports/nuspell/vcpkg.json | 2 + ports/omniorb/vcpkg.json | 3 +- ports/open62541/vcpkg.json | 2 + ports/openal-soft/vcpkg.json | 3 +- ports/opencascade/vcpkg.json | 4 +- ports/openmama/vcpkg.json | 3 +- ports/openmvg/vcpkg.json | 4 +- ports/openmvs/vcpkg.json | 2 + ports/openscap/vcpkg.json | 2 + ports/openslide/vcpkg.json | 4 +- ports/openvdb/vcpkg.json | 3 +- ports/openvpn3/vcpkg.json | 3 +- ports/osgearth/vcpkg.json | 3 +- ports/pagmo2/vcpkg.json | 2 + ports/pango/vcpkg.json | 2 + ports/pangomm/vcpkg.json | 4 +- ports/plib/vcpkg.json | 4 +- ports/podofo/vcpkg.json | 4 +- ports/poppler/vcpkg.json | 4 +- ports/qcustomplot/vcpkg.json | 2 + ports/qscintilla/vcpkg.json | 3 +- ports/qt-advanced-docking-system/vcpkg.json | 2 + ports/quazip/vcpkg.json | 2 + ports/restbed/vcpkg.json | 3 +- ports/rubberband/vcpkg.json | 3 +- ports/shiftmedia-libgnutls/vcpkg.json | 4 +- ports/spatialite-tools/vcpkg.json | 3 +- ports/usbmuxd/vcpkg.json | 4 +- ports/wolftpm/vcpkg.json | 3 +- ports/wt/vcpkg.json | 3 +- ports/wxchartdir/vcpkg.json | 3 +- ports/wxwidgets/vcpkg.json | 4 +- ports/x264/vcpkg.json | 3 +- ports/x265/vcpkg.json | 4 +- ports/xapian/vcpkg.json | 4 +- ports/xmlsec/vcpkg.json | 2 + ports/zeromq/vcpkg.json | 4 +- versions/7-/7zip.json | 5 + versions/a-/arb.json | 5 + versions/a-/atk.json | 5 + versions/a-/atkmm.json | 5 + versions/a-/aubio.json | 5 + versions/a-/avisynthplus.json | 5 + versions/b-/boinc.json | 5 + versions/b-/bxzstr.json | 5 + versions/baseline.json | 254 ++++++++++---------- versions/c-/cairo.json | 5 + versions/c-/cairomm.json | 5 + versions/c-/cctag.json | 5 + versions/c-/cgal.json | 5 + versions/c-/chromaprint.json | 5 + versions/c-/cserialport.json | 5 + versions/c-/czmq.json | 5 + versions/d-/discordcoreapi.json | 5 + versions/e-/epsilon.json | 5 + versions/e-/exiv2.json | 5 + versions/f-/fluidsynth.json | 5 + versions/f-/freealut.json | 5 + versions/f-/freetds.json | 5 + versions/g-/gdk-pixbuf.json | 5 + versions/g-/gettext-libintl.json | 5 + versions/g-/gettext.json | 5 + versions/g-/glib.json | 5 + versions/g-/glibmm.json | 5 + versions/g-/glpk.json | 5 + versions/g-/gmime.json | 5 + versions/g-/gmp.json | 5 + versions/g-/gppanel.json | 5 + versions/g-/grantlee.json | 5 + versions/g-/gst-rtsp-server.json | 5 + versions/g-/gstreamer.json | 5 + versions/g-/gtk.json | 5 + versions/g-/gtkmm.json | 5 + versions/g-/gul14.json | 5 + versions/h-/hunspell.json | 5 + versions/i-/ideviceinstaller.json | 5 + versions/i-/idyntree.json | 5 + versions/i-/igraph.json | 5 + versions/j-/jsonifier.json | 5 + versions/k-/kf5archive.json | 5 + versions/k-/kfr.json | 5 + versions/l-/lcm.json | 5 + versions/l-/libadwaita.json | 5 + versions/l-/libalkimia.json | 5 + versions/l-/libao.json | 5 + versions/l-/libcsv.json | 5 + versions/l-/libdatachannel.json | 5 + versions/l-/libde265.json | 5 + versions/l-/libdjinterop.json | 5 + versions/l-/libfreenect2.json | 5 + versions/l-/libheif.json | 5 + versions/l-/libhsplasma.json | 5 + versions/l-/libimobiledevice.json | 5 + versions/l-/libirecovery.json | 5 + versions/l-/libleidenalg.json | 5 + versions/l-/libmariadb.json | 5 + versions/l-/libmesh.json | 5 + versions/l-/libmicrodns.json | 5 + versions/l-/libmikmod.json | 5 + versions/l-/libmodbus.json | 5 + versions/l-/libmysql.json | 5 + versions/l-/libnice-gst.json | 5 + versions/l-/libnice.json | 5 + versions/l-/libofx.json | 5 + versions/l-/libpff.json | 5 + versions/l-/libproxy.json | 5 + versions/l-/libqcow.json | 5 + versions/l-/libqglviewer.json | 5 + versions/l-/libraw.json | 5 + versions/l-/libredwg.json | 5 + versions/l-/libsbml.json | 5 + versions/l-/libsndfile.json | 5 + versions/l-/libsrt.json | 5 + versions/l-/libssh.json | 5 + versions/l-/libunistring.json | 5 + versions/l-/libusb-win32.json | 5 + versions/l-/libxmp.json | 5 + versions/l-/libzim.json | 5 + versions/l-/live555.json | 5 + versions/m-/mapnik.json | 5 + versions/m-/marble.json | 5 + versions/m-/mathgl.json | 5 + versions/m-/mchehab-zbar.json | 5 + versions/m-/moos-core.json | 5 + versions/m-/mpfr.json | 5 + versions/m-/mpg123.json | 5 + versions/n-/nspr.json | 5 + versions/n-/nss.json | 5 + versions/n-/nuspell.json | 5 + versions/o-/omniorb.json | 5 + versions/o-/open62541.json | 5 + versions/o-/openal-soft.json | 5 + versions/o-/opencascade.json | 5 + versions/o-/openmama.json | 5 + versions/o-/openmvg.json | 5 + versions/o-/openmvs.json | 5 + versions/o-/openscap.json | 5 + versions/o-/openslide.json | 5 + versions/o-/openvdb.json | 5 + versions/o-/openvpn3.json | 5 + versions/o-/osgearth.json | 5 + versions/p-/pagmo2.json | 5 + versions/p-/pango.json | 5 + versions/p-/pangomm.json | 5 + versions/p-/plib.json | 5 + versions/p-/podofo.json | 5 + versions/p-/poppler.json | 5 + versions/q-/qcustomplot.json | 5 + versions/q-/qscintilla.json | 5 + versions/q-/qt-advanced-docking-system.json | 5 + versions/q-/quazip.json | 5 + versions/r-/restbed.json | 5 + versions/r-/rubberband.json | 5 + versions/s-/shiftmedia-libgnutls.json | 5 + versions/s-/spatialite-tools.json | 5 + versions/u-/usbmuxd.json | 5 + versions/w-/wolftpm.json | 5 + versions/w-/wt.json | 5 + versions/w-/wxchartdir.json | 5 + versions/w-/wxwidgets.json | 5 + versions/x-/x264.json | 5 + versions/x-/x265.json | 5 + versions/x-/xapian.json | 5 + versions/x-/xmlsec.json | 5 + versions/z-/zeromq.json | 5 + 255 files changed, 1018 insertions(+), 264 deletions(-) diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index 642d18c45176a0..57a2a50b0c83ae 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,10 +1,11 @@ { "name": "7zip", "version-string": "22.01", + "port-version": 1, "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/arb/vcpkg.json b/ports/arb/vcpkg.json index 9cfb617f355509..35e454c8a92bf9 100644 --- a/ports/arb/vcpkg.json +++ b/ports/arb/vcpkg.json @@ -1,10 +1,11 @@ { "name": "arb", "version": "2.21.1", - "port-version": 1, + "port-version": 2, "description": "a C library for arbitrary-precision interval arithmetic", "homepage": "https://github.com/fredrik-johansson/arb", "license": "LGPL-2.1", + "supports": "!xbox", "dependencies": [ "flint", { diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index b0c3a9dbd4e595..562a83e0e78f58 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,10 +1,11 @@ { "name": "atk", "version": "2.38.0", - "port-version": 5, + "port-version": 6, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "license": "GPL-2.0-only", + "supports": "!xbox", "dependencies": [ "gettext", { diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index 523ff23c338f5a..6df0032cd99f98 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "atkmm", "version": "2.36.1", - "port-version": 1, + "port-version": 2, "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.", "homepage": "https://www.gtkmm.org", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ "atk", "gettext", diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index b7007a8bdb0b7f..b03cc7149d0a8c 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,9 +1,11 @@ { "name": "aubio", "version-date": "2022-01-26", + "port-version": 1, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "license": "GPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index 26af95e8ea038c..655d892ca5a6af 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,11 +1,11 @@ { "name": "avisynthplus", "version": "3.7.2", - "port-version": 1, + "port-version": 2, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "https://avs-plus.net/", "license": "GPL-2.0", - "supports": "!arm & !uwp", + "supports": "!arm & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index eca3f87d9903a7..391356f27d2393 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boinc", "version": "7.22.2", + "port-version": 1, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", - "supports": "!(windows & arm) & !uwp", + "supports": "!(windows & arm) & !uwp & !xbox", "dependencies": [ "openssl", { diff --git a/ports/bxzstr/vcpkg.json b/ports/bxzstr/vcpkg.json index 1af0474bf3ae32..effb4665fa4165 100644 --- a/ports/bxzstr/vcpkg.json +++ b/ports/bxzstr/vcpkg.json @@ -1,9 +1,11 @@ { "name": "bxzstr", "version": "1.2.0", + "port-version": 1, "description": "A C++ header-only ZLib/libBZ2/libLZMA/Zstandard wrapper.", "homepage": "https://github.com/tmaklin/bxzstr", "license": "MPL-2.0", + "supports": "!xbox", "dependencies": [ "bzip2", "liblzma", diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 53ce7bc0570be5..9cafa207f99a2f 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,9 +1,11 @@ { "name": "cairo", "version": "1.17.8", + "port-version": 1, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", + "supports": "!xbox", "dependencies": [ "dirent", "expat", diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index b5edb25adaa556..6fdae3480806dc 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "cairomm", "version": "1.16.2", - "port-version": 3, + "port-version": 4, "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", "license": "LGPL-2.0-only", + "supports": "!xbox", "dependencies": [ "cairo", "libsigcpp", diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index 131029d8c19a05..4960a87277736a 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,13 +1,13 @@ { "name": "cctag", "version-semver": "1.0.2", - "port-version": 3, + "port-version": 4, "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", "documentation": "https://cctag.readthedocs.io/", "license": "MPL-2.0", - "supports": "!(uwp | arm | arm64 | android | x86)", + "supports": "!(uwp | arm | arm64 | android | x86 | xbox)", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 1265fc1b753d86..8d2bfd92b01638 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,9 +1,11 @@ { "name": "cgal", "version": "5.5.2", + "port-version": 1, "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", + "supports": "!xbox", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/ports/chromaprint/vcpkg.json b/ports/chromaprint/vcpkg.json index 5aee10bf190596..3d068853c0fef0 100644 --- a/ports/chromaprint/vcpkg.json +++ b/ports/chromaprint/vcpkg.json @@ -1,10 +1,11 @@ { "name": "chromaprint", "version": "1.5.0", - "port-version": 2, + "port-version": 3, "description": "C library for generating audio fingerprints used by AcoustID", "homepage": "https://github.com/acoustid/chromaprint", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ "ffmpeg", { diff --git a/ports/cserialport/vcpkg.json b/ports/cserialport/vcpkg.json index b2aaf684a434cf..e8cacfaacb850e 100644 --- a/ports/cserialport/vcpkg.json +++ b/ports/cserialport/vcpkg.json @@ -1,10 +1,11 @@ { "name": "cserialport", "version": "4.3.0", + "port-version": 1, "description": "C++ lightweight cross-platform serial port library, also support C#, Java, Python, Node.js etc.", "homepage": "https://github.com/itas109/CSerialPort", "license": "LGPL-3.0-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json index 09b2d59d793360..c4fdd0f480e701 100644 --- a/ports/czmq/vcpkg.json +++ b/ports/czmq/vcpkg.json @@ -1,10 +1,11 @@ { "name": "czmq", "version-semver": "4.2.1", - "port-version": 1, + "port-version": 2, "description": "High-level C binding for ZeroMQ", "homepage": "https://github.com/zeromq/czmq", "license": "MPL-2.0", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index e6c07c042d2c56..8b6be19596a7d1 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,10 +1,11 @@ { "name": "discordcoreapi", "version-date": "2023-05-30", + "port-version": 1, "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "LGPL-2.1-or-later", - "supports": "(windows & x64 & !static) | (linux & x64)", + "supports": "(windows & x64 & !static & !xbox) | (linux & x64)", "dependencies": [ "ffmpeg", "jsonifier", diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json index 7973271eaaeff2..9377d9dda3169c 100644 --- a/ports/epsilon/vcpkg.json +++ b/ports/epsilon/vcpkg.json @@ -1,11 +1,11 @@ { "name": "epsilon", "version": "0.9.2", - "port-version": 7, + "port-version": 8, "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", "license": "GPL-2.0-only OR LGPL-2.0-only", - "supports": "windows", + "supports": "windows & !xbox", "dependencies": [ "libpopt" ] diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index 9a8885609d25cd..cd3032e959ba6a 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,11 +1,11 @@ { "name": "exiv2", "version": "0.27.6", - "port-version": 2, + "port-version": 3, "description": "Image metadata library and tools", "homepage": "https://exiv2.org", "license": "GPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "libiconv", diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 2f55fe8c85311b..6ba99a814d178b 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,10 +1,11 @@ { "name": "fluidsynth", "version": "2.3.2", - "port-version": 2, + "port-version": 3, "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", + "supports": "!xbox", "dependencies": [ { "name": "alsa", diff --git a/ports/freealut/vcpkg.json b/ports/freealut/vcpkg.json index 90a8aad4b064f7..f3a16be68388bd 100644 --- a/ports/freealut/vcpkg.json +++ b/ports/freealut/vcpkg.json @@ -1,14 +1,14 @@ { "name": "freealut", "version": "1.1.0", - "port-version": 3, + "port-version": 4, "description": [ "FreeALUT is a free implementation of OpenAL's ALUT standard.", "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. " ], "homepage": "https://github.com/vancegroup/freealut", "license": "LGPL-2.0-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "openal-soft", { diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json index 5483fdf9947013..be1146fd765757 100644 --- a/ports/freetds/vcpkg.json +++ b/ports/freetds/vcpkg.json @@ -1,11 +1,11 @@ { "name": "freetds", "version": "1.3.10", - "port-version": 1, + "port-version": 2, "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", "license": "GPL-2.0-only", - "supports": "windows & !uwp", + "supports": "windows & !uwp & !xbox", "dependencies": [ { "name": "gperf", diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index d0d2e7e6acf6ba..68cd59bd945956 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,9 +1,11 @@ { "name": "gdk-pixbuf", "version": "2.42.10", + "port-version": 1, "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ "gettext", "glib", diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json index 810149a54dd050..89ad8f2fa2f64d 100644 --- a/ports/gettext-libintl/vcpkg.json +++ b/ports/gettext-libintl/vcpkg.json @@ -1,9 +1,11 @@ { "name": "gettext-libintl", "version": "0.21.1", + "port-version": 1, "description": "The libintl C library from GNU gettext-runtime.", "homepage": "https://www.gnu.org/software/gettext/", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "libiconv", diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index 016286d600e476..e7a0f77bef926b 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,10 +1,11 @@ { "name": "gettext", "version": "0.21.1", - "port-version": 1, + "port-version": 2, "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "license": "GPL-3.0-only", + "supports": "!xbox", "dependencies": [ "gettext-libintl" ], diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index d70885e2a1dbbc..ae22edd51e8dac 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,10 +1,11 @@ { "name": "glib", "version": "2.76.3", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "dirent", "gettext", diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index fabca11f99cabd..9542055538b63e 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "glibmm", "version": "2.76.0", + "port-version": 1, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "gettext", "glib", diff --git a/ports/glpk/vcpkg.json b/ports/glpk/vcpkg.json index 077488879a06d8..9486ff8638285d 100644 --- a/ports/glpk/vcpkg.json +++ b/ports/glpk/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "glpk", "version": "5.0", - "port-version": 1, + "port-version": 2, "maintainers": "Fabio A. Correa Duran", "description": [ "The GNU Linear Programming Kit (GLPK) solves large-scale linear programming (LP), mixed integer programming (MIP), and related problems.", @@ -17,6 +17,7 @@ "homepage": "https://www.gnu.org/software/glpk/", "documentation": "https://www.gnu.org/software/glpk/#documentation", "license": "GPL-3.0-or-later", + "supports": "!xbox", "features": { "dl": { "description": "Enable shared library support", diff --git a/ports/gmime/vcpkg.json b/ports/gmime/vcpkg.json index d92dfe61ccfa21..349a31b7051f2a 100644 --- a/ports/gmime/vcpkg.json +++ b/ports/gmime/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gmime", "version": "3.2.6", - "port-version": 5, + "port-version": 6, "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", "homepage": "https://developer.gnome.org/gmime/", "license": "LGPL-2.1-or-later", - "supports": "windows", + "supports": "windows & !xbox", "dependencies": [ "glib", "libiconv", diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 2960c09f35f648..a1682aad1bd21b 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,10 +1,11 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 18, + "port-version": 19, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "license": "LGPL-3.0-only OR GPL-2.0-only", + "supports": "!xbox", "dependencies": [ { "name": "gmp", diff --git a/ports/gppanel/vcpkg.json b/ports/gppanel/vcpkg.json index 3e6d8ee05bb7e5..6b6d2dbf294b27 100644 --- a/ports/gppanel/vcpkg.json +++ b/ports/gppanel/vcpkg.json @@ -1,10 +1,11 @@ { "name": "gppanel", "version-date": "2020-05-20", - "port-version": 3, + "port-version": 4, "description": "gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine.", "homepage": "https://github.com/woollybah/gppanel", "license": "GPL-2.0-or-later WITH WxWindows-exception-3.1", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/grantlee/vcpkg.json b/ports/grantlee/vcpkg.json index f3c93c0379b3c3..bea4842ecd4518 100644 --- a/ports/grantlee/vcpkg.json +++ b/ports/grantlee/vcpkg.json @@ -1,11 +1,11 @@ { "name": "grantlee", "version": "5.3.1", - "port-version": 1, + "port-version": 2, "description": "Libraries for text templating with Qt", "homepage": "https://github.com/steveire/grantlee", "license": "LGPL-2.1-or-later", - "supports": "!staticcrt", + "supports": "!staticcrt & !xbox", "dependencies": [ "qtdeclarative", { diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index 624f5f5c3ddb23..b3af8a48b298d6 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,10 +1,11 @@ { "name": "gst-rtsp-server", "version": "1.20.5", - "port-version": 1, + "port-version": 2, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.1-only", + "supports": "!xbox", "dependencies": [ "glib", { diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 3b968ad524efa8..f7a78f64ad866e 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gstreamer", "version": "1.20.5", - "port-version": 8, + "port-version": 9, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "glib", { diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index b964d379abcfc7..31e7f53a4d7bd3 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,9 +1,11 @@ { "name": "gtk", "version": "4.10.4", + "port-version": 1, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", + "supports": "!xbox", "dependencies": [ "atk", { diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index 4ce750b67cbf09..526afb0d81adb3 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "gtkmm", "version": "4.10.0", + "port-version": 1, "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", "license": "LGPL-3.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "cairomm", "gdk-pixbuf", diff --git a/ports/gul14/vcpkg.json b/ports/gul14/vcpkg.json index 09f8c993b1ca61..e3ac87313c2302 100644 --- a/ports/gul14/vcpkg.json +++ b/ports/gul14/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gul14", "version": "2.9.1", + "port-version": 1, "description": [ "General Utility Library for C++14.", "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.", @@ -9,7 +10,7 @@ "homepage": "https://github.desy.de/gul-cpp/gul14.git", "documentation": "https://gul14.info", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-tool-meson", diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 5cd54c4819d84b..42c35b8e61bad4 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,11 +1,11 @@ { "name": "hunspell", "version": "1.7.1", - "port-version": 3, + "port-version": 4, "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", "license": "MPL-1.1 OR LGPL-2.1-or-later OR GPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "libiconv" ], diff --git a/ports/ideviceinstaller/vcpkg.json b/ports/ideviceinstaller/vcpkg.json index ff9ea70725b521..ccfc1fd34ab737 100644 --- a/ports/ideviceinstaller/vcpkg.json +++ b/ports/ideviceinstaller/vcpkg.json @@ -1,11 +1,11 @@ { "name": "ideviceinstaller", "version": "1.1.2.23", - "port-version": 5, + "port-version": 6, "description": "Manage apps of iOS devices", "homepage": "https://libimobiledevice.org/", "license": "LGPL-2.1-only", - "supports": "windows & !arm64", + "supports": "windows & !arm64 & !xbox", "dependencies": [ "libimobiledevice", "libzip" diff --git a/ports/idyntree/vcpkg.json b/ports/idyntree/vcpkg.json index 038853de5380ff..63cef5be4f22a4 100644 --- a/ports/idyntree/vcpkg.json +++ b/ports/idyntree/vcpkg.json @@ -1,9 +1,11 @@ { "name": "idyntree", "version": "9.0.0", + "port-version": 1, "description": "Multibody Dynamics Library designed for Free Floating Robots.", "homepage": "https://github.com/robotology/idyntree", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ "eigen3", "libxml2", diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index b3580cf0b106fd..e2056a13c11b4a 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,9 +1,11 @@ { "name": "igraph", "version": "0.10.4", + "port-version": 1, "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", + "supports": "!xbox", "dependencies": [ "blas", "lapack", diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index af3654bd86cfc2..545efddf20a3e3 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,10 +1,11 @@ { "name": "jsonifier", "version": "0.9.2", + "port-version": 1, "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "LGPL-2.1-or-later", - "supports": "(windows & x64 & !uwp) | (linux & x64) | (osx & x64)", + "supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (osx & x64)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index 400001f049cd56..7432e5afaa18ef 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,9 +1,11 @@ { "name": "kf5archive", "version": "5.98.0", + "port-version": 1, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "license": "LGPL-2.0-or-later", + "supports": "!xbox", "dependencies": [ "ecm", "qt5-base", diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json index a09e44e4aa100d..0d6edb00aa2d5a 100644 --- a/ports/kfr/vcpkg.json +++ b/ports/kfr/vcpkg.json @@ -1,10 +1,11 @@ { "name": "kfr", "version-semver": "5.0.1", + "port-version": 1, "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", "license": "GPL-2.0", - "supports": "!(arm | linux)", + "supports": "!(arm | linux | xbox)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/lcm/vcpkg.json b/ports/lcm/vcpkg.json index a76cae68ad14f8..3a0666e9a2c520 100644 --- a/ports/lcm/vcpkg.json +++ b/ports/lcm/vcpkg.json @@ -1,14 +1,14 @@ { "name": "lcm", "version": "1.4.0", - "port-version": 5, + "port-version": 6, "description": [ "Lightweight Communications and Marshalling (LCM)", "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." ], "homepage": "https://github.com/lcm-proj/lcm", "license": "LGPL-2.1-or-later", - "supports": "!osx", + "supports": "!osx & !xbox", "dependencies": [ "glib", { diff --git a/ports/libadwaita/vcpkg.json b/ports/libadwaita/vcpkg.json index b8420443304dd3..8f1f5d229dc1d8 100644 --- a/ports/libadwaita/vcpkg.json +++ b/ports/libadwaita/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libadwaita", "version": "1.3.2", + "port-version": 1, "description": "Building blocks for modern GNOME applications", "homepage": "https://gnome.pages.gitlab.gnome.org/libadwaita", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "glib", diff --git a/ports/libalkimia/vcpkg.json b/ports/libalkimia/vcpkg.json index 90cd8e2e0c215c..9e8bcd7b8d604e 100644 --- a/ports/libalkimia/vcpkg.json +++ b/ports/libalkimia/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libalkimia", "version": "8.1.70", - "port-version": 1, + "port-version": 2, "description": "Common functionality for finance applications.", "homepage": "https://community.kde.org/Alkimia/libalkimia", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ "ecm", { diff --git a/ports/libao/vcpkg.json b/ports/libao/vcpkg.json index 18f7a2675107f4..fe6117b531c635 100644 --- a/ports/libao/vcpkg.json +++ b/ports/libao/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libao", "version": "1.2.2", - "port-version": 4, + "port-version": 5, "description": "libao - A Cross-platform Audio Library", "homepage": "https://github.com/xiph/libao", "license": "GPL-2.0", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libcsv/vcpkg.json b/ports/libcsv/vcpkg.json index 5c3b46ec58e58b..520c00e4b6fa9e 100644 --- a/ports/libcsv/vcpkg.json +++ b/ports/libcsv/vcpkg.json @@ -1,7 +1,9 @@ { "name": "libcsv", "version": "3.0.3", + "port-version": 1, "description": "CSV parser and writer library", "homepage": "https://github.com/rgamble/libcsv", - "license": "GPL-2.0-or-later" + "license": "GPL-2.0-or-later", + "supports": "!xbox" } diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index dcd7ef969521c8..3d200e5fd2b5d7 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libdatachannel", "version-semver": "0.18.2", - "port-version": 1, + "port-version": 2, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", + "supports": "!xbox", "dependencies": [ "libjuice", "openssl", diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index c565b31cf911aa..d11d6fa0d4861a 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libde265", "version": "1.0.11", - "port-version": 1, + "port-version": 2, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", - "supports": "!uwp & !(arm & windows)", + "supports": "!uwp & !xbox & !(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index 7ccfa916e551be..3802c293f27136 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libdjinterop", "version": "0.16.0", + "port-version": 1, "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ "sqlite3", { diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index cbeaef735dd324..b8aa71df2b9de2 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libfreenect2", "version": "0.2.0", - "port-version": 9, + "port-version": 10, "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", "license": "GPL-2.0-only", + "supports": "!xbox", "dependencies": [ "libjpeg-turbo", "libusb", diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index f2ad6f54d05d0e..81a78726b3d14f 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libheif", "version": "1.16.1", + "port-version": 1, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", + "supports": "!xbox", "dependencies": [ { "name": "gdk-pixbuf", diff --git a/ports/libhsplasma/vcpkg.json b/ports/libhsplasma/vcpkg.json index 44639e11ce864c..c2317a4a9bd9ce 100644 --- a/ports/libhsplasma/vcpkg.json +++ b/ports/libhsplasma/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libhsplasma", "version-date": "2022-05-19", + "port-version": 1, "description": "Cross-platform Plasma data and network library", "homepage": "https://github.com/H-uru/libhsplasma", "license": "GPL-3.0-or-later", - "supports": "!(arm | uwp)", + "supports": "!(arm | uwp | xbox)", "dependencies": [ "libjpeg-turbo", "libpng", diff --git a/ports/libimobiledevice/vcpkg.json b/ports/libimobiledevice/vcpkg.json index 8b399b4eb083f2..36d16b9b1d1c32 100644 --- a/ports/libimobiledevice/vcpkg.json +++ b/ports/libimobiledevice/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libimobiledevice", "version": "1.3.17", - "port-version": 3, + "port-version": 4, "description": "A cross-platform protocol library to communicate with iOS devices", "homepage": "http://www.libimobiledevice.org", "license": "LGPL-2.1-only", + "supports": "!xbox", "dependencies": [ "dirent", "getopt", diff --git a/ports/libirecovery/vcpkg.json b/ports/libirecovery/vcpkg.json index 2a9a35287f4a92..711c65caee6cca 100644 --- a/ports/libirecovery/vcpkg.json +++ b/ports/libirecovery/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libirecovery", "version": "1.0.25", - "port-version": 6, + "port-version": 7, "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", "license": "LGPL-2.1-only", - "supports": "windows & !arm64 & !static & !staticcrt", + "supports": "windows & !arm64 & !static & !staticcrt & !xbox", "dependencies": [ "getopt", "libusbmuxd", diff --git a/ports/libleidenalg/vcpkg.json b/ports/libleidenalg/vcpkg.json index a6ce8fc04befd9..569c63f14a967a 100644 --- a/ports/libleidenalg/vcpkg.json +++ b/ports/libleidenalg/vcpkg.json @@ -1,10 +1,12 @@ { "name": "libleidenalg", "version": "0.10.0", + "port-version": 1, "maintainers": "Andrew Robbins ", "description": "Leiden is a general algorithm for methods of community detection in large networks.", "homepage": "https://github.com/vtraag/libleidenalg", "license": "GPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "igraph", diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index 3718a3a914f1d7..cd4b708c86aa1f 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libmariadb", "version-semver": "3.3.1", - "port-version": 2, + "port-version": 3, "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json index d7240de5559b7e..8981af66f30885 100644 --- a/ports/libmesh/vcpkg.json +++ b/ports/libmesh/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libmesh", "version": "1.5.0", - "port-version": 4, + "port-version": 5, "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", "homepage": "https://github.com/libMesh/libmesh", - "license": "LGPL-2.1-only" + "license": "LGPL-2.1-only", + "supports": "!xbox" } diff --git a/ports/libmicrodns/vcpkg.json b/ports/libmicrodns/vcpkg.json index b522539d5ce9b9..dca30505f91dc2 100644 --- a/ports/libmicrodns/vcpkg.json +++ b/ports/libmicrodns/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libmicrodns", "version": "0.2.0", + "port-version": 1, "description": "Minimal mDNS resolver (and announcer) library", "homepage": "https://github.com/videolabs/libmicrodns", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-tool-meson", diff --git a/ports/libmikmod/vcpkg.json b/ports/libmikmod/vcpkg.json index fa13d1eb978ec5..03bf5c26399a0b 100644 --- a/ports/libmikmod/vcpkg.json +++ b/ports/libmikmod/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libmikmod", "version": "3.3.11.1", - "port-version": 11, + "port-version": 12, "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.", "homepage": "https://sourceforge.net/projects/mikmod/", "license": "LGPL-2.1-or-later", - "supports": "!osx & !uwp", + "supports": "!(osx | uwp | xbox)", "dependencies": [ "openal-soft", { diff --git a/ports/libmodbus/vcpkg.json b/ports/libmodbus/vcpkg.json index f42ee0aaee3b1d..34778e6160265c 100644 --- a/ports/libmodbus/vcpkg.json +++ b/ports/libmodbus/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libmodbus", "version": "3.1.6", - "port-version": 4, + "port-version": 5, "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol", "homepage": "https://github.com/stephane/libmodbus", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 41e3fa65a7e2ce..c7542693af396a 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libmysql", "version": "8.0.32", - "port-version": 4, + "port-version": 5, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", - "supports": "!(windows & x86) & !uwp", + "supports": "!(windows & x86) & !uwp & !xbox", "dependencies": [ "boost-algorithm", "boost-functional", diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json index 56e825b323ee92..6215c9344f565b 100644 --- a/ports/libnice-gst/vcpkg.json +++ b/ports/libnice-gst/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libnice-gst", "version": "0.1.21", - "port-version": 1, + "port-version": 2, "description": "Gstreamer Libnice plugins.", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", + "supports": "!xbox", "dependencies": [ "gstreamer", "libnice" diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index 69a62d4827d257..200ad1d2a46fa0 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libnice", "version": "0.1.21", + "port-version": 1, "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", + "supports": "!xbox", "dependencies": [ "glib", { diff --git a/ports/libofx/vcpkg.json b/ports/libofx/vcpkg.json index d0e3355401ee36..32fe77d10ffdb0 100644 --- a/ports/libofx/vcpkg.json +++ b/ports/libofx/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libofx", "version": "0.10.9", + "port-version": 1, "description": "OFX banking protocol abstraction library", "homepage": "https://github.com/libofx/libofx", "license": "GPL-2.0-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "libopensp", { diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json index ddc8b52eca6606..2703c62158857d 100644 --- a/ports/libpff/vcpkg.json +++ b/ports/libpff/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libpff", "version-date": "2021-11-14", - "port-version": 1, + "port-version": 2, "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", "homepage": "https://github.com/libyal/libpff", "license": "LGPL-3.0-or-later", - "supports": "windows & !(static & windows) & !uwp", + "supports": "windows & !(static & windows) & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index fcd0b5d494b8f6..0a26245082b458 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libproxy", "version": "0.4.18", - "port-version": 2, + "port-version": 3, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", - "supports": "!(uwp | android)", + "supports": "!(uwp | xbox | android)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libqcow/vcpkg.json b/ports/libqcow/vcpkg.json index 5a7cdc406c064f..007db5163b6df8 100644 --- a/ports/libqcow/vcpkg.json +++ b/ports/libqcow/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libqcow", "version": "20221124", + "port-version": 1, "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", "homepage": "https://github.com/libyal/libqcow", "license": "LGPL-3.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "gettext", "openssl", diff --git a/ports/libqglviewer/vcpkg.json b/ports/libqglviewer/vcpkg.json index 941cff6168cc5a..1145483b2e148c 100644 --- a/ports/libqglviewer/vcpkg.json +++ b/ports/libqglviewer/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libqglviewer", "version": "2.9.1", + "port-version": 1, "description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.", "homepage": "http://libqglviewer.com/", "license": "GPL-2.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "qtbase", diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index 48cf4134ec10c2..cfcb8fed9b8f2d 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libraw", "version": "0.21.1", + "port-version": 1, "description": "raw image decoder library", "homepage": "https://www.libraw.org", "license": "LGPL-2.1-only OR CDDL-1.0", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "jasper", "lcms", diff --git a/ports/libredwg/vcpkg.json b/ports/libredwg/vcpkg.json index 8843498f66c4f1..841af79d2a9a82 100644 --- a/ports/libredwg/vcpkg.json +++ b/ports/libredwg/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libredwg", "version": "0.12.5.5178", + "port-version": 1, "description": "GNU LibreDWG is a free C library to handle DWG files. It aims to be a free replacement for the OpenDWG libraries. DWG is the native file format of AutoCAD.", "homepage": "https://www.gnu.org/software/libredwg/", "license": "GPL-3.0", + "supports": "!xbox", "dependencies": [ "jsmn", { diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index 42281404d53910..f97eb24f739304 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libsbml", "version": "5.20.0", + "port-version": 1, "description": "A library for reading / writing SBML files", "homepage": "https://github.com/sbmlteam/libsbml", "license": "LGPL-2.1", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index b8ab13edb7b8e4..7d97b2c106cc98 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libsndfile", "version-semver": "1.2.0", + "port-version": 1, "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index d96d44844c65b1..7e62bfdd1db6a0 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libsrt", "version": "1.5.0", - "port-version": 2, + "port-version": 3, "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", "license": "MPL-2.0", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "openssl", { diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 55bf4385e93003..dfdc88278f68e5 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libssh", "version": "0.10.4+20221123", - "port-version": 3, + "port-version": 4, "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "license": "LGPL-2.1-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "libssh", diff --git a/ports/libunistring/vcpkg.json b/ports/libunistring/vcpkg.json index d3dc3e759c3161..9d3340347d8ce9 100644 --- a/ports/libunistring/vcpkg.json +++ b/ports/libunistring/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libunistring", "version": "1.1", - "port-version": 2, + "port-version": 3, "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", "homepage": "https://www.gnu.org/software/libunistring/", "license": "LGPL-3.0-or-later OR GPL-2.0-or-later", + "supports": "!xbox", "dependencies": [ "libiconv" ] diff --git a/ports/libusb-win32/vcpkg.json b/ports/libusb-win32/vcpkg.json index 547edbd391d78c..5dc4288684526c 100644 --- a/ports/libusb-win32/vcpkg.json +++ b/ports/libusb-win32/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libusb-win32", "version": "1.2.6.0", - "port-version": 9, + "port-version": 10, "description": "Allows user space applications to access many USB device on Windows.", "homepage": "https://sourceforge.net/projects/libusb-win32", "license": "LGPL-3.0-only", - "supports": "windows & !static", + "supports": "windows & !static & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libxmp/vcpkg.json b/ports/libxmp/vcpkg.json index 9c4dc8139c109d..f6481f4342cb8b 100644 --- a/ports/libxmp/vcpkg.json +++ b/ports/libxmp/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libxmp", "version-date": "2023-04-13", + "port-version": 1, "description": "Libxmp is a library that renders module files to PCM data.", "homepage": "https://sourceforge.net/projects/xmp/", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libzim/vcpkg.json b/ports/libzim/vcpkg.json index 9df7dd355e7c24..58a4f0efbd61b9 100644 --- a/ports/libzim/vcpkg.json +++ b/ports/libzim/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libzim", "version": "8.2.0", - "port-version": 1, + "port-version": 2, "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.", "homepage": "https://github.com/openzim/libzim", "license": "GPL-2.0-or-later", - "supports": "!android", + "supports": "!android & !xbox", "dependencies": [ "icu", "liblzma", diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 302aae21807201..4467303c4d37ed 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,9 +1,11 @@ { "name": "live555", "version-date": "2023-06-10", + "port-version": 1, "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ "openssl", { diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 7506aa800d4557..3a87054df95cac 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,9 +1,11 @@ { "name": "mapnik", "version-date": "2023-06-12", + "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", + "supports": "!xbox", "dependencies": [ "boost-assign", "boost-bimap", diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json index 06c6ae814225cd..730236632c3c3b 100644 --- a/ports/marble/vcpkg.json +++ b/ports/marble/vcpkg.json @@ -1,11 +1,11 @@ { "name": "marble", "version-string": "22.04.0", - "port-version": 1, + "port-version": 2, "description": "Marble KDE library", "homepage": "https://marble.kde.org", "license": "LGPL-2.1-or-later", - "supports": "windows & x64 & !static", + "supports": "windows & x64 & !static & !xbox", "dependencies": [ "qt5-base", "qt5-quickcontrols", diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index 4e0adcc11b03f4..fd235b0b9edfc5 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,10 +1,10 @@ { "name": "mathgl", "version": "8.0.1", - "port-version": 4, + "port-version": 5, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "license": "GPL-3.0-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "getopt", { diff --git a/ports/mchehab-zbar/vcpkg.json b/ports/mchehab-zbar/vcpkg.json index ff07384aee7536..c56b3f779e3c04 100644 --- a/ports/mchehab-zbar/vcpkg.json +++ b/ports/mchehab-zbar/vcpkg.json @@ -1,11 +1,11 @@ { "name": "mchehab-zbar", "version": "0.23.90", - "port-version": 4, + "port-version": 5, "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.", "homepage": "https://github.com/mchehab/zbar", "license": "LGPL-2.1-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "gettext", diff --git a/ports/moos-core/vcpkg.json b/ports/moos-core/vcpkg.json index 43b72a27ef5a4f..6516d65f1b953c 100644 --- a/ports/moos-core/vcpkg.json +++ b/ports/moos-core/vcpkg.json @@ -1,10 +1,11 @@ { "name": "moos-core", "version": "10.4.0", - "port-version": 8, + "port-version": 9, "description": "A very light weight, easy to use middleware.", "homepage": "https://sites.google.com/site/moossoftware/", "license": "GPL-2.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json index e77193ddad3fa3..56916d8b237468 100644 --- a/ports/mpfr/vcpkg.json +++ b/ports/mpfr/vcpkg.json @@ -1,9 +1,11 @@ { "name": "mpfr", "version": "4.2.0", + "port-version": 1, "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", "homepage": "https://www.mpfr.org", "license": "LGPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ "gmp" ] diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index f5de8d82859d32..0452cbb7f9b51d 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,9 +1,11 @@ { "name": "mpg123", "version": "1.31.3", + "port-version": 1, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json index ee000485aec789..8d5c7115ee2964 100644 --- a/ports/nspr/vcpkg.json +++ b/ports/nspr/vcpkg.json @@ -1,11 +1,11 @@ { "name": "nspr", "version": "4.35", - "port-version": 3, + "port-version": 4, "description": "Netscape portable runtime", "homepage": "https://releases.mozilla.org/pub/nspr/", "license": "MPL-2.0", - "supports": "windows & !(arm | uwp | static)", + "supports": "windows & !(arm | uwp | static | xbox)", "dependencies": [ { "name": "vcpkg-tool-mozbuild", diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index e84343a61d3b69..434917cf2b81e9 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,11 +1,11 @@ { "name": "nss", "version": "3.87", - "port-version": 1, + "port-version": 2, "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", - "supports": "windows & !arm", + "supports": "windows & !arm & !xbox", "dependencies": [ "nspr", "sqlite3", diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 389b567266b769..68fc8609fb0146 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nuspell", "version-semver": "5.1.2", + "port-version": 1, "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", @@ -8,6 +9,7 @@ ], "homepage": "https://nuspell.github.io/", "license": "LGPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ "icu", { diff --git a/ports/omniorb/vcpkg.json b/ports/omniorb/vcpkg.json index 11dce3fbd92cab..7107c9e1fa26c5 100644 --- a/ports/omniorb/vcpkg.json +++ b/ports/omniorb/vcpkg.json @@ -1,10 +1,11 @@ { "name": "omniorb", "version": "4.3.0", + "port-version": 1, "description": "omniORB is a robust high performance CORBA ORB for C++", "homepage": "https://omniorb.sourceforge.io/", "license": "LGPL-2.1-or-later", - "supports": "!uwp & !((arm | x86) & windows) & !osx", + "supports": "!uwp & !xbox & !((arm | x86) & windows) & !osx", "dependencies": [ "openssl", "python3", diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 981269848d12b5..10c7a39416a627 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,9 +1,11 @@ { "name": "open62541", "version": "1.3.5", + "port-version": 1, "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", "license": "MPL-2.0", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 7a998e4da2cda4..b72c71dd35fe66 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openal-soft", "version": "1.23.0", + "port-version": 1, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "LGPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "alsa", diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index 37efb036445e8d..d03ec3ba8be0de 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,11 +1,11 @@ { "name": "opencascade", "version": "7.6.2", - "port-version": 4, + "port-version": 5, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", - "supports": "!(uwp | osx | arm)", + "supports": "!(uwp | xbox | osx | arm)", "dependencies": [ "fontconfig", "freetype", diff --git a/ports/openmama/vcpkg.json b/ports/openmama/vcpkg.json index c5b014d2caaf6f..0a5a2005405035 100644 --- a/ports/openmama/vcpkg.json +++ b/ports/openmama/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openmama", "version-semver": "6.3.2", - "port-version": 2, + "port-version": 3, "description": "OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages", "homepage": "https://github.com/finos/OpenMAMA", "license": "LGPL-2.1", + "supports": "!xbox", "dependencies": [ "apr", "apr-util", diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index 4511137bb6fb53..55b297a70a7b92 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,10 +1,10 @@ { "name": "openmvg", "version": "2.0", - "port-version": 7, + "port-version": 8, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": "MPL-2.0-no-copyleft-exception", - "supports": "x86 | x64", + "supports": "(x86 | x64) & !xbox", "dependencies": [ "cereal", { diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 96022f4249c949..809fe85cd88e68 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,9 +1,11 @@ { "name": "openmvs", "version": "2.1.0", + "port-version": 1, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "license": "AGPL-3.0-only", + "supports": "!xbox", "dependencies": [ "boost-iostreams", "boost-program-options", diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json index 3a3f1e51b1189c..571eb4b705a08c 100644 --- a/ports/openscap/vcpkg.json +++ b/ports/openscap/vcpkg.json @@ -1,9 +1,11 @@ { "name": "openscap", "version": "1.3.7", + "port-version": 1, "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "homepage": "https://github.com/OpenSCAP/openscap", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ "curl", "glib", diff --git a/ports/openslide/vcpkg.json b/ports/openslide/vcpkg.json index ef9e6292ece1cd..afcc3c87293f8c 100644 --- a/ports/openslide/vcpkg.json +++ b/ports/openslide/vcpkg.json @@ -1,11 +1,11 @@ { "name": "openslide", "version": "3.4.1", - "port-version": 1, + "port-version": 2, "description": "OpenSlide is a C library for reading whole slide image files (also known as virtual slides). It provides a consistent and simple API for reading files from multiple vendors.", "homepage": "https://openslide.org/", "license": "LGPL-2.1-or-later", - "supports": "native & !(windows & static) & !osx", + "supports": "native & !(windows & static) & !xbox & !osx", "dependencies": [ "cairo", "gdk-pixbuf", diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index ea60355aca434b..9e9f38433b16e2 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openvdb", "version": "10.0.0", - "port-version": 2, + "port-version": 3, "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "license": "MPL-2.0", + "supports": "!xbox", "dependencies": [ "blosc", "boost-any", diff --git a/ports/openvpn3/vcpkg.json b/ports/openvpn3/vcpkg.json index cac8788966ff94..b96855c9a3607a 100644 --- a/ports/openvpn3/vcpkg.json +++ b/ports/openvpn3/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openvpn3", "version": "3.7.0", - "port-version": 1, + "port-version": 2, "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.", "homepage": "https://openvpn.net", "license": "AGPL-3.0", + "supports": "!xbox", "dependencies": [ "asio", "mbedtls", diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 36d07a1f686268..1459fde3f078e4 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,10 +1,11 @@ { "name": "osgearth", "version": "3.4", + "port-version": 1, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", - "supports": "!(arm | x86 | wasm32)", + "supports": "!(arm | x86 | wasm32 | xbox)", "dependencies": [ "basisu", "blosc", diff --git a/ports/pagmo2/vcpkg.json b/ports/pagmo2/vcpkg.json index 0ad81183b4d0e4..c301f4ead8c66d 100644 --- a/ports/pagmo2/vcpkg.json +++ b/ports/pagmo2/vcpkg.json @@ -1,9 +1,11 @@ { "name": "pagmo2", "version": "2.19.0", + "port-version": 2, "description": "A C++ platform to perform parallel computations of optimization tasks (global and local) via the asynchronous generalized island model.", "homepage": "https://esa.github.io/pagmo2/", "license": "GPL-3.0-or-later OR LGPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ "boost-any", "boost-graph", diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index e7f7ac562adef3..1d87ac2cc60b7d 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,9 +1,11 @@ { "name": "pango", "version": "1.50.14", + "port-version": 1, "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-only", + "supports": "!xbox", "dependencies": [ { "name": "cairo", diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index 49117f5ac452b4..955bef04fd64f0 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,11 +1,11 @@ { "name": "pangomm", "version": "2.50.1", - "port-version": 2, + "port-version": 3, "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", "homepage": "https://gitlab.gnome.org/GNOME/pangomm", "license": "LGPL-2.1-or-later", - "supports": "!arm", + "supports": "!(arm | xbox)", "dependencies": [ "cairo", "cairomm", diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json index 35892d993bac63..ab7919c05d0b74 100644 --- a/ports/plib/vcpkg.json +++ b/ports/plib/vcpkg.json @@ -1,10 +1,10 @@ { "name": "plib", "version": "1.8.5", - "port-version": 7, + "port-version": 8, "description": "A suite of portable game libraries", "license": "LGPL-2.0-only", - "supports": "!osx & !uwp", + "supports": "!(osx | uwp | xbox)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index 24398f4254cf2c..3a9cb740166092 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,11 +1,11 @@ { "name": "podofo", "version": "0.10.0", - "port-version": 1, + "port-version": 2, "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://github.com/podofo/podofo", "license": "LGPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "freetype", "libjpeg-turbo", diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 730c62fb4598da..bc3aeeba3d10de 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,11 +1,11 @@ { "name": "poppler", "version": "23.1.0", - "port-version": 3, + "port-version": 4, "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ "boost-container", "boost-move", diff --git a/ports/qcustomplot/vcpkg.json b/ports/qcustomplot/vcpkg.json index 4c00c7c0b89c0c..c8bd342a9720a8 100644 --- a/ports/qcustomplot/vcpkg.json +++ b/ports/qcustomplot/vcpkg.json @@ -1,9 +1,11 @@ { "name": "qcustomplot", "version": "2.1.1", + "port-version": 1, "description": "QCustomPlot is a Qt C++ widget for plotting and data visualization.", "homepage": "https://www.qcustomplot.com/", "license": "GPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "qtbase", diff --git a/ports/qscintilla/vcpkg.json b/ports/qscintilla/vcpkg.json index 50784a3327dba7..864d54fe522f49 100644 --- a/ports/qscintilla/vcpkg.json +++ b/ports/qscintilla/vcpkg.json @@ -1,10 +1,11 @@ { "name": "qscintilla", "version": "2.13.4", - "port-version": 1, + "port-version": 2, "description": "QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)", "homepage": "https://www.riverbankcomputing.com/software/qscintilla", "license": "GPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "qtbase", diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index 50ec23d894ec26..1404b611c1fb8d 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,9 +1,11 @@ { "name": "qt-advanced-docking-system", "version": "4.0.3", + "port-version": 1, "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", "license": "LGPL-2.1-only", + "supports": "!xbox", "dependencies": [ "bzip2", { diff --git a/ports/quazip/vcpkg.json b/ports/quazip/vcpkg.json index 720b28be4f204e..5a144c8a6e8e21 100644 --- a/ports/quazip/vcpkg.json +++ b/ports/quazip/vcpkg.json @@ -1,9 +1,11 @@ { "name": "quazip", "version": "1.4", + "port-version": 1, "description": "Qt/C++ wrapper over minizip", "homepage": "https://stachenov.github.io/quazip/", "license": "LGPL-2.1-or-later", + "supports": "!xbox", "dependencies": [ { "name": "qt5compat", diff --git a/ports/restbed/vcpkg.json b/ports/restbed/vcpkg.json index 408bd47a9c5ce1..4807d4976df1c0 100644 --- a/ports/restbed/vcpkg.json +++ b/ports/restbed/vcpkg.json @@ -1,10 +1,11 @@ { "name": "restbed", "version": "4.8", - "port-version": 2, + "port-version": 3, "description": "Corvusoft's Restbed framework brings asynchronous RESTful functionality to C++14 applications.", "homepage": "https://github.com/corvusoft/restbed", "license": "AGPL-3.0-or-later OR CPL-1.0", + "supports": "!xbox", "dependencies": [ "asio", { diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json index f5a571f48f7570..15d2f408431ed5 100644 --- a/ports/rubberband/vcpkg.json +++ b/ports/rubberband/vcpkg.json @@ -1,10 +1,11 @@ { "name": "rubberband", "version": "3.2.1", + "port-version": 1, "description": "A high quality software library for audio time-stretching and pitch-shifting.", "homepage": "https://www.breakfastquay.com/rubberband/", "license": "GPL-2.0-or-later", - "supports": "!uwp & !(windows & static)", + "supports": "!uwp & !(windows & static) & !xbox", "dependencies": [ { "name": "fftw3", diff --git a/ports/shiftmedia-libgnutls/vcpkg.json b/ports/shiftmedia-libgnutls/vcpkg.json index d2abccbc581b62..cf9a6a589c7bb0 100644 --- a/ports/shiftmedia-libgnutls/vcpkg.json +++ b/ports/shiftmedia-libgnutls/vcpkg.json @@ -1,11 +1,11 @@ { "name": "shiftmedia-libgnutls", "version": "3.7.6", - "port-version": 2, + "port-version": 3, "description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ", "homepage": "https://github.com/ShiftMediaProject/gnutls", "license": "LGPL-2.1-only", - "supports": "windows & !arm & !mingw", + "supports": "windows & !arm & !mingw & !xbox", "dependencies": [ "gettext", "gmp", diff --git a/ports/spatialite-tools/vcpkg.json b/ports/spatialite-tools/vcpkg.json index dd2a54db0b15ad..5f834eb1194a70 100644 --- a/ports/spatialite-tools/vcpkg.json +++ b/ports/spatialite-tools/vcpkg.json @@ -1,10 +1,11 @@ { "name": "spatialite-tools", "version": "5.0.1", - "port-version": 3, + "port-version": 4, "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)", "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index", "license": "GPL-3.0-or-later", + "supports": "!xbox", "dependencies": [ "expat", "libiconv", diff --git a/ports/usbmuxd/vcpkg.json b/ports/usbmuxd/vcpkg.json index fdbb2ef8ed8027..ceb268b6d212a8 100644 --- a/ports/usbmuxd/vcpkg.json +++ b/ports/usbmuxd/vcpkg.json @@ -1,11 +1,11 @@ { "name": "usbmuxd", "version": "1.2.235", - "port-version": 3, + "port-version": 4, "description": "A socket daemon to multiplex connections from and to iOS devices", "homepage": "http://www.libimobiledevice.org", "license": "LGPL-2.1-only", - "supports": "windows & !arm64 & !static", + "supports": "windows & !arm64 & !static & !xbox", "dependencies": [ "libimobiledevice", "libusb", diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json index 687d6705f0c080..ba1e880f9776eb 100644 --- a/ports/wolftpm/vcpkg.json +++ b/ports/wolftpm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "wolftpm", "version": "2.7.0", + "port-version": 1, "description": "TPM library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 79a25672709a72..f629baaa11c316 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,10 +1,11 @@ { "name": "wt", "version": "4.9.1", - "port-version": 1, + "port-version": 2, "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "license": "GPL-2.0-only", + "supports": "!xbox", "dependencies": [ "boost-algorithm", "boost-array", diff --git a/ports/wxchartdir/vcpkg.json b/ports/wxchartdir/vcpkg.json index 6ff8f401dc18ec..27806462ab6d5b 100644 --- a/ports/wxchartdir/vcpkg.json +++ b/ports/wxchartdir/vcpkg.json @@ -1,10 +1,11 @@ { "name": "wxchartdir", "version": "2.0.0", - "port-version": 1, + "port-version": 2, "description": "wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.", "homepage": "https://github.com/utelle/wxchartdir", "license": "GPL-3.0-only AND LGPL-3.0 AND wxWindows", + "supports": "!xbox", "dependencies": [ "chartdir", { diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index aad9fcdc48ea78..4cdeb6b33988b0 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version": "3.2.2.1", - "port-version": 2, + "port-version": 3, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", @@ -9,7 +9,7 @@ ], "homepage": "https://github.com/wxWidgets/wxWidgets", "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "cairo", diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index c7a9c187324f0f..7a2a82573bdb57 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,10 +1,11 @@ { "name": "x264", "version": "0.164.3095", - "port-version": 4, + "port-version": 5, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", + "supports": "!xbox", "dependencies": [ { "name": "vcpkg-cmake-get-vars", diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json index 983e4cca89ea80..ee7bc4a88a9bfa 100644 --- a/ports/x265/vcpkg.json +++ b/ports/x265/vcpkg.json @@ -1,11 +1,11 @@ { "name": "x265", "version": "3.4", - "port-version": 8, + "port-version": 9, "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", "homepage": "https://github.com/videolan/x265", "license": "GPL-2.0-or-later", - "supports": "!uwp & !(arm & windows)", + "supports": "!uwp & !(arm & windows) & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/xapian/vcpkg.json b/ports/xapian/vcpkg.json index 42071590a0b225..33bf4ffd58ed14 100644 --- a/ports/xapian/vcpkg.json +++ b/ports/xapian/vcpkg.json @@ -1,11 +1,11 @@ { "name": "xapian", "version": "1.4.22", - "port-version": 1, + "port-version": 2, "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)", "homepage": "https://xapian.org/", "license": "GPL-2.0-or-later", - "supports": "(!arm | arm64) & !uwp", + "supports": "(!arm | arm64) & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake-config", diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index c0c3a477b40c5f..a7e8fdebe5a2cf 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,9 +1,11 @@ { "name": "xmlsec", "version": "1.2.37", + "port-version": 1, "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "license": "X11 AND MPL-1.1", + "supports": "!xbox", "dependencies": [ "libxml2", "openssl", diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index a82a4f5424da42..a4cfb20711e19d 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,11 +1,11 @@ { "name": "zeromq", "version-date": "2023-01-31", - "port-version": 4, + "port-version": 5, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "LGPL-3.0-only", - "supports": "!uwp", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 2ef7dd1710e7fa..86ad7bba0b40ba 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0a5040bfab9f50a386dc1b40f291fa581b21c79", + "version-string": "22.01", + "port-version": 1 + }, { "git-tree": "e28ef5008a5e93e67db2904c72586f4a667ef5ed", "version-string": "22.01", diff --git a/versions/a-/arb.json b/versions/a-/arb.json index f01bc86bd1010a..1ea3d18cc1c729 100644 --- a/versions/a-/arb.json +++ b/versions/a-/arb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "979cfcc7b4326308bf376e69fd60982d28afef72", + "version": "2.21.1", + "port-version": 2 + }, { "git-tree": "e1b560a5a2aa835d54da9fdabac5eea48255e93d", "version": "2.21.1", diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 15a1a354c72064..9d13458a1b0371 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c40b0b29185c3bf172af4eaca94e38a892221b2", + "version": "2.38.0", + "port-version": 6 + }, { "git-tree": "0287be8f06bb4da8b89f9edb0aa93258c6d36f1e", "version": "2.38.0", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index b2de1cc72c3cfc..00ab30dbefbcd0 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98ad8f81a31186ba590b553c5e99d4ea5415eb64", + "version": "2.36.1", + "port-version": 2 + }, { "git-tree": "d9acaf9d071486528917fa62e0315a65d2c4ed6d", "version": "2.36.1", diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 8117a0dce907de..d8521908b2cd5d 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e51e332257e4b788828390a39d86109000d5b960", + "version-date": "2022-01-26", + "port-version": 1 + }, { "git-tree": "2e15f362018acee6d200577e41252e911eef35f0", "version-date": "2022-01-26", diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index feb78b21b2ff3b..d9eba72bad6fa4 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e89f515dc497bb37dd138d024d572ef318a10fb", + "version": "3.7.2", + "port-version": 2 + }, { "git-tree": "10f62c32226c4f588e4524ebe1ffc36a2ad2165a", "version": "3.7.2", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 67664be7c80311..4f420acdd77a01 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61b5ebb30db7da8972a235b11ffc92f667c597eb", + "version": "7.22.2", + "port-version": 1 + }, { "git-tree": "b0f6f1b59e54a64b321aba20d196531d6e181d2c", "version": "7.22.2", diff --git a/versions/b-/bxzstr.json b/versions/b-/bxzstr.json index 9e992baf410bc0..66c4b744f41cf5 100644 --- a/versions/b-/bxzstr.json +++ b/versions/b-/bxzstr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23e9ed2e92c2146d490f3d2b61de409c0201adeb", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "ad9511ac67f069a83b89c91a8fb0c995a6aca196", "version": "1.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b96092b8f5d1f2..374d65d96b4925 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6,7 +6,7 @@ }, "7zip": { "baseline": "22.01", - "port-version": 0 + "port-version": 1 }, "ableton": { "baseline": "3.0.6", @@ -162,7 +162,7 @@ }, "arb": { "baseline": "2.21.1", - "port-version": 1 + "port-version": 2 }, "arcus": { "baseline": "4.10.0", @@ -278,11 +278,11 @@ }, "atk": { "baseline": "2.38.0", - "port-version": 5 + "port-version": 6 }, "atkmm": { "baseline": "2.36.1", - "port-version": 1 + "port-version": 2 }, "atlmfc": { "baseline": "0", @@ -298,7 +298,7 @@ }, "aubio": { "baseline": "2022-01-26", - "port-version": 0 + "port-version": 1 }, "audiofile": { "baseline": "1.1.0", @@ -322,7 +322,7 @@ }, "avisynthplus": { "baseline": "3.7.2", - "port-version": 1 + "port-version": 2 }, "avro-c": { "baseline": "1.11.0", @@ -618,7 +618,7 @@ }, "boinc": { "baseline": "7.22.2", - "port-version": 0 + "port-version": 1 }, "bond": { "baseline": "10.0.0", @@ -1314,7 +1314,7 @@ }, "bxzstr": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "byte-lite": { "baseline": "0.3.0", @@ -1358,11 +1358,11 @@ }, "cairo": { "baseline": "1.17.8", - "port-version": 0 + "port-version": 1 }, "cairomm": { "baseline": "1.16.2", - "port-version": 3 + "port-version": 4 }, "calceph": { "baseline": "3.5.2", @@ -1418,7 +1418,7 @@ }, "cctag": { "baseline": "1.0.2", - "port-version": 3 + "port-version": 4 }, "cctz": { "baseline": "2.3", @@ -1450,7 +1450,7 @@ }, "cgal": { "baseline": "5.5.2", - "port-version": 0 + "port-version": 1 }, "cgicc": { "baseline": "3.2.19", @@ -1502,7 +1502,7 @@ }, "chromaprint": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "chromium-base": { "baseline": "86.0.4199.1", @@ -1898,7 +1898,7 @@ }, "cserialport": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "cspice": { "baseline": "67", @@ -1978,7 +1978,7 @@ }, "czmq": { "baseline": "4.2.1", - "port-version": 1 + "port-version": 2 }, "d3d12-memory-allocator": { "baseline": "2021-05-05", @@ -2122,7 +2122,7 @@ }, "discordcoreapi": { "baseline": "2023-05-30", - "port-version": 0 + "port-version": 1 }, "discount": { "baseline": "2.2.6", @@ -2334,7 +2334,7 @@ }, "epsilon": { "baseline": "0.9.2", - "port-version": 7 + "port-version": 8 }, "ereignis": { "baseline": "1.1", @@ -2366,7 +2366,7 @@ }, "exiv2": { "baseline": "0.27.6", - "port-version": 2 + "port-version": 3 }, "expat": { "baseline": "2.5.0", @@ -2554,7 +2554,7 @@ }, "fluidsynth": { "baseline": "2.3.2", - "port-version": 2 + "port-version": 3 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", @@ -2618,7 +2618,7 @@ }, "freealut": { "baseline": "1.1.0", - "port-version": 3 + "port-version": 4 }, "freeglut": { "baseline": "3.4.0", @@ -2638,7 +2638,7 @@ }, "freetds": { "baseline": "1.3.10", - "port-version": 1 + "port-version": 2 }, "freetype": { "baseline": "2.12.1", @@ -2750,7 +2750,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.10", - "port-version": 0 + "port-version": 1 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2790,11 +2790,11 @@ }, "gettext": { "baseline": "0.21.1", - "port-version": 1 + "port-version": 2 }, "gettext-libintl": { "baseline": "0.21.1", - "port-version": 0 + "port-version": 1 }, "gettimeofday": { "baseline": "2017-10-14", @@ -2858,11 +2858,11 @@ }, "glib": { "baseline": "2.76.3", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.76.0", - "port-version": 0 + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2882,7 +2882,7 @@ }, "glpk": { "baseline": "5.0", - "port-version": 1 + "port-version": 2 }, "glslang": { "baseline": "12.2.0", @@ -2894,7 +2894,7 @@ }, "gmime": { "baseline": "3.2.6", - "port-version": 5 + "port-version": 6 }, "gmmlib": { "baseline": "21.3.2", @@ -2902,7 +2902,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 18 + "port-version": 19 }, "gmsh": { "baseline": "4.9.0", @@ -2946,11 +2946,11 @@ }, "gppanel": { "baseline": "2020-05-20", - "port-version": 3 + "port-version": 4 }, "grantlee": { "baseline": "5.3.1", - "port-version": 1 + "port-version": 2 }, "graphene": { "baseline": "1.10.8", @@ -2998,11 +2998,11 @@ }, "gst-rtsp-server": { "baseline": "1.20.5", - "port-version": 1 + "port-version": 2 }, "gstreamer": { "baseline": "1.20.5", - "port-version": 8 + "port-version": 9 }, "gtest": { "baseline": "1.13.0", @@ -3010,7 +3010,7 @@ }, "gtk": { "baseline": "4.10.4", - "port-version": 0 + "port-version": 1 }, "gtk3": { "baseline": "3.24.38", @@ -3018,7 +3018,7 @@ }, "gtkmm": { "baseline": "4.10.0", - "port-version": 0 + "port-version": 1 }, "gtl": { "baseline": "1.1.8", @@ -3046,7 +3046,7 @@ }, "gul14": { "baseline": "2.9.1", - "port-version": 0 + "port-version": 1 }, "gumbo": { "baseline": "0.10.1", @@ -3182,7 +3182,7 @@ }, "hunspell": { "baseline": "1.7.1", - "port-version": 3 + "port-version": 4 }, "hwloc": { "baseline": "2.9.0", @@ -3210,7 +3210,7 @@ }, "ideviceinstaller": { "baseline": "1.1.2.23", - "port-version": 5 + "port-version": 6 }, "idevicerestore": { "baseline": "1.0.12", @@ -3218,7 +3218,7 @@ }, "idyntree": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "if97": { "baseline": "2.1.3", @@ -3302,7 +3302,7 @@ }, "igraph": { "baseline": "0.10.4", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.9.1", @@ -3498,7 +3498,7 @@ }, "jsonifier": { "baseline": "0.9.2", - "port-version": 0 + "port-version": 1 }, "jsonnet": { "baseline": "0.18.0", @@ -3554,7 +3554,7 @@ }, "kf5archive": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5attica": { "baseline": "5.98.0", @@ -3702,7 +3702,7 @@ }, "kfr": { "baseline": "5.0.1", - "port-version": 0 + "port-version": 1 }, "kinectsdk1": { "baseline": "1.8", @@ -3786,7 +3786,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 5 + "port-version": 6 }, "lcms": { "baseline": "2.14", @@ -3838,7 +3838,7 @@ }, "libadwaita": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "libaiff": { "baseline": "5.0", @@ -3846,11 +3846,11 @@ }, "libalkimia": { "baseline": "8.1.70", - "port-version": 1 + "port-version": 2 }, "libao": { "baseline": "1.2.2", - "port-version": 4 + "port-version": 5 }, "libarchive": { "baseline": "3.6.2", @@ -3938,7 +3938,7 @@ }, "libcsv": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libcuckoo": { "baseline": "0.3.1", @@ -3950,7 +3950,7 @@ }, "libdatachannel": { "baseline": "0.18.2", - "port-version": 1 + "port-version": 2 }, "libdatrie": { "baseline": "0.2.13", @@ -3962,7 +3962,7 @@ }, "libde265": { "baseline": "1.0.11", - "port-version": 1 + "port-version": 2 }, "libdeflate": { "baseline": "1.17", @@ -3978,7 +3978,7 @@ }, "libdjinterop": { "baseline": "0.16.0", - "port-version": 0 + "port-version": 1 }, "libdmx": { "baseline": "1.1.4", @@ -4054,7 +4054,7 @@ }, "libfreenect2": { "baseline": "0.2.0", - "port-version": 9 + "port-version": 10 }, "libfs": { "baseline": "1.0.8", @@ -4134,11 +4134,11 @@ }, "libheif": { "baseline": "1.16.1", - "port-version": 0 + "port-version": 1 }, "libhsplasma": { "baseline": "2022-05-19", - "port-version": 0 + "port-version": 1 }, "libhv": { "baseline": "1.3.0", @@ -4182,11 +4182,11 @@ }, "libimobiledevice": { "baseline": "1.3.17", - "port-version": 3 + "port-version": 4 }, "libirecovery": { "baseline": "1.0.25", - "port-version": 6 + "port-version": 7 }, "libjpeg-turbo": { "baseline": "2.1.5.1", @@ -4218,7 +4218,7 @@ }, "libleidenalg": { "baseline": "0.10.0", - "port-version": 0 + "port-version": 1 }, "liblemon": { "baseline": "2019-06-13", @@ -4258,7 +4258,7 @@ }, "libmariadb": { "baseline": "3.3.1", - "port-version": 2 + "port-version": 3 }, "libmaxminddb": { "baseline": "1.4.3", @@ -4270,11 +4270,11 @@ }, "libmesh": { "baseline": "1.5.0", - "port-version": 4 + "port-version": 5 }, "libmicrodns": { "baseline": "0.2.0", - "port-version": 0 + "port-version": 1 }, "libmicrohttpd": { "baseline": "0.9.77", @@ -4282,11 +4282,11 @@ }, "libmikmod": { "baseline": "3.3.11.1", - "port-version": 11 + "port-version": 12 }, "libmodbus": { "baseline": "3.1.6", - "port-version": 4 + "port-version": 5 }, "libmodman": { "baseline": "2.0.1", @@ -4322,15 +4322,15 @@ }, "libmysql": { "baseline": "8.0.32", - "port-version": 4 + "port-version": 5 }, "libnice": { "baseline": "0.1.21", - "port-version": 0 + "port-version": 1 }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 1 + "port-version": 2 }, "libnoise": { "baseline": "1.0.0", @@ -4362,7 +4362,7 @@ }, "libofx": { "baseline": "0.10.9", - "port-version": 0 + "port-version": 1 }, "libogg": { "baseline": "1.3.5", @@ -4410,7 +4410,7 @@ }, "libpff": { "baseline": "2021-11-14", - "port-version": 1 + "port-version": 2 }, "libphonenumber": { "baseline": "8.13.13", @@ -4446,15 +4446,15 @@ }, "libproxy": { "baseline": "0.4.18", - "port-version": 2 + "port-version": 3 }, "libqcow": { "baseline": "20221124", - "port-version": 0 + "port-version": 1 }, "libqglviewer": { "baseline": "2.9.1", - "port-version": 0 + "port-version": 1 }, "libqrencode": { "baseline": "4.1.1", @@ -4470,7 +4470,7 @@ }, "libraw": { "baseline": "0.21.1", - "port-version": 0 + "port-version": 1 }, "librdkafka": { "baseline": "2.1.1", @@ -4478,7 +4478,7 @@ }, "libredwg": { "baseline": "0.12.5.5178", - "port-version": 0 + "port-version": 1 }, "libressl": { "baseline": "3.6.2", @@ -4510,7 +4510,7 @@ }, "libsbml": { "baseline": "5.20.0", - "port-version": 0 + "port-version": 1 }, "libsbsms": { "baseline": "2.3.0", @@ -4550,7 +4550,7 @@ }, "libsndfile": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "libsnoretoast": { "baseline": "0.8.0", @@ -4586,7 +4586,7 @@ }, "libsrt": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "libsrtp": { "baseline": "2.4.2", @@ -4594,7 +4594,7 @@ }, "libssh": { "baseline": "0.10.4+20221123", - "port-version": 3 + "port-version": 4 }, "libssh2": { "baseline": "1.10.0", @@ -4686,7 +4686,7 @@ }, "libunistring": { "baseline": "1.1", - "port-version": 2 + "port-version": 3 }, "liburing": { "baseline": "2.3", @@ -4698,7 +4698,7 @@ }, "libusb-win32": { "baseline": "1.2.6.0", - "port-version": 9 + "port-version": 10 }, "libusbmuxd": { "baseline": "1.2.219", @@ -4830,7 +4830,7 @@ }, "libxmp": { "baseline": "2023-04-13", - "port-version": 0 + "port-version": 1 }, "libxmu": { "baseline": "1.1.3", @@ -4894,7 +4894,7 @@ }, "libzim": { "baseline": "8.2.0", - "port-version": 1 + "port-version": 2 }, "libzip": { "baseline": "1.9.2", @@ -4938,7 +4938,7 @@ }, "live555": { "baseline": "2023-06-10", - "port-version": 0 + "port-version": 1 }, "llfio": { "baseline": "2023-03-13", @@ -5142,11 +5142,11 @@ }, "mapnik": { "baseline": "2023-06-12", - "port-version": 0 + "port-version": 1 }, "marble": { "baseline": "22.04.0", - "port-version": 1 + "port-version": 2 }, "marisa-trie": { "baseline": "0.2.6+20200926", @@ -5170,7 +5170,7 @@ }, "mathgl": { "baseline": "8.0.1", - "port-version": 4 + "port-version": 5 }, "matio": { "baseline": "1.5.23", @@ -5194,7 +5194,7 @@ }, "mchehab-zbar": { "baseline": "0.23.90", - "port-version": 4 + "port-version": 5 }, "mcpp": { "baseline": "2.7.2.14", @@ -5374,7 +5374,7 @@ }, "moos-core": { "baseline": "10.4.0", - "port-version": 8 + "port-version": 9 }, "moos-essential": { "baseline": "10.0.1", @@ -5414,11 +5414,11 @@ }, "mpfr": { "baseline": "4.2.0", - "port-version": 0 + "port-version": 1 }, "mpg123": { "baseline": "1.31.3", - "port-version": 0 + "port-version": 1 }, "mpi": { "baseline": "1", @@ -5714,11 +5714,11 @@ }, "nspr": { "baseline": "4.35", - "port-version": 3 + "port-version": 4 }, "nss": { "baseline": "3.87", - "port-version": 1 + "port-version": 2 }, "nsync": { "baseline": "1.24.0", @@ -5746,7 +5746,7 @@ }, "nuspell": { "baseline": "5.1.2", - "port-version": 0 + "port-version": 1 }, "nvtt": { "baseline": "2.1.2", @@ -5842,7 +5842,7 @@ }, "omniorb": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "ompl": { "baseline": "1.5.1", @@ -5882,11 +5882,11 @@ }, "open62541": { "baseline": "1.3.5", - "port-version": 0 + "port-version": 1 }, "openal-soft": { "baseline": "1.23.0", - "port-version": 0 + "port-version": 1 }, "openblas": { "baseline": "0.3.23", @@ -5894,7 +5894,7 @@ }, "opencascade": { "baseline": "7.6.2", - "port-version": 4 + "port-version": 5 }, "opencc": { "baseline": "1.1.6", @@ -5982,7 +5982,7 @@ }, "openmama": { "baseline": "6.3.2", - "port-version": 2 + "port-version": 3 }, "openmesh": { "baseline": "9.0", @@ -5994,11 +5994,11 @@ }, "openmvg": { "baseline": "2.0", - "port-version": 7 + "port-version": 8 }, "openmvs": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "openni2": { "baseline": "2.2.0.33", @@ -6006,11 +6006,11 @@ }, "openscap": { "baseline": "1.3.7", - "port-version": 0 + "port-version": 1 }, "openslide": { "baseline": "3.4.1", - "port-version": 1 + "port-version": 2 }, "openssl": { "baseline": "3.1.1", @@ -6046,11 +6046,11 @@ }, "openvdb": { "baseline": "10.0.0", - "port-version": 2 + "port-version": 3 }, "openvpn3": { "baseline": "3.7.0", - "port-version": 1 + "port-version": 2 }, "openvr": { "baseline": "1.23.7", @@ -6098,7 +6098,7 @@ }, "osgearth": { "baseline": "3.4", - "port-version": 0 + "port-version": 1 }, "osi": { "baseline": "0.108.6", @@ -6126,7 +6126,7 @@ }, "pagmo2": { "baseline": "2.19.0", - "port-version": 0 + "port-version": 2 }, "paho-mqtt": { "baseline": "1.3.12", @@ -6142,7 +6142,7 @@ }, "pango": { "baseline": "1.50.14", - "port-version": 0 + "port-version": 1 }, "pangolin": { "baseline": "0.8", @@ -6150,7 +6150,7 @@ }, "pangomm": { "baseline": "2.50.1", - "port-version": 2 + "port-version": 3 }, "parallel-hashmap": { "baseline": "1.3.11", @@ -6322,7 +6322,7 @@ }, "plib": { "baseline": "1.8.5", - "port-version": 7 + "port-version": 8 }, "plibsys": { "baseline": "0.0.4", @@ -6358,7 +6358,7 @@ }, "podofo": { "baseline": "0.10.0", - "port-version": 1 + "port-version": 2 }, "poissonrecon": { "baseline": "2021-09-26", @@ -6386,7 +6386,7 @@ }, "poppler": { "baseline": "23.1.0", - "port-version": 3 + "port-version": 4 }, "popsift": { "baseline": "0.9", @@ -6530,7 +6530,7 @@ }, "qcustomplot": { "baseline": "2.1.1", - "port-version": 0 + "port-version": 1 }, "qhttpengine": { "baseline": "1.0.2", @@ -6550,7 +6550,7 @@ }, "qscintilla": { "baseline": "2.13.4", - "port-version": 1 + "port-version": 2 }, "qt": { "baseline": "6.5.1", @@ -6558,7 +6558,7 @@ }, "qt-advanced-docking-system": { "baseline": "4.0.3", - "port-version": 0 + "port-version": 1 }, "qt3d": { "baseline": "6.5.1", @@ -6938,7 +6938,7 @@ }, "quazip": { "baseline": "1.4", - "port-version": 0 + "port-version": 1 }, "quickfast": { "baseline": "1.5", @@ -7114,7 +7114,7 @@ }, "restbed": { "baseline": "4.8", - "port-version": 2 + "port-version": 3 }, "restc-cpp": { "baseline": "0.10.0", @@ -7234,7 +7234,7 @@ }, "rubberband": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "rxcpp": { "baseline": "4.1.1", @@ -7462,7 +7462,7 @@ }, "shiftmedia-libgnutls": { "baseline": "3.7.6", - "port-version": 2 + "port-version": 3 }, "shiftmedia-libgpg-error": { "baseline": "1.45", @@ -7654,7 +7654,7 @@ }, "spatialite-tools": { "baseline": "5.0.1", - "port-version": 3 + "port-version": 4 }, "spdk": { "baseline": "19.01.1", @@ -8298,7 +8298,7 @@ }, "usbmuxd": { "baseline": "1.2.235", - "port-version": 3 + "port-version": 4 }, "usd": { "baseline": "23.5", @@ -8646,7 +8646,7 @@ }, "wolftpm": { "baseline": "2.7.0", - "port-version": 0 + "port-version": 1 }, "wordnet": { "baseline": "3.0", @@ -8666,7 +8666,7 @@ }, "wt": { "baseline": "4.9.1", - "port-version": 1 + "port-version": 2 }, "wtl": { "baseline": "10.0.10320", @@ -8674,7 +8674,7 @@ }, "wxchartdir": { "baseline": "2.0.0", - "port-version": 1 + "port-version": 2 }, "wxcharts": { "baseline": "2022-07-05", @@ -8682,7 +8682,7 @@ }, "wxwidgets": { "baseline": "3.2.2.1", - "port-version": 2 + "port-version": 3 }, "wyhash": { "baseline": "2023-01-25", @@ -8694,11 +8694,11 @@ }, "x264": { "baseline": "0.164.3095", - "port-version": 4 + "port-version": 5 }, "x265": { "baseline": "3.4", - "port-version": 8 + "port-version": 9 }, "x86-simd-sort": { "baseline": "2023-03-04", @@ -8706,7 +8706,7 @@ }, "xapian": { "baseline": "1.4.22", - "port-version": 1 + "port-version": 2 }, "xaudio2redist": { "baseline": "1.2.11", @@ -8778,7 +8778,7 @@ }, "xmlsec": { "baseline": "1.2.37", - "port-version": 0 + "port-version": 1 }, "xnnpack": { "baseline": "2022-02-17", @@ -8902,7 +8902,7 @@ }, "zeromq": { "baseline": "2023-01-31", - "port-version": 4 + "port-version": 5 }, "zfp": { "baseline": "1.0.0", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 56b7c17dbe20e2..5bb572493aa71a 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28395e25157c57307d10e37eba8c9018dcd8f75", + "version": "1.17.8", + "port-version": 1 + }, { "git-tree": "062c7e11a8b910e76a2f16e57e3ffe0d59bd905e", "version": "1.17.8", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index f275c2de3f1ba8..fee7ae9436eb85 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5804d5f576169610ec03d2803f9d8a03678cc95", + "version": "1.16.2", + "port-version": 4 + }, { "git-tree": "7a7e6f9ecf73d0a2ec27e9a70a099746e643ec84", "version": "1.16.2", diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index 1090f7be166edb..553ce2501b1058 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2827046cf8d7fe6c0d9003a927dcfc1f33d4469b", + "version-semver": "1.0.2", + "port-version": 4 + }, { "git-tree": "a54aac960d7c5e10bf85b66fb8e1cd9a7a384f64", "version-semver": "1.0.2", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 66f09570c59001..cb27a979860196 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "339e2b1de050beafb97938c210b823c04182e206", + "version": "5.5.2", + "port-version": 1 + }, { "git-tree": "ddfb9d5fd8c8cd1a799af276c972b376f35f1267", "version": "5.5.2", diff --git a/versions/c-/chromaprint.json b/versions/c-/chromaprint.json index 1ac3ded2e6bb17..624ad16e4d0c8b 100644 --- a/versions/c-/chromaprint.json +++ b/versions/c-/chromaprint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2186fe85098c877929c5e1a8916ae9d23fc0a540", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "d50d41c54f3aa2854ae05e64715100761517cb31", "version": "1.5.0", diff --git a/versions/c-/cserialport.json b/versions/c-/cserialport.json index cfa392e787a97e..7e26904362c33c 100644 --- a/versions/c-/cserialport.json +++ b/versions/c-/cserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "842df8d9c0fac5c130724643392f828bb20a6f97", + "version": "4.3.0", + "port-version": 1 + }, { "git-tree": "28d4a472a2587c890738ebb66b79bfd3ab052ac9", "version": "4.3.0", diff --git a/versions/c-/czmq.json b/versions/c-/czmq.json index 982b8f19ee7cda..dfe25eb1a9b6e7 100644 --- a/versions/c-/czmq.json +++ b/versions/c-/czmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bebd4e3a17c277fc4813a24cbdde5d2a06ccc01", + "version-semver": "4.2.1", + "port-version": 2 + }, { "git-tree": "fd4ccb9b894541d10e393139468aaac97419b0f2", "version-semver": "4.2.1", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 979c27af94acf5..b8015de514cb73 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9c84716a494279e16d9f85834ecb7e130dfa561", + "version-date": "2023-05-30", + "port-version": 1 + }, { "git-tree": "d24e2b697098510aeb4799426a66c5749f9a3b97", "version-date": "2023-05-30", diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index 39b536af231daa..9642317235664e 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c976014bade32edb4c7fc233fe92823ae6d5340", + "version": "0.9.2", + "port-version": 8 + }, { "git-tree": "800dbc074727df7eded3e5707b828be676bb5943", "version": "0.9.2", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index d585377481253f..08227c2b3f484c 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3966c9ebea089fea43d1730cc2b1b21bd5703d3e", + "version": "0.27.6", + "port-version": 3 + }, { "git-tree": "9616cd1c578515f6aa85ab9dc6e00cdbbda31371", "version": "0.27.6", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 0a9e45fe3d6eee..94c596039e082e 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89822d934c8cfc857147fb1aa1baed78694b0b51", + "version": "2.3.2", + "port-version": 3 + }, { "git-tree": "eb9b815d5af8da59d2cb5a42361a9c88e7d6a1f4", "version": "2.3.2", diff --git a/versions/f-/freealut.json b/versions/f-/freealut.json index e8da86da45b2c8..e7597c86da4b36 100644 --- a/versions/f-/freealut.json +++ b/versions/f-/freealut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f2e347e59d7834de007c46ea8eff150b9e55487", + "version": "1.1.0", + "port-version": 4 + }, { "git-tree": "969ad25e70aeab73962cb7bea1df1ea30644ad20", "version": "1.1.0", diff --git a/versions/f-/freetds.json b/versions/f-/freetds.json index 0deb3189ea14f7..a3d5712084fa83 100644 --- a/versions/f-/freetds.json +++ b/versions/f-/freetds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5eded489fe66e5c21c2ad93db8d8f5b9fc5fe4d4", + "version": "1.3.10", + "port-version": 2 + }, { "git-tree": "7d2a8c09978586d81a52529c94a96dd2f1208ebe", "version": "1.3.10", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 65c8e7afd712fb..aa25b83634a626 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca75f73ba67cdacfd245b67e6dca8c45fb97ee93", + "version": "2.42.10", + "port-version": 1 + }, { "git-tree": "39ca957973ae4f5cbeb0e658172c079e6ad0362c", "version": "2.42.10", diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json index f11756e85221c2..0b3eb690337107 100644 --- a/versions/g-/gettext-libintl.json +++ b/versions/g-/gettext-libintl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25450f3473f6c62f28af9702a772d8b48a6170b7", + "version": "0.21.1", + "port-version": 1 + }, { "git-tree": "783d7b1a2ddaf29b0f1a2d785ccfbb4a05615667", "version": "0.21.1", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index cfe3eb9fe5d6e6..ad075d3d593418 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0915f060ea0fb91c5a2356f2171de0a714e79437", + "version": "0.21.1", + "port-version": 2 + }, { "git-tree": "6cc01d324fb1fc9a461212e5577ec9897d7da345", "version": "0.21.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index f5eba925391826..dc3740138eaaf1 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d1c3788ae7982f573db3e59116dd1ca885b88a4", + "version": "2.76.3", + "port-version": 1 + }, { "git-tree": "32c3e0235a72e62db8c1b248e3096c1d51415ba7", "version": "2.76.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 356dec298462f3..12b6e8256067c9 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8a2235a74e6c215246a3ade8ad3248b7e04e439", + "version": "2.76.0", + "port-version": 1 + }, { "git-tree": "16125400e378b3a45ff56a2f26573d9312ead0d1", "version": "2.76.0", diff --git a/versions/g-/glpk.json b/versions/g-/glpk.json index 28f3db81642972..adf68410bb775e 100644 --- a/versions/g-/glpk.json +++ b/versions/g-/glpk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebfbd1278a8d3e33d1cb52ed7806bf690642ffa6", + "version": "5.0", + "port-version": 2 + }, { "git-tree": "4ccc68be5d979b64412919b488ed88b798903ccf", "version": "5.0", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index c22207fd2438f5..4f6711334cb6aa 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93e8b6f02474e1edb7e99db85020d864ee071ce0", + "version": "3.2.6", + "port-version": 6 + }, { "git-tree": "6db1f443a21e7c2f4004f8039b562ca1506f966c", "version": "3.2.6", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 0b5fa719d94f14..7a4a530e8bf0e0 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0f2cfc5cc1dea868ccad4363887bf9593b6c021", + "version": "6.2.1", + "port-version": 19 + }, { "git-tree": "efae5abe8271dc5c25bfa47b9cc146a29e02dc05", "version": "6.2.1", diff --git a/versions/g-/gppanel.json b/versions/g-/gppanel.json index 659f7557935ea5..0695359daa1f0a 100644 --- a/versions/g-/gppanel.json +++ b/versions/g-/gppanel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "275a8f2deb026e033572cc5ccea803dbe4bc45dd", + "version-date": "2020-05-20", + "port-version": 4 + }, { "git-tree": "ba97170231ed485d5ba3dfbfe2ed7a66c0260517", "version-date": "2020-05-20", diff --git a/versions/g-/grantlee.json b/versions/g-/grantlee.json index e8b134fe9a9265..5bca5c1bd9cdd3 100644 --- a/versions/g-/grantlee.json +++ b/versions/g-/grantlee.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8ada7d8eca1a8b8926d25e9cbcd861f3e00f24", + "version": "5.3.1", + "port-version": 2 + }, { "git-tree": "5828abf42559b6f3db682f7827f502cf75c7ec32", "version": "5.3.1", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 1077ebdd934f1e..1706f8bc6ac8a6 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74327fa3eac21619a868533135c685bcee046a24", + "version": "1.20.5", + "port-version": 2 + }, { "git-tree": "85ca43c538fdb1f41292003c458eb209a1478906", "version": "1.20.5", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 7dc1235b990ab8..457316e48c85e0 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75810a0d259dd1294e994266d469dde9423dc209", + "version": "1.20.5", + "port-version": 9 + }, { "git-tree": "f4fa840c6345c1b7bf4c35e2977ed3f680d6584a", "version": "1.20.5", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 9b4167ae00d513..d86b26204fb24c 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a79d7945c3db191e81a4cc3367efb9972b8df29e", + "version": "4.10.4", + "port-version": 1 + }, { "git-tree": "d527905d8bda9bb0f59ab326013dcfc0154613a7", "version": "4.10.4", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 59e00717c13036..2f3b4ec3298604 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9e63e49ac6c8ade89bf2df6bf73bb32f3b18f9b", + "version": "4.10.0", + "port-version": 1 + }, { "git-tree": "5bede7b8a7ab28981640b17d73708e710c5e8701", "version": "4.10.0", diff --git a/versions/g-/gul14.json b/versions/g-/gul14.json index fe02a9624c7af7..892e5b29008727 100644 --- a/versions/g-/gul14.json +++ b/versions/g-/gul14.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ef663cd26e5a6fea87578b1662e28cae9caf233", + "version": "2.9.1", + "port-version": 1 + }, { "git-tree": "cdf7849b2344332aa6cdcbee58c03452009ec4bc", "version": "2.9.1", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index 61e729b19f2316..1e1ac1b1b31c75 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "661af60066452aeb627f9cf0675303b7ac677a02", + "version": "1.7.1", + "port-version": 4 + }, { "git-tree": "798ac2e490d16afc2713b95740101c03fa555f84", "version": "1.7.1", diff --git a/versions/i-/ideviceinstaller.json b/versions/i-/ideviceinstaller.json index cf24d12e20d61c..6ef3f5ba92fc94 100644 --- a/versions/i-/ideviceinstaller.json +++ b/versions/i-/ideviceinstaller.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e90c045618ecd5001790b38c44567d47397801e", + "version": "1.1.2.23", + "port-version": 6 + }, { "git-tree": "3e54543ef504b74edb836a2c47abb3845b83b7c3", "version": "1.1.2.23", diff --git a/versions/i-/idyntree.json b/versions/i-/idyntree.json index 2ad55e7fb4d5f4..6ac41a1e9644fa 100644 --- a/versions/i-/idyntree.json +++ b/versions/i-/idyntree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50658eb0c1ccc3ada2d91638cddb51bec93dd2c5", + "version": "9.0.0", + "port-version": 1 + }, { "git-tree": "4c7bc2d8282bf918d6be1b0b63af3f4612e673ef", "version": "9.0.0", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index 8483314bcfe594..1788d80adad54b 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b366fc43d220a0243a9e16860dee50c62ea4cf35", + "version": "0.10.4", + "port-version": 1 + }, { "git-tree": "6821431944042e175acb75af3e2164949361f887", "version": "0.10.4", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 17b17eebd36db2..a2cbab57426ce7 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8093800ff625535fd7bddaedc1394fb5412c80c", + "version": "0.9.2", + "port-version": 1 + }, { "git-tree": "46dce3bb23c3edd1ae77e46fa11543d678ae26e6", "version": "0.9.2", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index 67c87c37b1535f..89394349321f25 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc79165deff9b9e843f9078cd2b0f4190588929d", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "2c232fe1786179a6c7c2e21f98336d6645fb5cae", "version": "5.98.0", diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json index 7bbe01012e06ed..7c5f1db764255b 100644 --- a/versions/k-/kfr.json +++ b/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b00300796a5d295a7e55dca654c19fffd3916242", + "version-semver": "5.0.1", + "port-version": 1 + }, { "git-tree": "98355b4aa76624a4542c63890145d9b6e19b919d", "version-semver": "5.0.1", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index 6e435957c8313b..7d1c87cb9b3f92 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b282016c7e5f1aacff821854e8fab52d64b4c970", + "version": "1.4.0", + "port-version": 6 + }, { "git-tree": "06163d8d06a5f6b22e76ed353743da7370d73602", "version": "1.4.0", diff --git a/versions/l-/libadwaita.json b/versions/l-/libadwaita.json index 19c48d57b52c47..511a4a2d49e3f9 100644 --- a/versions/l-/libadwaita.json +++ b/versions/l-/libadwaita.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed0c59fcd97bfea68ea94baf161a1c9e6d5c673d", + "version": "1.3.2", + "port-version": 1 + }, { "git-tree": "3c273bec50ed1314ccfb55bd957905df22c9ed61", "version": "1.3.2", diff --git a/versions/l-/libalkimia.json b/versions/l-/libalkimia.json index 2bd6b715ea2aeb..d7477c9519a8f7 100644 --- a/versions/l-/libalkimia.json +++ b/versions/l-/libalkimia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f9b0ce11bf52ea4e33323b2587234a6b40f7d94", + "version": "8.1.70", + "port-version": 2 + }, { "git-tree": "09e0633aca7ce1433e7cd6542404a12f90bf1de1", "version": "8.1.70", diff --git a/versions/l-/libao.json b/versions/l-/libao.json index c0d0833c8fa8b6..db12138fa36c46 100644 --- a/versions/l-/libao.json +++ b/versions/l-/libao.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c128d640fa4cb28b96cb398411bba846febdb5f", + "version": "1.2.2", + "port-version": 5 + }, { "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f", "version": "1.2.2", diff --git a/versions/l-/libcsv.json b/versions/l-/libcsv.json index 6fd09c8a9802bf..a1d95cdbc7fbe6 100644 --- a/versions/l-/libcsv.json +++ b/versions/l-/libcsv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "936ce0ff18976c35cec212d25fbcc143dafd7b6b", + "version": "3.0.3", + "port-version": 1 + }, { "git-tree": "05dbce143e6757c7df2df6813ac7d559b2d908a1", "version": "3.0.3", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 6971adf03fe066..046e451e033952 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b22ab8a6787704e52d3b715feb12e38522540ab", + "version-semver": "0.18.2", + "port-version": 2 + }, { "git-tree": "96f395b47c8ee56f6a268f3e1da86eb23a4ba0ea", "version-semver": "0.18.2", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index 89dab1ffce4b06..5112762e3a81c5 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e24685d5b2c9686f77369463e32b307d03580059", + "version": "1.0.11", + "port-version": 2 + }, { "git-tree": "35f74e1100615e9ff16d6b05529baf8e7de774aa", "version": "1.0.11", diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index 324976efb84c43..ae88933184557b 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07081634d12b7ede73b9921d461f55061410a6c7", + "version": "0.16.0", + "port-version": 1 + }, { "git-tree": "c1c63ff4c5483425a19992ddefa98a3c1e2fabf3", "version": "0.16.0", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index 3100a1da8a46b4..ff702f94936a3d 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68766f591851bf3b1bf97eff04a69dcd894d712a", + "version": "0.2.0", + "port-version": 10 + }, { "git-tree": "33bfc70d84b528fa549f57401c884abda1073526", "version": "0.2.0", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 791c2f113d688e..2cf6290b7df65e 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ee9a2b84e8279ba555de6f0f5e3f93b93b98d5d", + "version": "1.16.1", + "port-version": 1 + }, { "git-tree": "30bfad0af10297606d1687eba9fabe7b5eda60e8", "version": "1.16.1", diff --git a/versions/l-/libhsplasma.json b/versions/l-/libhsplasma.json index dcfd8672acc0c2..9738c4d856f488 100644 --- a/versions/l-/libhsplasma.json +++ b/versions/l-/libhsplasma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23a51f404cad21bb38d5d663ff90af099ec63562", + "version-date": "2022-05-19", + "port-version": 1 + }, { "git-tree": "8b2f7f61711ccfb81d5d9a8b34e057494bd5f902", "version-date": "2022-05-19", diff --git a/versions/l-/libimobiledevice.json b/versions/l-/libimobiledevice.json index c6ac8156905f40..3c840fbbe10a94 100644 --- a/versions/l-/libimobiledevice.json +++ b/versions/l-/libimobiledevice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b950fc1c05e12ac6349b88de19d2df84e9393a7", + "version": "1.3.17", + "port-version": 4 + }, { "git-tree": "c29103e4c8a3225f67bcfbc45b1eb128ab2c8939", "version": "1.3.17", diff --git a/versions/l-/libirecovery.json b/versions/l-/libirecovery.json index bbd8f7740ba24d..3aef62a3867863 100644 --- a/versions/l-/libirecovery.json +++ b/versions/l-/libirecovery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd02ed99ae380b71fb4bc55f98012c20e7d73bb8", + "version": "1.0.25", + "port-version": 7 + }, { "git-tree": "da471f398ce0264ef333dfbaaa521c79c51ab5f9", "version": "1.0.25", diff --git a/versions/l-/libleidenalg.json b/versions/l-/libleidenalg.json index 14ac2306708270..289c3cbb59fdb9 100644 --- a/versions/l-/libleidenalg.json +++ b/versions/l-/libleidenalg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54e658de6b5148a82e4f7ef8e56e5d56db8deedb", + "version": "0.10.0", + "port-version": 1 + }, { "git-tree": "4c059e549496795874b93130451377bb09a78630", "version": "0.10.0", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index 806f9ba2ac34d7..d32ea073338de7 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3d524a86a6280626f4955396e2dc21ad5f8be35", + "version-semver": "3.3.1", + "port-version": 3 + }, { "git-tree": "99cf48b4599872b087d938a2f4ccdbca34f61f1a", "version-semver": "3.3.1", diff --git a/versions/l-/libmesh.json b/versions/l-/libmesh.json index 555e78ddddd4bf..e7b3fb10271f9e 100644 --- a/versions/l-/libmesh.json +++ b/versions/l-/libmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73d90f24859b402b05ffe0e27eea3db3ab58a2ea", + "version": "1.5.0", + "port-version": 5 + }, { "git-tree": "347e56f7cd6e4bf1ca5621c564e4421a7f5a45cd", "version": "1.5.0", diff --git a/versions/l-/libmicrodns.json b/versions/l-/libmicrodns.json index 03ec5150c2a49e..e6ac063ef05c36 100644 --- a/versions/l-/libmicrodns.json +++ b/versions/l-/libmicrodns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ea7d0ad7b306f0c554fff32499486c6c4758105", + "version": "0.2.0", + "port-version": 1 + }, { "git-tree": "479151454954c9fe2e5ddce7f1b358f3c8688ce8", "version": "0.2.0", diff --git a/versions/l-/libmikmod.json b/versions/l-/libmikmod.json index de3f9ad5c66cb9..ff0c441238905f 100644 --- a/versions/l-/libmikmod.json +++ b/versions/l-/libmikmod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f76309c386e04e04888bb094d32b960d0c3cdc39", + "version": "3.3.11.1", + "port-version": 12 + }, { "git-tree": "688a0ecd6fe11127c1f75e04390beea8f582860f", "version": "3.3.11.1", diff --git a/versions/l-/libmodbus.json b/versions/l-/libmodbus.json index 2b18b1f3bffce6..30f4d8df12e4de 100644 --- a/versions/l-/libmodbus.json +++ b/versions/l-/libmodbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "803427a42499df9013b9e6a4dc3501384fc69760", + "version": "3.1.6", + "port-version": 5 + }, { "git-tree": "6fedbd1a42b56a0b3325c6d4bf1e7682a99aafa4", "version": "3.1.6", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 616fc6f76dbea6..9405948c7cd56e 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d32101a913ac66b95dff40eb0ce3e315438566ab", + "version": "8.0.32", + "port-version": 5 + }, { "git-tree": "95618ed8c0e55195ee395eaf7bb230cc61776b33", "version": "8.0.32", diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index bcea36ed84e89e..afaa4cd29a0bb4 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e61d1c0b43c2f4feca65ea7a20ab901ff6e4c025", + "version": "0.1.21", + "port-version": 2 + }, { "git-tree": "9ea8f77a4a4f70cceb4d65650ee5de24e14e8190", "version": "0.1.21", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index cdd903530f65c4..192231bbab0005 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "752ea02df5a3ae83ff67c4bfcfc34e9570cc27f9", + "version": "0.1.21", + "port-version": 1 + }, { "git-tree": "6efccae4d0017390516e28abce03705114131b16", "version": "0.1.21", diff --git a/versions/l-/libofx.json b/versions/l-/libofx.json index 482c77d85c9f59..65f39f4e23b373 100644 --- a/versions/l-/libofx.json +++ b/versions/l-/libofx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b01272b9801e2885f990f376956f8058851b9fe", + "version": "0.10.9", + "port-version": 1 + }, { "git-tree": "3f68c536d0f30c47c36d02d0bf6e7eda76ea7e08", "version": "0.10.9", diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index 1e6a5cd8ccc0fa..6aeb1f384cec56 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6000969a75ea417329af263110993a00910d1b1b", + "version-date": "2021-11-14", + "port-version": 2 + }, { "git-tree": "5358a29d95b177de74fe31072cfa21a7adf4254b", "version-date": "2021-11-14", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 78403134351cbc..25ae342370df25 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7f8bc39ce8dc00ea1dfca802a8a1c58cdf257c1", + "version": "0.4.18", + "port-version": 3 + }, { "git-tree": "190bb3f2c7dcb0e36636bbed1e4619f1072c86f2", "version": "0.4.18", diff --git a/versions/l-/libqcow.json b/versions/l-/libqcow.json index e4a908a85463a7..2b2d391610b77d 100644 --- a/versions/l-/libqcow.json +++ b/versions/l-/libqcow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b1e94b2b7373b63353193be9ff260cf543b8460", + "version": "20221124", + "port-version": 1 + }, { "git-tree": "70abb044b3b25aff006a6858812325ad2a923e7f", "version": "20221124", diff --git a/versions/l-/libqglviewer.json b/versions/l-/libqglviewer.json index 538f8835958bd3..85d946d39c4b29 100644 --- a/versions/l-/libqglviewer.json +++ b/versions/l-/libqglviewer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb8cb610ce82055671ffb7e84836da4a02cc3127", + "version": "2.9.1", + "port-version": 1 + }, { "git-tree": "ad6a8d25fcd68d39367a45811a58379f3cea0d01", "version": "2.9.1", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index d5fe53d53212b7..299b525d4ec085 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b27d2a7401506c017a98e896c3dee2db0a01bfa", + "version": "0.21.1", + "port-version": 1 + }, { "git-tree": "fda25697452394dfb723fa576576a76b67b32468", "version": "0.21.1", diff --git a/versions/l-/libredwg.json b/versions/l-/libredwg.json index c0d20d03292790..5a74cb668f52ec 100644 --- a/versions/l-/libredwg.json +++ b/versions/l-/libredwg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17dd1242cc7c640c0b51f493eef55d3c12ad6e52", + "version": "0.12.5.5178", + "port-version": 1 + }, { "git-tree": "aa161067eef7398933b726e81cd4824733a9c9a6", "version": "0.12.5.5178", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 544d754823acf5..2b1d39e03316d3 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6b4494941ba4df373899108eaab63d59387c875", + "version": "5.20.0", + "port-version": 1 + }, { "git-tree": "6b592087185a6576e30cc29e129bec77d12c4aeb", "version": "5.20.0", diff --git a/versions/l-/libsndfile.json b/versions/l-/libsndfile.json index b8939316fe2390..f4244679647d75 100644 --- a/versions/l-/libsndfile.json +++ b/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f4a276bfb9911abd9901cb6c977d7a132eff35d", + "version-semver": "1.2.0", + "port-version": 1 + }, { "git-tree": "50c34624e4951e4b4919717f63b8f4fcbdacf088", "version-semver": "1.2.0", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index 92f696814912b9..ca0ef0a36743da 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96864197a0d35ea5a746ac1076b625c0372c37ae", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "08022cd3b0ae3348a7af42013e5245fb5929d037", "version": "1.5.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index ad0f8d8d53298c..b2e799dd002df8 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2f4d398d1b82025b8aec8dba4e844f867286d38", + "version": "0.10.4+20221123", + "port-version": 4 + }, { "git-tree": "e15d10eb435fbd46abba95b50c8d47d2ff166603", "version": "0.10.4+20221123", diff --git a/versions/l-/libunistring.json b/versions/l-/libunistring.json index 7945beb56f0f07..d2713261b52399 100644 --- a/versions/l-/libunistring.json +++ b/versions/l-/libunistring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ba0cbad49845cff90c4368b3e2459a9fdd18c00", + "version": "1.1", + "port-version": 3 + }, { "git-tree": "8bcb2f939ea16732abab03352b951cf12713bc54", "version": "1.1", diff --git a/versions/l-/libusb-win32.json b/versions/l-/libusb-win32.json index cc828432d66c00..a1d4034cb027a3 100644 --- a/versions/l-/libusb-win32.json +++ b/versions/l-/libusb-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af8b466e97e4d465147eb08289328d9cdf6f077d", + "version": "1.2.6.0", + "port-version": 10 + }, { "git-tree": "33a59191d5fa27f6d37b37e39dd1f100d4faed0f", "version": "1.2.6.0", diff --git a/versions/l-/libxmp.json b/versions/l-/libxmp.json index 8caedf06d37ab4..3d8b1fc7aa97f1 100644 --- a/versions/l-/libxmp.json +++ b/versions/l-/libxmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5c05ac5a1e4a0ff9580fc5bba923b39a48b033e", + "version-date": "2023-04-13", + "port-version": 1 + }, { "git-tree": "2773b355a7b3a41ab6739548277b9b828d163242", "version-date": "2023-04-13", diff --git a/versions/l-/libzim.json b/versions/l-/libzim.json index 52f4ea9bc578df..9f7021ecb7f7e8 100644 --- a/versions/l-/libzim.json +++ b/versions/l-/libzim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96c23c527ace6213975b81955373f37d96977063", + "version": "8.2.0", + "port-version": 2 + }, { "git-tree": "1488a183ad98b3610343e68c207554492b1e8c8e", "version": "8.2.0", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 965579f0a868de..112411781b5a01 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7944bec69900cba45393bcacfb4d903a3569300", + "version-date": "2023-06-10", + "port-version": 1 + }, { "git-tree": "087f65196bb8a0fe3a7e8012e3e2970106e085fd", "version-date": "2023-06-10", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 5aa68b9bc16f0c..a081556e954f8f 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64501290af397067ec972c69113abd28139efdcc", + "version-date": "2023-06-12", + "port-version": 1 + }, { "git-tree": "55a1af72282030a832c73b5fe9bedb2089b1b08c", "version-date": "2023-06-12", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index c9d010a3da0f33..29751e93154aa2 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5f88df6aa916d5bfcfbf3396df344d90de36778", + "version-string": "22.04.0", + "port-version": 2 + }, { "git-tree": "c1e722f12de290f18b92e662040c499a51d57249", "version-string": "22.04.0", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index 46a51b7c4c1e70..4fa18701dd5d35 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21cc2f6ab97eed24ec95774335e364a7737c83d2", + "version": "8.0.1", + "port-version": 5 + }, { "git-tree": "629d09b4394436b3821f1871eaa6caa27bf04be0", "version": "8.0.1", diff --git a/versions/m-/mchehab-zbar.json b/versions/m-/mchehab-zbar.json index 9a02cb4a6360a0..a09be3be3278f6 100644 --- a/versions/m-/mchehab-zbar.json +++ b/versions/m-/mchehab-zbar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "368a491e8bad201ee1b88e88314b77c540dcea2b", + "version": "0.23.90", + "port-version": 5 + }, { "git-tree": "34932d2a4b1c53aefeed99ef9133f8a307ad9958", "version": "0.23.90", diff --git a/versions/m-/moos-core.json b/versions/m-/moos-core.json index 0816a4e0d70f0e..0f06d36aaf4c9d 100644 --- a/versions/m-/moos-core.json +++ b/versions/m-/moos-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a409b13d5b8375d40c505f08f7c1d1e43ac54975", + "version": "10.4.0", + "port-version": 9 + }, { "git-tree": "9f2f00b654a7a9a9a810ae8d84099c9567f847cf", "version": "10.4.0", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 960fed22074d89..77f79088b5c64b 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2163475ac427c02bc7a7c24142b45662d5993cc", + "version": "4.2.0", + "port-version": 1 + }, { "git-tree": "843923d6f0b86ada254232a971968923c83bc1b5", "version": "4.2.0", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 4057c0b922aa7a..77fca26318bfee 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73f380749ae40814a07c7a0952e94db2970a9b85", + "version": "1.31.3", + "port-version": 1 + }, { "git-tree": "a328d4e2a48af20df2ff33217be9c27343a56d4b", "version": "1.31.3", diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json index bcfc36e3d7e3fb..a2cf6687331270 100644 --- a/versions/n-/nspr.json +++ b/versions/n-/nspr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ac026e89f8d32d1b421bdc000ca17f0c7d3e3c7", + "version": "4.35", + "port-version": 4 + }, { "git-tree": "f6ae665af0bc5a8b98f846bf8e8468e823f09509", "version": "4.35", diff --git a/versions/n-/nss.json b/versions/n-/nss.json index 2ab6abf96e9c55..a06dde1c678a47 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "761d0ded1579714c014fed176818feb0b07b953f", + "version": "3.87", + "port-version": 2 + }, { "git-tree": "3ee50028600372dc454e15907e4f3168463c5570", "version": "3.87", diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index 3e29a947878ede..9738f8d1d9a777 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9dfb4c97779fd3bd294df93a76aa309578949c9", + "version-semver": "5.1.2", + "port-version": 1 + }, { "git-tree": "6175a848b3c05c1adf0816f1b3b4dd056c12ed40", "version-semver": "5.1.2", diff --git a/versions/o-/omniorb.json b/versions/o-/omniorb.json index 2db0ec429642c9..9d85a3b24ab71c 100644 --- a/versions/o-/omniorb.json +++ b/versions/o-/omniorb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a03b9df1f3ad5b4d5de0b3bc278af0ff52d06703", + "version": "4.3.0", + "port-version": 1 + }, { "git-tree": "51fa63a0e4615dd806fd5ac4cd532f81123ddd4d", "version": "4.3.0", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 442b1acd16787b..1234dded03d514 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f1e010d847419f3f68439f1ad1d76df9b118f26", + "version": "1.3.5", + "port-version": 1 + }, { "git-tree": "e7412d5c63f5b77eb06f485b7fb89bb718b2f712", "version": "1.3.5", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 125d812106b92e..d8962dc5de7955 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2179403cae57a853e75e3d30363750c39e370bc6", + "version": "1.23.0", + "port-version": 1 + }, { "git-tree": "3c25d8ead902160593b570f4696cf2eba2d86511", "version": "1.23.0", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index be251b3a3082b3..5b39b3a35c769f 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c368cdc0775dea309e247518b3931795487cb5f0", + "version": "7.6.2", + "port-version": 5 + }, { "git-tree": "935cc481bbce6ae22ed3257376f0a3edb198d3e2", "version": "7.6.2", diff --git a/versions/o-/openmama.json b/versions/o-/openmama.json index 0bd5d8b6960ca6..dd9543a4e048d5 100644 --- a/versions/o-/openmama.json +++ b/versions/o-/openmama.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6db41ddb8cabc06e9df68962e43d64b7e1ab7b7", + "version-semver": "6.3.2", + "port-version": 3 + }, { "git-tree": "e1a0265c65af044c234b3724715e089272679d40", "version-semver": "6.3.2", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 3f2c0df392a43a..70cf1ba176eec1 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3712d684593f777107e58a37bf601083a6351738", + "version": "2.0", + "port-version": 8 + }, { "git-tree": "58d0c2b4b7785f8ace8ff861d5e45ef40619dcc6", "version": "2.0", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index bf7e223795be4b..e1e32f1bd90099 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93c2bb0fd968757d60afa8ce2de0d456a3ae5cc0", + "version": "2.1.0", + "port-version": 1 + }, { "git-tree": "fbeb86b69f146df9049966d4e58117f38e166257", "version": "2.1.0", diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json index 8a858c188be499..c90441d133f9af 100644 --- a/versions/o-/openscap.json +++ b/versions/o-/openscap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da537eeaaeb13c275a44fac02d7262875e5c29f4", + "version": "1.3.7", + "port-version": 1 + }, { "git-tree": "453f57565bf1882caf7355c14c079725153cd844", "version": "1.3.7", diff --git a/versions/o-/openslide.json b/versions/o-/openslide.json index 33555a61365a00..371b6daff14a29 100644 --- a/versions/o-/openslide.json +++ b/versions/o-/openslide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dafb9bb4d2ad8dc07570e45c4f5a4794ca016778", + "version": "3.4.1", + "port-version": 2 + }, { "git-tree": "ff177e74dacffe2a12dec525304bac97b7f67a9f", "version": "3.4.1", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 42ea99b0ded6f9..143dbe33172dd9 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc6551f1e86bf8c86ce9fd0133e6e979f3729faa", + "version": "10.0.0", + "port-version": 3 + }, { "git-tree": "65264bf4e9ac9e13e48374147f7b4454b8e45b97", "version": "10.0.0", diff --git a/versions/o-/openvpn3.json b/versions/o-/openvpn3.json index 7f9fd3361d4312..265e51fa6bba0a 100644 --- a/versions/o-/openvpn3.json +++ b/versions/o-/openvpn3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97a26dd437bb027004b075333db96473652ca1fd", + "version": "3.7.0", + "port-version": 2 + }, { "git-tree": "352f972ff2ff0cfb7305f779253f322ba72e14f5", "version": "3.7.0", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index c438f5d8e839b2..6e98d6cbbd2257 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c7eac5ebac0fb2f82b730a863d50278a83955a9", + "version": "3.4", + "port-version": 1 + }, { "git-tree": "765cddcfc821c355b20c1fed7a43f181f8eb0817", "version": "3.4", diff --git a/versions/p-/pagmo2.json b/versions/p-/pagmo2.json index c356ae7feb8de4..1eef6114274a66 100644 --- a/versions/p-/pagmo2.json +++ b/versions/p-/pagmo2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebff91665e8cced80124a56db196cd800cd02f79", + "version": "2.19.0", + "port-version": 2 + }, { "git-tree": "77f146b96ad3179551dca78c832542683cf3801e", "version": "2.19.0", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 1ce3eef7e958c0..46a8bcfab6ebe4 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae2c0487d81de23e5f928edd4905c379be0bac54", + "version": "1.50.14", + "port-version": 1 + }, { "git-tree": "3985e71b9e3446f57995321a290a75a7bf5101dc", "version": "1.50.14", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index db1095b632483f..acd02fcced7f66 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "934da9592c2710373598b3f3d3a53103bad2b1e4", + "version": "2.50.1", + "port-version": 3 + }, { "git-tree": "359b0fe0cdacbc56edd56143da7d545633e50960", "version": "2.50.1", diff --git a/versions/p-/plib.json b/versions/p-/plib.json index 55d7d046cc23cc..018736342817d6 100644 --- a/versions/p-/plib.json +++ b/versions/p-/plib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31a68c9911b826a760e8be17864b7d6dc1830e88", + "version": "1.8.5", + "port-version": 8 + }, { "git-tree": "fe0ee99ffd2bcad6cc3709d85477c174fb9773f7", "version": "1.8.5", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 9952781259ed64..7b07cfe4be4fb8 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b550a1cf9eabeb17534710cb767f971c57184c1", + "version": "0.10.0", + "port-version": 2 + }, { "git-tree": "8282e8f30863ef7d8a84928ef5dbe0625b09fa2a", "version": "0.10.0", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 83cdcbac2389a8..22cde8f4a2f1db 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c07d1b54b7ce6cd8a4ce8ba9da7cf9f3ae2af70", + "version": "23.1.0", + "port-version": 4 + }, { "git-tree": "7b2c553e564102940f72ca3c649d651dc8807848", "version": "23.1.0", diff --git a/versions/q-/qcustomplot.json b/versions/q-/qcustomplot.json index d7c8df891f5693..f8b3bc04df5c06 100644 --- a/versions/q-/qcustomplot.json +++ b/versions/q-/qcustomplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9777b7a98f80b51511f9a266053ff1373c5aee72", + "version": "2.1.1", + "port-version": 1 + }, { "git-tree": "5fa5ea943fa7d0b35422a11a04d01491745bf990", "version": "2.1.1", diff --git a/versions/q-/qscintilla.json b/versions/q-/qscintilla.json index d3aef96cc73687..2869bd1be9ddbd 100644 --- a/versions/q-/qscintilla.json +++ b/versions/q-/qscintilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b86f317966ccab4dcfecbff35fd2496ac29541e", + "version": "2.13.4", + "port-version": 2 + }, { "git-tree": "4920a3d743be78d0d5be05132786873977677665", "version": "2.13.4", diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index 1712819963e317..9f0721cb2934ff 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98c020f1eda45cfc5d1eee6369bbdb5c1a52825a", + "version": "4.0.3", + "port-version": 1 + }, { "git-tree": "152f31d925c8f0d75f41ad9f656abbe8f30c1b44", "version": "4.0.3", diff --git a/versions/q-/quazip.json b/versions/q-/quazip.json index 78acfbd0e12e10..eb15a68e45fb94 100644 --- a/versions/q-/quazip.json +++ b/versions/q-/quazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e981c8d145807aac756fc5e289f7190cf106c91", + "version": "1.4", + "port-version": 1 + }, { "git-tree": "20b5c279bf0a7075a9d6cddb9c1de0e4e4adc0ec", "version": "1.4", diff --git a/versions/r-/restbed.json b/versions/r-/restbed.json index 872ce70463e7e9..4eaea4fb6ac4df 100644 --- a/versions/r-/restbed.json +++ b/versions/r-/restbed.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d606ecb46ac21637b8d40e1dc3fe175e721e987", + "version": "4.8", + "port-version": 3 + }, { "git-tree": "c41ea5f5396b24a4566efaea78d996fcbc2c4ec2", "version": "4.8", diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json index b4460f4ca53162..0d08a30a3c3829 100644 --- a/versions/r-/rubberband.json +++ b/versions/r-/rubberband.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e89e7b8691ae1ce66b0e82d00ec50061b23b593a", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "66dc21d5c29b7406cf1408081b8d99d6df217d4b", "version": "3.2.1", diff --git a/versions/s-/shiftmedia-libgnutls.json b/versions/s-/shiftmedia-libgnutls.json index 4b698fb548a469..6404b7548a2d8d 100644 --- a/versions/s-/shiftmedia-libgnutls.json +++ b/versions/s-/shiftmedia-libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9016464ed8d222fec37cee5ff63cf786731342a1", + "version": "3.7.6", + "port-version": 3 + }, { "git-tree": "44e16573e54fa8a8c8599c0b2cb82a0d1f829e22", "version": "3.7.6", diff --git a/versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json index d7b464dd38c9a1..45a1dda88f64b9 100644 --- a/versions/s-/spatialite-tools.json +++ b/versions/s-/spatialite-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "200da5b412aa158df73737b51ef1b679c5bbf27f", + "version": "5.0.1", + "port-version": 4 + }, { "git-tree": "d43ffc786b8af336ac589bde284a4a7393c950f0", "version": "5.0.1", diff --git a/versions/u-/usbmuxd.json b/versions/u-/usbmuxd.json index e9f9614396e903..f52d336737c2ca 100644 --- a/versions/u-/usbmuxd.json +++ b/versions/u-/usbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c137f8ea6a9f68922e301479aa2b251c130636", + "version": "1.2.235", + "port-version": 4 + }, { "git-tree": "b3f2cea522d35497750ecfd9446e29bf034b4d21", "version": "1.2.235", diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json index 396cff0d262298..7a04044ae2221a 100644 --- a/versions/w-/wolftpm.json +++ b/versions/w-/wolftpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6849bfc65dbf33f5d51d9bc8c7a4e365a1d3553", + "version": "2.7.0", + "port-version": 1 + }, { "git-tree": "c7c2224865bfcc21dc98ab68f0b53ce5ca07e640", "version": "2.7.0", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index 890377e897afa1..5058494da88e85 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9246a50b2cb7aaf547b61a4343ab3849e22533e6", + "version": "4.9.1", + "port-version": 2 + }, { "git-tree": "9dd116caa8830e2d131b0d3ffbcde1002aa12333", "version": "4.9.1", diff --git a/versions/w-/wxchartdir.json b/versions/w-/wxchartdir.json index fdaa66e863d6d2..6481816e155bde 100644 --- a/versions/w-/wxchartdir.json +++ b/versions/w-/wxchartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a868514047472153d999319f7cfd5d2f9c5af01", + "version": "2.0.0", + "port-version": 2 + }, { "git-tree": "2a61292a9c23a9ea0ba1f3ed9035441289bb0da2", "version": "2.0.0", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index ed7c001685749e..0ffbf0353c6a38 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cbbd8d7a9d521546e8bc9b8957560806c4902e1", + "version": "3.2.2.1", + "port-version": 3 + }, { "git-tree": "9f6e3030aa5a9fa6b83099a43a0e98c8c06f0f68", "version": "3.2.2.1", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 480ef7d94e5375..79bed1919b1627 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36ff38fabd741ddef6ccf4c207ef99058383c0bb", + "version": "0.164.3095", + "port-version": 5 + }, { "git-tree": "0361283be94126cf5e42a4cf765f700f8f209ea5", "version": "0.164.3095", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index 7edfd8fba2352d..5923b4ed2da3a7 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa43c511cf7041c15a3a56b0527124fa5f1640f2", + "version": "3.4", + "port-version": 9 + }, { "git-tree": "e47c9f9c25b46dbf26b7db6843e23d6f0d329ddb", "version": "3.4", diff --git a/versions/x-/xapian.json b/versions/x-/xapian.json index 1e183f3ba05045..b217c36e4411e3 100644 --- a/versions/x-/xapian.json +++ b/versions/x-/xapian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09d9178c29620d437cfb26264b48e601c694aefd", + "version": "1.4.22", + "port-version": 2 + }, { "git-tree": "0a050725d62e180539040589c1691a5ec3974a30", "version": "1.4.22", diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index dc6a0c3e540294..82709032ff3284 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19b8aab695c131f0dcbb7498f0d6a10517d01b70", + "version": "1.2.37", + "port-version": 1 + }, { "git-tree": "90c79a327b276a7cb1f9eb3e76020cd7483e4899", "version": "1.2.37", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 0043d92eaeef41..ea48d6ae1e8b76 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "910e9e92155a96a07837641615e3356c98edec9a", + "version-date": "2023-01-31", + "port-version": 5 + }, { "git-tree": "487c1669ab781a8adfa16097f1c7142165f5debf", "version-date": "2023-01-31", From 1e90576cf5e931fa1b59ea289b9615fef6441306 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 16 Jun 2023 01:26:18 -0700 Subject: [PATCH 317/533] Update vcpkg-tool to 2023-06-15. (#32039) https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-15 --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 1674786749e76a..04d4a5c5b023c6 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-06-08' +$versionDate = '2023-06-15' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 50f31c7541ba34..c9db563d21da89 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-06-08" +vcpkgToolReleaseTag="2023-06-15" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="d094a52e23f7ddd18b91790f9c08b1f7974c724f5f161d758a8d6d8db9d8a1946e7f819cc1bef3663702337db075610cb021d53b8a9d68a16ac2dc4fca8980aa" + vcpkgToolReleaseSha="3a746ca1402b5ac6cd26d09077681c4f8d1090a06ed4243574d81bcff22d651eae5a47107b407828bfa36236f2c4c02d3e2c6392d92b8c5aaf9992f332091f35" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="e027fdaac7a0517cf8222a7a8991283173f4004dc521163c1db8716cb5a36f8f0bfc043dd508464535187408534c8efad14710d2c7fc6be291c90ecc856f011c" + vcpkgToolReleaseSha="0426668fbfaece4f51798c1ee201ffbc26b0b239e212ce6118b2ab5d2490b414a01e725b05ce98c8a95d06341a70405f4223bd4f42e291c5792ec2a631e22cc1" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="c517fc369d7c2f0132de9c90e9960becb58dbd8936ec39699a69d148a60a01e7416c00dfc44d34c99d7bc41dcba50b6b5707969f757ed46514494ca08e948187" + vcpkgToolReleaseSha="4c49238277cecc81cf0a152f9505e4020290e25ada736ec8ff956f740e5e4b986a9e5c3cc0816f4c9ccde06639cb5275d57ea86818060573fa246d019ef835f8" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="85afece575943969502e2fd21cd91dc4ba1629d4b90ea6db66ba1c59f0abac5aa8d4a82a12f73088a6a3601e6b524b03de1a50b32250709a223715200a7fa2fd" + vcpkgToolReleaseSha="05c50173959634a4557b756fce78f92bbc38bf23c91d4c41368c24f91e9479966fb4537a391cee2141423edd6cf84ca488c9e1d57323aa65575baa0ecc6af8e3" fi # Do the download or build. From c6c59e33f39b6c5588fb5884537d31c51dd947a9 Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Fri, 16 Jun 2023 10:50:24 -0700 Subject: [PATCH 318/533] =?UTF-8?q?[boost]=20pulling=20has=5Fsynchro=20bit?= =?UTF-8?q?s=20from=20https://github.com/microsoft/vcpkg/pull=E2=80=A6=20(?= =?UTF-8?q?#30836)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pulling has_synchro bits from https://github.com/microsoft/vcpkg/pull/27694 * bump port version * version * fix clang * bump version * version * oops * bump dependency version for boost-atomic's boost-module-build-helper dependency * version * revert renaming stuff -.- * version * remove detection stuff for lib prefix/suffix * version * fix indentation * version * forgot one * version * one more! * version * revert changes to cmake-get-vars * version * generate ports * version db * generate ports * version db --------- Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/boost-atomic/portfile.cmake | 2 + ports/boost-atomic/vcpkg.json | 2 +- .../boost-modular-build-helper/CMakeLists.txt | 18 ++++----- .../boost-modular-build-helper/Jamroot.jam.in | 31 +++++++++++++++- .../boost-modular-build.cmake | 7 ++-- ports/boost-modular-build-helper/vcpkg.json | 2 +- scripts/boost/generate-ports.ps1 | 3 +- scripts/boost/post-source-stubs/atomic.cmake | 2 + scripts/ci.baseline.txt | 1 + scripts/test_ports/cmake-user/vcpkg.json | 5 +++ scripts/test_ports/vcpkg-ci-boost/vcpkg.json | 37 +++++++++++++++---- versions/b-/boost-atomic.json | 5 +++ versions/b-/boost-modular-build-helper.json | 5 +++ versions/baseline.json | 4 +- versions/v-/vcpkg-cmake-get-vars.json | 5 +++ 15 files changed, 101 insertions(+), 28 deletions(-) diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 856d81225b0535..7586dcb2dc3371 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -13,6 +13,8 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" ) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +#Make sure to keep this line when updating boost. +file(INSTALL "${SOURCE_PATH}/config/has_synchronization_lib.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-atomic") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 3d2293017a652c..642b10f9f89597 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-atomic", "version": "1.82.0", - "port-version": 2, + "port-version": 3, "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "license": "BSL-1.0", diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 21902016e33bd3..62419f2ccf7671 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -61,11 +61,11 @@ if(VCPKG_DETECTED_MSVC) set(USER_CONFIG_TOOLSET clang-win) else() set(USER_CONFIG_TOOLSET msvc) - endif() - if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") - math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") - else() - math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50") + if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") + else() + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50") + endif() endif() elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") set(USER_CONFIG_TOOLSET emscripten) @@ -144,7 +144,7 @@ if(CFLAGS MATCHES "-Zi" OR CXXFLAGS MATCHES "-Zi") ) endif() -if(USER_CONFIG_TOOLSET STREQUAL "msvc") +if(USER_CONFIG_TOOLSET MATCHES "^(msvc|clang-win)$") file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${NOTHING_BAT}\"\n" @@ -171,7 +171,7 @@ if(NOT LDFLAGS STREQUAL "") string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${LDFLAGS}\"\n") endif() -if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc") +if(WIN32 AND NOT USER_CONFIG_TOOLSET MATCHES "^(msvc|clang-win)$") # MINGW here causes b2 to not run cygpath string(APPEND USER_CONFIG_TOOLSET_OPTIONS " mingw\n" @@ -291,10 +291,10 @@ add_custom_target(boost ALL threading=multi stage - WORKING_DIRECTORY ${SOURCE_PATH}/build + WORKING_DIRECTORY "${SOURCE_PATH}/build" ) -set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib) +set(SUBDIR "${CMAKE_CURRENT_BINARY_DIR}/stage/lib") install( CODE " file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUBDIR}/*.dylib\" \"${SUBDIR}/*.dylib.*\" \"${SUBDIR}/*.lib\") diff --git a/ports/boost-modular-build-helper/Jamroot.jam.in b/ports/boost-modular-build-helper/Jamroot.jam.in index 9a490b3ad557dc..a9d687afb16f65 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam.in +++ b/ports/boost-modular-build-helper/Jamroot.jam.in @@ -4,6 +4,7 @@ constant BOOST_JAMROOT_MODULE : $(__name__) ; import boostcpp ; import feature ; +import configure ; boostcpp.set-version $(BOOST_VERSION) ; @@ -100,10 +101,36 @@ if "@PORT@" != "boost-filesystem" if "@PORT@" != "boost-atomic" { + lib synchronization ; + explicit synchronization ; + + exe has_synchronization_lib : @CURRENT_INSTALLED_DIR@/share/boost-atomic/has_synchronization_lib.cpp : synchronization ; + explicit has_synchronization_lib ; + + rule check-synchronization-lib ( properties * ) + { + local result ; + + if windows in $(properties) + { + if [ configure.builds has_synchronization_lib : $(properties) : "has synchronization.lib" ] + { + result += synchronization ; + } + else + { + result += BOOST_ATOMIC_NO_SYNCHRONIZATION_LIB ; + } + } + + return $(result) ; + } use-project /boost/atomic : . ; - lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" release ; - lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" debug ; + lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" release : : usage-requirements + @check-synchronization-lib ; + lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" debug : : usage-requirements + @check-synchronization-lib ; explicit boost_atomic ; } diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index bc9556e3c15fdd..a57ca416a052b2 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -5,7 +5,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cma get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) -set(BOOST_VERSION 1.82.0) +set(BOOST_VERSION "${VERSION}") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") if("${CMAKE_MATCH_3}" GREATER 0) set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") @@ -38,7 +38,6 @@ function(boost_modular_build) else() message(FATAL_ERROR "Could not find b2 in ${BOOST_BUILD_PATH}") endif() - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(BOOST_LIB_PREFIX) if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") @@ -102,7 +101,7 @@ function(boost_modular_build) string(REPLACE "." "" PYTHON_VERSION_TAG "${python3_version}") endif() - configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) + configure_file("${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in" "${_bm_SOURCE_PATH}/Jamroot.jam" @ONLY) set(configure_options) if(_bm_BOOST_CMAKE_FRAGMENT) @@ -199,5 +198,5 @@ function(boost_modular_build) message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") endif() - configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) + configure_file("${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) endfunction() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 0935bb9e1ee6e0..465aebd623f32b 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-modular-build-helper", "version": "1.82.0", - "port-version": 2, + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index cd746eea2d13e1..26008144a0a3fe 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -24,7 +24,8 @@ else { # Clear this array when moving to a new boost version $defaultPortVersion = 2 $portVersions = @{ - #e.g. "boost-asio" = 1; + "boost-atomic" = 3; + "boost-modular-build-helper" = 3; } function Get-PortVersion { diff --git a/scripts/boost/post-source-stubs/atomic.cmake b/scripts/boost/post-source-stubs/atomic.cmake index ec57791922adc5..c333e5a69285e8 100644 --- a/scripts/boost/post-source-stubs/atomic.cmake +++ b/scripts/boost/post-source-stubs/atomic.cmake @@ -3,3 +3,5 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" ) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") +#Make sure to keep this line when updating boost. +file(INSTALL "${SOURCE_PATH}/config/has_synchronization_lib.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/boost-atomic") \ No newline at end of file diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index aa3f2df280fc8e..94cb2cc15a1a9e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1751,6 +1751,7 @@ vcpkg-ci-arrow:x64-windows-static-md=pass vcpkg-ci-arrow:x64-osx=pass vcpkg-ci-arrow:x64-linux=pass vcpkg-ci-boost:x64-linux=pass +vcpkg-ci-boost:arm64-windows=pass vcpkg-ci-boost:x64-osx=pass vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index ce2a69ec702345..ed1718e0936e9e 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -38,6 +38,11 @@ "find-package": { "description": "Ports to be tested via find_package($package)", "dependencies": [ + { + "$package": "Boost", + "name":"boost", + "platform": "!uwp" + }, { "$package": "BZip2", "name": "bzip2" diff --git a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json index c8c19f49eb5bc9..c4bdf2a85a4a52 100644 --- a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json @@ -8,7 +8,8 @@ "default-features": false, "features": [ "mpi" - ] + ], + "platform":"!(arm & windows)" }, { "name": "boost-asio", @@ -22,14 +23,16 @@ "default-features": false, "features": [ "numa" - ] + ], + "platform":"!uwp & !arm & !emscripten" }, { "name": "boost-locale", "default-features": false, "features": [ "icu" - ] + ], + "platform":"!uwp" }, { "name": "boost-mpi", @@ -37,29 +40,47 @@ "features": [ "python3" ], - "platform": "!static" + "platform": "!static & !(arm & windows)" + }, + { + "name":"boost-odeint", + "default-features":false }, { "name": "boost-odeint", "default-features": false, "features": [ "mpi" - ] + ], + "platform": "!(arm & windows)" + }, + { + "name": "boost-python", + "default-features":false, + "features":[ + "python2" + ], + "platform":"!(arm & windows)" }, { "name": "boost-python", "default-features": false, "features": [ - "python2", "python3" - ] + ], + "platform":"!uwp" + }, + { + "name":"boost-regex", + "default-features":false }, { "name": "boost-regex", "default-features": false, "features": [ "icu" - ] + ], + "platform":"!uwp" } ] } diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 0d8b30785765c4..48f380dfc66361 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05f82c6b7fe3a31ffb4f16f25eb98473131f201a", + "version": "1.82.0", + "port-version": 3 + }, { "git-tree": "4cd58a1ad5ec2c381440b733e3799368df678b49", "version": "1.82.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index e75fcd27569145..136c0237d96eb0 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f75b07bdab1080c9470eb115836035d7142397", + "version": "1.82.0", + "port-version": 3 + }, { "git-tree": "3ae088c69a58eb9a5854ff99807397a0c09daf6a", "version": "1.82.0", diff --git a/versions/baseline.json b/versions/baseline.json index 374d65d96b4925..802f2946230ed5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -666,7 +666,7 @@ }, "boost-atomic": { "baseline": "1.82.0", - "port-version": 2 + "port-version": 3 }, "boost-beast": { "baseline": "1.82.0", @@ -934,7 +934,7 @@ }, "boost-modular-build-helper": { "baseline": "1.82.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.82.0", diff --git a/versions/v-/vcpkg-cmake-get-vars.json b/versions/v-/vcpkg-cmake-get-vars.json index 4bfa475bc11eaf..56e54de8af3b7f 100644 --- a/versions/v-/vcpkg-cmake-get-vars.json +++ b/versions/v-/vcpkg-cmake-get-vars.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6eb09f11e34173a4bfc31252d02d6aea6c25d8f", + "version-date": "2023-04-13", + "port-version": 0 + }, { "git-tree": "2e624c2cf12a97a7a802e31ff1d28b9fa6ba9bde", "version-date": "2023-03-02", From 9f9a071621ca0391787cc6adbee918cc3453366d Mon Sep 17 00:00:00 2001 From: Henrik Date: Sat, 17 Jun 2023 00:48:44 +0200 Subject: [PATCH 319/533] [vulkan-memory-allocator-hpp] Update to 3.0.1-1 (#31708) * Updated vulkan-memory-allocator-hpp port * Ran vcpkg x-add-version vulkan-memory-allocator-hpp * Used VERSION variable * Updated port version * Updated port version again * Turned port-version back to 1 * Ran x-add-version * Added development branch in description and reset port version * Ran x-add-version * Fixed version number * Re-ran x-add-version --- ports/vulkan-memory-allocator-hpp/portfile.cmake | 4 ++-- ports/vulkan-memory-allocator-hpp/vcpkg.json | 8 ++++---- versions/baseline.json | 4 ++-- versions/v-/vulkan-memory-allocator-hpp.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/vulkan-memory-allocator-hpp/portfile.cmake b/ports/vulkan-memory-allocator-hpp/portfile.cmake index 388e9af5652837..72b5d54ef9c078 100644 --- a/ports/vulkan-memory-allocator-hpp/portfile.cmake +++ b/ports/vulkan-memory-allocator-hpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO YaaZ/VulkanMemoryAllocator-Hpp - REF v3.0.1 - SHA512 0631319ec892161acb85903ddeecf0b18ff6772fdb44b46c756f6c148d150ea0850f7a35f105a04e9b23baf6ea5aa9bb373e04c7be598f1caa23c22cacf4ee00 + REF "v3.0.1-1" + SHA512 71709a889ea4527c2ee273521fe62b61bb87cda3e3c3ae2964cc18bd70ac69629aeed00b1e92d4470ba6cb08394813880018401847a6d4ed5c15e4ee1fb60ff1 HEAD_REF master ) diff --git a/ports/vulkan-memory-allocator-hpp/vcpkg.json b/ports/vulkan-memory-allocator-hpp/vcpkg.json index e1f34a37684776..8b04a6cb3bb6d8 100644 --- a/ports/vulkan-memory-allocator-hpp/vcpkg.json +++ b/ports/vulkan-memory-allocator-hpp/vcpkg.json @@ -1,12 +1,12 @@ { "name": "vulkan-memory-allocator-hpp", - "version": "3.0.1", - "port-version": 1, - "description": "C++ bindings for VulkanMemoryAllocator", + "version": "3.0.1.1", + "description": "C++ bindings for VulkanMemoryAllocator (Development branch)", "homepage": "https://github.com/YaaZ/VulkanMemoryAllocator-Hpp", "license": "CC0-1.0", "supports": "!uwp & !xbox", "dependencies": [ - "vulkan" + "vulkan", + "vulkan-memory-allocator" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 802f2946230ed5..184679ac2a3a28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8525,8 +8525,8 @@ "port-version": 2 }, "vulkan-memory-allocator-hpp": { - "baseline": "3.0.1", - "port-version": 1 + "baseline": "3.0.1.1", + "port-version": 0 }, "vvenc": { "baseline": "1.7.0", diff --git a/versions/v-/vulkan-memory-allocator-hpp.json b/versions/v-/vulkan-memory-allocator-hpp.json index 5dfb4cd1d20b97..41b4ddd548e11d 100644 --- a/versions/v-/vulkan-memory-allocator-hpp.json +++ b/versions/v-/vulkan-memory-allocator-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "917058b3096f3375a29ff9960e4cae4a988655ea", + "version": "3.0.1.1", + "port-version": 0 + }, { "git-tree": "572ac6bfc63ddd4a37633aa76f54ff4c8325cb85", "version": "3.0.1", From e977c102fe2abbfb9a874befc0b9e18dda4f5b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Sat, 17 Jun 2023 00:55:50 +0200 Subject: [PATCH 320/533] [quill] Update to 3.0.1 (#32048) * [quill] Update to 3.0.1 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 3e2bf0cfcbe826..15e78a637bdf9b 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 35b1c2fa0c41cd0adc295da7182d54dd40990d6717608d7b9214f7c99e860787c3e5988908a525f44a674ddd8ea479532cec25fcf48113a957ee8abaf4d83441 + SHA512 92210265c0b8a38774f1b57eedd4d319034dcfe267bd4035ccf338a0b46e7393bee361d4bf379421a7e5106bae67cf64d70cad01f9c6b82655aeb859af29a8ed HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 36861e5b0f7340..e579233d683ff2 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "2.9.1", + "version": "3.0.1", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 184679ac2a3a28..2a37fa25d86deb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6949,7 +6949,7 @@ "port-version": 9 }, "quill": { - "baseline": "2.9.1", + "baseline": "3.0.1", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 30fe7574230b6c..6cf182d57968b0 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e99204ad49b5de261987492e81a290fa15d66626", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "7d0b893d24e4034db0e663e68c95188a26523d29", "version": "2.9.1", From c65131a11592976b0824040e069acbf4fc74cc39 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sat, 17 Jun 2023 07:58:06 +0900 Subject: [PATCH 321/533] Update async_mqtt version to 1.0.3. (#32040) --- ports/async-mqtt/portfile.cmake | 2 +- ports/async-mqtt/vcpkg.json | 2 +- versions/a-/async-mqtt.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 4b1fc1dc0224d9..9056d48a003c1b 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 54ae476ef1cac600c2a86dcb56d12729b3e75987dbe6eb768754de66e820b46b53dde2a14780f42a1e28c1dbb74615a3426a26cc7492c6c6664160b9e6355c8d + SHA512 7670c64f6c1ed98434620e107474283fec802098421c77ba503fc732141597ae0926d187be0cbcc0a86433c502a21cdc19a6d25d8e009ee1c72fd691f9fe9163 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index c182fb49f075db..de789d04b47f25 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "1.0.2", + "version": "1.0.3", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index 0c20deb131c4b0..5b16bc74da69ac 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "624a7f874eca273e12ebe2ac104d13294c4126bd", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "035119f49547730765ec2a296355d550b8ac7920", "version": "1.0.2", diff --git a/versions/baseline.json b/versions/baseline.json index 2a37fa25d86deb..a70d5a2911139c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,7 +257,7 @@ "port-version": 0 }, "async-mqtt": { - "baseline": "1.0.2", + "baseline": "1.0.3", "port-version": 0 }, "asynch": { From acee1bdb49adda5e33ac104c9019b002b4f8d35d Mon Sep 17 00:00:00 2001 From: Michael Ferrari Date: Sat, 17 Jun 2023 01:00:14 +0200 Subject: [PATCH 322/533] [entt] Update to 3.12.0 (#32038) --- ports/entt/portfile.cmake | 2 +- ports/entt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 0333f521ae762d..6a8a4056b978cf 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -9,7 +9,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt REF "v${VERSION}" - SHA512 dfbf95e70685e04f1917589fe2484e928cf8883615840b7b5b2906e21bec0830cefcb97133f8822f682bffae8f98d99d525407a00e8dc885f6aa5655af3bcc94 + SHA512 51fe70e68cbb7d3a5a9ca6b5ff974d324e34248a13a1c828b6c5876461a173861ab26f1bfd0bac7287f8499d07b93bdb73622b579d11a65c916aad7b642dc6e0 HEAD_REF master ) endif() diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index 2c8a7a33570402..4175aae33eaf33 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "entt", - "version": "3.11.1", + "version": "3.12.0", "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a70d5a2911139c..fc710853602198 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2329,7 +2329,7 @@ "port-version": 5 }, "entt": { - "baseline": "3.11.1", + "baseline": "3.12.0", "port-version": 0 }, "epsilon": { diff --git a/versions/e-/entt.json b/versions/e-/entt.json index b1a703c95bc432..0116726db73c0e 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "715488654a998a72da8fff6596cbeedf1962fa56", + "version": "3.12.0", + "port-version": 0 + }, { "git-tree": "d9bf4ab0cc1354ea754f3038dee29ae00ded6331", "version": "3.11.1", From ae56ff4adb881f97e31b5e63c438f3edacf421ef Mon Sep 17 00:00:00 2001 From: Daniel Ju <41210545+daniel-ju@users.noreply.github.com> Date: Fri, 16 Jun 2023 18:05:02 -0500 Subject: [PATCH 323/533] [clapack] Initialize clapack variables (#32034) * Re-apply CLAPACK_FOUND fix * Update version --- ports/clapack/FindLAPACK.cmake | 8 ++++++++ ports/clapack/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/clapack.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index aa546e672be054..56913183d5078c 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -166,6 +166,14 @@ set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE) find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR) mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY) +set(CLAPACK_FOUND "${LAPACK_FOUND}" CACHE STRING "" FORCE) + +set(oF2C_LIBRARY_RELEASE "${oF2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(oF2C_LIBRARY_DEBUG "${oF2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE) +set(oLAPACK_LIBRARY_RELEASE "${oLAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(oLAPACK_LIBRARY_DEBUG "${oLAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE) +set(LAPACK_BLAS_LIBRARY_RELEASE "${LAPACK_BLAS_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(LAPACK_BLAS_LIBRARY_DEBUG "${LAPACK_BLAS_LIBRARY_DEBUG}" CACHE STRING "" FORCE) #TARGETS if(CLAPACK_FOUND AND NOT TARGET clapack::clapack) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index b3d28c2965c9e3..ec85ad4f1a8f16 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 21, + "port-version": 22, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fc710853602198..2a15e1ac640905 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1542,7 +1542,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 21 + "port-version": 22 }, "clara": { "baseline": "1.1.5", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 3ae3ce28579fe6..02e660a7d605b9 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0736bfcd19b6aaa7f1c75c10122433d4b4cc50a9", + "version": "3.2.1", + "port-version": 22 + }, { "git-tree": "f6f25a8699a34ca09b840a5e71b22ab8f6d01fda", "version": "3.2.1", From a76139fb41ec08c9274dd2aa1acada6de64cd361 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sat, 17 Jun 2023 02:14:53 +0300 Subject: [PATCH 324/533] [qt5] Apply CVE fixes (#32031) --- .../patches/CVE-2023-33285-qtbase-5.15.diff | 68 +++++++++++++++++++ .../patches/CVE-2023-34410-qtbase-5.15.diff | 52 ++++++++++++++ ports/qt5-base/portfile.cmake | 2 + ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 ++ 6 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff create mode 100644 ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff diff --git a/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff new file mode 100644 index 00000000000000..fe344c6a310d0e --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-33285-qtbase-5.15.diff @@ -0,0 +1,68 @@ +--- a/src/network/kernel/qdnslookup_unix.cpp ++++ b/src/network/kernel/qdnslookup_unix.cpp +@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + // responseLength in case of error, we still can extract the + // exact error code from the response. + HEADER *header = (HEADER*)response; +- const int answerCount = ntohs(header->ancount); + switch (header->rcode) { + case NOERROR: + break; +@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + return; + } + +- // Skip the query host, type (2 bytes) and class (2 bytes). + char host[PACKETSZ], answer[PACKETSZ]; + unsigned char *p = response + sizeof(HEADER); +- int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); +- if (status < 0) { ++ int status; ++ ++ if (ntohs(header->qdcount) == 1) { ++ // Skip the query host, type (2 bytes) and class (2 bytes). ++ status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); ++ if (status < 0) { ++ reply->error = QDnsLookup::InvalidReplyError; ++ reply->errorString = tr("Could not expand domain name"); ++ return; ++ } ++ if ((p - response) + status + 4 >= responseLength) ++ header->qdcount = 0xffff; // invalid reply below ++ else ++ p += status + 4; ++ } ++ if (ntohs(header->qdcount) > 1) { + reply->error = QDnsLookup::InvalidReplyError; +- reply->errorString = tr("Could not expand domain name"); ++ reply->errorString = tr("Invalid reply received"); + return; + } +- p += status + 4; + + // Extract results. ++ const int answerCount = ntohs(header->ancount); + int answerIndex = 0; + while ((p < response + responseLength) && (answerIndex < answerCount)) { + status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); +@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + const QString name = QUrl::fromAce(host); + + p += status; ++ ++ if ((p - response) + 10 > responseLength) { ++ // probably just a truncated reply, return what we have ++ return; ++ } + const quint16 type = (p[0] << 8) | p[1]; + p += 2; // RR type + p += 2; // RR class +@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN + p += 4; + const quint16 size = (p[0] << 8) | p[1]; + p += 2; ++ if ((p - response) + size > responseLength) ++ return; // truncated + + if (type == QDnsLookup::A) { + if (size != 4) { diff --git a/ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff b/ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff new file mode 100644 index 00000000000000..4fe51388215167 --- /dev/null +++ b/ports/qt5-base/patches/CVE-2023-34410-qtbase-5.15.diff @@ -0,0 +1,52 @@ +--- a/src/network/ssl/qsslsocket_schannel.cpp ++++ b/src/network/ssl/qsslsocket_schannel.cpp +@@ -1880,6 +1880,28 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext) + if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth) + verifyDepth = DWORD(configuration.peerVerifyDepth); + ++ const auto &caCertificates = q->sslConfiguration().caCertificates(); ++ ++ if (!rootCertOnDemandLoadingAllowed() ++ && !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN) ++ && (q->peerVerifyMode() == QSslSocket::VerifyPeer ++ || (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) { ++ // When verifying a peer Windows "helpfully" builds a chain that ++ // may include roots from the system store. But we don't want that if ++ // the user has set their own CA certificates. ++ // Since Windows claims this is not a partial chain the root is included ++ // and we have to check that it is one of our configured CAs. ++ CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1]; ++ QSslCertificate certificate = getCertificateFromChainElement(element); ++ if (!caCertificates.contains(certificate)) { ++ auto error = QSslError(QSslError::CertificateUntrusted, certificate); ++ sslErrors += error; ++ emit q->peerVerifyError(error); ++ if (q->state() != QAbstractSocket::ConnectedState) ++ return false; ++ } ++ } ++ + for (DWORD i = 0; i < verifyDepth; i++) { + CERT_CHAIN_ELEMENT *element = chain->rgpElement[i]; + QSslCertificate certificate = getCertificateFromChainElement(element); +--- a/src/network/ssl/qsslsocket.cpp ++++ b/src/network/ssl/qsslsocket.cpp +@@ -2221,6 +2221,10 @@ QSslSocketPrivate::QSslSocketPrivate() + , flushTriggered(false) + { + QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration); ++ // If the global configuration doesn't allow root certificates to be loaded ++ // on demand then we have to disable it for this socket as well. ++ if (!configuration.allowRootCertOnDemandLoading) ++ allowRootCertOnDemandLoading = false; + } + + /*! +@@ -2470,6 +2474,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri + ptr->sessionProtocol = global->sessionProtocol; + ptr->ciphers = global->ciphers; + ptr->caCertificates = global->caCertificates; ++ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading; + ptr->protocol = global->protocol; + ptr->peerVerifyMode = global->peerVerifyMode; + ptr->peerVerifyDepth = global->peerVerifyDepth; diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 94923ba74692ce..890a1e4d153447 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -49,6 +49,8 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH # CVE fixes from https://download.qt.io/official_releases/qt/5.15/ patches/CVE-2023-32762-qtbase-5.15.diff patches/CVE-2023-32763-qtbase-5.15.diff + patches/CVE-2023-33285-qtbase-5.15.diff + patches/CVE-2023-34410-qtbase-5.15.diff patches/winmain_pro.patch #Moves qtmain to manual-link patches/windows_prf.patch #fixes the qtmain dependency due to the above move diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index e6c83a8010bd23..70ad71f67b3e2a 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.10", - "port-version": 1, + "port-version": 2, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 2a15e1ac640905..859a1b585f8fcc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6582,7 +6582,7 @@ }, "qt5-base": { "baseline": "5.15.10", - "port-version": 1 + "port-version": 2 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index beac80539cf816..d7ebb11ff8039c 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47eb2c538dd9220fcf44ca6a72f1aa64e4fb8d26", + "version": "5.15.10", + "port-version": 2 + }, { "git-tree": "3088e8df941cddfdc7dd5a5b6efae7386cb3d388", "version": "5.15.10", From fbc868ee5e12e3e81f464104be246ec06553c274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= <70097935+omarhogni@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:21:05 +0000 Subject: [PATCH 325/533] [glaze] update v1.2.6 (#32029) * Update glaze v1.2.6 * update database --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index e487688bf3c525..258e9bd59988ee 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 456b49a86dddb5949991050daa8dcfbe47ca55db6746539e14995a19bd2623ab46ac72e08af29f64cb1f3ff79265fb8d824bf9b7744f3cf94e568f27467b6185 + SHA512 a57b7807ff99a7388e4b19564ba7505fc7e8e3ac9a1b6c02335d2c5ef65b0e9e015aa3e7795e634855e013ccea8049efbbe72ca0d9c738e2f0480f86e1e26b5e ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 8bbaae3886e3c8..05da44b4925ccb 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.2.3", + "version": "1.2.6", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 859a1b585f8fcc..19b94c1a4bf0c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2837,7 +2837,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.2.3", + "baseline": "1.2.6", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index e015cce5a4348e..024a3d5399edcf 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe60168d31fea0898c1282a01d8fddead9af6bd7", + "version": "1.2.6", + "port-version": 0 + }, { "git-tree": "ccae5c60306415e7f7bd44e4ebb91b972b550c10", "version": "1.2.3", From 9e629f0221bc896ddba60d989ee7f754c61e34f0 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 16 Jun 2023 20:38:42 -0700 Subject: [PATCH 326/533] [libosmscout] Fix features and add qt feature (#32023) * [libosmscout] Fix features and add qt feature * format vcpkg.json * update version * codes clean up * update version --- ports/libosmscout/portfile.cmake | 24 ++++++++---------------- ports/libosmscout/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 2 +- versions/l-/libosmscout.json | 5 +++++ 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ports/libosmscout/portfile.cmake b/ports/libosmscout/portfile.cmake index d680c08f57881f..26f46201f83ab6 100644 --- a/ports/libosmscout/portfile.cmake +++ b/ports/libosmscout/portfile.cmake @@ -6,20 +6,13 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - cairo OSMDCOUT_BUILD_MAP_CAIRO - directx OSMDCOUT_BUILD_MAP_DIRECTX - gdi OSMDCOUT_BUILD_MAP_GDI - svg OSMDCOUT_BUILD_MAP_SVG - ) -else() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - cairo OSMDCOUT_BUILD_MAP_CAIRO - svg OSMDCOUT_BUILD_MAP_SVG - ) - list(APPEND FEATURE_OPTIONS -DOSMDCOUT_BUILD_MAP_DIRECTX=OFF -DOSMDCOUT_BUILD_MAP_GDI=OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + cairo OSMSCOUT_BUILD_MAP_CAIRO + directx OSMSCOUT_BUILD_MAP_DIRECTX + gdi OSMSCOUT_BUILD_MAP_GDI + svg OSMSCOUT_BUILD_MAP_SVG + qt OSMSCOUT_BUILD_MAP_QT +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -34,7 +27,6 @@ vcpkg_cmake_configure( -DOSMSCOUT_BUILD_TOOL_STYLEEDITOR=OFF -DOSMSCOUT_BUILD_EXTERN_MATLAB=OFF -DOSMSCOUT_BUILD_TESTS=OFF - -DOSMDCOUT_BUILD_MAP_QT=OFF ${FEATURE_OPTIONS} ) @@ -42,7 +34,7 @@ vcpkg_cmake_install() vcpkg_copy_tools(TOOL_NAMES Import AUTO_CLEAN) vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libosmscout) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libosmscout/vcpkg.json b/ports/libosmscout/vcpkg.json index fcff03a79ce9ba..1e8aeb9acca746 100644 --- a/ports/libosmscout/vcpkg.json +++ b/ports/libosmscout/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosmscout", "version": "1.1.1", - "port-version": 2, + "port-version": 3, "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.", "homepage": "http://libosmscout.sourceforge.net/", "documentation": "http://libosmscout.sourceforge.net/documentation/", @@ -33,10 +33,19 @@ ] }, "directx": { - "description": "Direct2D backend renderer" + "description": "Direct2D backend renderer", + "supports": "windows" }, "gdi": { - "description": "GDI+ backend renderer" + "description": "GDI+ backend renderer", + "supports": "windows" + }, + "qt": { + "description": "Enable build of Qt map drawing backend", + "dependencies": [ + "qt5-base", + "qt5-svg" + ] }, "svg": { "description": "SVG backend renderer", diff --git a/versions/baseline.json b/versions/baseline.json index 19b94c1a4bf0c6..33f4b8cc0b68ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4394,7 +4394,7 @@ }, "libosmscout": { "baseline": "1.1.1", - "port-version": 2 + "port-version": 3 }, "libp7-baical": { "baseline": "replaced", diff --git a/versions/l-/libosmscout.json b/versions/l-/libosmscout.json index 585c1a0ecf86b4..51c8e42fa1313f 100644 --- a/versions/l-/libosmscout.json +++ b/versions/l-/libosmscout.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a036a2f5b16cbc586266834abfe3c7a3f712c7e", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "4a9ab34b9b12105e070411d8be66aeb3a1baf246", "version": "1.1.1", From 43773b7610863df4c512ad3ed81dd2df63d4eb76 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:48:32 +0800 Subject: [PATCH 327/533] [sockpp] Update to 0.8.1 (#32021) * update sockpp * update version * Use the upstream config files * update git-tree --------- Co-authored-by: Monica --- ports/sockpp/portfile.cmake | 9 ++++----- ports/sockpp/sockppConfig.cmake | 23 ----------------------- ports/sockpp/usage | 5 ----- ports/sockpp/vcpkg.json | 7 +++++-- versions/baseline.json | 4 ++-- versions/s-/sockpp.json | 5 +++++ 6 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 ports/sockpp/sockppConfig.cmake delete mode 100644 ports/sockpp/usage diff --git a/ports/sockpp/portfile.cmake b/ports/sockpp/portfile.cmake index 2ab525a968d386..6ead08eb707ee5 100644 --- a/ports/sockpp/portfile.cmake +++ b/ports/sockpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fpagliughi/sockpp - REF 999ad87296e34d5a8e4edf15d985315d0d84eda7 - SHA512 159b9288f45d5f5144a002f35caf520e55a66c2d45cdb1fe325021f100db0770601e973b86ec5b032e5bea1542203b30eba3e6be20e03c78f0504b62da1900b3 + REF "v${VERSION}" + SHA512 e675bd9e094108c222128f65f64519d550f5dcc36ec217c57277d2d3bfadd4410d06278cfe2858e24d36fdcc0cced8d87d05c61abb94848d073182c29860b61a HEAD_REF master ) @@ -22,9 +22,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL "${CURRENT_PORT_DIR}/sockppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sockpp/sockppConfig.cmake b/ports/sockpp/sockppConfig.cmake deleted file mode 100644 index 840b96ed04f378..00000000000000 --- a/ports/sockpp/sockppConfig.cmake +++ /dev/null @@ -1,23 +0,0 @@ -get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -if(NOT SOCKPP_FIND_COMPONENTS) - set(SOCKPP_FIND_COMPONENTS sockpp) - if(SOCKPP_FIND_REQUIRED) - set(SOCKPP_FIND_REQUIRED_sockpp TRUE) - endif() - set(SOCKPP_FOUND TRUE) -endif() - -set(SOCKPP_INCLUDE_DIRS ${_DIR}/include) -set(SOCKPP_LIBRARIES) -if (EXISTS ${_DIR}/lib/libsockpp.a) - list(APPEND SOCKPP_LIBRARIES optimized ${_DIR}/lib/libsockpp.a) -endif() -if (EXISTS ${_DIR}/debug/lib/libsockpp.a) - list(APPEND SOCKPP_LIBRARIES debug ${_DIR}/debug/lib/libsockpp.a) -endif() -if (EXISTS ${_DIR}/lib/sockpp.lib) - list(APPEND SOCKPP_LIBRARIES optimized ${_DIR}/lib/sockpp.lib) -endif() -if (EXISTS ${_DIR}/debug/lib/sockpp.lib) - list(APPEND SOCKPP_LIBRARIES debug ${_DIR}/debug/lib/sockpp.lib) -endif() diff --git a/ports/sockpp/usage b/ports/sockpp/usage deleted file mode 100644 index 5cfb06d29e77f0..00000000000000 --- a/ports/sockpp/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package sockpp provides CMake integration: - - find_package(sockpp CONFIG REQUIRED) - target_include_directories(main PRIVATE ${SOCKPP_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${SOCKPP_LIBRARIES}) diff --git a/ports/sockpp/vcpkg.json b/ports/sockpp/vcpkg.json index 07d6f3f000c196..eeb2d570dcf48b 100644 --- a/ports/sockpp/vcpkg.json +++ b/ports/sockpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sockpp", - "version": "0.7.1", - "port-version": 1, + "version": "0.8.1", "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.", "homepage": "https://github.com/fpagliughi/sockpp", "license": "BSD-3-Clause", @@ -10,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 33f4b8cc0b68ef..6bbf495610e681 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7589,8 +7589,8 @@ "port-version": 0 }, "sockpp": { - "baseline": "0.7.1", - "port-version": 1 + "baseline": "0.8.1", + "port-version": 0 }, "soem": { "baseline": "2023-06-09", diff --git a/versions/s-/sockpp.json b/versions/s-/sockpp.json index 792eb3f5de70cb..e1ca8344dcf5ce 100644 --- a/versions/s-/sockpp.json +++ b/versions/s-/sockpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab2b9cfee212de99341c19d0604cf857c789dc60", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "608151660b414b2bbcdec35bdd622fdce5620abb", "version": "0.7.1", From 537780d3d03a3dfe75c3c2357f7f9780a987b6f9 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:49:20 +0800 Subject: [PATCH 328/533] [indirect-value] add new port (#32019) * [indirect-value]: add new port * fix deps * fix deps * fix deps * fix deps * fix deps --- ports/indirect-value/fix-install.patch | 25 ++++++++++++++++++++++ ports/indirect-value/portfile.cmake | 29 ++++++++++++++++++++++++++ ports/indirect-value/usage | 4 ++++ ports/indirect-value/vcpkg.json | 16 ++++++++++++++ versions/baseline.json | 4 ++++ versions/i-/indirect-value.json | 9 ++++++++ 6 files changed, 87 insertions(+) create mode 100644 ports/indirect-value/fix-install.patch create mode 100644 ports/indirect-value/portfile.cmake create mode 100644 ports/indirect-value/usage create mode 100644 ports/indirect-value/vcpkg.json create mode 100644 versions/i-/indirect-value.json diff --git a/ports/indirect-value/fix-install.patch b/ports/indirect-value/fix-install.patch new file mode 100644 index 00000000000000..9400f3060fc526 --- /dev/null +++ b/ports/indirect-value/fix-install.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index da1d4d8..f314754 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -162,12 +162,6 @@ if (${CPP_INDIRECT_IS_NOT_SUBPROJECT}) + ${CMAKE_INSTALL_INCLUDEDIR} + ) + +- install( +- FILES +- "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt" +- DESTINATION +- "${CMAKE_INSTALL_DATAROOTDIR}/licenses/indirect_value" +- ) + + install( + TARGETS indirect_value +@@ -179,6 +173,7 @@ if (${CPP_INDIRECT_IS_NOT_SUBPROJECT}) + + install( + EXPORT indirect_value-export-set ++ FILE indirect_value-target.cmake + NAMESPACE indirect_value:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/indirect_value" + ) diff --git a/ports/indirect-value/portfile.cmake b/ports/indirect-value/portfile.cmake new file mode 100644 index 00000000000000..b7aad2f8d1f39d --- /dev/null +++ b/ports/indirect-value/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jbcoe/indirect_value + REF 4152dcc5d2e35d03f3e71089508b47a8f630b8e7 + SHA512 fea37378041f9c770b76e6c68777d0fd5c27e28e7f83b0a7a021eb06aa279c959ab6d5f4d748e1f0fedd90c04965073850a855395b72574143fa1053704211ea + HEAD_REF main + PATCHES + fix-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_CODE_COVERAGE=OFF + -DENABLE_INCLUDE_NATVIS=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME indirect_value CONFIG_PATH lib/cmake/indirect_value) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" ) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") + +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/indirect-value/") diff --git a/ports/indirect-value/usage b/ports/indirect-value/usage new file mode 100644 index 00000000000000..7b10b90cf3c921 --- /dev/null +++ b/ports/indirect-value/usage @@ -0,0 +1,4 @@ +The package indirect-value provides CMake targets: + + find_package(indirect_value CONFIG REQUIRED) + target_link_libraries(main PRIVATE indirect_value::indirect_value) diff --git a/ports/indirect-value/vcpkg.json b/ports/indirect-value/vcpkg.json new file mode 100644 index 00000000000000..79e197b12e5b92 --- /dev/null +++ b/ports/indirect-value/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "indirect-value", + "version-date": "2023-06-01", + "description": "An indirect value-type for C++", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6bbf495610e681..469fdda98f0c7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3352,6 +3352,10 @@ "baseline": "2.3", "port-version": 0 }, + "indirect-value": { + "baseline": "2023-06-01", + "port-version": 0 + }, "influxdb-cxx": { "baseline": "0.7.1", "port-version": 0 diff --git a/versions/i-/indirect-value.json b/versions/i-/indirect-value.json new file mode 100644 index 00000000000000..6c311f592429d8 --- /dev/null +++ b/versions/i-/indirect-value.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d62fd633114abe776446de54ddae3249cb4e7617", + "version-date": "2023-06-01", + "port-version": 0 + } + ] +} From 98ba38fd7f06359b51aafac691562ebfbfefb77f Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:50:42 +0800 Subject: [PATCH 329/533] [ixwebsocket] update to 11.4.4 (#32018) --- ports/ixwebsocket/fix-C2065-of-errorMsg.patch | 13 +++++++++++++ ports/ixwebsocket/portfile.cmake | 8 +++++--- ports/ixwebsocket/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/ixwebsocket.json | 5 +++++ 5 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 ports/ixwebsocket/fix-C2065-of-errorMsg.patch diff --git a/ports/ixwebsocket/fix-C2065-of-errorMsg.patch b/ports/ixwebsocket/fix-C2065-of-errorMsg.patch new file mode 100644 index 00000000000000..2435866c9bd4b9 --- /dev/null +++ b/ports/ixwebsocket/fix-C2065-of-errorMsg.patch @@ -0,0 +1,13 @@ +diff --git a/ixwebsocket/IXSocketMbedTLS.cpp b/ixwebsocket/IXSocketMbedTLS.cpp +index f5c0cf6..0192dc7 100644 +--- a/ixwebsocket/IXSocketMbedTLS.cpp ++++ b/ixwebsocket/IXSocketMbedTLS.cpp +@@ -49,7 +49,7 @@ namespace ix + mbedtls_pk_init(&_pkey); + } + +- bool SocketMbedTLS::loadSystemCertificates(std::string& /* errorMsg */) ++ bool SocketMbedTLS::loadSystemCertificates(std::string& errorMsg) + { + #ifdef _WIN32 + DWORD flags = CERT_STORE_READONLY_FLAG | CERT_STORE_OPEN_EXISTING_FLAG | diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index 57a2b2c570ad6e..b9e45518794bf4 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -3,8 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket - REF v11.4.3 - SHA512 6db4f05b3a73aa5f6efdb6d4692d9f9665b14c3a6e4837ff6b2719d9261aa660166fd4ddf99ca8e6804202d6f71c399fe1c223932493ea8db0a73752cb5b8e97 + REF "v${VERSION}" + SHA512 698ad96f25f53bf48906201826008bad46c657f8043d3653988716ddd9fb5dfeb52cebc002b3af76b91d0561155607a5f38bbc2c808aa67f438432207da82a35 + PATCHES + fix-C2065-of-errorMsg.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -33,4 +35,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/ixwebsocket/vcpkg.json b/ports/ixwebsocket/vcpkg.json index 4d7808ac636d99..8eee6a764c0d98 100644 --- a/ports/ixwebsocket/vcpkg.json +++ b/ports/ixwebsocket/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ixwebsocket", - "version-semver": "11.4.3", + "version-semver": "11.4.4", "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", "homepage": "https://github.com/machinezone/IXWebSocket", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 469fdda98f0c7a..90d84524743be4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3421,7 +3421,7 @@ "port-version": 10 }, "ixwebsocket": { - "baseline": "11.4.3", + "baseline": "11.4.4", "port-version": 0 }, "jack2": { diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json index 0c4f7fde889527..2136d72f0b732c 100644 --- a/versions/i-/ixwebsocket.json +++ b/versions/i-/ixwebsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8831fc46f1465a5630978a28255c9edab0fed860", + "version-semver": "11.4.4", + "port-version": 0 + }, { "git-tree": "c5abcb4348cb05507367eeaac8fb075c5cf8ed35", "version-semver": "11.4.3", From cbf56573a987527b39272e88cbdd11389b78c6e4 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:52:08 +0800 Subject: [PATCH 330/533] fix cmake zlib ver required (#32017) --- ports/libxlsxwriter/fix-zlib-ver-required.patch | 13 +++++++++++++ ports/libxlsxwriter/portfile.cmake | 1 + ports/libxlsxwriter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxlsxwriter.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/libxlsxwriter/fix-zlib-ver-required.patch diff --git a/ports/libxlsxwriter/fix-zlib-ver-required.patch b/ports/libxlsxwriter/fix-zlib-ver-required.patch new file mode 100644 index 00000000000000..d2d1b104a47a13 --- /dev/null +++ b/ports/libxlsxwriter/fix-zlib-ver-required.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 776c88a..ccc057d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,7 +219,7 @@ enable_language(CXX) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + # ZLIB +-find_package(ZLIB REQUIRED "1.0") ++find_package(ZLIB "1.0" REQUIRED) + list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}) + message("zlib version: " ${ZLIB_VERSION}) + diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index 2ccfb6f76a42b8..7d9427d484bf9e 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES dependencies.diff + fix-zlib-ver-required.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/minizip") diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json index da65e5f14d9b9a..f7d4f00afdbf1d 100644 --- a/ports/libxlsxwriter/vcpkg.json +++ b/ports/libxlsxwriter/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxlsxwriter", "version": "1.1.5", - "port-version": 1, + "port-version": 2, "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", "homepage": "https://github.com/jmcnamara/libxlsxwriter", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 90d84524743be4..f02ee7bc53b217 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4818,7 +4818,7 @@ }, "libxlsxwriter": { "baseline": "1.1.5", - "port-version": 1 + "port-version": 2 }, "libxml2": { "baseline": "2.10.3", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index c44d7202685620..c1b7e5a0860cb8 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a877e6dd9e9652cedcb94daa467c8fd7580bf5fb", + "version": "1.1.5", + "port-version": 2 + }, { "git-tree": "2769eadc216de088f724efd09edce1c73f9e8b4b", "version": "1.1.5", From f16b736da4a6b8c7f760d219c972a57eed57f448 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 17 Jun 2023 05:52:51 +0200 Subject: [PATCH 331/533] [sfml] Fix exported dependencies (#32006) --- ports/sfml/fix-dependencies.patch | 26 +++++++++++++++++++------- ports/sfml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sfml.json | 5 +++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ports/sfml/fix-dependencies.patch b/ports/sfml/fix-dependencies.patch index cea4ebff76af35..d6704be2dbd2f3 100644 --- a/ports/sfml/fix-dependencies.patch +++ b/ports/sfml/fix-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/cmake/SFMLConfig.cmake.in b/cmake/SFMLConfig.cmake.in -index ce81953..bd2d330 100644 +index ce81953..c8dd971 100644 --- a/cmake/SFMLConfig.cmake.in +++ b/cmake/SFMLConfig.cmake.in @@ -1,3 +1,8 @@ @@ -12,10 +12,22 @@ index ce81953..bd2d330 100644 # ------------------------------------ # diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in -index 1028110..927d1a4 100644 +index 1028110..76fc650 100644 --- a/cmake/SFMLConfigDependencies.cmake.in +++ b/cmake/SFMLConfigDependencies.cmake.in -@@ -56,6 +56,9 @@ if(SFML_STATIC_LIBRARIES) +@@ -31,9 +31,11 @@ if(SFML_STATIC_LIBRARIES) + endif() + + # No lookup in environment variables (PATH on Windows), as they may contain wrong library versions ++ if(NOT ${THIS_FRIENDLY_NAME}_LIB) + find_library(${THIS_FRIENDLY_NAME}_LIB NAMES ${THIS_SEARCH_NAMES} + PATHS ${FIND_SFML_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH) + mark_as_advanced(${THIS_FRIENDLY_NAME}_LIB) ++ endif() + if(${THIS_FRIENDLY_NAME}_LIB) + set_property(TARGET ${THIS_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${${THIS_FRIENDLY_NAME}_LIB}") + else() +@@ -56,6 +58,9 @@ if(SFML_STATIC_LIBRARIES) if (FIND_SFML_OS_WINDOWS) set_property(TARGET OpenGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenGL32") elseif(NOT FIND_SFML_OS_IOS) @@ -25,7 +37,7 @@ index 1028110..927d1a4 100644 sfml_bind_dependency(TARGET OpenGL FRIENDLY_NAME "OpenGL" SEARCH_NAMES "OpenGL" "GL") endif() endif() -@@ -63,6 +66,8 @@ if(SFML_STATIC_LIBRARIES) +@@ -63,6 +68,8 @@ if(SFML_STATIC_LIBRARIES) # sfml-graphics list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT_INDEX) if(FIND_SFML_GRAPHICS_COMPONENT_INDEX GREATER -1) @@ -35,7 +47,7 @@ index 1028110..927d1a4 100644 endif() diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt -index 883c758..402efbe 100644 +index 883c758..b59e659 100644 --- a/src/SFML/Graphics/CMakeLists.txt +++ b/src/SFML/Graphics/CMakeLists.txt @@ -97,7 +97,8 @@ sfml_add_library(sfml-graphics @@ -48,7 +60,7 @@ index 883c758..402efbe 100644 # let CMake know about our additional graphics libraries paths if(SFML_OS_WINDOWS) -@@ -134,7 +134,8 @@ if(SFML_OS_ANDROID) +@@ -134,7 +135,8 @@ if(SFML_OS_ANDROID) target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM) endif() @@ -59,7 +71,7 @@ index 883c758..402efbe 100644 # add preprocessor symbols diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt -index 98ea439..0f1fb53 100644 +index 98ea439..acb8d61 100644 --- a/src/SFML/Window/CMakeLists.txt +++ b/src/SFML/Window/CMakeLists.txt @@ -254,7 +254,9 @@ if(SFML_OPENGL_ES) diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index 3dc5a482414f08..ef0fa9301bea5c 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 15, + "port-version": 16, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index f02ee7bc53b217..b944a04d2805f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7438,7 +7438,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 15 + "port-version": 16 }, "sfsexp": { "baseline": "1.3.1", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index f7de9517b8c81f..ebe91f0c0eb872 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9e87b4e23cdcec8d249517f14a69d8e453d3418", + "version": "2.5.1", + "port-version": 16 + }, { "git-tree": "477c029a9588d5f24c19fd0b6dbc82813fdc2150", "version": "2.5.1", From 59faaaf536b58c605cb72dad2cbba24ed1b2e675 Mon Sep 17 00:00:00 2001 From: Matt Swann <3lemenopy@gmail.com> Date: Fri, 16 Jun 2023 20:53:15 -0700 Subject: [PATCH 332/533] [yara] Update yara from 4.3.0 to 4.3.2 (#32003) * Update yara to 4.3.2 * Update versions list * Update ports/yara/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update baseline version * Update port version --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/yara/portfile.cmake | 2 +- ports/yara/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/y-/yara.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/yara/portfile.cmake b/ports/yara/portfile.cmake index 60903f70706720..4259fbea0182ef 100644 --- a/ports/yara/portfile.cmake +++ b/ports/yara/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VirusTotal/yara REF "v${VERSION}" - SHA512 fe239ae2f29fac7b4dbdc0ec84eba057dd4d93c6ae3a53d6bc2a333cc15ed45b1ff5cb896faf02813be667ce191ccbe1d64549552ea4f0834804ad0ec4b29092 + SHA512 dc77ec46a30ca2fff33b639166fc554c9c6d9e955642774e23da3ea7dbb25fe154cfd4ef83c9808920193028b9099258a63b3f1b9a66864a1f3905f0a8e8053f HEAD_REF master PATCHES # Module elf request new library tlshc(https://github.com/avast/tlshc), the related upstream PR: https://github.com/VirusTotal/yara/pull/1624. diff --git a/ports/yara/vcpkg.json b/ports/yara/vcpkg.json index 094a0e512b4cae..0e81f70a85b775 100644 --- a/ports/yara/vcpkg.json +++ b/ports/yara/vcpkg.json @@ -1,7 +1,6 @@ { "name": "yara", - "version": "4.3.0", - "port-version": 1, + "version": "4.3.2", "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index b944a04d2805f8..4a7a967a4bc576 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8853,8 +8853,8 @@ "port-version": 1 }, "yara": { - "baseline": "4.3.0", - "port-version": 1 + "baseline": "4.3.2", + "port-version": 0 }, "yas": { "baseline": "7.1.0", diff --git a/versions/y-/yara.json b/versions/y-/yara.json index 2fb694f1546b16..bdf1606f75006c 100644 --- a/versions/y-/yara.json +++ b/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "993e6ee9f366ecd84f0636ae4f7de293293a9068", + "version": "4.3.2", + "port-version": 0 + }, { "git-tree": "4deddff9f05a4c7f2fc13b77da1717b50d25072a", "version": "4.3.0", From 7dfcad590a8b864f50bd33c91bd2e0b883eac019 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 16 Jun 2023 23:53:40 -0400 Subject: [PATCH 333/533] [google-cloud-cpp] update to latest release (v2.11.0) (#31995) --- ports/google-cloud-cpp/portfile.cmake | 6 +++++- ports/google-cloud-cpp/vcpkg.json | 14 +++++++++++++- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 859e71f91c481e..03217528d65c3b 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF v${VERSION} - SHA512 1ccc0163fcc34e4e8c74af0193d6402d115809a8421b8c78ce527ae934051b71401bd66df84174b405c3ab83aeabbc2ef5eefc66b241f6f4f0a82e2c7acf0428 + SHA512 d8515906b81e5bb8babe76bdbcba9462eeb9906e7099772d47d871483fa26fbc86943c41c1a916003c0bce767d15ebbbf870699ef75f2fdbcb61f9879d8b4017 HEAD_REF main PATCHES support_absl_cxx17.patch @@ -40,6 +40,10 @@ vcpkg_cmake_configure( -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF -DBUILD_TESTING=OFF + # This is needed by the `experimental-storage-grpc` feature until vcpkg + # gets Protobuf >= 4.23.0. It has no effect for other features, so + # it is simpler to just always turn it on. + -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_CORD_WORKAROUND=ON ) vcpkg_cmake_install() diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 1e1fdfcee443e5..7ca46bcdd06a94 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.10.0", + "version": "2.11.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -1105,6 +1105,18 @@ } ] }, + "support": { + "description": "Cloud Support API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "talent": { "description": "Cloud Talent Solution API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4a7a967a4bc576..4a379537d9a3df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2913,7 +2913,7 @@ "port-version": 3 }, "google-cloud-cpp": { - "baseline": "2.10.0", + "baseline": "2.11.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 22c7f8e1d1ed4b..05d532cdc03874 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a4dc6845aca21d78853e4f6bc11e9bc5174b7b2", + "version": "2.11.0", + "port-version": 0 + }, { "git-tree": "c3c69ec65e243e929646ca08f0697849d2d78191", "version": "2.10.0", From a2a3b8288f2657c1432236a4735a7d54b73d739d Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Sat, 17 Jun 2023 05:54:47 +0200 Subject: [PATCH 334/533] [folly] Update folly to v2023.05.22.00 (#31979) * Update folly to v2023.05.22.00 Signed-off-by: Julien Jerphanion * Overwrite git-tree ref using with vcpkg x-add-version folly Signed-off-by: Julien Jerphanion * Overwrite git-tree ref using with vcpkg x-add-version folly, again Signed-off-by: Julien Jerphanion * Change SHA2-512 digest of sources The one indicated on the GitHub releases might be invalid. See: https://github.com/facebook/folly/releases/tag/v2023.05.22.00 Signed-off-by: Julien Jerphanion * Retrigger CI Signed-off-by: Julien Jerphanion * Retrigger CI Signed-off-by: Julien Jerphanion * Retrigger CI Signed-off-by: Julien Jerphanion * update version --------- Signed-off-by: Julien Jerphanion Co-authored-by: Zhao Liu --- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index afb46e4ce47517..d57f4a032dab54 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 311cc6dfebfdfb49bfdd54e66c5dffabb16090610a3b0f05286aadb0e9d6b8b5b27f4bf3400cf74ba35b88f97d6ed7a79a6f32c093c78b8667684d4cbd8baedb + SHA512 8be640c0b87c85929aa0af2e147ef9556e24f777d80dc7d06019b7edc9b5738635ad3db9dea94f99f1a9eb7eb48e91d78a42d08bcb19b98a279fb805da41bf82 HEAD_REF main PATCHES reorder-glog-gflags.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 05b48346e2b26b..c2de6d40f8345b 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2023.05.15.00", + "version-string": "2023.05.22.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4a379537d9a3df..6675d8a07ebc93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2573,7 +2573,7 @@ "port-version": 0 }, "folly": { - "baseline": "2023.05.15.00", + "baseline": "2023.05.22.00", "port-version": 0 }, "font-chef": { diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 0f7897a64cf4d3..2addb767c1dab1 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4af22bbbe7fd8616fc5dfdeef6c2475f4fc3a4e5", + "version-string": "2023.05.22.00", + "port-version": 0 + }, { "git-tree": "691eb72c1ad244629c0993986a9f33240afa4710", "version-string": "2023.05.15.00", From ac541816b14c7803d80afcba3888a8e67fb09f82 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:56:11 +0800 Subject: [PATCH 335/533] [openscap]: fix not install oscap util (#31982) * [openscap] update to 1.3.6 * update version * update evrsion * Fix conflict * update evrsion * CI [skip actions] * fix xmlsec dependency * fix deps * fix deps * fix deps * fix deps * fix deps * CI * version 1.3.7 * update to 1.3.7 * world * CI * fix deps * fix deps * CI * fix deps * CI * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util * [openscap]: fix not install util --------- Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/openscap/fix-utils.patch | 36 ++++++++++++++++++++++++++++++++++ ports/openscap/portfile.cmake | 6 +++++- ports/openscap/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/o-/openscap.json | 5 +++++ 5 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 ports/openscap/fix-utils.patch diff --git a/ports/openscap/fix-utils.patch b/ports/openscap/fix-utils.patch new file mode 100644 index 00000000000000..7fad24619b6548 --- /dev/null +++ b/ports/openscap/fix-utils.patch @@ -0,0 +1,36 @@ +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index f500e1d..ebddcbf 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -1,5 +1,5 @@ + install(PROGRAMS "oscap-run-sce-script" +- DESTINATION ${CMAKE_INSTALL_BINDIR} ++ DESTINATION tools/openscap + ) + + if(ENABLE_OSCAP_UTIL) +@@ -24,13 +24,13 @@ if(ENABLE_OSCAP_UTIL) + target_link_libraries(oscap ${GETOPT_LIBRARY}) + endif() + +- set(OSCAP_UTIL_DESTINATION ".") ++ set(OSCAP_UTIL_DESTINATION bin) + # Install the 'oscap' utility + install(TARGETS "oscap" + DESTINATION ${OSCAP_UTIL_DESTINATION} + ) + else() +- set(OSCAP_UTIL_DESTINATION tools) ++ set(OSCAP_UTIL_DESTINATION bin) + # Install the 'oscap' utility + install(TARGETS "oscap" + DESTINATION ${OSCAP_UTIL_DESTINATION} +@@ -110,7 +110,7 @@ if(ENABLE_OSCAP_UTIL_SSH) + endif() + if(ENABLE_OSCAP_UTIL_AUTOTAILOR) + install(PROGRAMS "autotailor" +- DESTINATION ${CMAKE_INSTALL_BINDIR} ++ DESTINATION tools/openscap + ) + install(FILES "autotailor.8" + DESTINATION "${CMAKE_INSTALL_MANDIR}/man8" diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake index e62abda1d99be6..f8d06346c55b37 100644 --- a/ports/openscap/portfile.cmake +++ b/ports/openscap/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-build.patch fix-buildflag-and-install.patch + fix-utils.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake") @@ -16,6 +17,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + util ENABLE_OSCAP_UTIL python ENABLE_PYTHON3 ) @@ -32,13 +34,15 @@ vcpkg_cmake_configure( -DENABLE_OSCAP_UTIL_VM=OFF -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF - -DENABLE_OSCAP_UTIL=OFF -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF ) vcpkg_cmake_install() +if(ENABLE_OSCAP_UTIL) + vcpkg_copy_tools(TOOL_NAMES oscap AUTO_CLEAN) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json index 571eb4b705a08c..47212b839c7d86 100644 --- a/ports/openscap/vcpkg.json +++ b/ports/openscap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openscap", "version": "1.3.7", - "port-version": 1, + "port-version": 2, "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "homepage": "https://github.com/OpenSCAP/openscap", "license": "LGPL-2.1-or-later", @@ -26,6 +26,15 @@ "features": { "python": { "description": "build with python3" + }, + "util": { + "description": "build available utils", + "dependencies": [ + { + "name": "getopt-win32", + "platform": "windows" + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 6675d8a07ebc93..383eda7de944b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6010,7 +6010,7 @@ }, "openscap": { "baseline": "1.3.7", - "port-version": 1 + "port-version": 2 }, "openslide": { "baseline": "3.4.1", diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json index c90441d133f9af..346df50bcb1ac9 100644 --- a/versions/o-/openscap.json +++ b/versions/o-/openscap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5317006070f414abe07df69cea20ee7a7ebfc1d4", + "version": "1.3.7", + "port-version": 2 + }, { "git-tree": "da537eeaaeb13c275a44fac02d7262875e5c29f4", "version": "1.3.7", From 2499eadab83c26b3de89d07267f53f8c921c2968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Sat, 17 Jun 2023 06:00:07 +0200 Subject: [PATCH 336/533] [arrow] Update to 12.0.1 (#31960) * [arrow] Update to 12.0.1 * Update versions --- ports/arrow/portfile.cmake | 2 +- ports/arrow/vcpkg.json | 3 +-- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 36b48e1e0b3af5..fa8c0f330cafe3 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 f815be4fb20b6001ba5525270765fe239b5468708a7be34b93b60ee0ce63464727d183c9756fbc33bffd199019e1f06a7fddd306ce8388435cea7771070a2ca9 + SHA512 551ae200551fcc73b7deddcc5f0b06633159ab1308506901a9086e4e2e34e4437f26d609fdbacba0ebe7d1fe83bdb8e92a268e9e41575d655d5b2d4fbef7a7ce ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 15730c3cec6742..9090f146bf3644 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "arrow", - "version": "12.0.0", - "port-version": 2, + "version": "12.0.1", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 9bcd7e62d2bc90..39b8f9b79837a0 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1f5c7d4ca0f45c1629b3f393d360d5c8d035a01", + "version": "12.0.1", + "port-version": 0 + }, { "git-tree": "f4aba951b4604b0846af32c50cf4e6959e0e119d", "version": "12.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 383eda7de944b3..88b9c57a6f76f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -221,8 +221,8 @@ "port-version": 4 }, "arrow": { - "baseline": "12.0.0", - "port-version": 2 + "baseline": "12.0.1", + "port-version": 0 }, "arsenalgear": { "baseline": "2.1.0", From 192085896aef6465661df33b2f886c5fd07882a0 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 17 Jun 2023 12:02:06 +0800 Subject: [PATCH 337/533] [coinutils] Add feature glpk (#31739) * [coinutils] Add feature glpk * version * add options * version * add without * version * glpk description * version --- ports/coinutils/portfile.cmake | 8 +++++++- ports/coinutils/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/c-/coinutils.json | 5 +++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ports/coinutils/portfile.cmake b/ports/coinutils/portfile.cmake index bdb8320d2f1b03..fa7bbef6a028a8 100644 --- a/ports/coinutils/portfile.cmake +++ b/ports/coinutils/portfile.cmake @@ -11,12 +11,18 @@ file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SO set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"") #--enable-msvc +set(options "") +if("glpk" IN_LIST FEATURES) + list(APPEND options "--with-glpk") +else() + list(APPEND options "--without-glpk") +endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS - --with-glpk + ${options} --with-lapack --without-netlib --without-sample diff --git a/ports/coinutils/vcpkg.json b/ports/coinutils/vcpkg.json index 7def668982a154..f55e695441b1c3 100644 --- a/ports/coinutils/vcpkg.json +++ b/ports/coinutils/vcpkg.json @@ -1,6 +1,7 @@ { "name": "coinutils", "version-date": "2023-02-02", + "port-version": 1, "description": "CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project", "homepage": "https://www.coin-or.org/", "license": "EPL-2.0", @@ -8,8 +9,18 @@ "dependencies": [ "bzip2", "coin-or-buildtools", - "glpk", "lapack", "zlib" - ] + ], + "features": { + "glpk": { + "description": "Build with Glpk", + "dependencies": [ + { + "name": "glpk", + "default-features": false + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 88b9c57a6f76f0..a79113c1bb2469 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1662,7 +1662,7 @@ }, "coinutils": { "baseline": "2023-02-02", - "port-version": 0 + "port-version": 1 }, "collada-dom": { "baseline": "2.5.0", diff --git a/versions/c-/coinutils.json b/versions/c-/coinutils.json index 14681e96daf4e3..e55d18c359904c 100644 --- a/versions/c-/coinutils.json +++ b/versions/c-/coinutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ab5035f6a4fc5601ecc3e644a107b1763426259", + "version-date": "2023-02-02", + "port-version": 1 + }, { "git-tree": "9f78d3e4a95d02a06ad5fe90773ca39a25cd93de", "version-date": "2023-02-02", From 287be77bafec7e81cd80c093bd7dde3016462765 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 17 Jun 2023 08:06:06 +0400 Subject: [PATCH 338/533] [openvino]: new port (#31671) * [openvino]: added new port with 2023.0.0+ version * updated versions files --- ports/openvino/001-disable-tools.patch | 13 ++ ports/openvino/portfile.cmake | 135 +++++++++++++++++++ ports/openvino/usage | 4 + ports/openvino/vcpkg.json | 175 +++++++++++++++++++++++++ versions/baseline.json | 4 + versions/o-/openvino.json | 9 ++ 6 files changed, 340 insertions(+) create mode 100644 ports/openvino/001-disable-tools.patch create mode 100644 ports/openvino/portfile.cmake create mode 100644 ports/openvino/usage create mode 100644 ports/openvino/vcpkg.json create mode 100644 versions/o-/openvino.json diff --git a/ports/openvino/001-disable-tools.patch b/ports/openvino/001-disable-tools.patch new file mode 100644 index 00000000000000..7cd391d6714b53 --- /dev/null +++ b/ports/openvino/001-disable-tools.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3182d12693..db70cca198 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,7 +134,7 @@ if (ENABLE_TESTS OR ENABLE_TEMPLATE) + endif() + include(cmake/extra_modules.cmake) + add_subdirectory(docs) +-add_subdirectory(tools) ++# add_subdirectory(tools) + add_subdirectory(scripts) + add_subdirectory(licensing) + diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake new file mode 100644 index 00000000000000..9ff14ce1ecfc31 --- /dev/null +++ b/ports/openvino/portfile.cmake @@ -0,0 +1,135 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openvinotoolkit/openvino + REF 50c85f01ab44b2470f08b0f8824cced109628fc6 + SHA512 e14ac8d48f577188522d0b80f55d53a839f843a03bf0eccf7e370a7bfe977d19e65e4f4748274baf9b0a71751bbdcb7c1e2d4270e54b1ddd72f578176f48058d + PATCHES + 001-disable-tools.patch + HEAD_REF master) + +function(ov_checkout_in_path PATH REPO REF SHA512) + vcpkg_from_github( + OUT_SOURCE_PATH DEP_SOURCE_PATH + REPO ${REPO} + REF ${REF} + SHA512 ${SHA512} + ) + + file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/${PATH}") +endfunction() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpu ENABLE_INTEL_CPU + gpu ENABLE_INTEL_GPU + auto ENABLE_AUTO + hetero ENABLE_HETERO + auto-batch ENABLE_AUTO_BATCH + ir ENABLE_OV_IR_FRONTEND + onnx ENABLE_OV_ONNX_FRONTEND + paddle ENABLE_OV_PADDLE_FRONTEND + pytorch ENABLE_OV_PYTORCH_FRONTEND + tensorflow ENABLE_OV_TF_FRONTEND + tensorflow-lite ENABLE_OV_TF_LITE_FRONTEND +) + +if(ENABLE_INTEL_GPU) + # python is required for conversion of OpenCL source files into .cpp. + vcpkg_find_acquire_program(PYTHON3) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(WARNING + "OneDNN for GPU is not available for static build, which is required for dGPU." + "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\".") + list(APPEND FEATURE_OPTIONS "-DENABLE_ONEDNN_FOR_GPU=OFF") + else() + ov_checkout_in_path( + src/plugins/intel_gpu/thirdparty/onednn_gpu + oneapi-src/oneDNN + f27dedbfc093f51032a4580198bb80579440dc15 + 882eb42e31490df1b35b5e55bef1be8452b710b7a16f5ad648961510abd288e16dbd783e0163aab9dd161fd3a9bd836b0f4afc82b14043d80d1dad9c3400af1b + ) + endif() + + list(APPEND FEATURE_OPTIONS + "-DENABLE_SYSTEM_OPENCL=ON" + "-DPYTHON_EXECUTABLE=${PYTHON3}") +endif() + +if(ENABLE_INTEL_CPU) + ov_checkout_in_path( + src/plugins/intel_cpu/thirdparty/onednn + openvinotoolkit/oneDNN + 48bf41e04ba8cdccb1e7ad166fecfb329f5f84a1 + 8a5ef1ce07545bc28328d1cfd49a8ee8f2ff13c2e393623cb842982b83963881f3d096230805d2a187100c68a2ca30c99add5a975f3f623d9f4a51517c2d585f + ) + + if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + # scons (python tool) is required for ARM Compute Library building + vcpkg_find_acquire_program(PYTHON3) + + x_vcpkg_get_python_packages( + PYTHON_VERSION 3 + PYTHON_EXECUTABLE ${PYTHON3} + PACKAGES scons + OUT_PYTHON_VAR OV_PYTHON_WITH_SCONS + ) + + ov_checkout_in_path( + src/plugins/intel_cpu/thirdparty/ComputeLibrary + ARM-software/ComputeLibrary + v23.02.1 + ee9439e0804bacd365f079cedc548ffe2c12b0d4a86780e0783186884eb5a6d7aa7ceac11c504e242bedc55c3d026b826c90adaafbdbd3e5cfa2562a1c4ee04d + ) + endif() +endif() + +if(ENABLE_OV_TF_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_PADDLE_FRONTEND) + list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_PROTOBUF=ON") +endif() + +if(ENABLE_OV_TF_FRONTEND) + list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_SNAPPY=ON") +endif() + +if(ENABLE_OV_TF_LITE_FRONTEND) + list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_FLATBUFFERS=ON") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + "-DENABLE_SYSTEM_TBB=ON" + "-DENABLE_SYSTEM_PUGIXML=ON" + "-DENABLE_TBBBIND_2_5=OFF" + "-DENABLE_CLANG_FORMAT=OFF" + "-DENABLE_NCC_STYLE=OFF" + "-DENABLE_CPPLINT=OFF" + "-DENABLE_SAMPLES=OFF" + "-DENABLE_COMPILE_TOOL=OFF" + "-DENABLE_TEMPLATE=OFF" + "-DENABLE_INTEL_GNA=OFF" + "-DENABLE_PYTHON=OFF" + "-DENABLE_GAPI_PREPROCESSING=OFF" + "-DCPACK_GENERATOR=VCPKG" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/licensing/third-party-programs.txt" + "${SOURCE_PATH}/licensing/tbb_third-party-programs.txt" + "${SOURCE_PATH}/licensing/onednn_third-party-programs.txt" + "${SOURCE_PATH}/licensing/runtime-third-party-programs.txt" + COMMENT + "OpenVINO License") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/openvino/usage b/ports/openvino/usage new file mode 100644 index 00000000000000..27e68898dc2706 --- /dev/null +++ b/ports/openvino/usage @@ -0,0 +1,4 @@ +The package OpenVINO can be used in cmake scripts as: + + find_package(OpenVINO REQUIRED) + target_link_libraries(main PRIVATE openvino::runtime) diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json new file mode 100644 index 00000000000000..a25aad11627d82 --- /dev/null +++ b/ports/openvino/vcpkg.json @@ -0,0 +1,175 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "openvino", + "version-date": "2023-06-11", + "maintainers": "OpenVINO Developers ", + "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", + "description": [ + "Intel® Distribution of OpenVINO™ toolkit is an open-source toolkit for optimizing ", + "and deploying AI inference. It can be used to develop applications and solutions based ", + "on deep learning tasks, such as: emulation of human vision, automatic speech recognition, ", + "natural language processing, recommendation systems, etc. It provides high-performance ", + "and rich deployment options, from edge to cloud" + ], + "homepage": "https://github.com/openvinotoolkit/openvino", + "documentation": "https://docs.openvino.ai/latest/index.html", + "license": "Apache-2.0", + "dependencies": [ + "ade", + { + "name": "pkgconf", + "host": true + }, + "pugixml", + { + "name": "tbb", + "platform": "static | osx", + "version>=": "2021.9.0#2" + }, + { + "name": "tbb", + "features": [ + "hwloc" + ], + "platform": "!static & !osx", + "version>=": "2021.9.0#2" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, + { + "name": "xbyak", + "platform": "!(arm | uwp)", + "version>=": "6.69" + } + ], + "default-features": [ + "auto", + "auto-batch", + "default-features", + "hetero", + "ir", + "onnx", + "paddle", + "pytorch", + "tensorflow", + "tensorflow-lite" + ], + "features": { + "auto": { + "description": "Enables Auto plugin for inference" + }, + "auto-batch": { + "description": "Enables Auto Batch plugin for inference, useful for throughput mode" + }, + "cpu": { + "description": "Enables CPU plugin for inference", + "supports": "!(windows & arm)" + }, + "default-features": { + "description": "Enables all default features", + "dependencies": [ + { + "name": "openvino", + "features": [ + "cpu" + ], + "platform": "!(windows & arm)" + }, + { + "name": "openvino", + "features": [ + "gpu" + ], + "platform": "x64 & !(osx | uwp) & !static" + } + ] + }, + "gpu": { + "description": "Enables GPU plugin for inference", + "supports": "x64 & !(osx | uwp) & !static", + "dependencies": [ + "opencl" + ] + }, + "hetero": { + "description": "Enables Hetero plugin for inference" + }, + "ir": { + "description": "Enables IR frontend for reading models in OpenVINO IR format" + }, + "onnx": { + "description": "Enables ONNX frontend for reading models in ONNX format", + "dependencies": [ + { + "name": "onnx", + "version>=": "1.13.1" + }, + { + "name": "protobuf", + "version>=": "3.20.3" + }, + { + "name": "protobuf", + "host": true, + "version>=": "3.20.3" + } + ] + }, + "paddle": { + "description": "Enables PaddlePaddle frontend for reading models in PaddlePaddle format", + "dependencies": [ + { + "name": "protobuf", + "version>=": "3.20.3" + }, + { + "name": "protobuf", + "host": true, + "version>=": "3.20.3" + } + ] + }, + "pytorch": { + "description": "Enables PyTorch frontend to convert models in PyTorch format" + }, + "tensorflow": { + "description": "Enables TensorFlow frontend for reading models in TensorFlow format", + "dependencies": [ + { + "name": "protobuf", + "version>=": "3.20.3" + }, + { + "name": "protobuf", + "host": true, + "version>=": "3.20.3" + }, + "snappy" + ] + }, + "tensorflow-lite": { + "description": "Enables TensorFlow Lite frontend for reading models in TensorFlow Lite format", + "dependencies": [ + { + "name": "flatbuffers", + "version>=": "2.0.6" + }, + { + "name": "flatbuffers", + "host": true, + "version>=": "2.0.6" + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index a79113c1bb2469..59ce60a7911f81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6052,6 +6052,10 @@ "baseline": "10.0.0", "port-version": 3 }, + "openvino": { + "baseline": "2023-06-11", + "port-version": 0 + }, "openvpn3": { "baseline": "3.7.0", "port-version": 2 diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json new file mode 100644 index 00000000000000..e8fc4edd1e6076 --- /dev/null +++ b/versions/o-/openvino.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "85c70516c12c1c3544e7a2996e6f83e35aa6a88f", + "version-date": "2023-06-11", + "port-version": 0 + } + ] +} From 80ecf32496c3806c5bb79bb80f029f83d058930e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Sat, 17 Jun 2023 00:09:41 -0400 Subject: [PATCH 339/533] [mysql-connector-cpp] upgrade to 8.0.32 (#30869) * [mysql-connector-cpp] update to 8.0.32 * reformat file * update version * fix compile on Linux * update version * requested changes * update versions * fix target not exported * update version --- ports/mysql-connector-cpp/dependencies.patch | 154 ++++++++++++++++++ .../mysql-connector-cpp/export-targets.patch | 2 +- .../fix-static-build8.patch | 26 --- ports/mysql-connector-cpp/portfile.cmake | 22 ++- ports/mysql-connector-cpp/vcpkg.json | 18 +- versions/baseline.json | 4 +- versions/m-/mysql-connector-cpp.json | 5 + 7 files changed, 196 insertions(+), 35 deletions(-) create mode 100644 ports/mysql-connector-cpp/dependencies.patch diff --git a/ports/mysql-connector-cpp/dependencies.patch b/ports/mysql-connector-cpp/dependencies.patch new file mode 100644 index 00000000000000..8f4a38f651b84a --- /dev/null +++ b/ports/mysql-connector-cpp/dependencies.patch @@ -0,0 +1,154 @@ +diff --git a/cdk/cmake/DepFindCompression.cmake b/cdk/cmake/DepFindCompression.cmake +index f9fe519f..0f893da8 100644 +--- a/cdk/cmake/DepFindCompression.cmake ++++ b/cdk/cmake/DepFindCompression.cmake +@@ -48,7 +48,12 @@ message(STATUS "Setting up compression libraries.") + ####### + # ZLIB + # +-add_ext(zlib zlib.h z ext_zlib) ++if (WIN32) ++ set(ZLIB_NAME zlib) ++else() ++ set(ZLIB_NAME z) ++endif() ++add_ext(zlib zlib.h ${ZLIB_NAME} ext_zlib) + if(NOT ZLIB_FOUND) + message(FATAL_ERROR "Can't build without zlib support") + endif() +diff --git a/cdk/cmake/dependency.cmake b/cdk/cmake/dependency.cmake +index e928e711..30d34fef 100644 +--- a/cdk/cmake/dependency.cmake ++++ b/cdk/cmake/dependency.cmake +@@ -286,10 +286,18 @@ endif() + function(add_ext_lib EXT target name) + # Search for the library + if(DEFINED ${EXT}_ROOT_DIR) +- set(suffix PATHS ${${EXT}_ROOT_DIR} +- PATH_SUFFIXES lib lib64 dll +- NO_DEFAULT_PATH +- ) ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(name "${name}d;${name}") ++ set(suffix PATHS "${${EXT}_ROOT_DIR}/debug" ++ PATH_SUFFIXES lib lib64 dll ++ NO_DEFAULT_PATH ++ ) ++ else() ++ set(suffix PATHS ${${EXT}_ROOT_DIR} ++ PATH_SUFFIXES lib lib64 dll ++ NO_DEFAULT_PATH ++ ) ++ endif() + elseif(DEFINED ${EXT}_LIB_DIR) + set(suffix + PATHS ${${EXT}_LIB_DIR} +@@ -326,9 +334,10 @@ endfunction(add_ext_lib) + # + function(add_ext_exec EXT target name) + # Search for the library ++ string(TOLOWER ${EXT} EXT_LOWER) + if(DEFINED ${EXT}_ROOT_DIR) + set(suffix PATHS ${${EXT}_ROOT_DIR} +- PATH_SUFFIXES bin ++ PATH_SUFFIXES tools/${EXT_LOWER} + NO_DEFAULT_PATH + ) + +diff --git a/cdk/protocol/mysqlx/CMakeLists.txt b/cdk/protocol/mysqlx/CMakeLists.txt +index 97a4b005..cfc81daf 100644 +--- a/cdk/protocol/mysqlx/CMakeLists.txt ++++ b/cdk/protocol/mysqlx/CMakeLists.txt +@@ -135,8 +135,13 @@ else() + target_link_libraries(cdk_proto_mysqlx PRIVATE ext::protobuf-lite) + endif() + ++if (WIN32) ++ set(EXT_ZLIB_NAME ext::zlib) ++else() ++ set(EXT_ZLIB_NAME ext::z) ++endif() + target_link_libraries(cdk_proto_mysqlx +- PRIVATE cdk_foundation ext::z ext::lz4 ext::zstd ++ PRIVATE cdk_foundation ${EXT_ZLIB_NAME} ext::lz4 ext::zstd + ) + + ADD_COVERAGE(cdk_proto_mysqlx) +diff --git a/jdbc/cmake/DepFindMySQL.cmake b/jdbc/cmake/DepFindMySQL.cmake +index 7977381a..d7f4e58b 100644 +--- a/jdbc/cmake/DepFindMySQL.cmake ++++ b/jdbc/cmake/DepFindMySQL.cmake +@@ -167,13 +167,13 @@ function(main) + + find_library(MYSQL_LIB + NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} +- PATHS ${MYSQL_LIB_DIR} ++ PATHS "${MYSQL_LIB_DIR}/lib" + NO_DEFAULT_PATH + ) + + find_library(MYSQL_LIB_DEBUG + NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} +- PATHS "${MYSQL_LIB_DIR}/debug" ++ PATHS "${MYSQL_LIB_DIR}/debug/lib" + NO_DEFAULT_PATH + ) + +@@ -181,39 +181,39 @@ function(main) + + find_library(MYSQL_DLL + NAMES ${CMAKE_DYNAMIC_LIBRARY_PREFIX}mysqlclient${CMAKE_DYNAMIC_LIBRARY_SUFFIX} +- PATHS ${MYSQL_LIB_DIR} ++ PATHS "${MYSQL_LIB_DIR}/lib" + NO_DEFAULT_PATH + ) + + find_library(MYSQL_DLL_DEBUG + NAMES ${CMAKE_DYNAMIC_LIBRARY_PREFIX}mysqlclient${CMAKE_DYNAMIC_LIBRARY_SUFFIX} +- PATHS "${MYSQL_LIB_DIR}/debug" ++ PATHS "${MYSQL_LIB_DIR}/debug/lib" + NO_DEFAULT_PATH + ) + + else() #WIN32 + +- find_library(MYSQL_DLL +- NAMES libmysql +- PATHS ${MYSQL_LIB_DIR} ++ find_file(MYSQL_DLL ++ NAMES libmysql.dll ++ PATHS "${MYSQL_LIB_DIR}/bin" + NO_DEFAULT_PATH + ) + +- find_library(MYSQL_DLL_DEBUG +- NAMES libmysql +- PATHS "${MYSQL_LIB_DIR}/debug" ++ find_file(MYSQL_DLL_DEBUG ++ NAMES libmysql.dll ++ PATHS "${MYSQL_LIB_DIR}/debug/bin" + NO_DEFAULT_PATH + ) + + find_library(MYSQL_DLL_IMP + NAMES libmysql.lib +- PATHS ${MYSQL_LIB_DIR} ++ PATHS "${MYSQL_LIB_DIR}/lib" + NO_DEFAULT_PATH + ) + + find_library(MYSQL_DLL_IMP_DEBUG + NAMES libmysql.lib +- PATHS "${MYSQL_LIB_DIR}/debug" ++ PATHS "${MYSQL_LIB_DIR}/debug/lib" + NO_DEFAULT_PATH + ) + endif() +@@ -383,6 +383,7 @@ function(main) + # external dependencies. + # + ++ find_package(OpenSSL) + target_link_libraries(MySQL::client-static INTERFACE ${MYSQL_EXTERNAL_DEPENDENCIES}) + + endif() diff --git a/ports/mysql-connector-cpp/export-targets.patch b/ports/mysql-connector-cpp/export-targets.patch index 75c85402442f1e..0f9e18540c903a 100644 --- a/ports/mysql-connector-cpp/export-targets.patch +++ b/ports/mysql-connector-cpp/export-targets.patch @@ -7,7 +7,7 @@ index e734714..6d665dc 100644 merge_libraries(connector xapi devapi) -target_include_directories(connector PUBLIC "${PROJECT_SOURCE_DIR}/include") -+target_include_directories(connector PRIVATE "${PROJECT_SOURCE_DIR}/include") ++target_include_directories(connector PUBLIC $ $) # diff --git a/ports/mysql-connector-cpp/fix-static-build8.patch b/ports/mysql-connector-cpp/fix-static-build8.patch index b0e60c088f3911..91cf2739ec9514 100644 --- a/ports/mysql-connector-cpp/fix-static-build8.patch +++ b/ports/mysql-connector-cpp/fix-static-build8.patch @@ -34,32 +34,6 @@ index 4c3aab0..a1596af 100644 add_library(lz4 STATIC lz4.c lz4frame.c -diff --git a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt -index efe6b97..377a817 100644 ---- a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt -+++ b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt -@@ -186,9 +186,9 @@ else (protobuf_BUILD_SHARED_LIBS) - # Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags - # making programmatic control difficult. Prefer the functionality in newer - # CMake versions when available. -- if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) -- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) -- else() -+ #if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) -+ # set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) -+ #else() - # In case we are building static libraries, link also the runtime library statically - # so that MSVCR*.DLL is not required at runtime. - # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx -@@ -203,7 +203,7 @@ else (protobuf_BUILD_SHARED_LIBS) - endif(${flag_var} MATCHES "/MD") - endforeach(flag_var) - endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME) -- endif() -+ #endif() - endif (protobuf_BUILD_SHARED_LIBS) - - if (MSVC) diff --git a/cdk/extra/zlib/CMakeLists.txt b/cdk/extra/zlib/CMakeLists.txt index 237c2c3..7746bd0 100644 --- a/cdk/extra/zlib/CMakeLists.txt diff --git a/ports/mysql-connector-cpp/portfile.cmake b/ports/mysql-connector-cpp/portfile.cmake index 6beb0253c973f5..8eb35a2a1f0cee 100644 --- a/ports/mysql-connector-cpp/portfile.cmake +++ b/ports/mysql-connector-cpp/portfile.cmake @@ -1,12 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-connector-cpp - REF 8.0.30 - SHA512 fd6d8a03ba66ca028b3748218c60a721c9e2c79867c6cf2ea95d2649d3a252e9bd307986b149897dcc1d24a11785666c5480225a20c4baba7c87b376b7289a13 + REF "${VERSION}" + SHA512 b65c44ef05e3f6ec8613f7d09f6662fc1b4cce5fdf515dec43a20398605acc2555572b788a89b61d6ce835dab3f68183be6610750ae42a6be7d9c24c99ecaacf HEAD_REF master PATCHES fix-static-build8.patch export-targets.patch + dependencies.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + jdbc WITH_JDBC ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/mysql-connector-cpp-config.cmake.in" DESTINATION "${SOURCE_PATH}") @@ -20,10 +27,19 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" WINDOWS_USE_MSBUILD OPTIONS - "-DWITH_SSL=${CURRENT_INSTALLED_DIR}" + -DWITH_SSL=${CURRENT_INSTALLED_DIR} + -DWITH_LZ4=${CURRENT_INSTALLED_DIR} + -DWITH_ZLIB=${CURRENT_INSTALLED_DIR} + -DWITH_ZSTD=${CURRENT_INSTALLED_DIR} + -DWITH_PROTOBUF=${CURRENT_INSTALLED_DIR} -DBUILD_STATIC=${BUILD_STATIC} -DSTATIC_MSVCRT=${STATIC_MSVCRT} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DWITH_JDBC=${WITH_JDBC} # the following variables are only used by jdbc + MAYBE_UNUSED_VARIABLES # and they are windows only + -DMYSQL_INCLUDE_DIR="${CURRENT_INSTALLED_DIR}/include/mysql" + -DMYSQL_LIB_DIR=${CURRENT_INSTALLED_DIR} + -DWITH_BOOST=${CURRENT_INSTALLED_DIR} ) vcpkg_cmake_install() diff --git a/ports/mysql-connector-cpp/vcpkg.json b/ports/mysql-connector-cpp/vcpkg.json index 76c7949be8269d..7751be5ef660e5 100644 --- a/ports/mysql-connector-cpp/vcpkg.json +++ b/ports/mysql-connector-cpp/vcpkg.json @@ -1,13 +1,14 @@ { "name": "mysql-connector-cpp", - "version": "8.0.30", - "port-version": 1, + "version": "8.0.32", "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", "homepage": "https://github.com/mysql/mysql-connector-cpp", "license": null, "supports": "!uwp & !(windows & (arm | arm64))", "dependencies": [ + "lz4", "openssl", + "protobuf", { "name": "vcpkg-cmake", "host": true @@ -15,6 +16,17 @@ { "name": "vcpkg-cmake-config", "host": true + }, + "zlib", + "zstd" + ], + "features": { + "jdbc": { + "description": "Legacy JDBC support.", + "supports": "static", + "dependencies": [ + "libmysql" + ] } - ] + } } diff --git a/versions/baseline.json b/versions/baseline.json index 59ce60a7911f81..c204a3d96608cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5521,8 +5521,8 @@ "port-version": 5 }, "mysql-connector-cpp": { - "baseline": "8.0.30", - "port-version": 1 + "baseline": "8.0.32", + "port-version": 0 }, "nameof": { "baseline": "0.10.2", diff --git a/versions/m-/mysql-connector-cpp.json b/versions/m-/mysql-connector-cpp.json index 8dd35179ffa2d4..c7eea3c356194f 100644 --- a/versions/m-/mysql-connector-cpp.json +++ b/versions/m-/mysql-connector-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b78f858b560a7a1fb4d13646a7652f86465885fd", + "version": "8.0.32", + "port-version": 0 + }, { "git-tree": "0cb6021de557d4669a9483690da1500b2b83ba26", "version": "8.0.30", From 223b8d5695bd0615e1eeba393c64770f6faf20e7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 19 Jun 2023 23:53:45 +0200 Subject: [PATCH 340/533] [libressl] no absolute paths (#32099) --- ports/libressl/portfile.cmake | 2 ++ ports/libressl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libressl.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index e6ec383d566392..7b50024e039bbd 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -58,6 +58,8 @@ vcpkg_copy_pdbs() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +vcpkg_fixup_pkgconfig() + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") foreach(LIB ${LIBS}) diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index bd1c0cdabd0d2c..9b04f5ac29f186 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libressl", "version": "3.6.2", + "port-version": 1, "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "license": "ISC", "supports": "!(uwp | arm)", diff --git a/versions/baseline.json b/versions/baseline.json index c204a3d96608cd..e09ab9336b5209 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4486,7 +4486,7 @@ }, "libressl": { "baseline": "3.6.2", - "port-version": 0 + "port-version": 1 }, "librsvg": { "baseline": "2.40.20", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 988050fd2424ec..d2d92f33aa8ab0 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad22d9c62107c65630cd57d97749920a02016095", + "version": "3.6.2", + "port-version": 1 + }, { "git-tree": "dbc5385ec4d693da812158dc9e2c1eaaaf9c6908", "version": "3.6.2", From f6a5d4e8eb7476b8d7fc12a56dff300c1c986131 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 20 Jun 2023 12:12:03 -0700 Subject: [PATCH 341/533] Patch Tuesday June 2023 + Ubuntu 22.04 (#32014) --- ports/bond/portfile.cmake | 8 +++-- ports/bond/vcpkg.json | 1 + scripts/azure-pipelines/azure-pipelines.yml | 8 ++--- .../azure-pipelines/linux/create-image.ps1 | 4 +-- .../azure-pipelines/linux/provision-image.sh | 18 +++++------- scripts/ci.baseline.txt | 29 ++++++++----------- .../vcpkg-find-acquire-program/portfile.cmake | 6 ++-- versions/b-/bond.json | 5 ++++ versions/baseline.json | 2 +- 9 files changed, 40 insertions(+), 41 deletions(-) diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 4c70c9f44b73ce..2e119751510866 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF "${VERSION}" SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014 HEAD_REF master - PATCHES fix-install-path.patch skip-grpc-compilation.patch + PATCHES + fix-install-path.patch + skip-grpc-compilation.patch ) if (VCPKG_TARGET_IS_WINDOWS) @@ -31,7 +33,6 @@ else() # The build needs a version of the Haskel Tool stack that is newer than some distros ship with. # For this reason the message is not guarded by checking to see if the tool is installed. message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n") - endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -39,6 +40,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS bond-over-grpc BOND_ENABLE_GRPC ) +set(ENV{STACK_ROOT} "${CURRENT_BUILDTREES_DIR}/stack") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -46,7 +49,6 @@ vcpkg_cmake_configure( -DBOND_LIBRARIES_ONLY=TRUE -DBOND_GBC_PATH=${FETCHED_GBC_PATH} -DBOND_SKIP_GBC_TESTS=TRUE - -DBOND_ENABLE_COMM=FALSE -DBOND_FIND_RAPIDJSON=TRUE -DBOND_STACK_OPTIONS=--allow-different-user ${FEATURE_OPTIONS} diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index 1fc94cea811587..7e28e4a4e60162 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bond", "version": "10.0.0", + "port-version": 1, "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7ebeb3c9edf0fa..5835979ceb65a8 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,9 +2,9 @@ # SPDX-License-Identifier: MIT # variables: - android-pool: 'PrAnd-2023-05-09' - linux-pool: 'PrLin-2023-05-09' - windows-pool: 'PrWin-2023-05-09' + android-pool: 'PrAnd-2023-06-14' + linux-pool: 'PrLin-2023-06-14' + windows-pool: 'PrWin-2023-06-14' osx-pool: 'PrOsx-2022-02-04' linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20' @@ -112,4 +112,4 @@ jobs: poolName: $(android-pool) dockerImage: $(linux-docker-image) vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - tripletPattern: ${{ parameters.tripletPattern }} \ No newline at end of file + tripletPattern: ${{ parameters.tripletPattern }} diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 7873dbdaaa6407..537cf4dd5eeecd 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -95,8 +95,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` - -Offer '0001-com-ubuntu-server-focal' ` - -Skus '20_04-lts' ` + -Offer '0001-com-ubuntu-server-jammy' ` + -Skus '22_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 4b5ebd7f883e61..dafaa37e0aa673 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -8,14 +8,13 @@ export DEBIAN_FRONTEND=noninteractive # Add apt repos ## CUDA -apt-key del 7fa2af80 -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub -add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin +mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" ## PowerShell -wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb +wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb rm -f packages-microsoft-prod.deb add-apt-repository universe @@ -72,7 +71,7 @@ APT_PACKAGES="$APT_PACKAGES nodejs" APT_PACKAGES="$APT_PACKAGES libwayland-dev" ## required by all GN projects -APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" +APT_PACKAGES="$APT_PACKAGES python-is-python3" ## required by libctl APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" @@ -89,9 +88,6 @@ APT_PACKAGES="$APT_PACKAGES libxtst-dev" ## required by bond APT_PACKAGES="$APT_PACKAGES haskell-stack" -## required by duktape -APT_PACKAGES="$APT_PACKAGES python-yaml" - ## CUDA APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \ cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \ @@ -104,7 +100,7 @@ APT_PACKAGES="$APT_PACKAGES powershell" if [[ $(grep microsoft /proc/version) ]]; then echo "Skipping install of ADO prerequisites on WSL." else -APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu66" +APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70 debsums liblttng-ust1" fi apt-get -y --no-install-recommends install $APT_PACKAGES diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 94cb2cc15a1a9e..cd9e3427f4f496 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -84,12 +84,17 @@ blitz:x64-android=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail +blitz:x64-linux=fail # python2 boinc:arm-neon-android=fail boinc:arm64-android=fail boinc:x64-android=fail bond:arm-neon-android=fail +bond:arm-uwp=fail bond:arm64-android=fail +bond:arm64-osx=fail bond:x64-android=fail +bond:x64-osx=fail +bond:x64-uwp=fail # Conflicts with openssl boringssl:arm-neon-android=skip boringssl:arm64-android=skip @@ -104,10 +109,6 @@ boringssl:x64-windows=skip boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip boringssl:x86-windows=skip -bond:arm-uwp=fail -bond:x64-osx=fail -bond:arm64-osx=fail -bond:x64-uwp=fail botan:arm-neon-android=fail botan:arm64-android=fail botan:x64-android=fail @@ -240,8 +241,7 @@ cnats:x64-android=fail coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail -# coinutils requires autoconf2.71 not yet available in CI -coinutils:x64-linux=fail +coin-or-ipopt:x64-linux=fail # there is an ICE in VS2022 with colmap in release mode colmap:x86-windows=fail colmap:x64-windows=fail @@ -256,12 +256,10 @@ concurrencpp:x64-osx=fail constexpr-contracts:arm-neon-android=fail constexpr-contracts:arm64-android=fail constexpr-contracts:x64-android=fail -constexpr-contracts:x64-linux=fail coroutine:arm-neon-android=fail coroutine:arm-uwp=fail coroutine:arm64-android=fail coroutine:x64-android=fail -coroutine:x64-linux=fail coroutine:x64-uwp=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail @@ -289,9 +287,6 @@ cppslippi:x64-osx=fail cppcoro:x64-linux=fail cppcoro:arm-uwp=fail cppcoro:x64-uwp=fail -# The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. -# This is known to work on x64-linux as of gcc 10.3.0. -cppgraphqlgen:x64-linux=fail cpptoml:arm-neon-android=fail cpptoml:arm64-android=fail cpptoml:x64-android=fail @@ -341,8 +336,6 @@ discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail -# requires g++11 -discordcoreapi:x64-linux=fail discount:x64-android=fail dlib:arm-uwp=fail dlib:x64-uwp=fail @@ -359,6 +352,7 @@ duktape:arm64-android=fail duktape:x64-android=fail duktape:x64-osx=skip duktape:arm64-osx=skip +duktape:x64-linux=fail eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail @@ -633,6 +627,7 @@ jinja2cpplight:x64-android=fail jinja2cpplight:x64-uwp=fail json-schema-validator:arm-neon-android=fail json-schema-validator:arm64-android=fail +keystone:x64-linux=fail # python2 kfr:arm64-windows=fail kfr:x64-android=fail kfr:x64-uwp=fail @@ -772,6 +767,7 @@ libmysql:arm64-android=fail libmysql:x64-android=fail libmysql:x86-windows=fail libmysql:arm64-windows=fail +libodb:x64-linux=fail # dynamic exception specifications libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail @@ -895,6 +891,7 @@ llvm:arm64-android=fail llvm:x64-android=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail +log4cpp:x64-linux=fail # dynamic exception specifications log4cxx:arm-uwp=fail log4cxx:x64-uwp=fail loguru:arm-neon-android=fail @@ -1148,6 +1145,7 @@ openmesh:x64-uwp=fail openmpi:arm-neon-android=fail openmpi:arm64-android=fail openmpi:x64-android=fail +openmvg:x64-linux=fail openscap:arm-neon-android=fail openscap:arm64-android=fail openscap:x64-android=fail @@ -1365,13 +1363,9 @@ rsasynccpp:arm64-windows=fail rsasynccpp:arm-uwp=fail rsasynccpp:x64-linux=fail rsasynccpp:x64-osx=fail -# Requires g++10 but CI compiler only has g++9 -rsm-binary-io:x64-linux=fail rsm-bsa:arm-neon-android=fail rsm-bsa:arm64-android=fail rsm-bsa:x64-android=fail -# Requires g++10 but CI compiler only has g++9 -rsm-bsa:x64-linux=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail @@ -1689,6 +1683,7 @@ wpilib:arm64-android=fail wpilib:arm64-windows=fail wpilib:x64-android=fail wpilib:x64-osx=fail +wpilib:x64-linux=fail wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 x264:arm-neon-android=fail x264:arm64-android=fail diff --git a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake index 0316fc2b69b27d..f6ce20fefa8b76 100644 --- a/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake +++ b/scripts/test_ports/vcpkg-find-acquire-program/portfile.cmake @@ -3,7 +3,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) # For each vcpkg_find_acquire_program(NAME).cmake script, # there must be a literal call to vcpkg_find_acquire_program(NAME).cmake -set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON2 PYTHON3 YASM) +set(variables BAZEL BISON FLEX GIT GN NINJA PERL PKGCONFIG PYTHON3 YASM) vcpkg_find_acquire_program(BAZEL) vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) @@ -12,7 +12,6 @@ vcpkg_find_acquire_program(GN) vcpkg_find_acquire_program(NINJA) vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(YASM) @@ -28,7 +27,7 @@ if(VCPKG_HOST_IS_LINUX) endif() if(VCPKG_HOST_IS_WINDOWS) - list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET RUBY SCONS SWIG) + list(APPEND variables 7Z ARIA2 CLANG DARK DOXYGEN GASPREPROCESSOR GO GPERF JOM NASM NUGET PYTHON2 RUBY SCONS SWIG) vcpkg_find_acquire_program(7Z) vcpkg_find_acquire_program(ARIA2) vcpkg_find_acquire_program(CLANG) @@ -40,6 +39,7 @@ if(VCPKG_HOST_IS_WINDOWS) vcpkg_find_acquire_program(JOM) vcpkg_find_acquire_program(NASM) vcpkg_find_acquire_program(NUGET) + vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(RUBY) vcpkg_find_acquire_program(SCONS) vcpkg_find_acquire_program(SWIG) diff --git a/versions/b-/bond.json b/versions/b-/bond.json index 4ce5e1675fa552..8fb5504bdc9e04 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d9b960403809575097267ac43d1ce18e9b2a7f2", + "version": "10.0.0", + "port-version": 1 + }, { "git-tree": "5ce8875d8de21ca31d61b521c2e84a974e325436", "version": "10.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index e09ab9336b5209..05f8c80e7899eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -622,7 +622,7 @@ }, "bond": { "baseline": "10.0.0", - "port-version": 0 + "port-version": 1 }, "boolinq": { "baseline": "3.0.4", From abd1153d8a4149d8782731046a00cdb7c17de1a4 Mon Sep 17 00:00:00 2001 From: Doug Cook <45909143+idigdoug@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:36:15 -0700 Subject: [PATCH 342/533] [libtracepoint, libeventheader] - v1.1.0 (#32129) * [libtracepoint, libeventheader] - v1.1.0 Update `libtracepoint-*` and `libeventheader-*` to v1.1.0. * Versions for libtracepoint and libeventheader --- ports/libeventheader-decode/portfile.cmake | 4 ++-- ports/libeventheader-decode/vcpkg.json | 10 +++++++--- ports/libeventheader-tracepoint/portfile.cmake | 4 ++-- ports/libeventheader-tracepoint/vcpkg.json | 6 +++--- ports/libtracepoint-decode/portfile.cmake | 4 ++-- ports/libtracepoint-decode/vcpkg.json | 4 ++-- ports/libtracepoint/portfile.cmake | 4 ++-- ports/libtracepoint/vcpkg.json | 4 ++-- versions/baseline.json | 8 ++++---- versions/l-/libeventheader-decode.json | 5 +++++ versions/l-/libeventheader-tracepoint.json | 5 +++++ versions/l-/libtracepoint-decode.json | 5 +++++ versions/l-/libtracepoint.json | 5 +++++ 13 files changed, 46 insertions(+), 22 deletions(-) diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake index 6708c2f2a369ff..7827c203d79f61 100644 --- a/ports/libeventheader-decode/portfile.cmake +++ b/ports/libeventheader-decode/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 - SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b + SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json index e83b558e554a74..19e79c2746bf14 100644 --- a/ports/libeventheader-decode/vcpkg.json +++ b/ports/libeventheader-decode/vcpkg.json @@ -1,14 +1,18 @@ { "name": "libeventheader-decode", - "version": "1.0.0", - "description": "EventHeader tracepoint decoding classes for C++", + "version": "1.1.0", + "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", "supports": "linux | windows", "dependencies": [ { "name": "libeventheader-tracepoint", - "version>=": "1.0.0" + "version>=": "1.1.0" + }, + { + "name": "libtracepoint-decode", + "version>=": "1.1.0" }, { "name": "vcpkg-cmake", diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake index d151d6d643b6a0..19d8ae4ee89c3f 100644 --- a/ports/libeventheader-tracepoint/portfile.cmake +++ b/ports/libeventheader-tracepoint/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 - SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b + SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json index a9e3c7d14a1893..f66fbdb9667718 100644 --- a/ports/libeventheader-tracepoint/vcpkg.json +++ b/ports/libeventheader-tracepoint/vcpkg.json @@ -1,14 +1,14 @@ { "name": "libeventheader-tracepoint", - "version": "1.0.0", - "description": "EventHeader-encoded Linux tracepoints for C/C++", + "version": "1.1.0", + "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", "supports": "linux | windows", "dependencies": [ { "name": "libtracepoint", - "version>=": "1.0.0" + "version>=": "1.1.0" }, { "name": "vcpkg-cmake", diff --git a/ports/libtracepoint-decode/portfile.cmake b/ports/libtracepoint-decode/portfile.cmake index da094600d0c1d8..5233d415de4f4e 100644 --- a/ports/libtracepoint-decode/portfile.cmake +++ b/ports/libtracepoint-decode/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF abf1f6d3e32546aeaab75ed3cea45b54b94fbd50 - SHA512 ac67bbd8184a29c8058a7b2cde51db9a14f97326396ba894f56a36d4219bebbc580f64a3ed5f182df4a0111ad97294a6b780bd44181d37e0fda1be16a6e23dea + REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b + SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-decode/vcpkg.json b/ports/libtracepoint-decode/vcpkg.json index bc6ce21fd20d61..47ed70e0fed5e7 100644 --- a/ports/libtracepoint-decode/vcpkg.json +++ b/ports/libtracepoint-decode/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtracepoint-decode", - "version": "1.0.0", - "description": "Tracepoint decoding classes for C++", + "version": "1.1.0", + "description": "C++ classes for decoding Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", "supports": "linux | windows", diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake index 6431b4668bb6c8..bf7f04e9432019 100644 --- a/ports/libtracepoint/portfile.cmake +++ b/ports/libtracepoint/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF f3a5b3e4c12a19924a4d6fc30a7681742fd7eb01 - SHA512 f94a3cf1367ec4749f40217923f1158da40caaf5cd75529d1ca9a5e8b51c581f0aec286f715a88b6203f9979a2e32ad69efde1738a12fa71a0301b8ddbfcc6e4 + REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b + SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json index 9db1f1d3abcf0d..8221e3e2dc7604 100644 --- a/ports/libtracepoint/vcpkg.json +++ b/ports/libtracepoint/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtracepoint", - "version": "1.0.0", - "description": "Linux tracepoints interface for C/C++", + "version": "1.1.0", + "description": "C/C++ interface for generating Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", "supports": "linux | windows", diff --git a/versions/baseline.json b/versions/baseline.json index 05f8c80e7899eb..0bb9258b2e01dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4017,11 +4017,11 @@ "port-version": 0 }, "libeventheader-decode": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "libeventheader-tracepoint": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "libevhtp": { @@ -4657,11 +4657,11 @@ "port-version": 0 }, "libtracepoint": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "libtracepoint-decode": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json index 5e32bf698f15fb..ea3869e9d25c2c 100644 --- a/versions/l-/libeventheader-decode.json +++ b/versions/l-/libeventheader-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e830f1815ed8de8c73a7e90841533854b54261c", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "fd67531cc60d91c4d8b45da15cd7414b398b9cd7", "version": "1.0.0", diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json index 556d9c4ff6046e..c1ca544bb1777f 100644 --- a/versions/l-/libeventheader-tracepoint.json +++ b/versions/l-/libeventheader-tracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba5030dde966e742b068efb77cab8f820f0ab7ea", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "d8ba8b72bb5c6dde050b85f84e01efb6b36d535c", "version": "1.0.0", diff --git a/versions/l-/libtracepoint-decode.json b/versions/l-/libtracepoint-decode.json index b7dbc0d841d290..7b7e0e933d50e5 100644 --- a/versions/l-/libtracepoint-decode.json +++ b/versions/l-/libtracepoint-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3559772cf7c926b54b92bdc0e72ecaa9e06534d6", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "6bd99da97aa18ca05fd3a67eb77f6df1ea210d2e", "version": "1.0.0", diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json index 8a14f9ee300b2d..128184e5a81f16 100644 --- a/versions/l-/libtracepoint.json +++ b/versions/l-/libtracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0106479d49132d017d8c89f4189bce8cb4251479", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "f60f9a909a55a04c9bc87b6a3e10df5f0faec1a4", "version": "1.0.0", From 2b9358ea52fd2f1f0ad08f11524a0e24937b2708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Fr=C3=B6hlich?= Date: Thu, 22 Jun 2023 02:37:21 +0200 Subject: [PATCH 343/533] [gul14] Update to version 2.9.2 (#32124) --- ports/gul14/portfile.cmake | 4 ++-- ports/gul14/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/gul14.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/gul14/portfile.cmake b/ports/gul14/portfile.cmake index 1e7938536cc883..c6dfa515435222 100644 --- a/ports/gul14/portfile.cmake +++ b/ports/gul14/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gul-cpp/gul14 - REF v2.9.1 - SHA512 40c980f4d92a4767c4f6200e8625671b8e23ea148005518b88d394064fc371357d1d7d68f1a1a25b72b94999d4b78663b45cdcc71971c594de1be1abe2254ae5 + REF v2.9.2 + SHA512 d9b364638d595cb03cbc8793750947d393f9e7632016ec9e6f31a8ea1b0f235444be5c1aa7cd5c18b47c85463e15db9240d08aab86797e5ca3452a4646dfa8d1 HEAD_REF main ) diff --git a/ports/gul14/vcpkg.json b/ports/gul14/vcpkg.json index e3ac87313c2302..c4f22929563ed3 100644 --- a/ports/gul14/vcpkg.json +++ b/ports/gul14/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gul14", - "version": "2.9.1", - "port-version": 1, + "version": "2.9.2", "description": [ "General Utility Library for C++14.", "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.", diff --git a/versions/baseline.json b/versions/baseline.json index 0bb9258b2e01dc..a41f704dc1c25c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3045,8 +3045,8 @@ "port-version": 0 }, "gul14": { - "baseline": "2.9.1", - "port-version": 1 + "baseline": "2.9.2", + "port-version": 0 }, "gumbo": { "baseline": "0.10.1", diff --git a/versions/g-/gul14.json b/versions/g-/gul14.json index 892e5b29008727..6a6a9889eaf6ea 100644 --- a/versions/g-/gul14.json +++ b/versions/g-/gul14.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f62f0824bba51279ec18b9e4dedfa607bc2e3b", + "version": "2.9.2", + "port-version": 0 + }, { "git-tree": "0ef663cd26e5a6fea87578b1662e28cae9caf233", "version": "2.9.1", From 48f861d3d9ecb8c56e9c6e5ba6c8a3b93f59280d Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:38:04 +0800 Subject: [PATCH 344/533] [concurrencpp] Fix error C2039: 'numeric_limits': is not a member of 'std' (#32121) * [concurrencpp] Fix error C2039: 'numeric_limits': is not a member of 'std' * format --- ports/concurrencpp/fix-missing-limits.patch | 12 ++++++++++++ ports/concurrencpp/portfile.cmake | 3 ++- ports/concurrencpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/concurrencpp.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/concurrencpp/fix-missing-limits.patch diff --git a/ports/concurrencpp/fix-missing-limits.patch b/ports/concurrencpp/fix-missing-limits.patch new file mode 100644 index 00000000000000..5b8d8eb0e82946 --- /dev/null +++ b/ports/concurrencpp/fix-missing-limits.patch @@ -0,0 +1,12 @@ +diff --git a/include/concurrencpp/executors/constants.h b/include/concurrencpp/executors/constants.h +index c717831..3a3d700 100644 +--- a/include/concurrencpp/executors/constants.h ++++ b/include/concurrencpp/executors/constants.h +@@ -2,6 +2,7 @@ + #define CONCURRENCPP_EXECUTORS_CONSTS_H + + #include ++#include + + namespace concurrencpp::details::consts { + inline const char* k_inline_executor_name = "concurrencpp::inline_executor"; diff --git a/ports/concurrencpp/portfile.cmake b/ports/concurrencpp/portfile.cmake index 4c5594dc0cf4f2..5079aff94098f7 100644 --- a/ports/concurrencpp/portfile.cmake +++ b/ports/concurrencpp/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO David-Haim/concurrencpp - REF v.${VERSION} + REF "v.${VERSION}" SHA512 51e8ba898256165ef5173a098e804121ae0d1212b5d83e6356a34c72dc3d66849f7382e1f35f5ec34718425563faf1795675c6eeb5374dd660a65800e8318a1f HEAD_REF master PATCHES fix-include-path.patch + fix-missing-limits.patch ) vcpkg_cmake_configure( diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json index 24dd2fc5fac8e7..1d4e50280b0a27 100644 --- a/ports/concurrencpp/vcpkg.json +++ b/ports/concurrencpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "concurrencpp", "version": "0.1.6", + "port-version": 1, "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", "homepage": "https://github.com/David-Haim/concurrencpp/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a41f704dc1c25c..517a93939fd79a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1694,7 +1694,7 @@ }, "concurrencpp": { "baseline": "0.1.6", - "port-version": 0 + "port-version": 1 }, "concurrentqueue": { "baseline": "1.0.3", diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json index bb5fec72ac99eb..355c1ec7583be8 100644 --- a/versions/c-/concurrencpp.json +++ b/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "692f9ce2162c5dd6ee54170400c4df33aaec6b5d", + "version": "0.1.6", + "port-version": 1 + }, { "git-tree": "d4d183249579167e00a7717a088721716d66635b", "version": "0.1.6", From a50b802d6b6598f191e7fcd03ce54b674b520e6e Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Thu, 22 Jun 2023 08:46:47 +0800 Subject: [PATCH 345/533] [angle] Fix static build (#32120) * [angle] Fix static build * update version database --- ports/angle/cmake-buildsystem/CMakeLists.txt | 74 +++++++++++++++----- ports/angle/portfile.cmake | 36 ++++------ ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 ++ versions/baseline.json | 2 +- 5 files changed, 77 insertions(+), 42 deletions(-) diff --git a/ports/angle/cmake-buildsystem/CMakeLists.txt b/ports/angle/cmake-buildsystem/CMakeLists.txt index 79ed06b421c979..09295948ec8efb 100644 --- a/ports/angle/cmake-buildsystem/CMakeLists.txt +++ b/ports/angle/cmake-buildsystem/CMakeLists.txt @@ -58,6 +58,16 @@ if(ANGLE_USE_D3D11_COMPOSITOR_NATIVE_WINDOW) endif() set(angle_enable_d3d11_compositor_native_window TRUE) endif() +if(NOT BUILD_SHARED_LIBS) + add_definitions( + -DANGLE_EXPORT= + -DANGLE_STATIC=1 + -DANGLE_UTIL_EXPORT= + -DEGLAPI= + -DGL_APICALL= + -DGL_API= + ) +endif() find_package(ZLIB REQUIRED) @@ -416,20 +426,52 @@ install(TARGETS ${_installableTargets} EXPORT ANGLEExport install(EXPORT ANGLEExport FILE unofficial-angle-targets.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle) install(FILES unofficial-angle-config.cmake DESTINATION share/unofficial-angle) -if(NOT DISABLE_INSTALL_HEADERS) - install( - DIRECTORY "${ANGLE_FRAMEWORK_HEADERS_DIR}" - DESTINATION include - FILES_MATCHING - PATTERN "*.h" - PATTERN "*.inc" - PATTERN "CL" EXCLUDE - PATTERN "GLSLANG" EXCLUDE - PATTERN "egl.h" EXCLUDE - PATTERN "eglext.h" EXCLUDE - PATTERN "eglplatform.h" EXCLUDE - PATTERN "KHR" EXCLUDE - PATTERN "WGL" EXCLUDE - PATTERN "export.h" EXCLUDE - ) +install( + DIRECTORY "${ANGLE_FRAMEWORK_HEADERS_DIR}/" + DESTINATION include + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.inc" + PATTERN "CL" EXCLUDE + PATTERN "GLSLANG" EXCLUDE + PATTERN "EGL/egl.h" EXCLUDE + PATTERN "EGL/eglext.h" EXCLUDE + PATTERN "EGL/eglplatform.h" EXCLUDE + PATTERN "KHR" EXCLUDE + PATTERN "WGL" EXCLUDE + PATTERN "export.h" EXCLUDE + PATTERN "GLES/egl.h" EXCLUDE + PATTERN "GLES/gl.h" EXCLUDE + PATTERN "GLES/glext.h" EXCLUDE + PATTERN "GLES/glplatform.h" EXCLUDE + PATTERN "GLES2/gl2.h" EXCLUDE + PATTERN "GLES2/gl2ext.h" EXCLUDE + PATTERN "GLES2/gl2platform.h" EXCLUDE + PATTERN "GLES3/gl3.h" EXCLUDE + PATTERN "GLES3/gl31.h" EXCLUDE + PATTERN "GLES3/gl32.h" EXCLUDE + PATTERN "GLES3/gl3platform.h" EXCLUDE +) +install( + DIRECTORY "${ANGLE_FRAMEWORK_HEADERS_DIR}/" + DESTINATION include/angle + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.inc" + PATTERN "CL" EXCLUDE + PATTERN "GLSLANG" EXCLUDE + PATTERN "EGL/egl.h" EXCLUDE + PATTERN "EGL/eglext.h" EXCLUDE + PATTERN "EGL/eglplatform.h" EXCLUDE + PATTERN "KHR" EXCLUDE + PATTERN "WGL" EXCLUDE + PATTERN "export.h" EXCLUDE +) + +if(NOT BUILD_SHARED_LIBS) + foreach(angle_target EGL GLESv2 ANGLE) + if(TARGET ${angle_target}) + target_compile_definitions(${angle_target} INTERFACE $) + endif() + endforeach() endif() diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 7abb4941ef240e..fa767c2bec4f1c 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -168,31 +168,19 @@ vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -# File conflict with opengl-registry! Make sure headers are similar on Update! -# angle defines some additional entrypoints. -# opengl-registry probably needs an upstream update to account for those -# Due to that all angle headers get moved to include/angle. -# If you want to use those instead of the onces provided by opengl-registry make sure -# VCPKG_INSTALLED_DIR/include/angle is before VCPKG_INSTALLED_DIR/include -file(GLOB_RECURSE angle_includes "${CURRENT_PACKAGES_DIR}/include") -file(COPY ${angle_includes} DESTINATION "${CURRENT_PACKAGES_DIR}/include/angle") - -set(_double_files - "include/GLES/egl.h" - "include/GLES/gl.h" - "include/GLES/glext.h" - "include/GLES/glplatform.h" - "include/GLES2/gl2.h" - "include/GLES2/gl2ext.h" - "include/GLES2/gl2platform.h" - "include/GLES3/gl3.h" - "include/GLES3/gl31.h" - "include/GLES3/gl32.h" - "include/GLES3/gl3platform.h") -foreach(_file ${_double_files}) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${_file}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# Remove empty directories inside include directory +file(GLOB directory_children RELATIVE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/*") +foreach(directory_child ${directory_children}) + if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/${directory_child}") + file(GLOB_RECURSE subdirectory_children "${CURRENT_PACKAGES_DIR}/include/${directory_child}/*") + if("${subdirectory_children}" STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${directory_child}") + endif() endif() endforeach() +unset(subdirectory_children) +unset(directory_child) +unset(directory_children) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index d63a12f2029230..afbb120c7faa94 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 2, + "port-version": 3, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 2a5e5e0ff28357..b4d510d3594c29 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5671959f9f2a59ecd232c72df54682bb10a14be", + "version-string": "chromium_5414", + "port-version": 3 + }, { "git-tree": "784aa16c1dacc9aedb49de3bd1393bb6ef6b853d", "version-string": "chromium_5414", diff --git a/versions/baseline.json b/versions/baseline.json index 517a93939fd79a..4c03ee8d7b87ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 2 + "port-version": 3 }, "annoy": { "baseline": "1.17.2", From 20b059fb8f453b39220401de64dcf35ffbfec2ac Mon Sep 17 00:00:00 2001 From: Pierre Date: Wed, 21 Jun 2023 17:52:55 -0700 Subject: [PATCH 346/533] [usockets] WolfSSL feature (#32162) * Add wolfSSL for usockets * Add port version * Format manifest * Update missing dependency * Update usockets.json --- ports/usockets/CMakeLists.txt | 19 ++++++++++++++++++- ports/usockets/portfile.cmake | 1 + ports/usockets/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/u-/usockets.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index b2daed66d7e370..e50b145edbdffc 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -12,6 +12,16 @@ else() set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL") endif() +if (CMAKE_USE_WOLFSSL) + find_package(wolfssl REQUIRED) + find_package(Threads REQUIRED) + set(USE_WOLFSSL "-DUSE_WOLFSSL -DLIBUS_USE_WOLFSSL") + + list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) +else() + set(NOT_USE_WOLFSSL "-DLIBUS_NO_SSL") +endif() + find_package(libuv CONFIG REQUIRED) if (TARGET uv) set(LIBUV_LIBRARY uv) @@ -33,6 +43,13 @@ if (CMAKE_USE_OPENSSL) list(APPEND USOCKETS_EXT_LIBS OpenSSL::SSL OpenSSL::Crypto) endif() +if (CMAKE_USE_WOLFSSL) + find_package(wolfssl REQUIRED) + #file(GLOB SSL_SOURCES src/crypto/*.c*) + #list(APPEND SOURCES ${SSL_SOURCES}) + list(APPEND USOCKETS_EXT_LIBS wolfssl) +endif() + if (CMAKE_USE_EVENT) file(GLOB SSL_SOURCES src/eventing/*.c) list(APPEND SOURCES ${SSL_SOURCES}) @@ -50,7 +67,7 @@ if (${LIBUS_USE_LIBUV}) target_compile_definitions(uSockets PRIVATE -DLIBUS_USE_LIBUV) endif() -target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL}) +target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL} ${USE_WOLFSSL} ${NOT_USE_WOLFSSL}) target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src") target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS}) diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake index 29584fc620bab7..765c27db76b584 100644 --- a/ports/usockets/portfile.cmake +++ b/ports/usockets/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ssl CMAKE_USE_OPENSSL event CMAKE_USE_EVENT network CMAKE_USE_NETWORK + wolfssl CMAKE_USE_WOLFSSL ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index ca0c8ac3555e2b..ad1faa599f2986 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "usockets", "version": "0.8.6", + "port-version": 1, "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", "license": "Apache-2.0", @@ -26,6 +27,12 @@ "dependencies": [ "openssl" ] + }, + "wolfssl": { + "description": "Build usockets with wolfssl support", + "dependencies": [ + "wolfssl" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 4c03ee8d7b87ca..b603a0b21bbb74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8314,7 +8314,7 @@ }, "usockets": { "baseline": "0.8.6", - "port-version": 0 + "port-version": 1 }, "usrsctp": { "baseline": "0.9.5.0", diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index 7f5b80c9fb4f4b..53a53e6f2a0e95 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbfb3ab5fe6fc9c96028f24a129c8ebab2883553", + "version": "0.8.6", + "port-version": 1 + }, { "git-tree": "648715b141f4bb501ebc83d09da547ee0b3fe467", "version": "0.8.6", From aa5e934ffd9a844805af2c523707b297ddd64a83 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:54:32 +0800 Subject: [PATCH 347/533] [redis-plus-plus] Add TLS feature and update to 1.3.9 (#32115) * [redis-plus-plus] Add TLS feature and update to 1.3.9 * format-manifest --- ports/redis-plus-plus/portfile.cmake | 19 +++++++++++++------ ports/redis-plus-plus/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 4 ++-- versions/r-/redis-plus-plus.json | 5 +++++ 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index 3d4b152a8ca017..774576376e3230 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus - REF 4368319fb668204f345da05b9dd79762506c67b6 # 1.3.8 - SHA512 37774078fb98992c4b4be276c91a2b6a8b8810d62a5087184d1fa2c05db77de15058d5139747578f7a2f9219351c05de32740b63c153ea902493d4b5d05c2d68 + REF "${VERSION}" + SHA512 a9afecc4059155137d524542e7ad699f78e5efc8b1136c1aac093e60fe70dddede3594afe6920f813ba011fb61740bec09b3564c8f8f42118e21fdd5f40f6161 HEAD_REF master PATCHES fix-conversion.patch @@ -10,6 +10,11 @@ vcpkg_from_github( fix-absolute-path.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tls" REDIS_PLUS_PLUS_USE_TLS +) + if("cxx17" IN_LIST FEATURES) set(REDIS_PLUS_PLUS_CXX_STANDARD 17) else() @@ -18,10 +23,10 @@ endif() set(EXTRA_OPT "") if ("async" IN_LIST FEATURES) - list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_BUILD_ASYNC="libuv") + list(APPEND EXTRA_OPT "-DREDIS_PLUS_PLUS_BUILD_ASYNC=libuv") endif() if ("async-std" IN_LIST FEATURES) - list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_ASYNC_FUTURE="std") + list(APPEND EXTRA_OPT "-DREDIS_PLUS_PLUS_ASYNC_FUTURE=std") endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC) @@ -31,7 +36,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - -DREDIS_PLUS_PLUS_USE_TLS=OFF + ${FEATURE_OPTIONS} -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC} -DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED} -DREDIS_PLUS_PLUS_BUILD_TEST=OFF @@ -43,10 +48,12 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME redis++ CONFIG_PATH share/cmake/redis++) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 2f3b575f26cf91..118ba4564c900e 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "redis-plus-plus", - "version-semver": "1.3.8", - "port-version": 1, + "version-semver": "1.3.9", "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", @@ -37,6 +36,18 @@ }, "cxx17": { "description": "Build redis-plus-plus with cxx 17 standard" + }, + "tls": { + "description": "Build with TLS support", + "dependencies": [ + { + "name": "hiredis", + "default-features": false, + "features": [ + "ssl" + ] + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index b603a0b21bbb74..be6c3bb4048d67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7093,8 +7093,8 @@ "port-version": 0 }, "redis-plus-plus": { - "baseline": "1.3.8", - "port-version": 1 + "baseline": "1.3.9", + "port-version": 0 }, "refl-cpp": { "baseline": "0.12.3", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 21de4ee44595f3..48c6e2eb06e690 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce8c8a22b5a791c7a3a96d72d5e2ce47881db17c", + "version-semver": "1.3.9", + "port-version": 0 + }, { "git-tree": "6be6c4d075dc736952132603d31f0ca568a0edde", "version-semver": "1.3.8", From d5e4b2f928a36449ac0b52c6f6630a29cdfd6488 Mon Sep 17 00:00:00 2001 From: Denis Barkar Date: Thu, 22 Jun 2023 04:55:07 +0400 Subject: [PATCH 348/533] [libxmp] Update to v4.6.0 (#32110) --- ports/libxmp/fix-uwp-build.patch | 26 -------------------------- ports/libxmp/portfile.cmake | 5 ++--- ports/libxmp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libxmp.json | 5 +++++ 5 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 ports/libxmp/fix-uwp-build.patch diff --git a/ports/libxmp/fix-uwp-build.patch b/ports/libxmp/fix-uwp-build.patch deleted file mode 100644 index 02b4e2b9ea17dd..00000000000000 --- a/ports/libxmp/fix-uwp-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/depackers/ptpopen.c b/src/depackers/ptpopen.c -index 421faf08c6bf83e38fbb795595f1a8cf79691b16..a11ade9d81267346a0a3970723de2dc12f62c189 100644 ---- a/src/depackers/ptpopen.c -+++ b/src/depackers/ptpopen.c -@@ -12,7 +12,7 @@ - * useful. -- Kurt Keller, Aug 2013 - */ - --#ifdef _WIN32 -+#if defined(_WIN32 ) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) - - #include "ptpopen.h" - -diff --git a/src/depackers/depacker.c b/src/depackers/depacker.c -index 7ff76513781d7daf79135ddf578db94f826f6e19..429a421e29fe1c17ed1d79a5e0d376dbfe04e7b9 100644 ---- a/src/depackers/depacker.c -+++ b/src/depackers/depacker.c -@@ -28,7 +28,7 @@ - #include "../tempfile.h" - #include "xfnmatch.h" - --#ifdef _WIN32 -+#if defined(_WIN32 ) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) - /* Note: The _popen function returns an invalid file opaque, if - * used in a Windows program, that will cause the program to hang - * indefinitely. _popen works properly in a Console application. diff --git a/ports/libxmp/portfile.cmake b/ports/libxmp/portfile.cmake index 4a409029acd0a7..78025a33189cc8 100644 --- a/ports/libxmp/portfile.cmake +++ b/ports/libxmp/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libxmp/libxmp - REF 2c339d0f7517e464d3f2f743212ca76c8c6fe1f1 - SHA512 6c8eca7e37ad9b51b4d9aea08f253c6c4c34f01bfc44b2be4066450b8e34c4bc96a1d1129edc761de4d2e281f718f8d969ce86273af23e37ee172072af8b0a2c + REF libxmp-${VERSION} + SHA512 5f7690e274f3857bd6889cd2ba637473f4a85359a6ef87c76313f87d0c725e3880ba6e428b542dbbf0c8a7725a87b5019289b3f19d2c5bb49527b380f1b4f7e4 PATCHES fix-cmake-config-dir.patch - fix-uwp-build.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/libxmp/vcpkg.json b/ports/libxmp/vcpkg.json index f6481f4342cb8b..3d7098189a4713 100644 --- a/ports/libxmp/vcpkg.json +++ b/ports/libxmp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxmp", - "version-date": "2023-04-13", - "port-version": 1, + "version": "4.6.0", "description": "Libxmp is a library that renders module files to PCM data.", "homepage": "https://sourceforge.net/projects/xmp/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index be6c3bb4048d67..42be8321838b6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4833,8 +4833,8 @@ "port-version": 3 }, "libxmp": { - "baseline": "2023-04-13", - "port-version": 1 + "baseline": "4.6.0", + "port-version": 0 }, "libxmu": { "baseline": "1.1.3", diff --git a/versions/l-/libxmp.json b/versions/l-/libxmp.json index 3d8b1fc7aa97f1..8de6ca5d27557d 100644 --- a/versions/l-/libxmp.json +++ b/versions/l-/libxmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9822e97892e95d5804274ce1076e1abbbed706ce", + "version": "4.6.0", + "port-version": 0 + }, { "git-tree": "a5c05ac5a1e4a0ff9580fc5bba923b39a48b033e", "version-date": "2023-04-13", From aee8671958f8520dea3c0429b94c063b7e1d2296 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Thu, 22 Jun 2023 09:56:15 +0900 Subject: [PATCH 349/533] Update async-mqtt version to 1.0.4. (#32100) --- ports/async-mqtt/portfile.cmake | 2 +- ports/async-mqtt/vcpkg.json | 2 +- versions/a-/async-mqtt.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 9056d48a003c1b..27c8cdd81dfc59 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 7670c64f6c1ed98434620e107474283fec802098421c77ba503fc732141597ae0926d187be0cbcc0a86433c502a21cdc19a6d25d8e009ee1c72fd691f9fe9163 + SHA512 e790f59a28ac7f841b0a3320fc11ecf705a6e800526f990a81ec7d290c1db0bfe83a0d879ba997f890e658dbe2d6cb30f89e7e9e28dc96b7494a96986f689747 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index de789d04b47f25..9e2bbde05297b4 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "1.0.3", + "version": "1.0.4", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index 5b16bc74da69ac..e2cfe1ffd269cd 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12788eb6a749ef28ef1dca9d6ab141bdf0458208", + "version": "1.0.4", + "port-version": 0 + }, { "git-tree": "624a7f874eca273e12ebe2ac104d13294c4126bd", "version": "1.0.3", diff --git a/versions/baseline.json b/versions/baseline.json index 42be8321838b6b..7ce3589fa44ce3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,7 +257,7 @@ "port-version": 0 }, "async-mqtt": { - "baseline": "1.0.3", + "baseline": "1.0.4", "port-version": 0 }, "asynch": { From 1fa1ed1e00729414291cf38d7b054c922b69a03b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:56:55 +0200 Subject: [PATCH 350/533] [cgns] fix non hdf5 features (#32097) --- ports/cgns/portfile.cmake | 5 ++++- ports/cgns/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cgns.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 11bb824cca3c70..6d1542a02be166 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -60,7 +60,10 @@ vcpkg_copy_tools( if(VCPKG_TARGET_IS_WINDOWS) set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat") elseif(VCPKG_TARGET_IS_LINUX) - set(TOOLS "adf2hdf" "hdf2adf" "cgnsupdate") + set(TOOLS "cgnsupdate") + if("hdf5" IN_LIST FEATURES) + list(APPEND TOOLS "adf2hdf" "hdf2adf") + endif() endif() foreach(TOOL ${TOOLS}) diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json index ff701a98c55d0f..48fd819bd1ca51 100644 --- a/ports/cgns/vcpkg.json +++ b/ports/cgns/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cgns", "version-semver": "4.3.0", - "port-version": 3, + "port-version": 4, "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", "homepage": "http://cgns.org/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 7ce3589fa44ce3..41f4ef761dde62 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1470,7 +1470,7 @@ }, "cgns": { "baseline": "4.3.0", - "port-version": 3 + "port-version": 4 }, "chaiscript": { "baseline": "6.1.0", diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index a7321919c10d59..d89e2062e734ed 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f56fa77d5ab2c24d5d8a9932129626feb65df5", + "version-semver": "4.3.0", + "port-version": 4 + }, { "git-tree": "3a5778901a44a39370c08cf42ad0de44223090c0", "version-semver": "4.3.0", From bf7748b51a4f026cedfe6b1925a84b1d0cad6729 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 22 Jun 2023 08:59:59 +0800 Subject: [PATCH 351/533] [nanoflann] update to 1.5.0 (#32093) * update nanoflann * update version * fix dependency nanoflann * update version * Modify EOF to LF * update git-tree * Modify MAYBE_UNUSED_VARIABLES * update git-tree --------- Co-authored-by: Monica --- ports/nanoflann/portfile.cmake | 10 +++- ports/nanoflann/vcpkg.json | 2 +- ports/pdal/fix-dependency.patch | 82 ++++++++++++++++++++++++++++++++- ports/pdal/portfile.cmake | 2 + ports/pdal/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/n-/nanoflann.json | 5 ++ versions/p-/pdal.json | 5 ++ 8 files changed, 104 insertions(+), 8 deletions(-) diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index de9d408b9ce3bc..4ac280eb6a8a4f 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann - REF v1.4.3 - SHA512 93a03357a57c8c122d01e35e7ce50751ec4490f938e2031d96521bbbbb5302de437c5933eb9e5cfb2583a8c4f28a118332bcf1be7b4f56259a2ce0af202de889 + REF "v${VERSION}" + SHA512 2248eed37872737c1f3c031e65d2f892024e35aa81ccf14cf8222289cfe12b5ca3fe461749e060ff822ca9e40dd9cb918216468c1343a42305f7adf780888c50 HEAD_REF master ) @@ -19,6 +19,12 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(READ "${CURRENT_PACKAGES_DIR}/share/nanoflann/nanoflannConfig.cmake" _contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/nanoflann/nanoflannConfig.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(Threads) +${_contents}") + # Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index 467c4606fdfa52..b256753c725d88 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nanoflann", - "version": "1.4.3", + "version": "1.5.0", "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", "homepage": "https://github.com/jlblancoc/nanoflann", "license": "BSD-3-Clause", diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index af6cca16c610a8..60011e3ab6e3b8 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1705a8426..248edcd38 100644 +index d13d417..011608d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -269,7 +269,7 @@ target_link_libraries(${PDAL_BASE_LIB_NAME} @@ -12,7 +12,7 @@ index 1705a8426..248edcd38 100644 ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake -index dfe3dc024..42a78d646 100644 +index dfe3dc0..42a78d6 100644 --- a/cmake/zstd.cmake +++ b/cmake/zstd.cmake @@ -4,7 +4,14 @@ @@ -31,3 +31,81 @@ index dfe3dc024..42a78d646 100644 set_package_properties(ZSTD PROPERTIES TYPE PURPOSE "General compression support") if (ZSTD_FOUND) +diff --git a/pdal/private/KDImpl.hpp b/pdal/private/KDImpl.hpp +index 473ffba..db6a7b0 100644 +--- a/pdal/private/KDImpl.hpp ++++ b/pdal/private/KDImpl.hpp +@@ -97,7 +97,7 @@ public: + resultSet.init(&output[0], &out_dist_sqr[0]); + + std::array pt { x, y }; +- m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams(10)); ++ m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters(10)); + return output; + } + +@@ -110,14 +110,14 @@ public: + resultSet.init(&indices->front(), &sqr_dists->front()); + + std::array pt { x, y }; +- m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams(10)); ++ m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters(10)); + } + + PointIdList radius(double const& x, double const& y, double const& r) const + { + PointIdList output; +- std::vector> ret_matches; +- nanoflann::SearchParams params; ++ std::vector> ret_matches; ++ nanoflann::SearchParameters params; + params.sorted = true; + + std::array pt { x, y }; +@@ -217,7 +217,7 @@ public: + // neighbor at the given stride. + nanoflann::KNNResultSet resultSet(k2); + resultSet.init(&output[0], &out_dist_sqr[0]); +- m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams()); ++ m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters()); + + // Perform the downsampling if a stride is provided. + if (stride > 1) +@@ -241,14 +241,14 @@ public: + pt.push_back(x); + pt.push_back(y); + pt.push_back(z); +- m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams(10)); ++ m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters(10)); + } + + PointIdList radius(double x, double y, double z, double r) const + { + PointIdList output; +- std::vector> ret_matches; +- nanoflann::SearchParams params; ++ std::vector> ret_matches; ++ nanoflann::SearchParameters params; + params.sorted = true; + + std::vector pt { x, y, z }; +@@ -315,7 +315,7 @@ public: + // neighbor at the given stride. + nanoflann::KNNResultSet resultSet(k2); + resultSet.init(&output[0], &out_dist_sqr[0]); +- m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParams()); ++ m_index.findNeighbors(resultSet, &pt[0], nanoflann::SearchParameters()); + + // Perform the downsampling if a stride is provided. + if (stride > 1) +@@ -330,8 +330,8 @@ public: + PointIdList radius(PointId idx, double r) const + { + PointIdList output; +- std::vector> ret_matches; +- nanoflann::SearchParams params; ++ std::vector> ret_matches; ++ nanoflann::SearchParameters params; + params.sorted = true; + + std::vector pt; diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index c2b330354c7c10..8acb6b2c0cd646 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -59,6 +59,8 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + PKG_CONFIG_EXECUTABLE ) vcpkg_cmake_install() diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 1736914d96302e..e31b17fc3ff94f 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdal", "version": "2.5.3", - "port-version": 1, + "port-version": 2, "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 41f4ef761dde62..f841a3b3b47672 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5545,7 +5545,7 @@ "port-version": 6 }, "nanoflann": { - "baseline": "1.4.3", + "baseline": "1.5.0", "port-version": 0 }, "nanogui": { @@ -6214,7 +6214,7 @@ }, "pdal": { "baseline": "2.5.3", - "port-version": 1 + "port-version": 2 }, "pdal-c": { "baseline": "2.2.0", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index c59ba1bc258adb..4884c7db9f99e6 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23c05262f235796a1f01174f1dedc48c346e96af", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "91e87dd11fdfc2cb98925ded3aab041f5f507715", "version": "1.4.3", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 830157c09d4473..1054a1a6333bfd 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59463f5cf4dccd2c2167abad2e290413cdc91d22", + "version": "2.5.3", + "port-version": 2 + }, { "git-tree": "a8618eb3877634f95eb6edbbba64f3e4cccb1d58", "version": "2.5.3", From 2f3a37163366e82b9cd9e9414b0304d39d04ad2e Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:00:55 +0800 Subject: [PATCH 352/533] update to 2.1.0 (#32091) --- ports/dataframe/portfile.cmake | 2 +- ports/dataframe/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dataframe.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dataframe/portfile.cmake b/ports/dataframe/portfile.cmake index 6b6c02607da830..f197f360bbc86e 100644 --- a/ports/dataframe/portfile.cmake +++ b/ports/dataframe/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hosseinmoein/DataFrame REF "${VERSION}" - SHA512 e37df83396746620d4d1de3a9ef20cf4beea5c47970da2c9c368aa56a2a783396658a218d922a6e840fd1ad2a0aa54d4ad8dfbfe3b33b555efae6fe2deea00b5 + SHA512 fba75b7f86c678bbfda7574d618530a88cf4b054fc7fae045e3506353ae687b5b4c59e93017439055599bf2739f0f34a4ac28c88246c185510b05b85f41a766f HEAD_REF master ) vcpkg_cmake_configure( diff --git a/ports/dataframe/vcpkg.json b/ports/dataframe/vcpkg.json index ca327b4b4166f8..7139997a8a0e4b 100644 --- a/ports/dataframe/vcpkg.json +++ b/ports/dataframe/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dataframe", - "version": "1.22.0", + "version": "2.1.0", "description": "This is a C++ statistical library that provides an interface similar to Pandas package in Python", "homepage": "https://github.com/hosseinmoein/DataFrame", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f841a3b3b47672..990839e857f6f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2001,7 +2001,7 @@ "port-version": 2 }, "dataframe": { - "baseline": "1.22.0", + "baseline": "2.1.0", "port-version": 0 }, "date": { diff --git a/versions/d-/dataframe.json b/versions/d-/dataframe.json index 02e13d4938ca56..8e6b6b474ef140 100644 --- a/versions/d-/dataframe.json +++ b/versions/d-/dataframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e44b0c459e2d1d35a587de3b8126794d57c7f8c", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "1dbcb0119d811c5e0ef7e36d5ee456396ac3c10a", "version": "1.22.0", From 5a90d5c436696e6ddab0ef00bf56a8b0f311c9f5 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 22 Jun 2023 08:16:32 +0400 Subject: [PATCH 353/533] [openvino] ported patch for default option value (#32082) * [openvino] added patch to fix default option value * updated versions files --- .../openvino/002-typo-in-default-option-value.patch | 13 +++++++++++++ ports/openvino/portfile.cmake | 3 ++- ports/openvino/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/openvino.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/openvino/002-typo-in-default-option-value.patch diff --git a/ports/openvino/002-typo-in-default-option-value.patch b/ports/openvino/002-typo-in-default-option-value.patch new file mode 100644 index 00000000000000..29231648855fc1 --- /dev/null +++ b/ports/openvino/002-typo-in-default-option-value.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/features.cmake b/cmake/features.cmake +index fc7a07252e..546fc72193 100644 +--- a/cmake/features.cmake ++++ b/cmake/features.cmake +@@ -126,7 +126,7 @@ ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON) + ie_option(ENABLE_OV_TF_FRONTEND "Enable TensorFlow FrontEnd" ON) + ie_option(ENABLE_OV_TF_LITE_FRONTEND "Enable TensorFlow Lite FrontEnd" ON) + ie_dependent_option(ENABLE_SNAPPY_COMPRESSION "Enables compression support for TF FE" ON +- "ENABLE_OV_TF_FRONTEND" ON) ++ "ENABLE_OV_TF_FRONTEND" OFF) + + if(CMAKE_HOST_LINUX AND LINUX) + # Debian packages are enabled on Ubuntu systems diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index 9ff14ce1ecfc31..886e753c33faab 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -2,9 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino REF 50c85f01ab44b2470f08b0f8824cced109628fc6 - SHA512 e14ac8d48f577188522d0b80f55d53a839f843a03bf0eccf7e370a7bfe977d19e65e4f4748274baf9b0a71751bbdcb7c1e2d4270e54b1ddd72f578176f48058d + SHA512 1673cdab4f0d73ba5e3d0ac1e8a7b136d25df59704575a468016650c3c6c0dcba0bdc0a2306f61a14d49792651b21e9233d166610e0b463624b309758f1b1c04 PATCHES 001-disable-tools.patch + 002-typo-in-default-option-value.patch HEAD_REF master) function(ov_checkout_in_path PATH REPO REF SHA512) diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index a25aad11627d82..299adda71588ca 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", "version-date": "2023-06-11", + "port-version": 1, "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ diff --git a/versions/baseline.json b/versions/baseline.json index 990839e857f6f0..e3198745ff9804 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6054,7 +6054,7 @@ }, "openvino": { "baseline": "2023-06-11", - "port-version": 0 + "port-version": 1 }, "openvpn3": { "baseline": "3.7.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index e8fc4edd1e6076..87b36c730844a9 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b845ea9bb49b0f44f2423d210e950003b67bfac4", + "version-date": "2023-06-11", + "port-version": 1 + }, { "git-tree": "85c70516c12c1c3544e7a2996e6f83e35aa6a88f", "version-date": "2023-06-11", From 4d8f7726095ede27ea50843bba2c183311f8ee90 Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Thu, 22 Jun 2023 12:53:49 +0800 Subject: [PATCH 354/533] [libosmscout] Refine feature name (#32080) * refine feature name for libosmscout * update port-version for libosmscout * vcpkg x-add-version for libosmscout --------- Co-authored-by: abc --- ports/libosmscout/portfile.cmake | 2 +- ports/libosmscout/vcpkg.json | 6 +++--- versions/baseline.json | 2 +- versions/l-/libosmscout.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libosmscout/portfile.cmake b/ports/libosmscout/portfile.cmake index 26f46201f83ab6..b10ac9d37ad10e 100644 --- a/ports/libosmscout/portfile.cmake +++ b/ports/libosmscout/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES directx OSMSCOUT_BUILD_MAP_DIRECTX gdi OSMSCOUT_BUILD_MAP_GDI svg OSMSCOUT_BUILD_MAP_SVG - qt OSMSCOUT_BUILD_MAP_QT + qt5 OSMSCOUT_BUILD_MAP_QT ) vcpkg_cmake_configure( diff --git a/ports/libosmscout/vcpkg.json b/ports/libosmscout/vcpkg.json index 1e8aeb9acca746..e49ed461e32754 100644 --- a/ports/libosmscout/vcpkg.json +++ b/ports/libosmscout/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosmscout", "version": "1.1.1", - "port-version": 3, + "port-version": 4, "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.", "homepage": "http://libosmscout.sourceforge.net/", "documentation": "http://libosmscout.sourceforge.net/documentation/", @@ -40,8 +40,8 @@ "description": "GDI+ backend renderer", "supports": "windows" }, - "qt": { - "description": "Enable build of Qt map drawing backend", + "qt5": { + "description": "Enable build of Qt5 map drawing backend", "dependencies": [ "qt5-base", "qt5-svg" diff --git a/versions/baseline.json b/versions/baseline.json index e3198745ff9804..6a2a489491db36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4398,7 +4398,7 @@ }, "libosmscout": { "baseline": "1.1.1", - "port-version": 3 + "port-version": 4 }, "libp7-baical": { "baseline": "replaced", diff --git a/versions/l-/libosmscout.json b/versions/l-/libosmscout.json index 51c8e42fa1313f..95ed7b0a8454a4 100644 --- a/versions/l-/libosmscout.json +++ b/versions/l-/libosmscout.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55b989b709d0c12649e6b2a522249bbf3d0788c7", + "version": "1.1.1", + "port-version": 4 + }, { "git-tree": "6a036a2f5b16cbc586266834abfe3c7a3f712c7e", "version": "1.1.1", From 2d2537b079667caa94a7085121aa2893fb9dc659 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 22 Jun 2023 08:13:41 +0300 Subject: [PATCH 355/533] [tinyexr] Update to 1.0.5 (#32074) * [tinyexr] Update to 1.0.5 * fix uwp builds --- ports/tinyexr/fix-uwp.patch | 12 ++++++++++++ ports/tinyexr/portfile.cmake | 5 +++-- ports/tinyexr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tinyexr.json | 5 +++++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 ports/tinyexr/fix-uwp.patch diff --git a/ports/tinyexr/fix-uwp.patch b/ports/tinyexr/fix-uwp.patch new file mode 100644 index 00000000000000..7a3cb66cbb9038 --- /dev/null +++ b/ports/tinyexr/fix-uwp.patch @@ -0,0 +1,12 @@ +--- a/tinyexr.h ++++ b/tinyexr.h +@@ -608,7 +608,9 @@ extern int LoadEXRFromMemory(float **out_rgba, int *width, int *height, + #define NOMINMAX + #endif + #include // for UTF-8 and memory-mapping ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) + #define TINYEXR_USE_WIN32_MMAP (1) ++#endif + + #elif defined(__linux__) || defined(__unix__) + #include // for open() diff --git a/ports/tinyexr/portfile.cmake b/ports/tinyexr/portfile.cmake index 81b084ae4bc45d..4502350bff606d 100644 --- a/ports/tinyexr/portfile.cmake +++ b/ports/tinyexr/portfile.cmake @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinyexr - REF v1.0.1 - SHA512 ba3bc09e7c2a93016b260849eb365a05fe1113c55f824767a19a20e3a6ff2a09dd686aa15094dd6c4508e68915dc8eb4a0ccc9778de73d9b55354701e7820e76 + REF "v${VERSION}" + SHA512 c15ac7d21cba70c3247ea49674191097325fcba7bfaeb8163298ded2e3b67f55b1b6486fd90a80f23f950661e96c063a28a70569f40a8938cd41249c34b4bbfe HEAD_REF master PATCHES fixtargets.patch + fix-uwp.patch # https://github.com/syoyo/tinyexr/pull/195 ) vcpkg_cmake_configure( diff --git a/ports/tinyexr/vcpkg.json b/ports/tinyexr/vcpkg.json index c87d92e0a08b8b..2871772fb95b8c 100644 --- a/ports/tinyexr/vcpkg.json +++ b/ports/tinyexr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinyexr", - "version": "1.0.1", + "version": "1.0.5", "description": "Library to load and save OpenEXR(.exr) images", "homepage": "https://github.com/syoyo/tinyexr", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 6a2a489491db36..26a22f935e6eb2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8057,7 +8057,7 @@ "port-version": 2 }, "tinyexr": { - "baseline": "1.0.1", + "baseline": "1.0.5", "port-version": 0 }, "tinyfiledialogs": { diff --git a/versions/t-/tinyexr.json b/versions/t-/tinyexr.json index 6a36a8626417eb..b8c2168df26585 100644 --- a/versions/t-/tinyexr.json +++ b/versions/t-/tinyexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14f0bcbec927dc73035b2642284f1329a113209f", + "version": "1.0.5", + "port-version": 0 + }, { "git-tree": "d0381d495cb1b502e1b5ccaafb2409f75c0726a3", "version": "1.0.1", From c6d3ab273572019ea0d6f6688e1163143190d326 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 22 Jun 2023 08:14:50 +0300 Subject: [PATCH 356/533] [openexr] Update to 3.1.8 (#32073) * [openexr] Update to 3.1.8 * Fix arm64 build --- ports/openexr/fix-arm64-windows-build.patch | 13 +++++++++++++ ports/openexr/portfile.cmake | 6 ++++-- ports/openexr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openexr.json | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 ports/openexr/fix-arm64-windows-build.patch diff --git a/ports/openexr/fix-arm64-windows-build.patch b/ports/openexr/fix-arm64-windows-build.patch new file mode 100644 index 00000000000000..1d3310a8b98588 --- /dev/null +++ b/ports/openexr/fix-arm64-windows-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/OpenEXRCore/internal_dwa_simd.h b/src/lib/OpenEXRCore/internal_dwa_simd.h +index 7b53501ac..ca69c9848 100644 +--- a/src/lib/OpenEXRCore/internal_dwa_simd.h ++++ b/src/lib/OpenEXRCore/internal_dwa_simd.h +@@ -18,7 +18,7 @@ + // aligned. Unaligned pointers may risk seg-faulting. + // + +-#if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE) ++#if defined __SSE2__ || (_MSC_VER >= 1300 && (_M_IX86 || _M_X64) && !_M_CEE_PURE) + # define IMF_HAVE_SSE2 1 + # include + # include diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index ecc7989b572eed..8ffa6c76bb898f 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openexr - REF v3.1.7 - SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5 + REF "v${VERSION}" + SHA512 ec60e79341695452e05f50bbcc0d55e0ce00fbb64cdec01a83911189c8643eb28a8046b14ee4230e5f438f018f2f1d0714f691983474d7979befd199f3f34758 HEAD_REF master + PATCHES + fix-arm64-windows-build.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1447 ) vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index a17182491693e2..7f35bfac6911f1 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openexr", - "version": "3.1.7", + "version": "3.1.8", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 26a22f935e6eb2..18d44e15c3f451 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5949,7 +5949,7 @@ "port-version": 1 }, "openexr": { - "baseline": "3.1.7", + "baseline": "3.1.8", "port-version": 0 }, "openfbx": { diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index 53718ab9cdf099..a96caff4d670d2 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36064f5fe46f2399a9a532fdb6d7542dae7faede", + "version": "3.1.8", + "port-version": 0 + }, { "git-tree": "5bf66027763e861e804aee6113c5afc8bb0e1e7e", "version": "3.1.7", From 76e68f2de9196f1fd145610127e91889985516f9 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:15:42 +0200 Subject: [PATCH 357/533] [palsigslot] Update to 1.2.2 (#32069) * Update palsigslot to 1.2.2 * Update CI baseline * Add license * Update CI baseline * Add back HEAD_REF * Update CI baseline --------- Co-authored-by: chausner --- ports/palsigslot/portfile.cmake | 6 +++--- ports/palsigslot/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/palsigslot.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/palsigslot/portfile.cmake b/ports/palsigslot/portfile.cmake index 4ab6d29cbff759..cff3980f370bb6 100644 --- a/ports/palsigslot/portfile.cmake +++ b/ports/palsigslot/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO palacaze/sigslot - REF v1.2.1 - SHA512 cd79985a09ad41562dc8e582d30bc9df0fdc9409ee3676919b56d0d70a6c1af9414587b61977d2fa2ba763ef8df65b30c7b7dc883629e016660baeb998e708f5 + REF "v${VERSION}" + SHA512 ed8614d9c2e418259b1bce6d0a528b54939700876969c5e8dfcfc466c167690180cb18324602f83d521c79dcba2565e5317647416b70cf8773860ab956d9b62f HEAD_REF master ) @@ -22,4 +22,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/palsigslot/vcpkg.json b/ports/palsigslot/vcpkg.json index 29c68fa94197b0..c02f85a0929a9f 100644 --- a/ports/palsigslot/vcpkg.json +++ b/ports/palsigslot/vcpkg.json @@ -1,8 +1,9 @@ { "name": "palsigslot", - "version": "1.2.1", + "version": "1.2.2", "description": "A header-only, thread safe implementation of signal-slots for C++.", "homepage": "https://github.com/palacaze/sigslot", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 18d44e15c3f451..28f140b89de9d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6145,7 +6145,7 @@ "port-version": 1 }, "palsigslot": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "pango": { diff --git a/versions/p-/palsigslot.json b/versions/p-/palsigslot.json index 0339cee7a880ae..99ba0d70087541 100644 --- a/versions/p-/palsigslot.json +++ b/versions/p-/palsigslot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db0f38f4ec93dc19183222e89759d4355733e75f", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "dd7ff9df2ee3a39656ab22a6fc6f210afa843513", "version": "1.2.1", From 3c6ad33eadda52c0392c413f696b050a000bd716 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:16:23 +0200 Subject: [PATCH 358/533] [libprotobuf-mutator] update (#32068) Co-authored-by: Billy O'Neal --- ports/libprotobuf-mutator/portfile.cmake | 4 ++-- ports/libprotobuf-mutator/vcpkg.json | 7 ++++--- versions/baseline.json | 4 ++-- versions/l-/libprotobuf-mutator.json | 5 +++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/libprotobuf-mutator/portfile.cmake b/ports/libprotobuf-mutator/portfile.cmake index 6ffb602fb21e62..4f79efcd729424 100644 --- a/ports/libprotobuf-mutator/portfile.cmake +++ b/ports/libprotobuf-mutator/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libprotobuf-mutator - REF v1.0 - SHA512 75e423289f938d4332d98033062cd9608b71141b7ca1df4e8f28c927c51a16e7ff2f5bf08867308d2a291fc2422e4456f8928ab2c11d545eeb982ea732baf2e9 + REF "v${VERSION}" + SHA512 cafc59c6c1e26a3e4873ec47f12db290739e98f229a17352c740aa17ac41f1435268eb0c45518b07e5c33280c18da1c4e363a31200569ffe636250e7c904b55e HEAD_REF master ) diff --git a/ports/libprotobuf-mutator/vcpkg.json b/ports/libprotobuf-mutator/vcpkg.json index 96dc0d5123bd36..8e7a1ad80d6549 100644 --- a/ports/libprotobuf-mutator/vcpkg.json +++ b/ports/libprotobuf-mutator/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libprotobuf-mutator", - "version": "1.0", - "port-version": 2, + "version": "1.1", "description": "Library for structured fuzzing with protobuffers.", "dependencies": [ + "liblzma", "protobuf", { "name": "vcpkg-cmake", @@ -12,6 +12,7 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 28f140b89de9d0..e6424fb7ba9c86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4445,8 +4445,8 @@ "port-version": 0 }, "libprotobuf-mutator": { - "baseline": "1.0", - "port-version": 2 + "baseline": "1.1", + "port-version": 0 }, "libproxy": { "baseline": "0.4.18", diff --git a/versions/l-/libprotobuf-mutator.json b/versions/l-/libprotobuf-mutator.json index 314c6199c6e07e..52281f5d216a48 100644 --- a/versions/l-/libprotobuf-mutator.json +++ b/versions/l-/libprotobuf-mutator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "711a63d6cbb8a9556e4d5df54aa17383780a46b1", + "version": "1.1", + "port-version": 0 + }, { "git-tree": "df52e818f4a57b22720260014d5adf089281af3c", "version": "1.0", From 6f979a90174c721d5123d6b8e146f598cd6dded4 Mon Sep 17 00:00:00 2001 From: Daniel Ju <41210545+daniel-ju@users.noreply.github.com> Date: Thu, 22 Jun 2023 00:20:01 -0500 Subject: [PATCH 359/533] [openblas] Support arm64-uwp builds (#32067) * [openblas] Support arm64-uwp build * Update version * Merge UWP patches and don't set CMAKE_SYSTEM_PROCESSOR. * Simplify supports clause. --------- Co-authored-by: Billy Robert O'Neal III --- ports/openblas/fix-uwp-build.patch | 35 ------------------------- ports/openblas/portfile.cmake | 12 ++++----- ports/openblas/uwp.patch | 41 +++++++++++++++++++++++++++--- ports/openblas/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/openblas.json | 5 ++++ 6 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 ports/openblas/fix-uwp-build.patch diff --git a/ports/openblas/fix-uwp-build.patch b/ports/openblas/fix-uwp-build.patch deleted file mode 100644 index 7604cf736c1c8e..00000000000000 --- a/ports/openblas/fix-uwp-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/common_stackalloc.h b/common_stackalloc.h -index d3d5466..cd157fc 100644 ---- a/common_stackalloc.h -+++ b/common_stackalloc.h -@@ -36,7 +36,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #define STACK_ALLOC_PROTECT_CHECK - #endif - --#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 -+#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) - - /* - * Allocate a buffer on the stack if the size is smaller than MAX_STACK_ALLOC. -@@ -63,7 +63,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #endif - - --#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 -+#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) - #define STACK_FREE(BUFFER) \ - STACK_ALLOC_PROTECT_CHECK \ - if(!stack_alloc_size) \ -diff --git a/interface/zgemv.c b/interface/zgemv.c -index 3e98dba..ee597f7 100644 ---- a/interface/zgemv.c -+++ b/interface/zgemv.c -@@ -244,7 +244,7 @@ void CNAME(enum CBLAS_ORDER order, - buffer_size = (buffer_size + 3) & ~3; - STACK_ALLOC(buffer_size, FLOAT, buffer); - --#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 -+#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) - // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746) - if(trans && stack_alloc_size) - memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size)); diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 98f892756447fa..765b2df6403a2a 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( PATCHES uwp.patch fix-redefinition-function.patch - fix-uwp-build.patch install-tools.patch ) @@ -26,9 +25,9 @@ vcpkg_add_to_path("${SED_EXE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - threads USE_THREAD - simplethread USE_SIMPLE_THREADED_LEVEL3 - "dynamic-arch" DYNAMIC_ARCH + threads USE_THREAD + simplethread USE_SIMPLE_THREADED_LEVEL3 + "dynamic-arch" DYNAMIC_ARCH ) set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) @@ -42,9 +41,8 @@ endif() set(OPENBLAS_EXTRA_OPTIONS) # for UWP version, must build non uwp first for helper # binaries. -if(VCPKG_TARGET_IS_UWP) - list(APPEND OPENBLAS_EXTRA_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 - "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPENBLAS_EXTRA_OPTIONS "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE") diff --git a/ports/openblas/uwp.patch b/ports/openblas/uwp.patch index 002410db3b7c59..fd29ed7fefd7ad 100644 --- a/ports/openblas/uwp.patch +++ b/ports/openblas/uwp.patch @@ -1,5 +1,5 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake -index a33acbb..451422d 100644 +index 730555a..1b09e00 100644 --- a/cmake/prebuild.cmake +++ b/cmake/prebuild.cmake @@ -39,6 +39,9 @@ @@ -12,7 +12,7 @@ index a33acbb..451422d 100644 if (DEFINED CPUIDEMU) set(EXFLAGS "-DCPUIDEMU -DVENDOR=99") -@@ -1399,8 +1402,8 @@ else(NOT CMAKE_CROSSCOMPILING) +@@ -1401,8 +1404,8 @@ else(NOT CMAKE_CROSSCOMPILING) message(STATUS "Running getarch") # use the cmake binary w/ the -E param to run a shell command in a cross-platform way @@ -23,7 +23,7 @@ index a33acbb..451422d 100644 message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") -@@ -1426,8 +1429,8 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE +@@ -1430,8 +1433,8 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE endif () # use the cmake binary w/ the -E param to run a shell command in a cross-platform way @@ -48,3 +48,38 @@ index 631e7fe..83220ce 100644 else() message(FATAL_ERROR "When cross compiling, a TARGET is required.") endif() +diff --git a/common_stackalloc.h b/common_stackalloc.h +index d3d5466..cd157fc 100644 +--- a/common_stackalloc.h ++++ b/common_stackalloc.h +@@ -36,7 +36,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #define STACK_ALLOC_PROTECT_CHECK + #endif + +-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 ++#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + + /* + * Allocate a buffer on the stack if the size is smaller than MAX_STACK_ALLOC. +@@ -63,7 +63,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #endif + + +-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 ++#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + #define STACK_FREE(BUFFER) \ + STACK_ALLOC_PROTECT_CHECK \ + if(!stack_alloc_size) \ +diff --git a/interface/zgemv.c b/interface/zgemv.c +index 3e98dba..ee597f7 100644 +--- a/interface/zgemv.c ++++ b/interface/zgemv.c +@@ -244,7 +244,7 @@ void CNAME(enum CBLAS_ORDER order, + buffer_size = (buffer_size + 3) & ~3; + STACK_ALLOC(buffer_size, FLOAT, buffer); + +-#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 ++#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)) + // cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746) + if(trans && stack_alloc_size) + memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size)); diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 0ce043ea35cd36..1c0c10f5f1d4af 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openblas", "version": "0.3.23", + "port-version": 1, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "license": "BSD-3-Clause", - "supports": "!(arm & uwp)", + "supports": "!arm | arm64 | !uwp", "dependencies": [ { "name": "openblas", diff --git a/versions/baseline.json b/versions/baseline.json index e6424fb7ba9c86..3b2eabe9e9c245 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5894,7 +5894,7 @@ }, "openblas": { "baseline": "0.3.23", - "port-version": 0 + "port-version": 1 }, "opencascade": { "baseline": "7.6.2", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 1fd4534c1157de..ff0b032ac13114 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d701021ccf4a0729f77788b2d90da377bfdd1486", + "version": "0.3.23", + "port-version": 1 + }, { "git-tree": "716c00140c032ec22773130b006af542e011f00e", "version": "0.3.23", From 337852104bd199dd44b1cf5f48cc1562559c54c6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:23:07 +0200 Subject: [PATCH 360/533] [breakpad] Fix installation regex (#32065) --- ports/breakpad/CMakeLists.txt | 2 +- ports/breakpad/vcpkg.json | 2 +- versions/b-/breakpad.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt index 8593f4b7bd9809..f37d30f3ef6dfc 100644 --- a/ports/breakpad/CMakeLists.txt +++ b/ports/breakpad/CMakeLists.txt @@ -192,7 +192,7 @@ if(INSTALL_HEADERS) if(WIN32) set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") elseif(APPLE) - set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|/*proj|/gcov") + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/sender|/testapp|\.xcodeproj|/gcov") else() set(HEADER_EXCLUDE_REGEX "/apple|/ios|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") install( diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index ea5404d1844bb6..5dd65371d87714 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "breakpad", "version-date": "2022-07-12", - "port-version": 4, + "port-version": 5, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "license": "BSD-3-Clause", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index f07d04697e4def..098056c1855946 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a451811c203f1ec086288b40dd4571d97bb7033e", + "version-date": "2022-07-12", + "port-version": 5 + }, { "git-tree": "26e6e78bdd989c749aa0f61ad6357374480bc184", "version-date": "2022-07-12", diff --git a/versions/baseline.json b/versions/baseline.json index 3b2eabe9e9c245..23debe7ff89b09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1258,7 +1258,7 @@ }, "breakpad": { "baseline": "2022-07-12", - "port-version": 4 + "port-version": 5 }, "brigand": { "baseline": "1.3.0", From 20ab0e10c890aae7b9bf341924bfdc893afbe8d2 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:25:00 +0800 Subject: [PATCH 361/533] [collada-dom] Fix calling zip.h in minizip (#32053) * Fix calling zip.h in minizip * update version * Modify the way to use minizip * update version * Modify the way to use minizip * update version --- ports/collada-dom/use-vcpkg-minizip.patch | 29 +++++++++++++++++++++++ ports/collada-dom/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/collada-dom.json | 5 ++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch index e696f702b83928..61a595c167c077 100644 --- a/ports/collada-dom/use-vcpkg-minizip.patch +++ b/ports/collada-dom/use-vcpkg-minizip.patch @@ -12,3 +12,32 @@ index f6c2bb6..3351ab0 100644 if(minizip_FOUND) set(MINIZIP_INCLUDE_DIR ${minizip_INCLUDE_DIRS}) else() +diff --git a/dom/include/dae/daeZAEUncompressHandler.h b/dom/include/dae/daeZAEUncompressHandler.h +index e9b0e9e..3d120da 100644 +--- a/dom/include/dae/daeZAEUncompressHandler.h ++++ b/dom/include/dae/daeZAEUncompressHandler.h +@@ -9,7 +9,7 @@ + #ifndef __DAE_ZAE_UNCOMPRESS_HANDLER_H__ + #define __DAE_ZAE_UNCOMPRESS_HANDLER_H__ + +-#include ++#include <../minizip/unzip.h> + #include + #include + +diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +index 4536275..2666959 100644 +--- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp ++++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp +@@ -32,9 +32,9 @@ + #include + using namespace std; + +-#include // for saving compressed files ++#include <../minizip/zip.h> // for saving compressed files + #ifdef _WIN32 +-#include ++#include <../minizip/iowin32.h> + #else + #include + #endif diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json index 7321d2f20d255f..181d60192c1996 100644 --- a/ports/collada-dom/vcpkg.json +++ b/ports/collada-dom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "collada-dom", "version": "2.5.0", - "port-version": 9, + "port-version": 10, "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.", "homepage": "https://github.com/rdiankov/collada-dom", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 23debe7ff89b09..b3a5ebd5cc7330 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1666,7 +1666,7 @@ }, "collada-dom": { "baseline": "2.5.0", - "port-version": 9 + "port-version": 10 }, "colmap": { "baseline": "2023-03-12", diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json index ce5b0896eb8397..9241e7a394c015 100644 --- a/versions/c-/collada-dom.json +++ b/versions/c-/collada-dom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9efe9cf28c36df64035b505810bf68f445be62a1", + "version": "2.5.0", + "port-version": 10 + }, { "git-tree": "d9c3011f64673cff7d61bac99def8048f4027f32", "version": "2.5.0", From d044127afe53c404ecad29aab466367f60df1b65 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:30:46 +0200 Subject: [PATCH 362/533] [folly] fix openssl dependency (#32050) --- ports/folly/openssl.patch | 14 ++++++++++++++ ports/folly/portfile.cmake | 1 + ports/folly/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/folly/openssl.patch diff --git a/ports/folly/openssl.patch b/ports/folly/openssl.patch new file mode 100644 index 00000000000000..83faaf3ac89706 --- /dev/null +++ b/ports/folly/openssl.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5e8758..bb488d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,9 +24,6 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + MESSAGE(STATUS "current platform: FreeBSD") + ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") + MESSAGE(STATUS "current platform: MacOS") +- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl" ) +- set(OPENSSL_LIBRARIES "/usr/local/opt/openssl/lib" ) +- set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include" ) + ELSE () + MESSAGE(STATUS "other platform: ${CMAKE_SYSTEM_NAME}") + ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index d57f4a032dab54..9ed1afeced040f 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( boost-1.70.patch fix-windows-minmax.patch fix-deps.patch + openssl.patch # from https://github.com/facebook/folly/pull/2016 ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index c2de6d40f8345b..7fe89263123e5d 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,7 @@ { "name": "folly", "version-string": "2023.05.22.00", + "port-version": 1, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b3a5ebd5cc7330..378954b1c8500d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2574,7 +2574,7 @@ }, "folly": { "baseline": "2023.05.22.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 2addb767c1dab1..9c7702e07233df 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5c2e858383fffea763ce85c2672d1d2aeead9e6", + "version-string": "2023.05.22.00", + "port-version": 1 + }, { "git-tree": "4af22bbbe7fd8616fc5dfdeef6c2475f4fc3a4e5", "version-string": "2023.05.22.00", From 4cdccc30bdf0a67f7e8b1547971e6f3326d17fd2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 22 Jun 2023 07:31:23 +0200 Subject: [PATCH 363/533] [catch2] Fix catch2-with-main.pc (#32047) --- ports/catch2/portfile.cmake | 5 ++++- ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 30915bf2d4d1e4..73303d99a12ede 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,7 +1,6 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -vcpkg_minimum_required(VERSION 2022-11-10) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -24,6 +23,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/catch2-with-main.pc" [["-L${libdir}"]] [["-L${libdir}/manual-link"]]) +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/catch2-with-main.pc" [["-L${libdir}"]] [["-L${libdir}/manual-link"]]) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index baaba33046ffec..f3ab9ccca03ac0 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "3.3.2", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 378954b1c8500d..2d44de3aa52672 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1402,7 +1402,7 @@ }, "catch2": { "baseline": "3.3.2", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index ec1e5fbc9b183b..e6cce5a874495c 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dc2e0cb32d0c1e0a12684a3628c926157f36ddd", + "version-semver": "3.3.2", + "port-version": 1 + }, { "git-tree": "e776d4cb313c846f6de82c05fa2ab9b7748edb6b", "version-semver": "3.3.2", From 465b19d15bd99fee72c58a2338a1a9ce4d6f7a77 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 22 Jun 2023 07:32:07 +0200 Subject: [PATCH 364/533] [libjpeg-turbo] Fix usage (#32046) --- ports/libjpeg-turbo/usage | 2 +- ports/libjpeg-turbo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libjpeg-turbo/usage b/ports/libjpeg-turbo/usage index c7be47b5aab1b3..6d70f46ff96850 100644 --- a/ports/libjpeg-turbo/usage +++ b/ports/libjpeg-turbo/usage @@ -6,4 +6,4 @@ libjpeg-turbo is compatible with built-in implementation-agnostic CMake targets: libjpeg-turbo provides CMake targets for the TurboJPEG C API: find_package(libjpeg-turbo CONFIG REQUIRED) - target_link_libraries(main PRIVATE libjpeg-turbo::turbojpeg) + target_link_libraries(main PRIVATE $,libjpeg-turbo::turbojpeg,libjpeg-turbo::turbojpeg-static>) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 16ac0ff48fcda4..0e44e1f8fadafc 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.1.5.1", - "port-version": 1, + "port-version": 2, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 2d44de3aa52672..091c239c64f68c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4194,7 +4194,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.5.1", - "port-version": 1 + "port-version": 2 }, "libjuice": { "baseline": "1.0.6", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index a5cc0b5f568ec9..67f670835a73a2 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a54bb2bec4dfc177249e2c10b31a665c249c660c", + "version": "2.1.5.1", + "port-version": 2 + }, { "git-tree": "2764640a1b2cc36636084470108de50f2b531085", "version": "2.1.5.1", From 41940d0e0c408733da175b993e2d706f2e31301f Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 22 Jun 2023 01:33:59 -0400 Subject: [PATCH 365/533] [DiscordCoreAPI] Update to version 2023-06-15 (#32043) * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. * Updating the necessary files. --- .../0001-Add-extern-C-to-avcodec.patch | 26 ------------------- ports/discordcoreapi/portfile.cmake | 5 ++-- ports/discordcoreapi/vcpkg.json | 6 ++--- versions/baseline.json | 4 +-- versions/d-/discordcoreapi.json | 5 ++++ 5 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch diff --git a/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch b/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch deleted file mode 100644 index 53814980b2dba3..00000000000000 --- a/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Source/AudioDecoder.cpp b/Source/AudioDecoder.cpp -index 42bd4543..ff210878 100644 ---- a/Source/AudioDecoder.cpp -+++ b/Source/AudioDecoder.cpp -@@ -25,7 +25,9 @@ - - #include - #include -+extern "C" { - #include -+} - - namespace DiscordCoreInternal { - -diff --git a/Include/discordcoreapi/AudioDecoder.hpp b/Include/discordcoreapi/AudioDecoder.hpp ---- a/Include/discordcoreapi/AudioDecoder.hpp (revision 1ecbbc1b3a7f6bd3ff5e6ca0be8606ec50f17ec1) -+++ b/Include/discordcoreapi/AudioDecoder.hpp (revision 3c80cf0c54719008610fc96bb457345bf0170701) -@@ -29,6 +29,7 @@ - #include - - extern "C" { -+#include - #include - #include - } - \ No newline at end of file diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 61231c3b92b933..be7f9186bb0dba 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,9 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF 8b54cf9 - SHA512 1ee042939f09b58d20f0a432ae83c696847cdf30922bc6345d76634f32c78706f3fa38a64eae259b592312f4af25af26883c76d5eb3866b08ff7f0dd42dd0ff9 - HEAD_REF main + REF "v${VERSION}" + SHA512 62fe2e3bc61cfc18c253a5d23faba95c0550e0e60b1bfbd55627afaee7ca441aeb44358a3f52c97255bd0afacb79855839af238caeff28b555f4682dc6cc2674 ) vcpkg_cmake_configure( diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 8b6be19596a7d1..999196cb932bc2 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,13 +1,11 @@ { "name": "discordcoreapi", - "version-date": "2023-05-30", - "port-version": 1, + "version": "1.40", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "LGPL-2.1-or-later", - "supports": "(windows & x64 & !static & !xbox) | (linux & x64)", + "supports": "(windows & x64 & !xbox) | (linux & x64)", "dependencies": [ - "ffmpeg", "jsonifier", "libsodium", "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 091c239c64f68c..36a4f4d8030d61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2121,8 +2121,8 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2023-05-30", - "port-version": 1 + "baseline": "1.40", + "port-version": 0 }, "discount": { "baseline": "2.2.6", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index b8015de514cb73..a911eb4f931d2f 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67dcb76ec4a6669264f61e9718533d9fd253a066", + "version": "1.40", + "port-version": 0 + }, { "git-tree": "c9c84716a494279e16d9f85834ecb7e130dfa561", "version-date": "2023-05-30", From 0c1513e0dccebe03afc46613485c573835750a1a Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 21 Jun 2023 22:37:34 -0700 Subject: [PATCH 366/533] Update libhsplasma to 2023-05-08 (#32036) --- ports/libhsplasma/portfile.cmake | 4 ++-- ports/libhsplasma/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libhsplasma.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libhsplasma/portfile.cmake b/ports/libhsplasma/portfile.cmake index e805e844f895d9..9a45aa559f8324 100644 --- a/ports/libhsplasma/portfile.cmake +++ b/ports/libhsplasma/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO H-uru/libhsplasma - REF 2327302a62b891f551b5f6daf899cf86997dce72 # 2022.05.19 - SHA512 89755e502e4a66a56013e3ff52c8d0c2350e5681be49c1b47f580591e3c3da24c587dee5af4f9524ea43f2d86f24ecef611d62d6045b293eb8d09cd5f0ac3d18 + REF 448ad712015c0b8a293af7bd56ab623dd2e6e131 # 2023.05.08 + SHA512 c08e7708f1a6e392075cc6eccbbf2ac932ce77d789ecb192e6805e478fe32f412c4b964494bdcc8574ed18c47b16c02e99b98994a63478ea6768ccedea6a3417 HEAD_REF master ) diff --git a/ports/libhsplasma/vcpkg.json b/ports/libhsplasma/vcpkg.json index c2317a4a9bd9ce..9b8acabb217ca5 100644 --- a/ports/libhsplasma/vcpkg.json +++ b/ports/libhsplasma/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libhsplasma", - "version-date": "2022-05-19", - "port-version": 1, + "version-date": "2023-05-08", "description": "Cross-platform Plasma data and network library", "homepage": "https://github.com/H-uru/libhsplasma", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 36a4f4d8030d61..851c3f1cdf324b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4141,8 +4141,8 @@ "port-version": 1 }, "libhsplasma": { - "baseline": "2022-05-19", - "port-version": 1 + "baseline": "2023-05-08", + "port-version": 0 }, "libhv": { "baseline": "1.3.0", diff --git a/versions/l-/libhsplasma.json b/versions/l-/libhsplasma.json index 9738c4d856f488..c037aba83ff93b 100644 --- a/versions/l-/libhsplasma.json +++ b/versions/l-/libhsplasma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "445149c7279ad9aa32d1fb947b2d2c331de5fffa", + "version-date": "2023-05-08", + "port-version": 0 + }, { "git-tree": "23a51f404cad21bb38d5d663ff90af099ec63562", "version-date": "2022-05-19", From f3b10454b33f4a7f17a0ca29355860c489fd3616 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 21 Jun 2023 22:39:47 -0700 Subject: [PATCH 367/533] [directxmesh, directxtex, directxtk, uvatlas, dxut, effects11] June 2023 update (#32033) * [directxmesh, directxtex, directxtk, uvatlas, dxut, effects11] Update for June 13, 2023 release * Minor format fix * Update baseline * Upstream fixes to CMake targets dependency handling * Update baseline --- ports/directxmesh/portfile.cmake | 9 +++++---- ports/directxmesh/usage | 8 ++++++++ ports/directxmesh/vcpkg.json | 12 +++++++++--- ports/directxtex/portfile.cmake | 17 +++++++++-------- ports/directxtex/usage | 4 ++++ ports/directxtex/vcpkg.json | 13 +++++++++---- ports/directxtk/portfile.cmake | 11 ++++++----- ports/directxtk/usage | 4 ++++ ports/directxtk/vcpkg.json | 2 +- ports/directxtk12/portfile.cmake | 11 ++++++----- ports/directxtk12/usage | 4 ++++ ports/directxtk12/vcpkg.json | 4 ++-- ports/dxut/portfile.cmake | 7 ++++--- ports/dxut/usage | 4 ++++ ports/dxut/vcpkg.json | 2 +- ports/effects11/portfile.cmake | 7 ++++--- ports/effects11/usage | 4 ++++ ports/effects11/vcpkg.json | 2 +- ports/uvatlas/portfile.cmake | 7 ++++--- ports/uvatlas/usage | 4 ++++ ports/uvatlas/vcpkg.json | 4 ++-- versions/baseline.json | 16 ++++++++-------- versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/d-/dxut.json | 5 +++++ versions/e-/effects11.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 29 files changed, 138 insertions(+), 53 deletions(-) create mode 100644 ports/directxmesh/usage create mode 100644 ports/directxtex/usage create mode 100644 ports/directxtk/usage create mode 100644 ports/directxtk12/usage create mode 100644 ports/dxut/usage create mode 100644 ports/effects11/usage create mode 100644 ports/uvatlas/usage diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 0534dd8b01f75a..62ba9ca07ae420 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXMESH_TAG apr2023) +set(DIRECTXMESH_TAG jun2023) 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 cd6608fafaa6d53c2f9ff9e7f316b0a79c8715e355d7362c83b08cae9a7add2561ce74e3350f41d71b1d2e99e61a3377e97073a562499a52677a22a87ba48f9b + SHA512 01fd1fc43dd51c203b31b8f668a4ece731bad980c97b65481fdd86e2b458556fb46b7709444c1741568b3c5633b766c51cb3211e21f348f12278ad8b10044e7c HEAD_REF main ) @@ -40,7 +40,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe" - SHA512 afe3d2ee57d933740ab380d3577d10511b4ca7e33ddd6eafc9408fbbabe6295c676c6313916a9bdb94f1708a3565675e23212cc7f237e2007407c8948e934d86 + SHA512 0fca478527c9975776a6a52c0ada08aa4f8bfa169bac9d204295abd6a1a9357c703ae69eabade9c33bab46c25a7342bfc53910ce8ae3cc6a166f807b0e8a8e02 ) file(INSTALL @@ -55,7 +55,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert_arm64.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}-arm64.exe" - SHA512 a28bc4c3aced8ac59fee80cd734ef44127499ab14e7cd680276accd74dcea2dee382282889cb3f565a21d446bfc3b097f986d72b69e7a19b5a7d6e43252e5abc + SHA512 92515ec4f3acf0f6cf66e3e20ac709c2b525632d042569272e9208917560f22c15fbbb8066ae44573fcf9c4246daa673c06316641e9585efa873aa06e5efd681 ) file(INSTALL @@ -76,4 +76,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxmesh/usage b/ports/directxmesh/usage new file mode 100644 index 00000000000000..ff81c281801b11 --- /dev/null +++ b/ports/directxmesh/usage @@ -0,0 +1,8 @@ +The package DirectXMesh is compatible with built-in CMake targets: + + find_package(directxmesh CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectXMesh) + +The utilities headers FlexibleVertexFormat.h and WaveFrontReader.h have their own target: + + target_link_libraries(main PRIVATE Microsoft::DirectXMesh::Utilities) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 878dce55971d1a..d01488f71e89d3 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2023-04-28", + "version-date": "2023-06-13", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", @@ -9,7 +9,7 @@ "dependencies": [ { "name": "directx-headers", - "platform": "(windows & !xbox) | linux" + "platform": "mingw | linux" }, "directxmath", { @@ -27,7 +27,13 @@ ], "features": { "dx12": { - "description": "Build with DirectX12 support for Windows 10/Windows 11" + "description": "Build with DirectX12 support for Windows 10/Windows 11", + "dependencies": [ + { + "name": "directx-headers", + "platform": "windows & !xbox" + } + ] }, "spectre": { "description": "Build Spectre-mitigated library" diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 2f5f2263bb97aa..9814f86d8442ac 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTEX_TAG apr2023) +set(DIRECTXTEX_TAG jun2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex REF ${DIRECTXTEX_TAG} - SHA512 112e25a61ff04dea82e0e6c695df8bf6a480008a2f6f68239b7393696f960b5fa5e42b93ba2043c652c34565f9b0ac9b3ac855204a0dc5f9b62e147ad5bacfbc + SHA512 7b09903b8fbb15f6e13a50608b80ff1128703f7843517db99dd1c05e01a0ab27ed4ac29f29a59de1f384787fbb75fb4f359bbddcd25483cb323fcc3750f0833d HEAD_REF main ) @@ -46,21 +46,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}.exe" - SHA512 758c3a99befca251ad0f05e6d9467dffef75868e541c027960c007406e55d10dbf5b09d4c4cf4f013a8c188d7a6a6dafecfd146d19a12ad520bfd47378adc331 + SHA512 e013d099b121147137db006d6ebefd90a374777160fcedf09e038eaab6c842aaaf0db7241dca3c56d35a91d4ea9f19fd56a007ac1bc05d12216c079974ec138e ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe" FILENAME "texconv-${DIRECTXTEX_TAG}.exe" - SHA512 a652debd8b6204fdf35bac968e6fcc3815202b6a858f2999566c4c5151574b7bc5b0a190c172f91b2bdea75d4873423b089894c640928807ee43dac2ecaf7cfd + SHA512 e5ea3a36dc1cc60e1426cec7af0e96f21ddf8e8ed8b2b666a5003db59008558f07f44e962508c28c8e5d2f14c92350a05da9688c40e1d5a41c7851a0c474470f ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}.exe" - SHA512 60b5b2d07ca686964b39f21f6433cb11ac5da009dee18c8c0fee6cf60ccaa531056f2efafe14096eaaf530f7293fd395f46c7d9509013f4ff08f0b42a41dc69e + SHA512 98c4cdb118ed6ef67d0e0a6a8f3e961e7702f1dac2b36f4ba2bc19191989fc72c847d3f65c4acbb63c8bb5adc167055a0adc90e3fce3b65629d01a956427d60e ) file(INSTALL @@ -79,21 +79,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 9365a3b15a17ec42bac19bf48a2bfba524191347e845ca0d79adf94771cc6f3d608ac0c41654cf3eb76e32ccce4f5dc3fd309eb7d6420669dc2f8015a71555f7 + SHA512 7890b3cf3c6d8834c3c6752d2ba82d34d91935f684f7c8b96a3840f4b1662fe2538a30a0a3f88fa3989728c1d4b7b29ca03274f77eaa1b1fa3acf6e5e98aa4f4 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe" FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 b479b725b78f2acf5a22958af85ce04eeb62bc25ea5eaaa7c2bc10b7161d2be103e13112c2f55e8da13ce260f8a62e7cfb951d0c7cc08cb23f3aafe4ebe8fec7 + SHA512 160cf3fe6d4488fc47e30aba763d8513f224b68e7a4b85360149752b32d52050714bc6f10a7ea7b8ccd1e8a564efccec73a968a5e9551a2f2cedfb6b764fbe9b ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 9226643fd9ec57de8f7d57d225c0d07d6f250975c1e04c15cec078678e1a24c3cafa8483138b7966015e4fdc7a53bd53043376a9ae157e98876d842f2ede9d37 + SHA512 d70ed9a12a83a2a28a9a8682d25d0c7f569509c422cc8cf0fe66789d62d86d305f7da3275ab3bf969e20bedd6f265c6520400649d8f917cf3106a48dc80e789a ) file(INSTALL @@ -118,4 +118,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtex/usage b/ports/directxtex/usage new file mode 100644 index 00000000000000..c054f2648541b3 --- /dev/null +++ b/ports/directxtex/usage @@ -0,0 +1,4 @@ +The package DirectXTex is compatible with built-in CMake targets: + + find_package(directxtex CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectXTex) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 125f7d142950de..ebdee6720a67e1 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtex", - "version-date": "2023-04-28", - "port-version": 1, + "version-date": "2023-06-13", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", @@ -10,7 +9,7 @@ "dependencies": [ { "name": "directx-headers", - "platform": "(windows & !xbox) | linux" + "platform": "mingw | linux" }, "directxmath", { @@ -34,7 +33,13 @@ "description": "Build with DirectX11 support" }, "dx12": { - "description": "Build with DirectX12 support for Windows 10/Windows 11" + "description": "Build with DirectX12 support for Windows 10/Windows 11", + "dependencies": [ + { + "name": "directx-headers", + "platform": "windows & !xbox" + } + ] }, "openexr": { "description": "Enable OpenEXR support", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 67c5b8217e614d..bcf16f9f7c19d9 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG apr2023) +set(DIRECTXTK_TAG jun2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK REF ${DIRECTXTK_TAG} - SHA512 161f647199479cdd79231717b963e2c28c40fe62f2d7e3e8aa16baeceac083645e68d4bbd993b1fb5ddf9ab8efc2a6606b037e922725bd0c74fbb83cba451111 + SHA512 de98429af5851fafdab4b24b38d0230798eab38c5fee291ea43ef46dabe275e3476d1449f94ebead53d5a4f361257218b165af37f96114cec5890403a044d600 HEAD_REF main ) @@ -38,7 +38,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 f014172f127a00aa3b51f33c17062772e75271f57fbade4db8c2da634cbc090c0f4eb8dd2771f6faead624054244469705f195fe10d643570df3ba95dbcb119f + SHA512 1b78df0fe1f1de0e3796c8ac3b3b99f7d44dc955ebd107791bda637a27a94a364cbf974a240a5ac02a79ff8bcc8ee74528bca502e71666d0d99ce28a0cb88fd1 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -53,7 +53,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 2bb9f9ecfe65e373dadd84b1550e499de5507fcf57257379e3da1f4d4325df686ec5e784754990c89da0a2915c12578424f5b66009ebc14d969c5c92db50b09a + SHA512 b200690f7b81cdf902ec8c84a2be315858796c7ce01fbf9971377a08b8f7e0211415bc4829944041b57ed6a786f2ace0f4991cc8f51241bb7351defcfc9c34de ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -66,7 +66,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 453a5504074f43104d77d79ab2824b7091302a0339361a433e56acc854594a3413f9675aaaa6be518329e2ab9c3cacb50a25293787d3f944e74d1a8eebc23a33 + SHA512 ba338c19e4a224cac3b31ed82bf5174f072186845ba5d70aa50a5c485faf6e463559613da213a55c8859e7b6615bfaa8819dd9e79bf955df67973e68fbefcad0 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -85,4 +85,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtk/usage b/ports/directxtk/usage new file mode 100644 index 00000000000000..c36358606dece4 --- /dev/null +++ b/ports/directxtk/usage @@ -0,0 +1,4 @@ +The DirectX Tool Kit for DX11 package is compatible with built-in CMake targets: + + find_package(directxtk CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectXTK) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index fae2ddecb816ba..cc245de9c5fc77 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2023-04-28", + "version-date": "2023-06-13", "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", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index fed26341506acd..40604e4828f7f6 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG apr2023) +set(DIRECTXTK_TAG jun2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 REF ${DIRECTXTK_TAG} - SHA512 ab8d9db145e8342e473e5b23d3ce0a396408c42db53ba38882e57f461b15694d291a98a55e2db19724c82ef1baef6ee1dc3c5ff3861684e9aeed296e352d7e7a + SHA512 61906a03bfba04539941f895cd718d80c9402ea04ece2f4ece43f8ad97231ae2388da5df30061103e25a48bab6dd7db30c192a65cace9d014a7850c6d535d424 HEAD_REF main ) @@ -39,7 +39,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 f014172f127a00aa3b51f33c17062772e75271f57fbade4db8c2da634cbc090c0f4eb8dd2771f6faead624054244469705f195fe10d643570df3ba95dbcb119f + SHA512 1b78df0fe1f1de0e3796c8ac3b3b99f7d44dc955ebd107791bda637a27a94a364cbf974a240a5ac02a79ff8bcc8ee74528bca502e71666d0d99ce28a0cb88fd1 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -54,7 +54,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 2bb9f9ecfe65e373dadd84b1550e499de5507fcf57257379e3da1f4d4325df686ec5e784754990c89da0a2915c12578424f5b66009ebc14d969c5c92db50b09a + SHA512 b200690f7b81cdf902ec8c84a2be315858796c7ce01fbf9971377a08b8f7e0211415bc4829944041b57ed6a786f2ace0f4991cc8f51241bb7351defcfc9c34de ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -67,7 +67,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 453a5504074f43104d77d79ab2824b7091302a0339361a433e56acc854594a3413f9675aaaa6be518329e2ab9c3cacb50a25293787d3f944e74d1a8eebc23a33 + SHA512 ba338c19e4a224cac3b31ed82bf5174f072186845ba5d70aa50a5c485faf6e463559613da213a55c8859e7b6615bfaa8819dd9e79bf955df67973e68fbefcad0 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -80,4 +80,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxtk12/usage b/ports/directxtk12/usage new file mode 100644 index 00000000000000..b9b9c8c6075f6d --- /dev/null +++ b/ports/directxtk12/usage @@ -0,0 +1,4 @@ +The DirectX Tool Kit for DX12 package is compatible with built-in CMake targets: + + find_package(directxtk12 CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectXTK12) diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 350d98a6a895ac..79ee5575919537 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2023-04-28", + "version-date": "2023-06-13", "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", @@ -49,7 +49,7 @@ "dependencies": [ { "name": "xaudio2redist", - "platform": "!uwp & !arm" + "platform": "!uwp & !arm & !xbox" } ] } diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index 270ef6b3a44c7c..155426f0f6f540 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT - REF feb2023 - SHA512 c436fa29a0bf61818df100d66e907f7bd42b93a6a5571238db65c4dfab7d31be130fe61db9040ab06b4d6ec33d209c387d5ae9f8501daa0c53a579ec9cd24697 + REF jun2023 + SHA512 72a322fcf062d0f52d0e854660e48943d0e10e7856019ad5bc0b37bcb2bde909d6fbc315e04e2b90a13a50a05129b8787159791ec525f5003f0c090dce9a7d42 HEAD_REF main ) @@ -25,4 +25,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE 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") diff --git a/ports/dxut/usage b/ports/dxut/usage new file mode 100644 index 00000000000000..f290ab4960f9d8 --- /dev/null +++ b/ports/dxut/usage @@ -0,0 +1,4 @@ +The DXUT for Direct3D 11 package is compatible with built-in CMake targets: + + find_package(dxut CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DXUTOpt Microsoft::DXUT) diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json index 876a20bfcd954f..8693eda541ccfb 100644 --- a/ports/dxut/vcpkg.json +++ b/ports/dxut/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dxut", "version": "11.31", - "port-version": 2, + "port-version": 3, "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", "documentation": "https://github.com/microsoft/DXUT/wiki", diff --git a/ports/effects11/portfile.cmake b/ports/effects11/portfile.cmake index a05a35d35c3d56..e6464ccdb9f729 100644 --- a/ports/effects11/portfile.cmake +++ b/ports/effects11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 - REF dec2022b - SHA512 5dc209c830d940aba9378d1442b0fb236d5e1f63bb4e073ce8db5a832da22cb2e575c171aff0b641201b34b4362b9274b106f93518b09d57d231386d0b4bdf58 + REF jun2023 + SHA512 93a90b42efbc8e1e9cb76de80c959bc24406536af9d943d21e324a82be677d695c201deb995490e331ecfcda301d8b42285b90577fbed9acd5bb61c753efd66c HEAD_REF main ) @@ -23,4 +23,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE 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") diff --git a/ports/effects11/usage b/ports/effects11/usage new file mode 100644 index 00000000000000..f3dc35f641932d --- /dev/null +++ b/ports/effects11/usage @@ -0,0 +1,4 @@ +The Effects (FX) system for Direct3D 11 package is compatible with built-in CMake targets: + + find_package(effects11 CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::Effects11) diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json index d67a0ab104736a..d7376d131e4d8c 100644 --- a/ports/effects11/vcpkg.json +++ b/ports/effects11/vcpkg.json @@ -1,7 +1,7 @@ { "name": "effects11", "version": "11.29", - "port-version": 2, + "port-version": 3, "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", "homepage": "https://github.com/Microsoft/FX11", "documentation": "https://github.com/microsoft/FX11/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 7e2628480a861f..bedf96f472665a 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,4 +1,4 @@ -set(UVATLAS_TAG apr2023) +set(UVATLAS_TAG jun2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas REF ${UVATLAS_TAG} - SHA512 e65eb32d80460ec6a679929dcb6d4518000e6697dd055616f59b564a87bb63a7696e0d78407a6e820d12e71ac0680d1aa382bf0408d7b2f5c3768db0bc867098 + SHA512 bd1ff3373871bb27872461c0211939f2f6d9b5b4927897bdb4668fdde4a862af74ee193a52434bf30a6cc0268d6fd084453bcedd2bd57c7abb2ca33e1643fced HEAD_REF main PATCHES openexr.patch ) @@ -41,7 +41,7 @@ if("tools" IN_LIST FEATURES) UVATLASTOOL_EXE URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe" FILENAME "uvatlastool-${UVATLAS_TAG}.exe" - SHA512 9009113286a28c19102c8fa4d8768f9d81ad563cc5698ba50ac8cb483b0e5734f1d86d6e398cabb1cf1f3801ec0dc567a78c2d91ee8d7c8d81bd1ef610be0a0c + SHA512 523e4a78709e52c418850369f9ce8fc1f4e03907015ad25a7cb098e622f8990b13f4996691602a8116b700397ac59e03bc1248da0c4fdd0b708ca1364bace6a7 ) file(INSTALL @@ -62,4 +62,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/uvatlas/usage b/ports/uvatlas/usage new file mode 100644 index 00000000000000..274e13b76bef6c --- /dev/null +++ b/ports/uvatlas/usage @@ -0,0 +1,4 @@ +The package UVAtlas is compatible with built-in CMake targets: + + find_package(uvatlas CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::UVAtlas) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index e454f71e698a18..32a4c66619d088 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2023-04-28", + "version-date": "2023-06-13", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", @@ -9,7 +9,7 @@ "dependencies": [ { "name": "directx-headers", - "platform": "(windows & !xbox) | linux" + "platform": "mingw | linux" }, "directxmath", { diff --git a/versions/baseline.json b/versions/baseline.json index 851c3f1cdf324b..33389103634f88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2089,7 +2089,7 @@ "port-version": 0 }, "directxmesh": { - "baseline": "2023-04-28", + "baseline": "2023-06-13", "port-version": 0 }, "directxsdk": { @@ -2097,15 +2097,15 @@ "port-version": 7 }, "directxtex": { - "baseline": "2023-04-28", - "port-version": 1 + "baseline": "2023-06-13", + "port-version": 0 }, "directxtk": { - "baseline": "2023-04-28", + "baseline": "2023-06-13", "port-version": 0 }, "directxtk12": { - "baseline": "2023-04-28", + "baseline": "2023-06-13", "port-version": 0 }, "dirent": { @@ -2218,7 +2218,7 @@ }, "dxut": { "baseline": "11.31", - "port-version": 2 + "port-version": 3 }, "eabase": { "baseline": "2.09.12", @@ -2278,7 +2278,7 @@ }, "effects11": { "baseline": "11.29", - "port-version": 2 + "port-version": 3 }, "effolkronium-random": { "baseline": "1.4.1", @@ -8345,7 +8345,7 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2023-04-28", + "baseline": "2023-06-13", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index c87055893696be..bfee61f207e084 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abb5d2c283eb23c36dc1e0f1330f4aa302d0de4d", + "version-date": "2023-06-13", + "port-version": 0 + }, { "git-tree": "4cf91137f48f28bc44cb34d28b3d03113f109e2d", "version-date": "2023-04-28", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 7818368e471444..869ab86cd6f8fa 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3", + "version-date": "2023-06-13", + "port-version": 0 + }, { "git-tree": "6d6f4042f6d636d2e24281cd5d0c1e29a28207d9", "version-date": "2023-04-28", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 4ac28cb9a46968..699c1cf757ac0a 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeeec09ca589bb93e5ec21960e5c0e84bd1b94e3", + "version-date": "2023-06-13", + "port-version": 0 + }, { "git-tree": "39f3ce588272b32b67881fb0e226c68e3255a0cb", "version-date": "2023-04-28", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index f45cbdb456b02a..7b89302e2b79d1 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a18359efb872f674283fb30d838cb014f74063c", + "version-date": "2023-06-13", + "port-version": 0 + }, { "git-tree": "b77dc8e9667b0717ed8c44333327a948e9f98eaa", "version-date": "2023-04-28", diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index 20231953a04816..86452a2c52ab87 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a23af22ce7047b4caba055c92bb2c7f31571321", + "version": "11.31", + "port-version": 3 + }, { "git-tree": "878ebc5ed10a20cb6d6c292e44b6eb7163296a0f", "version": "11.31", diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json index 58f5f92b8792a8..793d2681b480d3 100644 --- a/versions/e-/effects11.json +++ b/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d7d6262892fede7f8fee3fa410dac968e49ed99", + "version": "11.29", + "port-version": 3 + }, { "git-tree": "fe385ae61317ac6744d0587322237979de227284", "version": "11.29", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 7c3906fef5a059..42f51d9731abdd 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f28e65ddac26fdd4f5de13a5b31a3f460c7da37", + "version-date": "2023-06-13", + "port-version": 0 + }, { "git-tree": "9d245ea2b1c8fe04d653e858d2c9dda5fde706da", "version-date": "2023-04-28", From 0cabd9b4bd07696074160f2410119b2aa8a4ee67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= <70097935+omarhogni@users.noreply.github.com> Date: Thu, 22 Jun 2023 05:41:20 +0000 Subject: [PATCH 368/533] [mp-units] update v0.8.0 (#32028) * Update mp-units V0.8.0 * Update database * Add range-v3 as dependency * Update database * Add fmt and ranges as features that can be turned off * Update database * Try setting fmt and range-v3 as default on osx * Update database * Remove name * Use feature names instead of dep names * Update database --- ports/mp-units/config.patch | 15 +++++++++------ ports/mp-units/portfile.cmake | 17 ++++++++++++----- ports/mp-units/vcpkg.json | 36 +++++++++++++++++++++++++++++++---- versions/baseline.json | 4 ++-- versions/m-/mp-units.json | 5 +++++ 5 files changed, 60 insertions(+), 17 deletions(-) diff --git a/ports/mp-units/config.patch b/ports/mp-units/config.patch index b5f6bd6d20884b..a1cd01d7e47c0f 100644 --- a/ports/mp-units/config.patch +++ b/ports/mp-units/config.patch @@ -1,14 +1,17 @@ diff --git a/src/mp-unitsConfig.cmake b/src/mp-unitsConfig.cmake +index 668fd97d..0eebeded 100644 --- a/src/mp-unitsConfig.cmake +++ b/src/mp-unitsConfig.cmake -@@ -39,8 +39,8 @@ function(__check_libcxx_in_use variable) - endfunction() - +@@ -42,10 +42,10 @@ endfunction() include(CMakeFindDependencyMacro) --find_dependency(fmt) + + if(UNITS_USE_LIBFMT) +- find_dependency(fmt) ++ find_dependency(fmt CONFIG) + endif() + -find_dependency(gsl-lite) -+find_dependency(fmt CONFIG) +find_dependency(gsl-lite CONFIG) # add range-v3 dependency only for clang + libc++ - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake index 04236589db8e7a..a9e2a6b87994b6 100644 --- a/ports/mp-units/portfile.cmake +++ b/ports/mp-units/portfile.cmake @@ -1,14 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mpusz/units - REF v0.7.0 - SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64 + REF "v${VERSION}" + SHA512 6369c886629955c6457911b98a702c29bacce58e9049e1da700055a3f8b1981cce4f545c1d09550ec1c57f8805f7fc1f0198118950a14b2a7b797dd437ed72df PATCHES - config.patch + config.patch ) +set(USE_LIBFMT OFF) +if ("use-libfmt" IN_LIST FEATURES) + set(USE_LIBFMT ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/src" + OPTIONS + -DUNITS_USE_LIBFMT=${USE_LIBFMT} ) vcpkg_cmake_install() @@ -16,8 +23,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") # Handle copyright/readme/package files -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" - "${CURRENT_PACKAGES_DIR}/lib") # Header only \ No newline at end of file + "${CURRENT_PACKAGES_DIR}/lib") # Header only diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json index 7454612bcdc6ce..8945076f4fbe12 100644 --- a/ports/mp-units/vcpkg.json +++ b/ports/mp-units/vcpkg.json @@ -1,12 +1,10 @@ { "name": "mp-units", - "version-semver": "0.7.0", - "port-version": 1, + "version": "0.8.0", "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", "license": "MIT", "dependencies": [ - "fmt", "gsl-lite", { "name": "vcpkg-cmake", @@ -16,5 +14,35 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform specific default features", + "dependencies": [ + { + "name": "mp-units", + "features": [ + "install-range-v3", + "use-libfmt" + ], + "platform": "osx" + } + ] + }, + "install-range-v3": { + "description": "Provide range-v3 for compilers not supporting std::ranges", + "dependencies": [ + "range-v3" + ] + }, + "use-libfmt": { + "description": "Use libfmt instead of std::format", + "dependencies": [ + "fmt" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 33389103634f88..95113d144ff2bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5401,8 +5401,8 @@ "port-version": 0 }, "mp-units": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.8.0", + "port-version": 0 }, "mp3lame": { "baseline": "3.100", diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index ef5ebfecc2302f..5108f2833ad35e 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f26957340de86e12abc971d4db95b5a2a2cd7d37", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "b4bce95b7e67f66db9d613e7e3601c2b90cec665", "version-semver": "0.7.0", From f685b21cb5ed31d475db00d1d2f951bd1e1a2b33 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Thu, 22 Jun 2023 01:42:55 -0400 Subject: [PATCH 369/533] [fluidsynth] Update to 2.3.3 (#31993) * [fluidsynth] Update to 2.3.3. * [fluidsynth] Update baseline. --- ports/fluidsynth/portfile.cmake | 2 +- ports/fluidsynth/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index cdf2d316071cdc..a768b1b66efe08 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth REF "v${VERSION}" - SHA512 21798b5a80a7edd8ef02b983d9b230af45cc66b98b32d593228e12dbec15b12c6cf6c0f3692c12af66de1ba2049fa9d6ad2b68c7d1579347eec14d24870b0025 + SHA512 "702b80ff9c8e2ba9fadd46a0377a295be78900c831ec4b6b75c2f5fee7e453b2e1f5511b076ccc044be7e6eb87086230c50c317dad3597a16d610e16032410fc" HEAD_REF master PATCHES gentables.patch diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 6ba99a814d178b..efe02a7b567b9a 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fluidsynth", - "version": "2.3.2", - "port-version": 3, + "version": "2.3.3", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 95113d144ff2bd..f1b82a7f892aa9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2553,8 +2553,8 @@ "port-version": 0 }, "fluidsynth": { - "baseline": "2.3.2", - "port-version": 3 + "baseline": "2.3.3", + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 94c596039e082e..14ab2d687997fa 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48d3e215031eef593ac67de67ad986d1cd094e9f", + "version": "2.3.3", + "port-version": 0 + }, { "git-tree": "89822d934c8cfc857147fb1aa1baed78694b0b51", "version": "2.3.2", From b0bd92a8d6b0f966d14426cc1f9bfcd2874050a2 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:45:33 +0200 Subject: [PATCH 370/533] [libnice-gst] no absolute paths (#31803) --- ports/libnice-gst/portfile.cmake | 5 ++--- ports/libnice-gst/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libnice-gst.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libnice-gst/portfile.cmake b/ports/libnice-gst/portfile.cmake index 3c75ae3bebc968..1d90ef02c4e302 100644 --- a/ports/libnice-gst/portfile.cmake +++ b/ports/libnice-gst/portfile.cmake @@ -58,7 +58,6 @@ set(USAGE_FILE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") file(WRITE "${USAGE_FILE}" "${PORT} usage:\n\n") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled) file(APPEND "${USAGE_FILE}" "\tMake sure one of the following paths is added to the 'GST_PLUGIN_PATH' environment variable\n") file(APPEND "${USAGE_FILE}" "\tFor more information on GStreamer environment variables see https://gstreamer.freedesktop.org/documentation/gstreamer/running.html?gi-language=c#environment-variables\n") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") @@ -72,7 +71,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") endif() - file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_INSTALLED_DIR}/debug/plugins/gstreamer/'\n") + file(APPEND "${USAGE_FILE}" "\t\t* '/${TARGET_TRIPLET}/debug/plugins/gstreamer/'\n") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/gstreamer") @@ -85,7 +84,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") endif() - file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_INSTALLED_DIR}/plugins/gstreamer/'\n") + file(APPEND "${USAGE_FILE}" "\t\t* '/${TARGET_TRIPLET}/plugins/gstreamer/'\n") endif() else() file(APPEND "${USAGE_FILE}" "\tRegister static plugin with gst_plugin_register_static()\n") diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json index 6215c9344f565b..71d9c6f1af2d90 100644 --- a/ports/libnice-gst/vcpkg.json +++ b/ports/libnice-gst/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libnice-gst", "version": "0.1.21", - "port-version": 2, + "port-version": 3, "description": "Gstreamer Libnice plugins.", "homepage": "https://nice.freedesktop.org", "license": "LGPL-2.1-only AND MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index f1b82a7f892aa9..f3a5232c4fd386 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4334,7 +4334,7 @@ }, "libnice-gst": { "baseline": "0.1.21", - "port-version": 2 + "port-version": 3 }, "libnoise": { "baseline": "1.0.0", diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json index afaa4cd29a0bb4..d33bcc193e0001 100644 --- a/versions/l-/libnice-gst.json +++ b/versions/l-/libnice-gst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0454363efa550f5437e9bafac810b425ad2cef12", + "version": "0.1.21", + "port-version": 3 + }, { "git-tree": "e61d1c0b43c2f4feca65ea7a20ab901ff6e4c025", "version": "0.1.21", From 6258ccfdb86157eaee011f42b21b0181d8134b79 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 22 Jun 2023 07:57:42 +0200 Subject: [PATCH 371/533] [qtbase] clang source location fix (#31360) * [qtbase] clang feeling insecure about __cpp_consteval * v db * v db --- ports/qtbase/clang-cl_source_location.patch | 2 +- ports/qtbase/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 3811da601f3751..5155fb4bbb5353 100644 --- a/ports/qtbase/clang-cl_source_location.patch +++ b/ports/qtbase/clang-cl_source_location.patch @@ -7,7 +7,7 @@ index 823b2057b..4a8cd4fa8 100644 #include -#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) -+#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval) ++#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) ) #include #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 63ade33299e9bb..f454132dc60d23 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.5.1", - "port-version": 2, + "port-version": 3, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index f3a5232c4fd386..4bf12ed49c33db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6762,7 +6762,7 @@ }, "qtbase": { "baseline": "6.5.1", - "port-version": 2 + "port-version": 3 }, "qtcharts": { "baseline": "6.5.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index c19a17da90cf89..7ce2c9b3ac5262 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "198ba2cfff57e3ccc7a2f6f40002127d8d0abb6e", + "version": "6.5.1", + "port-version": 3 + }, { "git-tree": "384ddcfe175f58d6f498c91f6b8e790bb6ad70ac", "version": "6.5.1", From 6507e8cbe5a8ae067913197eb3784bf1c055d7f4 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:58:38 +0800 Subject: [PATCH 372/533] [icu] update to 73.1 (#31144) * update to 73.1 * add arm-android to ci.baseline * remove ci.baseline fail --- ports/icu/portfile.cmake | 5 ++--- ports/icu/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/icu.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 355eac58dcf03a..c622dfd708d266 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} string(REGEX MATCH "^[0-9]*" ICU_VERSION_MAJOR "${VERSION}") string(REPLACE "." "_" VERSION2 "${VERSION}") string(REPLACE "." "-" VERSION3 "${VERSION}") @@ -7,7 +6,7 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8 + SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -205,4 +204,4 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 21ed9065f93f98..88a574b25a5f92 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "icu", - "version": "72.1", - "port-version": 5, + "version": "73.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", diff --git a/versions/baseline.json b/versions/baseline.json index 4bf12ed49c33db..d3e77d9f45a003 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3205,8 +3205,8 @@ "port-version": 0 }, "icu": { - "baseline": "72.1", - "port-version": 5 + "baseline": "73.1", + "port-version": 0 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 4e944556b86fb7..7cd3b924823572 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acc3cf9137af5fc8fdd3e8607377026cf88f144d", + "version": "73.1", + "port-version": 0 + }, { "git-tree": "c1735b83e7793135a9d1e3689f7d36475f6d5ff7", "version": "72.1", From b8d272a463101415ab4f57545c4e1a1d2c24aafe Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 21 Jun 2023 22:59:16 -0700 Subject: [PATCH 373/533] [opencascade] Fix find_dependency missing (#30853) * [opencascade] Fix feature dependence * update version * update version * Apply suggesstion * update version --------- Co-authored-by: Billy Robert O'Neal III Co-authored-by: Zhao Liu --- ports/opencascade/fix-dependence.patch | 26 ++++++++++++++++++++++++++ ports/opencascade/portfile.cmake | 1 + ports/opencascade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 +++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 ports/opencascade/fix-dependence.patch diff --git a/ports/opencascade/fix-dependence.patch b/ports/opencascade/fix-dependence.patch new file mode 100644 index 00000000000000..d5390163277ceb --- /dev/null +++ b/ports/opencascade/fix-dependence.patch @@ -0,0 +1,26 @@ +diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in +index c926c499..2fbc4023 100644 +--- a/adm/templates/OpenCASCADEConfig.cmake.in ++++ b/adm/templates/OpenCASCADEConfig.cmake.in +@@ -4,6 +4,7 @@ + # + # This file is configured by OpenCASCADE. + # ++include(CMakeFindDependencyMacro) + + if(OpenCASCADE_ALREADY_INCLUDED) + return() +@@ -71,6 +72,13 @@ set (OpenCASCADE_WITH_GLES2 @USE_GLES2@) + @SET_OpenCASCADE_WITH_D3D@ + @SET_OpenCASCADE_WITH_GLX@ + ++if(@USE_FREETYPE@) ++ find_dependency(freetype CONFIG) ++endif() ++ ++find_dependency(OpenGL) ++find_dependency(Eigen3 REQUIRED) ++ + # Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration. + file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake") + foreach(f ${CONFIG_FILES}) diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 191d000aadf5bc..294f2dee64a860 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-install-prefix-path.patch install-include-dir.patch fix-depend-freetype.patch + fix-dependence.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index d03ec3ba8be0de..a1c81c8ee486f4 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencascade", "version": "7.6.2", - "port-version": 5, + "port-version": 6, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index d3e77d9f45a003..618b872f4312a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5898,7 +5898,7 @@ }, "opencascade": { "baseline": "7.6.2", - "port-version": 5 + "port-version": 6 }, "opencc": { "baseline": "1.1.6", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 5b39b3a35c769f..c6aea22191ace9 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a62400394101d54a0bea8a45ac0c1f68cf27b68", + "version": "7.6.2", + "port-version": 6 + }, { "git-tree": "c368cdc0775dea309e247518b3931795487cb5f0", "version": "7.6.2", From bf64d76062b3004544731fe9c1dc3a13d5b7b59a Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Fri, 23 Jun 2023 04:50:44 +0900 Subject: [PATCH 374/533] [tabulate] update to 1.5 (#32174) * [tabulate] update to 1.5 (microsoft/vcpkg#32173) * [tabulate] regenerate version registries (microsoft/vcpkg#32173) --- ports/tabulate/portfile.cmake | 4 ++-- ports/tabulate/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tabulate.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/tabulate/portfile.cmake b/ports/tabulate/portfile.cmake index fcc880a059e024..6f97e54e84a5b9 100644 --- a/ports/tabulate/portfile.cmake +++ b/ports/tabulate/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/tabulate - REF v1.4 - SHA512 37d69d53f1c628955f2a35779dbf3053c5b449f7069d846b697b541df1719b00e9b72e9d6de361d9733b7e7543c25e444b1aa139f72000730eeeafa022bbf3c1 + REF v1.5 + SHA512 324c9f2427d4d0e568b63fcd7bd81f4eee6743d7106af5ead134f81d637f190f77122f28cc42b9e95f7782f5058492b1903eadb44e1c3061a636b32bb93d0ed2 HEAD_REF master ) diff --git a/ports/tabulate/vcpkg.json b/ports/tabulate/vcpkg.json index 351a98db94fab1..d88fefb59285e7 100644 --- a/ports/tabulate/vcpkg.json +++ b/ports/tabulate/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tabulate", - "version": "1.4", + "version": "1.5", "description": "Table maker for modern C++", "homepage": "https://github.com/p-ranav/tabulate", "license": "MIT AND BSL-1.0 AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 618b872f4312a2..18dcd04319bcce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7889,7 +7889,7 @@ "port-version": 11 }, "tabulate": { - "baseline": "1.4", + "baseline": "1.5", "port-version": 0 }, "tacopie": { diff --git a/versions/t-/tabulate.json b/versions/t-/tabulate.json index 581205299223ff..5762648f148079 100644 --- a/versions/t-/tabulate.json +++ b/versions/t-/tabulate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0154785cec0295f02f3eed94d173c633c9cd9ee", + "version": "1.5", + "port-version": 0 + }, { "git-tree": "27a49e666dd469fbf41f27917b1cfd1640aa71f0", "version": "1.4", From ace28ada89315e8d174b536bf584bfa6191f6bfe Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 22 Jun 2023 13:33:51 -0700 Subject: [PATCH 375/533] Revert "[usockets] WolfSSL feature (#32162)" (#32175) This reverts commit 20b059fb8f453b39220401de64dcf35ffbfec2ac. --- ports/usockets/CMakeLists.txt | 19 +------------------ ports/usockets/portfile.cmake | 1 - ports/usockets/vcpkg.json | 7 ------- versions/baseline.json | 2 +- versions/u-/usockets.json | 5 ----- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index e50b145edbdffc..b2daed66d7e370 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -12,16 +12,6 @@ else() set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL") endif() -if (CMAKE_USE_WOLFSSL) - find_package(wolfssl REQUIRED) - find_package(Threads REQUIRED) - set(USE_WOLFSSL "-DUSE_WOLFSSL -DLIBUS_USE_WOLFSSL") - - list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) -else() - set(NOT_USE_WOLFSSL "-DLIBUS_NO_SSL") -endif() - find_package(libuv CONFIG REQUIRED) if (TARGET uv) set(LIBUV_LIBRARY uv) @@ -43,13 +33,6 @@ if (CMAKE_USE_OPENSSL) list(APPEND USOCKETS_EXT_LIBS OpenSSL::SSL OpenSSL::Crypto) endif() -if (CMAKE_USE_WOLFSSL) - find_package(wolfssl REQUIRED) - #file(GLOB SSL_SOURCES src/crypto/*.c*) - #list(APPEND SOURCES ${SSL_SOURCES}) - list(APPEND USOCKETS_EXT_LIBS wolfssl) -endif() - if (CMAKE_USE_EVENT) file(GLOB SSL_SOURCES src/eventing/*.c) list(APPEND SOURCES ${SSL_SOURCES}) @@ -67,7 +50,7 @@ if (${LIBUS_USE_LIBUV}) target_compile_definitions(uSockets PRIVATE -DLIBUS_USE_LIBUV) endif() -target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL} ${USE_WOLFSSL} ${NOT_USE_WOLFSSL}) +target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL}) target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src") target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS}) diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake index 765c27db76b584..29584fc620bab7 100644 --- a/ports/usockets/portfile.cmake +++ b/ports/usockets/portfile.cmake @@ -22,7 +22,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ssl CMAKE_USE_OPENSSL event CMAKE_USE_EVENT network CMAKE_USE_NETWORK - wolfssl CMAKE_USE_WOLFSSL ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index ad1faa599f2986..ca0c8ac3555e2b 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "usockets", "version": "0.8.6", - "port-version": 1, "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", "license": "Apache-2.0", @@ -27,12 +26,6 @@ "dependencies": [ "openssl" ] - }, - "wolfssl": { - "description": "Build usockets with wolfssl support", - "dependencies": [ - "wolfssl" - ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 18dcd04319bcce..8291fba5ded36c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8314,7 +8314,7 @@ }, "usockets": { "baseline": "0.8.6", - "port-version": 1 + "port-version": 0 }, "usrsctp": { "baseline": "0.9.5.0", diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index 53a53e6f2a0e95..7f5b80c9fb4f4b 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "bbfb3ab5fe6fc9c96028f24a129c8ebab2883553", - "version": "0.8.6", - "port-version": 1 - }, { "git-tree": "648715b141f4bb501ebc83d09da547ee0b3fe467", "version": "0.8.6", From a92697e2f167d1c4523c5bc3a85c95ae08a34751 Mon Sep 17 00:00:00 2001 From: Doug Cook <45909143+idigdoug@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:39:54 -0700 Subject: [PATCH 376/533] New port: libtracepoint-control (#32163) * Add libtracepoint-control * Versions for libtracepoint-control --- ports/libtracepoint-control/portfile.cmake | 21 +++++++++++++++++++++ ports/libtracepoint-control/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libtracepoint-control.json | 9 +++++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/libtracepoint-control/portfile.cmake create mode 100644 ports/libtracepoint-control/vcpkg.json create mode 100644 versions/l-/libtracepoint-control.json diff --git a/ports/libtracepoint-control/portfile.cmake b/ports/libtracepoint-control/portfile.cmake new file mode 100644 index 00000000000000..465cebc8e40d86 --- /dev/null +++ b/ports/libtracepoint-control/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "microsoft/LinuxTracepoints" + REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b + SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libtracepoint-control-cpp") + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_cmake_config_fixup( + PACKAGE_NAME tracepoint-control + CONFIG_PATH lib/cmake/tracepoint-control) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libtracepoint-control/vcpkg.json b/ports/libtracepoint-control/vcpkg.json new file mode 100644 index 00000000000000..fa6561a818302a --- /dev/null +++ b/ports/libtracepoint-control/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libtracepoint-control", + "version": "1.1.0", + "description": "C++ classes for collecting Linux Tracepoints", + "homepage": "https://github.com/microsoft/LinuxTracepoints/", + "license": "MIT", + "supports": "linux", + "dependencies": [ + { + "name": "libtracepoint-decode", + "version>=": "1.1.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8291fba5ded36c..b773af1d88e319 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4660,6 +4660,10 @@ "baseline": "1.1.0", "port-version": 0 }, + "libtracepoint-control": { + "baseline": "1.1.0", + "port-version": 0 + }, "libtracepoint-decode": { "baseline": "1.1.0", "port-version": 0 diff --git a/versions/l-/libtracepoint-control.json b/versions/l-/libtracepoint-control.json new file mode 100644 index 00000000000000..eeda65aea1bdab --- /dev/null +++ b/versions/l-/libtracepoint-control.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "46fe85ffc8eb1f431685a49dace1cf330d54d6c9", + "version": "1.1.0", + "port-version": 0 + } + ] +} From 7f40cd4c558d29e332da9ca397227eb00e41d78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 22 Jun 2023 22:40:27 +0200 Subject: [PATCH 377/533] [quill] Update to 3.0.2 (#32161) * [quill] Update to 3.0.2 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 15e78a637bdf9b..8a8536bb41bb84 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 92210265c0b8a38774f1b57eedd4d319034dcfe267bd4035ccf338a0b46e7393bee361d4bf379421a7e5106bae67cf64d70cad01f9c6b82655aeb859af29a8ed + SHA512 667c05771006a7ca5c3ea26d2232f344334cc8177800321a24bb3968c6145e0dbeb4a52c601bbfdace96000d1dd53934ba2ffb447b545673bb5f2671b7f9cef7 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index e579233d683ff2..71e10d9ff73f4d 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.0.1", + "version": "3.0.2", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b773af1d88e319..4bd82baa008152 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6961,7 +6961,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.0.1", + "baseline": "3.0.2", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 6cf182d57968b0..8d2ebe76e91fa7 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b47e691385beaa29c7906dad0b911602c601ccd", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "e99204ad49b5de261987492e81a290fa15d66626", "version": "3.0.1", From 1286cac8751e13bb289061b7e3b89eb4c3f613a2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 22 Jun 2023 22:50:07 +0200 Subject: [PATCH 378/533] [liburing] Set libdevdir (#32159) --- ports/liburing/portfile.cmake | 2 ++ ports/liburing/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/liburing.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 538cdf2bc595e0..96c3d67267f880 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -13,6 +13,8 @@ vcpkg_from_github( vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE + OPTIONS + [[--libdevdir=\${prefix}/lib]] # must match libdir ) vcpkg_install_make() vcpkg_fixup_pkgconfig() diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 8664faf370d767..39351df0da43d1 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liburing", "version": "2.3", + "port-version": 1, "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "license": "MIT OR LGPL-2.1 OR GPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4bd82baa008152..593bd9db04fb4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4698,7 +4698,7 @@ }, "liburing": { "baseline": "2.3", - "port-version": 0 + "port-version": 1 }, "libusb": { "baseline": "1.0.26.11791", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 6b424f664bbece..0f0671d5b7f504 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c51f4ef4488799a1c1389216ea8f7cec8be14b62", + "version": "2.3", + "port-version": 1 + }, { "git-tree": "0c8b60f54ff0c4e9a0ae2a1a2cbcf72e2cfeaf04", "version": "2.3", From 95c0444591c120f011a87727c899b03fad410836 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 23 Jun 2023 21:07:47 +0200 Subject: [PATCH 379/533] [scripts] add vcpkg-msbuild (#28773) * add vcpkg-msbuild * v db * Apply some suggestions from code review * revert v db and format manifest * v db * fix missing rename * v db * revert back to USE_MSVC_SYNTAX_ON_WINDOWS * v db * Fix logic * v db * Update versions/v-/vcpkg-msbuild.json * Apply suggestions from code review Co-authored-by: Javier Matos Denizac * remove include destination since it wasn't used any way * v db --------- Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Javier Matos Denizac --- ports/vcpkg-msbuild/portfile.cmake | 10 ++ ports/vcpkg-msbuild/vcpkg-port-config.cmake | 5 + ports/vcpkg-msbuild/vcpkg.json | 25 +++ ports/vcpkg-msbuild/vcpkg_msbuild.props.in | 22 +++ ports/vcpkg-msbuild/vcpkg_msbuild.targets.in | 64 ++++++++ .../vcpkg-msbuild/vcpkg_msbuild_install.cmake | 152 ++++++++++++++++++ .../z_vcpkg_msbuild_create_props.cmake | 76 +++++++++ ports/vcpkg-pkgconfig-get-modules/copyright | 23 --- .../portfile.cmake | 3 +- ports/vcpkg-pkgconfig-get-modules/vcpkg.json | 3 +- .../x_vcpkg_pkgconfig_get_modules.cmake | 36 +++-- versions/baseline.json | 8 +- versions/v-/vcpkg-msbuild.json | 9 ++ versions/v-/vcpkg-pkgconfig-get-modules.json | 5 + 14 files changed, 402 insertions(+), 39 deletions(-) create mode 100644 ports/vcpkg-msbuild/portfile.cmake create mode 100644 ports/vcpkg-msbuild/vcpkg-port-config.cmake create mode 100644 ports/vcpkg-msbuild/vcpkg.json create mode 100644 ports/vcpkg-msbuild/vcpkg_msbuild.props.in create mode 100644 ports/vcpkg-msbuild/vcpkg_msbuild.targets.in create mode 100644 ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake create mode 100644 ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake delete mode 100644 ports/vcpkg-pkgconfig-get-modules/copyright create mode 100644 versions/v-/vcpkg-msbuild.json diff --git a/ports/vcpkg-msbuild/portfile.cmake b/ports/vcpkg-msbuild/portfile.cmake new file mode 100644 index 00000000000000..42e0ac846e5576 --- /dev/null +++ b/ports/vcpkg-msbuild/portfile.cmake @@ -0,0 +1,10 @@ +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild.props.in" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild.targets.in" + "${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_msbuild_create_props.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild_install.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/ports/vcpkg-msbuild/vcpkg-port-config.cmake b/ports/vcpkg-msbuild/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..547ff61d980f52 --- /dev/null +++ b/ports/vcpkg-msbuild/vcpkg-port-config.cmake @@ -0,0 +1,5 @@ +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-pkgconfig-get-modules/vcpkg-port-config.cmake" OPTIONAL) +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_msbuild_create_props.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_msbuild_install.cmake") diff --git a/ports/vcpkg-msbuild/vcpkg.json b/ports/vcpkg-msbuild/vcpkg.json new file mode 100644 index 00000000000000..b381cab1c1df92 --- /dev/null +++ b/ports/vcpkg-msbuild/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "vcpkg-msbuild", + "version-date": "2023-06-22", + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "supports": "native & windows", + "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ], + "features": { + "pkg-config": { + "description": "Enable pkg-config lookup for msbuild", + "dependencies": [ + "pkgconf" + ] + } + } +} diff --git a/ports/vcpkg-msbuild/vcpkg_msbuild.props.in b/ports/vcpkg-msbuild/vcpkg_msbuild.props.in new file mode 100644 index 00000000000000..f04522c15e6ee2 --- /dev/null +++ b/ports/vcpkg-msbuild/vcpkg_msbuild.props.in @@ -0,0 +1,22 @@ + + + + true + + + @arg_TARGET_PLATFORM_VERSION@ + @VCPKG_PLATFORM_TOOLSET@ + + false + false + false + false + @TARGET_TRIPLET@ + @_VCPKG_INSTALLED_DIR@ + No + false + vcpkg_msbuild.props + vcpkg_msbuild.targets + + @VCPKG_MSBUILD_ADDITIONAL_PROPS_XML@ + \ No newline at end of file diff --git a/ports/vcpkg-msbuild/vcpkg_msbuild.targets.in b/ports/vcpkg-msbuild/vcpkg_msbuild.targets.in new file mode 100644 index 00000000000000..517aab0ed74502 --- /dev/null +++ b/ports/vcpkg-msbuild/vcpkg_msbuild.targets.in @@ -0,0 +1,64 @@ + + + + + @arg_TARGET_PLATFORM_VERSION@ + @VCPKG_PLATFORM_TOOLSET@ + + false + false + false + false + @TARGET_TRIPLET@ + @_VCPKG_INSTALLED_DIR@ + No + false + + + + + MultiThreadedDebug + MultiThreaded + MultiThreadedDebugDLL + MultiThreadedDLL + @MSBUILD_INCLUDE_DIRS_DEBUG@ + @MSBUILD_INCLUDE_DIRS_RELEASE@ + + + + + %(AdditionalOptions) @VCPKG_COMBINED_CXX_FLAGS_DEBUG@ @MSBUILD_CFLAGS_DEBUG@ /WX- + %(AdditionalOptions) @VCPKG_COMBINED_CXX_FLAGS_RELEASE@ @MSBUILD_CFLAGS_RELEASE@ /WX- + + + + + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@ @MSBUILD_CFLAGS_DEBUG@ /WX- + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@ @MSBUILD_CFLAGS_RELEASE@ /WX- + + + + + + @MSBUILD_LIBRARIES_DEBUG@ + @MSBUILD_LIBRARIES_DIRS_DEBUG@ + @MSBUILD_LIBRARIES_RELEASE@ + @MSBUILD_LIBRARIES_DIRS_RELEASE@ + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@ @MSBUILD_LIBS_DEBUG@ /WX:NO + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@ @MSBUILD_LIBS_RELEASE@ /WX:NO + %(AdditionalOptions) @VCPKG_COMBINED_EXE_LINKER_FLAGS_DEBUG@ @MSBUILD_LIBS_DEBUG@ /WX:NO + %(AdditionalOptions) @VCPKG_COMBINED_EXE_LINKER_FLAGS_RELEASE@ @MSBUILD_LIBS_RELEASE@ /WX:NO + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG@ + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE@ + + + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG@ + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE@ + + MachineX86 + MachineX64 + MachineARM + + + @VCPKG_MSBUILD_ADDITIONAL_TARGETS_XML@ + \ No newline at end of file diff --git a/ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake b/ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake new file mode 100644 index 00000000000000..cf360003407437 --- /dev/null +++ b/ports/vcpkg-msbuild/vcpkg_msbuild_install.cmake @@ -0,0 +1,152 @@ +function(vcpkg_msbuild_install) + cmake_parse_arguments( + PARSE_ARGV 0 + "arg" + "CLEAN;NO_TOOLCHAIN_PROPS;NO_INSTALL" + "SOURCE_PATH;PROJECT_SUBPATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;TARGET" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;DEPENDENT_PKGCONFIG;ADDITIONAL_LIBS;ADDITIONAL_LIBS_DEBUG;ADDITIONAL_LIBS_RELEASE" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_RELEASE_CONFIGURATION) + set(arg_RELEASE_CONFIGURATION Release) + endif() + if(NOT DEFINED arg_DEBUG_CONFIGURATION) + set(arg_DEBUG_CONFIGURATION Debug) + endif() + + if(NOT DEFINED arg_PLATFORM) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(arg_PLATFORM x64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(arg_PLATFORM Win32) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(arg_PLATFORM ARM) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(arg_PLATFORM arm64) + else() + message(FATAL_ERROR "Unsupported target architecture") + endif() + endif() + if(NOT DEFINED arg_PLATFORM_TOOLSET) + set(arg_PLATFORM_TOOLSET "${VCPKG_PLATFORM_TOOLSET}") + endif() + + if(NOT DEFINED arg_TARGET) + set(arg_TARGET Rebuild) + endif() + if(DEFINED arg_ADDITIONAL_LIBS) + list(APPEND arg_ADDITIONAL_LIBS_DEBUG ${arg_ADDITIONAL_LIBS}) + list(APPEND arg_ADDITIONAL_LIBS_RELEASE ${arg_ADDITIONAL_LIBS}) + endif() + + vcpkg_get_windows_sdk(arg_TARGET_PLATFORM_VERSION) + + if(NOT arg_NO_TOOLCHAIN_PROPS) + file(RELATIVE_PATH project_root "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}" "${arg_SOURCE_PATH}") # required by z_vcpkg_msbuild_create_props + z_vcpkg_msbuild_create_props(OUTPUT_PROPS props_file + OUTPUT_TARGETS target_file + RELEASE_CONFIGURATION "${arg_RELEASE_CONFIGURATION}" + DEBUG_CONFIGURATION "${arg_DEBUG_CONFIGURATION}" + DEPENDENT_PKGCONFIG ${arg_DEPENDENT_PKGCONFIG} + ADDITIONAL_LIBS_DEBUG ${arg_ADDITIONAL_LIBS_DEBUG} + ADDITIONAL_LIBS_RELEASE ${arg_ADDITIONAL_LIBS_RELEASE}) + list(APPEND arg_OPTIONS + "/p:ForceImportAfterCppProps=${props_file}" + "/p:ForceImportAfterCppTargets=${target_file}" + ) + endif() + + + list(APPEND arg_OPTIONS + "/t:${arg_TARGET}" + "/p:UseMultiToolTask=true" + "/p:MultiProcMaxCount=${VCPKG_CONCURRENCY}" + "/p:EnforceProcessCountAcrossBuilds=true" + "/m:${VCPKG_CONCURRENCY}" + "-maxCpuCount:${VCPKG_CONCURRENCY}" + # other Properties + "/p:Platform=${arg_PLATFORM}" + "/p:PlatformToolset=${arg_PLATFORM_TOOLSET}" + "/p:WindowsTargetPlatformVersion=${arg_TARGET_PLATFORM_VERSION}" + # vcpkg properties + "/p:VcpkgApplocalDeps=false" + "/p:VcpkgManifestInstall=false" + "/p:VcpkgManifestEnabled=false" + "/p:VcpkgEnabled=false" + "/p:VcpkgTriplet=${TARGET_TRIPLET}" + "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}" + ) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Disable LTCG for static libraries because this setting introduces ABI incompatibility between minor compiler versions + # TODO: Add a way for the user to override this if they want to opt-in to incompatibility + list(APPEND arg_OPTIONS "/p:WholeProgramOptimization=false") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Building ${arg_PROJECT_SUBPATH} for Release") + set(working_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + file(REMOVE_RECURSE "${working_dir}") + file(MAKE_DIRECTORY "${working_dir}") + file(COPY "${arg_SOURCE_PATH}/" DESTINATION "${working_dir}") + vcpkg_execute_required_process( + COMMAND msbuild "${working_dir}/${arg_PROJECT_SUBPATH}" + "/p:Configuration=${arg_RELEASE_CONFIGURATION}" + ${arg_OPTIONS} + ${arg_OPTIONS_RELEASE} + WORKING_DIRECTORY "${working_dir}" + LOGNAME "build-${TARGET_TRIPLET}-rel" + ) + if(NOT arg_NO_INSTALL) + file(GLOB_RECURSE libs "${working_dir}/*.lib") + file(GLOB_RECURSE dlls "${working_dir}/*.dll") + file(GLOB_RECURSE exes "${working_dir}/*.exe") + if(NOT libs STREQUAL "") + file(COPY ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + if(NOT dlls STREQUAL "") + file(COPY ${dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + if(NOT exes STREQUAL "") + file(COPY ${exes} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Building ${arg_PROJECT_SUBPATH} for Debug") + set(working_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + file(REMOVE_RECURSE "${working_dir}") + file(MAKE_DIRECTORY "${working_dir}") + file(COPY "${arg_SOURCE_PATH}/" DESTINATION "${working_dir}") + vcpkg_execute_required_process( + COMMAND msbuild "${working_dir}/${arg_PROJECT_SUBPATH}" + "/p:Configuration=${arg_DEBUG_CONFIGURATION}" + ${arg_OPTIONS} + ${arg_OPTIONS_DEBUG} + WORKING_DIRECTORY "${working_dir}" + LOGNAME "build-${TARGET_TRIPLET}-dbg" + ) + if(NOT arg_NO_INSTALL) + file(GLOB_RECURSE libs "${working_dir}/*.lib") + file(GLOB_RECURSE dlls "${working_dir}/*.dll") + if(NOT libs STREQUAL "") + file(COPY ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + if(NOT dlls STREQUAL "") + file(COPY ${dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + endif() + endif() + + vcpkg_copy_pdbs() + + if(arg_CLEAN) + vcpkg_clean_msbuild() + endif() + +endfunction() diff --git a/ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake b/ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake new file mode 100644 index 00000000000000..5cd6adeb397dcf --- /dev/null +++ b/ports/vcpkg-msbuild/z_vcpkg_msbuild_create_props.cmake @@ -0,0 +1,76 @@ +function(z_vcpkg_msbuild_create_props) + cmake_parse_arguments( + PARSE_ARGV 0 + "arg" + "" + "OUTPUT_PROPS;OUTPUT_TARGETS;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION" + "DEPENDENT_PKGCONFIG;ADDITIONAL_LIBS_DEBUG;ADDITIONAL_LIBS_RELEASE" + ) + + if(NOT arg_OUTPUT_PROPS) + message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' requires option 'OUTPUT_PROPS'!") + endif() + if(NOT arg_OUTPUT_TARGETS) + message(FATAL_ERROR "'${CMAKE_CURRENT_FUNCTION}' requires option 'OUTPUT_TARGETS'!") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "'${CMAKE_CURRENT_FUNCTION}' was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + # TODO: detect and set these ? + # stdcpp20 + # stdc17 + if(NOT DEFINED arg_RELEASE_CONFIGURATION) + set(arg_RELEASE_CONFIGURATION Release) + endif() + if(NOT DEFINED arg_DEBUG_CONFIGURATION) + set(arg_DEBUG_CONFIGURATION Debug) + endif() + + set(TARGET_PLATFORM_VERSION "") + vcpkg_get_windows_sdk(TARGET_PLATFORM_VERSION) + + if(arg_DEPENDENT_PKGCONFIG) + if(NOT COMMAND x_vcpkg_pkgconfig_get_modules) + message(FATAL_ERROR "Port vcpkg-msbuild needs to have feature 'pkg-config' enabled for 'DEPENDENT_PKGCONFIG'") + endif() + x_vcpkg_pkgconfig_get_modules(PREFIX MSBUILD INCLUDE_DIRS LIBRARIES LIBRARIES_DIR CFLAGS USE_MSVC_SYNTAX_ON_WINDOWS MODULES ${arg_DEPENDENT_PKGCONFIG}) + + separate_arguments(MSBUILD_INCLUDE_DIRS_RELEASE WINDOWS_COMMAND "${MSBUILD_INCLUDE_DIRS_RELEASE}") + separate_arguments(MSBUILD_INCLUDE_DIRS_DEBUG WINDOWS_COMMAND "${MSBUILD_INCLUDE_DIRS_DEBUG}") + foreach(inc_dirs IN LISTS MSBUILD_INCLUDE_DIRS_RELEASE) + string(REPLACE "${inc_dirs}" "" MSBUILD_CFLAGS_RELEASE "${MSBUILD_CFLAGS_RELEASE}") + endforeach() + foreach(inc_dirs IN LISTS MSBUILD_INCLUDE_DIRS_DEBUG) + string(REPLACE "${inc_dirs}" "" MSBUILD_CFLAGS_DEBUG "${MSBUILD_CFLAGS_DEBUG}") + endforeach() + list(TRANSFORM MSBUILD_INCLUDE_DIRS_RELEASE REPLACE "^/I" "") + list(TRANSFORM MSBUILD_INCLUDE_DIRS_DEBUG REPLACE "^/I" "") + + separate_arguments(MSBUILD_LIBRARIES_DIRS_RELEASE WINDOWS_COMMAND "${MSBUILD_LIBRARIES_DIRS_RELEASE}") + separate_arguments(MSBUILD_LIBRARIES_DIRS_DEBUG WINDOWS_COMMAND "${MSBUILD_LIBRARIES_DIRS_DEBUG}") + + separate_arguments(MSBUILD_LIBRARIES_RELEASE WINDOWS_COMMAND "${MSBUILD_LIBRARIES_RELEASE}") + separate_arguments(MSBUILD_LIBRARIES_DEBUG WINDOWS_COMMAND "${MSBUILD_LIBRARIES_DEBUG}") + endif() + vcpkg_cmake_get_vars(vars_file) + include("${vars_file}") + vcpkg_list(APPEND MSBUILD_INCLUDE_DIRS_RELEASE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_INSTALLED_DIR}/include") + vcpkg_list(APPEND MSBUILD_INCLUDE_DIRS_DEBUG "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_INSTALLED_DIR}/include") + vcpkg_list(APPEND MSBUILD_LIBRARIES_DIRS_RELEASE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_INSTALLED_DIR}/lib") + vcpkg_list(APPEND MSBUILD_LIBRARIES_DIRS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib" "${CURRENT_INSTALLED_DIR}/debug/lib") + vcpkg_list(APPEND MSBUILD_LIBRARIES_RELEASE ${arg_ADDITIONAL_LIBS_RELEASE}) + vcpkg_list(APPEND MSBUILD_LIBRARIES_DEBUG ${arg_ADDITIONAL_LIBS_DEBUG}) + + vcpkg_list(PREPEND MSBUILD_INCLUDE_DIRS_RELEASE "%(AdditionalIncludeDirectories)") + vcpkg_list(PREPEND MSBUILD_INCLUDE_DIRS_DEBUG "%(AdditionalIncludeDirectories)") + vcpkg_list(PREPEND MSBUILD_LIBRARIES_DIRS_RELEASE "%(AdditionalLibraryDirectories)") + vcpkg_list(PREPEND MSBUILD_LIBRARIES_DIRS_DEBUG "%(AdditionalLibraryDirectories)") + vcpkg_list(PREPEND MSBUILD_LIBRARIES_RELEASE "%(AdditionalDependencies)") + vcpkg_list(PREPEND MSBUILD_LIBRARIES_DEBUG "%(AdditionalDependencies)") + + configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/vcpkg_msbuild.targets.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.targets") + configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/vcpkg_msbuild.props.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.props") + set(${arg_OUTPUT_PROPS} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.props" PARENT_SCOPE) + set(${arg_OUTPUT_TARGETS} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vcpkg_msbuild.targets" PARENT_SCOPE) +endfunction() diff --git a/ports/vcpkg-pkgconfig-get-modules/copyright b/ports/vcpkg-pkgconfig-get-modules/copyright deleted file mode 100644 index 2e4eac8264fa4c..00000000000000 --- a/ports/vcpkg-pkgconfig-get-modules/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake index f82cf371bd6f5c..a807e7e7e2ba65 100644 --- a/ports/vcpkg-pkgconfig-get-modules/portfile.cmake +++ b/ports/vcpkg-pkgconfig-get-modules/portfile.cmake @@ -5,9 +5,10 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json index f38c13d4d76c4e..f03dd386808fdc 100644 --- a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json +++ b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vcpkg-pkgconfig-get-modules", - "version-date": "2022-02-10", - "port-version": 1, + "version-date": "2023-02-25", "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "dependencies": [ diff --git a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake index 0ed124cff4bb1d..54ad45ad28e723 100644 --- a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake +++ b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake @@ -1,7 +1,7 @@ include_guard(GLOBAL) function(x_vcpkg_pkgconfig_get_modules) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS;USE_MSVC_SYNTAX_ON_WINDOWS" "PREFIX" "MODULES") if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "") message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!") endif() @@ -11,6 +11,10 @@ function(x_vcpkg_pkgconfig_get_modules) if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}") endif() + set(msvc "") + if(arg_USE_MSVC_SYNTAX_ON_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(msvc "--msvc-syntax") + endif() set(PKGCONFIG "${CURRENT_INSTALLED_DIR}/../@HOST_TRIPLET@/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@") @@ -21,41 +25,46 @@ function(x_vcpkg_pkgconfig_get_modules) z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}") if(arg_LIBS) execute_process( - COMMAND "${PKGCONFIG}" --libs ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --libs ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_LIBS_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes LIBS_RELEASE) endif() if(arg_LIBRARIES) execute_process( - COMMAND "${PKGCONFIG}" --libs-only-l ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --libs-only-l ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes LIBRARIES_RELEASE) endif() if(arg_LIBRARIES_DIRS) execute_process( - COMMAND "${PKGCONFIG}" --libs-only-L ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --libs-only-L ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DIRS_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes LIBRARIES_DIRS_RELEASE) endif() if(arg_INCLUDE_DIRS) execute_process( - COMMAND "${PKGCONFIG}" --cflags-only-I ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --cflags-only-I ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_INCLUDE_DIRS_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes INCLUDE_DIRS_RELEASE) endif() if(arg_CFLAGS) execute_process( - COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --cflags ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes CFLAGS_RELEASE) endif() @@ -64,41 +73,46 @@ function(x_vcpkg_pkgconfig_get_modules) z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}") if(arg_LIBS) execute_process( - COMMAND "${PKGCONFIG}" --libs ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --libs ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_LIBS_DEBUG OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes LIBS_DEBUG) endif() if(arg_LIBRARIES) execute_process( - COMMAND "${PKGCONFIG}" --libs-only-l ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --libs-only-l ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DEBUG OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes LIBRARIES_DEBUG) endif() if(arg_LIBRARIES_DIRS) execute_process( - COMMAND "${PKGCONFIG}" --libs-only-L ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --libs-only-L ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_LIBRARIES_DIRS_DEBUG OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes LIBRARIES_DIRS_DEBUG) endif() if(arg_INCLUDE_DIRS) execute_process( - COMMAND "${PKGCONFIG}" --cflags-only-I ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --cflags-only-I ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_INCLUDE_DIRS_DEBUG OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes INCLUDE_DIRS_DEBUG) endif() if(arg_CFLAGS) execute_process( - COMMAND "${PKGCONFIG}" --cflags ${arg_MODULES} + COMMAND "${PKGCONFIG}" ${msvc} --cflags ${arg_MODULES} OUTPUT_VARIABLE ${arg_PREFIX}_CFLAGS_DEBUG OUTPUT_STRIP_TRAILING_WHITESPACE + COMMAND_ERROR_IS_FATAL ANY ) list(APPEND var_suffixes CFLAGS_DEBUG) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 593bd9db04fb4a..7c25a9da20a206 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8416,9 +8416,13 @@ "baseline": "2021-11-16", "port-version": 3 }, + "vcpkg-msbuild": { + "baseline": "2023-06-22", + "port-version": 0 + }, "vcpkg-pkgconfig-get-modules": { - "baseline": "2022-02-10", - "port-version": 1 + "baseline": "2023-02-25", + "port-version": 0 }, "vcpkg-qmake": { "baseline": "2023-03-22", diff --git a/versions/v-/vcpkg-msbuild.json b/versions/v-/vcpkg-msbuild.json new file mode 100644 index 00000000000000..fb293066cb3907 --- /dev/null +++ b/versions/v-/vcpkg-msbuild.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e9effc7e0ed636888b0bf3660d602f0737cba97e", + "version-date": "2023-06-22", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json index 3bb85c48b8ffb5..ce08cd4ec9e0a9 100644 --- a/versions/v-/vcpkg-pkgconfig-get-modules.json +++ b/versions/v-/vcpkg-pkgconfig-get-modules.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57e857fda6b1dadd02036d9c012963db900bfc33", + "version-date": "2023-02-25", + "port-version": 0 + }, { "git-tree": "48bfa748f78837921860329547ed6e5799665698", "version-date": "2022-02-10", From 477672dcb3ce80a2fe92cf508f63cd2afca819d0 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Fri, 23 Jun 2023 16:17:48 -0400 Subject: [PATCH 380/533] Updating the necessary files. (#32187) --- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/j-/jsonifier.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index d3accbd5f53c50..a2333855fd75be 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 4ba5033315f680d6a5fa29764b4c19ce219e881f2dccef4ede73a8f405fd4ac5d58f543c78fa3c35943601bbfd6922749bd9b086527d057086ec8977c0911d1a + SHA512 7373bd8d8554f9b76eb80d1c6b906d917ede80d55f5c363c6c26c67b4e659d9e657fb15d2da7d1eaf41fc24ee84fd54b16d8a0bd9bd76aacf899990eee425845 HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 545efddf20a3e3..6b38fa36a02144 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,10 +1,9 @@ { "name": "jsonifier", - "version": "0.9.2", - "port-version": 1, + "version": "0.9.3", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", - "license": "LGPL-2.1-or-later", + "license": "MIT", "supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (osx & x64)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 7c25a9da20a206..78c09aea04c4bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3501,8 +3501,8 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.2", - "port-version": 1 + "baseline": "0.9.3", + "port-version": 0 }, "jsonnet": { "baseline": "0.18.0", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index a2cbab57426ce7..c97f64f92de4c8 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29c1237004abf2ca9bb395ab8f2d211f7ba563f3", + "version": "0.9.3", + "port-version": 0 + }, { "git-tree": "a8093800ff625535fd7bddaedc1394fb5412c80c", "version": "0.9.2", From 663f45cb1cebe6a085fa4fd3d0abf1524fdacfa5 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 23 Jun 2023 22:18:23 +0200 Subject: [PATCH 381/533] [sentry-native] update to 0.6.4 (#32185) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 476649d28ca0ff..6c07cd10ab5e68 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 343960b98e5337d44a41fb2cafbf246430763edf6773fe9bdcefafaac6c14016155d8c433d29950b469e63aef90376a604a6e38912fed6ef7d798d6ad17cf999 + SHA512 81b935a0b909885d842b870d05d96d46ccb85ac4f91456e07a92b85547a96ba8c3ed620bc7034823fd4639d1f3698b5c40fc1ed4a93e1c997ce757dfb7a4d529 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index f1c4a78d8b8374..ab75bd7eb1a56d 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.3", + "version": "0.6.4", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 78c09aea04c4bb..cc50d2845d41b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7413,7 +7413,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.6.3", + "baseline": "0.6.4", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 507906d1e0b704..1ba39bba4457ef 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29eccf6f70b601b7e5ba3b94e0cbc38fe707b2fa", + "version": "0.6.4", + "port-version": 0 + }, { "git-tree": "26846f654fd9638934b225f981999759025ff252", "version": "0.6.3", From c799d5ea10a8f384651374a5dbff8964477c1a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Fri, 23 Jun 2023 22:23:10 +0200 Subject: [PATCH 382/533] Update SFML to 2.6.0 (#32182) * [sfml] Update SFML to 2.6.0 - SFML 2.6.0 was just released - The ARM64 patch for macOS is no longer needed - Add extra Linux dependency hint - Fix GitHub URL casing * [sfml] Update version database --- ports/sfml/arm64.patch | 21 ------------------- ports/sfml/fix-dependencies.patch | 34 +++++++++++++++---------------- ports/sfml/portfile.cmake | 5 ++--- ports/sfml/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/s-/sfml.json | 5 +++++ 6 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 ports/sfml/arm64.patch diff --git a/ports/sfml/arm64.patch b/ports/sfml/arm64.patch deleted file mode 100644 index 7faefc0e6aeb1b..00000000000000 --- a/ports/sfml/arm64.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67b61712ec..73711753ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -253,10 +253,12 @@ if(SFML_OS_MACOSX) - endif() - endif() - -- # only the default architecture (i.e. 64-bit) is supported -- if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64") -- message(FATAL_ERROR "Only 64-bit architecture is supported") -- endif() -+ # only the default x86_64 or arm64 are supported -+ foreach (arch IN LISTS CMAKE_OSX_ARCHITECTURES) -+ if (NOT (arch STREQUAL "x86_64" OR arch STREQUAL "arm64")) -+ message(FATAL_ERROR "Invalid arch ${arch}") -+ endif() -+ endforeach() - - # configure Xcode templates - set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") diff --git a/ports/sfml/fix-dependencies.patch b/ports/sfml/fix-dependencies.patch index d6704be2dbd2f3..eb3a8dc68f911d 100644 --- a/ports/sfml/fix-dependencies.patch +++ b/ports/sfml/fix-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/cmake/SFMLConfig.cmake.in b/cmake/SFMLConfig.cmake.in -index ce81953..c8dd971 100644 +index 30194c5f..40b72309 100644 --- a/cmake/SFMLConfig.cmake.in +++ b/cmake/SFMLConfig.cmake.in @@ -1,3 +1,8 @@ @@ -12,10 +12,10 @@ index ce81953..c8dd971 100644 # ------------------------------------ # diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in -index 1028110..76fc650 100644 +index 0737ec5d..05bf9a8f 100644 --- a/cmake/SFMLConfigDependencies.cmake.in +++ b/cmake/SFMLConfigDependencies.cmake.in -@@ -31,9 +31,11 @@ if(SFML_STATIC_LIBRARIES) +@@ -35,9 +35,11 @@ if(SFML_STATIC_LIBRARIES) endif() # No lookup in environment variables (PATH on Windows), as they may contain wrong library versions @@ -27,7 +27,7 @@ index 1028110..76fc650 100644 if(${THIS_FRIENDLY_NAME}_LIB) set_property(TARGET ${THIS_TARGET} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${${THIS_FRIENDLY_NAME}_LIB}") else() -@@ -56,6 +58,9 @@ if(SFML_STATIC_LIBRARIES) +@@ -64,6 +66,9 @@ if(SFML_STATIC_LIBRARIES) if (FIND_SFML_OS_WINDOWS) set_property(TARGET OpenGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenGL32") elseif(NOT FIND_SFML_OS_IOS) @@ -37,7 +37,7 @@ index 1028110..76fc650 100644 sfml_bind_dependency(TARGET OpenGL FRIENDLY_NAME "OpenGL" SEARCH_NAMES "OpenGL" "GL") endif() endif() -@@ -63,6 +68,8 @@ if(SFML_STATIC_LIBRARIES) +@@ -71,6 +76,8 @@ if(SFML_STATIC_LIBRARIES) # sfml-graphics list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT_INDEX) if(FIND_SFML_GRAPHICS_COMPONENT_INDEX GREATER -1) @@ -47,21 +47,21 @@ index 1028110..76fc650 100644 endif() diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt -index 883c758..b59e659 100644 +index a939a988..259835f7 100644 --- a/src/SFML/Graphics/CMakeLists.txt +++ b/src/SFML/Graphics/CMakeLists.txt -@@ -97,7 +97,8 @@ sfml_add_library(sfml-graphics +@@ -93,7 +93,8 @@ sfml_add_library(sfml-graphics target_link_libraries(sfml-graphics PUBLIC sfml-window) # stb_image sources --target_include_directories(sfml-graphics PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image") +-target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image") +find_path(STB_INCLUDE_DIR stb_image.h REQUIRED) +target_include_directories(sfml-graphics PRIVATE "${STB_INCLUDE_DIR}") - # let CMake know about our additional graphics libraries paths - if(SFML_OS_WINDOWS) -@@ -134,7 +135,8 @@ if(SFML_OS_ANDROID) - target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM) + # glad sources + target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include") +@@ -123,7 +124,8 @@ if((SFML_COMPILER_MSVC AND SFML_MSVC_VERSION GREATER_EQUAL 14) OR (SFML_COMPILER + target_link_libraries(sfml-graphics PRIVATE legacy_stdio_definitions.lib) endif() -sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") @@ -71,14 +71,14 @@ index 883c758..b59e659 100644 # add preprocessor symbols diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt -index 98ea439..acb8d61 100644 +index d2bdd5aa..2a9937f1 100644 --- a/src/SFML/Window/CMakeLists.txt +++ b/src/SFML/Window/CMakeLists.txt -@@ -254,7 +254,9 @@ if(SFML_OPENGL_ES) - target_link_libraries(sfml-window PRIVATE EGL GLESv1_CM) - endif() +@@ -325,7 +325,9 @@ elseif(SFML_OS_ANDROID) + target_link_libraries(sfml-window PRIVATE EGL) + target_link_libraries(sfml-window PRIVATE GLES) else() -- sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_LIBRARIES") +- sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_gl_LIBRARY") + set(EXPORT_OpenGL_GL_PREFERENCE "${OpenGL_GL_PREFERENCE}" CACHE INTERNAL "") + set(OpenGL_LIB OpenGL::GL) + sfml_find_package(OpenGL LINK OpenGL_LIB) diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index c187321e0e18ab..d1e0a6506488df 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -2,17 +2,16 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML REF "${VERSION}" HEAD_REF master - SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 + SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a PATCHES fix-dependencies.patch - arm64.patch ) # The embedded FindFreetype doesn't properly handle debug libraries file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") if(VCPKG_TARGET_IS_LINUX) - message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxi-dev libudev-dev libgl1-mesa-dev") + message(STATUS "SFML currently requires the following libraries from the system package manager:\n libudev\n libx11\n libxrandr\n libxcursor\n opengl\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libxrandr-dev libxcursor-dev libxi-dev libudev-dev libgl1-mesa-dev") endif() vcpkg_cmake_configure( diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index ef0fa9301bea5c..112cbcc83e7684 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,9 +1,9 @@ { "name": "sfml", - "version": "2.5.1", - "port-version": 16, + "version": "2.6.0", + "port-version": 17, "description": "Simple and fast multimedia library", - "homepage": "https://github.com/sfml/sfml", + "homepage": "https://github.com/SFML/SFML", "license": "Zlib", "dependencies": [ "freetype", diff --git a/versions/baseline.json b/versions/baseline.json index cc50d2845d41b3..2bc1922af02536 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7445,8 +7445,8 @@ "port-version": 6 }, "sfml": { - "baseline": "2.5.1", - "port-version": 16 + "baseline": "2.6.0", + "port-version": 17 }, "sfsexp": { "baseline": "1.3.1", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index ebe91f0c0eb872..412c58ac50962b 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d61263f546c87d3c26f45ade4f92d65f1203816", + "version": "2.6.0", + "port-version": 17 + }, { "git-tree": "d9e87b4e23cdcec8d249517f14a69d8e453d3418", "version": "2.5.1", From d9e62b5d3c9903c5e9ecc0f10e476a0d200c7ada Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Fri, 23 Jun 2023 22:28:10 +0200 Subject: [PATCH 383/533] [baresip-libre] Add new port (#31735) * libre 3.2.0 * update hash * vcpkg_cmake_config_fixup: add PACKAGE_NAME * update hash * update usage: See example usage from testcode here: https://github.com/baresip/re/blob/main/test/CMakeLists.txt#L62 * update hash * patch from Kai * update hash * patch: fix Libs (thanks Kai) * update hash * update patch * update hash * patch: fix bug with libre::re_shared (thanks Kai) * update hash * rename from libre to baresip-libre * update hash * delete libre.json --- ports/baresip-libre/portfile.cmake | 34 +++++++ ports/baresip-libre/usage | 5 + ports/baresip-libre/vcpkg.json | 20 ++++ ports/baresip-libre/wip.patch | 154 +++++++++++++++++++++++++++++ versions/b-/baresip-libre.json | 9 ++ versions/baseline.json | 4 + 6 files changed, 226 insertions(+) create mode 100644 ports/baresip-libre/portfile.cmake create mode 100644 ports/baresip-libre/usage create mode 100644 ports/baresip-libre/vcpkg.json create mode 100644 ports/baresip-libre/wip.patch create mode 100644 versions/b-/baresip-libre.json diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake new file mode 100644 index 00000000000000..8f3a5dc11f83e9 --- /dev/null +++ b/ports/baresip-libre/portfile.cmake @@ -0,0 +1,34 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO baresip/re + REF "v${VERSION}" + SHA512 fce61b96fd4a330c82045c470486e90e1128e242b7c311e9c6002d9752b775bbc430bf256de85f63841172c60630be3aa91e11bfa1501c71599d213701c6b459 + HEAD_REF main + PATCHES + wip.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBRE_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBRE_BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBRE_BUILD_SHARED=${LIBRE_BUILD_SHARED} + -DLIBRE_BUILD_STATIC=${LIBRE_BUILD_STATIC} + -DCMAKE_DISABLE_FIND_PACKAGE_Backtrace=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_OpenSSL=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON +) +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libre) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/baresip-libre/usage b/ports/baresip-libre/usage new file mode 100644 index 00000000000000..c207427cd287ac --- /dev/null +++ b/ports/baresip-libre/usage @@ -0,0 +1,5 @@ +baresip-libre provides CMake targets: + + find_package(libre CONFIG REQUIRED) + target_link_libraries(main PRIVATE libre::libre) + diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json new file mode 100644 index 00000000000000..e91604b4ed78f2 --- /dev/null +++ b/ports/baresip-libre/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "baresip-libre", + "version": "3.2.0", + "description": "Generic library for real-time communications with async IO support", + "homepage": "https://github.com/baresip/re", + "license": "BSD-3-Clause", + "supports": "!uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/ports/baresip-libre/wip.patch b/ports/baresip-libre/wip.patch new file mode 100644 index 00000000000000..41341536bfb103 --- /dev/null +++ b/ports/baresip-libre/wip.patch @@ -0,0 +1,154 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f85cb1e..b364219 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,7 +93,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") + endif() + + set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake) +-find_package(re CONFIG REQUIRED) ++include("${CMAKE_CURRENT_LIST_DIR}/cmake/re-config.cmake") + + list(APPEND RE_DEFINITIONS + -DVERSION="${PROJECT_VERSION_FULL}" +@@ -642,7 +642,7 @@ if(WIN32) + dbghelp + ) + else() +- list(APPEND LINKLIBS -lm) ++ list(APPEND LINKLIBS m) + endif() + + if(UNIX) +@@ -668,7 +668,7 @@ target_include_directories(re-objs PRIVATE + ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS}) + target_include_directories(re-objs PUBLIC + $ +- $ ++ $ # pointless, object libs don't get installed. + ) + + +@@ -697,11 +697,14 @@ endif() + if(LIBRE_BUILD_STATIC) + list(APPEND RE_INSTALL_TARGETS re) + add_library(re STATIC $) +- target_link_libraries(re PUBLIC ${LINKLIBS}) ++ target_link_libraries(re PRIVATE ${LINKLIBS}) + add_library(libre::re ALIAS re) + + if(MSVC) + set_target_properties(re PROPERTIES OUTPUT_NAME "re-static") ++ if(NOT LIBRE_BUILD_SHARED) ++ set(PC_LIBNAME "re-static") ++ endif() + endif() + endif() + +@@ -714,6 +717,28 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + add_subdirectory(packaging) + endif() + ++if(NOT PC_LIBNAME) ++ set(PC_LIBNAME "re") ++endif() ++set(PC_REQUIRES "") ++set(PC_LINKLIBS "") ++foreach(item IN LISTS LINKLIBS) ++ if(item STREQUAL "Threads::Threads") ++ list(APPEND PC_LINKLIBS ${CMAKE_THREADS_LIBS_INIT}) ++ elseif(item STREQUAL "OpenSSL::Crypto") ++ list(APPEND PC_REQUIRES "libcrypto") ++ elseif(item STREQUAL "OpenSSL::SSL") ++ list(APPEND PC_REQUIRES "libssl") ++ elseif(item STREQUAL "ZLIB::ZLIB") ++ list(APPEND PC_REQUIRES "zlib") ++ elseif(item MATCHES "^-|/") ++ list(APPEND PC_LINKLIBS "${item}") ++ else() ++ list(APPEND PC_LINKLIBS "-l${item}") ++ endif() ++endforeach() ++list(JOIN PC_LINKLIBS " " PC_LINKLIBS) ++list(JOIN PC_REQUIRES " " PC_REQUIRES) + configure_file(packaging/libre.pc.in libre.pc @ONLY) + + +@@ -725,6 +750,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY) + + install(TARGETS ${RE_INSTALL_TARGETS} + EXPORT libre ++ RUNTIME ++ DESTINATION ${CMAKE_INSTALL_BINDIR} ++ COMPONENT Libraries + LIBRARY + DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT Libraries +@@ -743,7 +771,9 @@ install(FILES ${HEADERS} + + install(EXPORT libre + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre ++ FILE libre-targets.cmake + NAMESPACE libre:: ++ COMPONENT Development + ) + + if(LIBRE_BUILD_SHARED) +@@ -755,12 +785,8 @@ if(LIBRE_BUILD_SHARED) + ) + endif() + +-install(FILES cmake/re-config.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re +- COMPONENT Development +-) +- +-install(FILES cmake/libre-config.cmake ++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/libre-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake/libre-config.cmake" @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/libre-config.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre + COMPONENT Development + ) +diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake +index 0965b84..af7f2de 100644 +--- a/cmake/libre-config.cmake ++++ b/cmake/libre-config.cmake +@@ -1 +1,23 @@ +-include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake") ++if("@LIBRE_BUILD_STATIC@") ++ include(CMakeFindDependencyMacro) ++ find_dependency(Threads) ++ if("@USE_OPENSSL@") ++ find_dependency(OpenSSL) ++ endif() ++ if("@ZLIB_FOUND@") ++ find_dependency(ZLIB) ++ endif() ++endif() ++ ++include("${CMAKE_CURRENT_LIST_DIR}/libre-targets.cmake") ++ ++# convenience target libre::libre for uniform usage ++if(NOT TARGET libre::libre) ++ if(TARGET libre::re_shared AND (BUILD_SHARED_LIBS OR NOT TARGET libre::re)) ++ add_library(libre::libre INTERFACE IMPORTED) ++ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re_shared) ++ elseif(TARGET libre::re AND (NOT BUILD_SHARED_LIBS OR NOT TARGET libre::re_shared)) ++ add_library(libre::libre INTERFACE IMPORTED) ++ set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re) ++ endif() ++endif() +diff --git a/packaging/libre.pc.in b/packaging/libre.pc.in +index 5817066..2df8f6c 100644 +--- a/packaging/libre.pc.in ++++ b/packaging/libre.pc.in +@@ -7,6 +7,7 @@ Name: libre + Description: @CMAKE_PROJECT_DESCRIPTION@ + Version: @PROJECT_VERSION@ + URL: @CMAKE_PROJECT_HOMEPAGE_URL@ +-Libs: -L${libdir} -lre +-Libs.private: -L${libdir} -lre -ldl -lssl -lcrypto -lz -lpthread ++Libs: -L${libdir} -l@PC_LIBNAME@ ++Libs.private: @PC_LINKLIBS@ ++Requires.private: @PC_REQUIRES@ + Cflags: -I${includedir} diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json new file mode 100644 index 00000000000000..7d606ccd037b33 --- /dev/null +++ b/versions/b-/baresip-libre.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "64ff48f8f4f42472f614ddece58f1249217d252c", + "version": "3.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2bc1922af02536..478d4f176637e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4480,6 +4480,10 @@ "baseline": "2.1.1", "port-version": 0 }, + "baresip-libre": { + "baseline": "3.2.0", + "port-version": 0 + }, "libredwg": { "baseline": "0.12.5.5178", "port-version": 1 From 288e8bebf4ca67c1f8ebd49366b03650cfd9eb7d Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Fri, 23 Jun 2023 15:29:52 -0500 Subject: [PATCH 384/533] [onednn] Update to 3.1.1 (#32160) * [onednn] Upgrade to 3.1.1 * Update version database * Remove non-default features to remove mutually exclusive features * Update version database --- ports/onednn/portfile.cmake | 8 ++++---- ports/onednn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/onednn.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index 643024b25233fb..eca06012bf1a81 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN - REF 3fef24ec08eb89a2c4be4425162c0651af7f1de3 - SHA512 3b012fcc92cf39b3205784f5f11607a8af9420d5affccb54079b275c7214dd93daa2ca1e29032de06483126eb103a85d2665da5291995b0f1e5e9978d4290462 + REF v3.1.1 + SHA512 0dae0ccff1e459ce24356694732bf4ee3c459469de70984863e1aed3bc965471793a110dedbb11f2baa762749cea7652a150d2f9a442c299d9ffa00febd87fec HEAD_REF master ) @@ -21,6 +21,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME dnnl CONFIG_PATH lib/cmake/dnnl) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/dnnl/reference/html") -# Copyright and license -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index 77f9fc9345d539..1a195221afe805 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onednn", - "version": "3.0.0", + "version": "3.1.1", "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 478d4f176637e8..cc912c15c4c172 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5865,7 +5865,7 @@ "port-version": 5 }, "onednn": { - "baseline": "3.0.0", + "baseline": "3.1.1", "port-version": 0 }, "oniguruma": { diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index 5155c1a252589c..60f31ef9bc328a 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "151a4ce15e279a44a305bc438e5beed45c7054b9", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "8d9dad8bf4f6fa7eae90870c5c3aac1ec4346f40", "version": "3.0.0", From 8f3e8d6e95c7f91edea60c47a7d1414ab5ca9492 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 26 Jun 2023 10:23:33 -0700 Subject: [PATCH 385/533] Update vcpkg-tool to 2023-06-22. (#32180) https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-22 VS PR: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_git/VS/pullrequest/480170 VS Code PR: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_git/vscode-embedded-tools/pullrequest/480171 --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 04d4a5c5b023c6..cdd7979f98f679 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2023-06-15' +$versionDate = '2023-06-22' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index c9db563d21da89..478cb1ccd742ec 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,23 +128,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2023-06-15" +vcpkgToolReleaseTag="2023-06-22" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="3a746ca1402b5ac6cd26d09077681c4f8d1090a06ed4243574d81bcff22d651eae5a47107b407828bfa36236f2c4c02d3e2c6392d92b8c5aaf9992f332091f35" + vcpkgToolReleaseSha="7a1d493a796036ed0e0a75ff85406417c401f5bf00d94017bce8d2146a79f8050ac4e4650744f62bb1cad7b52c685c2300d78a25c0ca80a7a580fdbfb217f260" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="0426668fbfaece4f51798c1ee201ffbc26b0b239e212ce6118b2ab5d2490b414a01e725b05ce98c8a95d06341a70405f4223bd4f42e291c5792ec2a631e22cc1" + vcpkgToolReleaseSha="d197ff003cc1ec39688187855249389db8ddcbe308058ba41b9fc75d18f27ad17886d1a2cb7e74811be38d1f732f9d3e7a0f016b7695e95aa3a72866c89facb0" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="4c49238277cecc81cf0a152f9505e4020290e25ada736ec8ff956f740e5e4b986a9e5c3cc0816f4c9ccde06639cb5275d57ea86818060573fa246d019ef835f8" + vcpkgToolReleaseSha="0afa55096856575f4b6ade5fc0087925dc1288bb3dd51c99e41824c1e23151a3101553d965bd1f589b0c42e4c9e57e568bd475517f5df21873bb8c29dd94f8b3" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="05c50173959634a4557b756fce78f92bbc38bf23c91d4c41368c24f91e9479966fb4537a391cee2141423edd6cf84ca488c9e1d57323aa65575baa0ecc6af8e3" + vcpkgToolReleaseSha="27135301c02ca9bf50e8bf458907daba62e92d7adcc5219b6b27dc835d4ff01f396ec320ea283e4a8de8117588b955f966203fd36f781f21f837d1d6377c03ef" fi # Do the download or build. From 23fa37729d41f6e97f99291845936f4e060c315e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 26 Jun 2023 22:07:06 +0200 Subject: [PATCH 386/533] [libssh2] Update to 0.11.0 (#32232) * [libssh2] Update to 1.11.0 * Control usage --- ports/libssh2/0001-Fix-UWP.patch | 64 --------------------------- ports/libssh2/0002-fix-macros.patch | 19 -------- ports/libssh2/0003-fix-openssl3.patch | 13 ------ ports/libssh2/portfile.cmake | 16 +++---- ports/libssh2/usage | 4 ++ ports/libssh2/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libssh2.json | 5 +++ 8 files changed, 19 insertions(+), 109 deletions(-) delete mode 100644 ports/libssh2/0001-Fix-UWP.patch delete mode 100644 ports/libssh2/0002-fix-macros.patch delete mode 100644 ports/libssh2/0003-fix-openssl3.patch create mode 100644 ports/libssh2/usage diff --git a/ports/libssh2/0001-Fix-UWP.patch b/ports/libssh2/0001-Fix-UWP.patch deleted file mode 100644 index 8a7190f8982947..00000000000000 --- a/ports/libssh2/0001-Fix-UWP.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6401acf..64de3e9 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -349,7 +349,7 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - # Check for the OS. - # Daniel's note: this should not be necessary and we need to work to - # get this removed. --if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") - target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) -diff --git a/src/agent.c b/src/agent.c -index c2ba422..f1799f8 100644 ---- a/src/agent.c -+++ b/src/agent.c -@@ -55,6 +55,10 @@ - #include - #endif - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+#define IS_UWP 1 -+#endif /* #if defined(WINAPI_FAMILY) */ -+ - /* Requests from client to agent for protocol 1 key operations */ - #define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1 - #define SSH_AGENTC_RSA_CHALLENGE 3 -@@ -254,7 +258,7 @@ struct agent_ops agent_ops_unix = { - }; - #endif /* PF_UNIX */ - --#ifdef WIN32 -+#if defined(WIN32) && !defined(IS_UWP) - /* Code to talk to Pageant was taken from PuTTY. - * - * Portions copyright Robert de Bath, Joris van Rantwijk, Delian -@@ -362,8 +366,8 @@ static struct { - const char *name; - struct agent_ops *ops; - } supported_backends[] = { --#ifdef WIN32 -- {"Pageant", &agent_ops_pageant}, -+#if defined(WIN32) && !defined(IS_UWP) -+ {"Pageant", &agent_ops_pageant}, - {"OpenSSH", &agent_ops_openssh}, - #endif /* WIN32 */ - #ifdef PF_UNIX -diff --git a/src/agent_win.c b/src/agent_win.c ---- a/src/agent_win.c -+++ b/src/agent_win.c -@@ -55,7 +55,11 @@ - #include - #endif - --#ifdef WIN32 -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+#define IS_UWP 1 -+#endif /* #if defined(WINAPI_FAMILY) */ -+ -+#if defined(WIN32) && !defined(IS_UWP) - /* Code to talk to OpenSSH was taken and modified from the Win32 port of - * Portable OpenSSH by the PowerShell team. Commit - * 8ab565c53f3619d6a1f5ac229e212cad8a52852c of diff --git a/ports/libssh2/0002-fix-macros.patch b/ports/libssh2/0002-fix-macros.patch deleted file mode 100644 index dc0f7193301b3e..00000000000000 --- a/ports/libssh2/0002-fix-macros.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2539607..eceb5a0 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -355,9 +355,12 @@ target_include_directories(libssh2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - # Daniel's note: this should not be necessary and we need to work to - # get this removed. - if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" OR ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore") -- target_compile_definitions(libssh2 PRIVATE LIBSSH2_WIN32) -+ target_compile_definitions(libssh2 PUBLIC LIBSSH2_WIN32) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(libssh2 PUBLIC _WINDLL PRIVATE LIBSSH2_LIBRARY) -+ endif() - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -- target_compile_definitions(libssh2 PRIVATE LIBSSH2_DARWIN) -+ target_compile_definitions(libssh2 PUBLIC LIBSSH2_DARWIN) - endif() - - if(MSVC) diff --git a/ports/libssh2/0003-fix-openssl3.patch b/ports/libssh2/0003-fix-openssl3.patch deleted file mode 100644 index 71aa61827c5fa4..00000000000000 --- a/ports/libssh2/0003-fix-openssl3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake -index b176d30..e986461 100644 ---- a/cmake/max_warnings.cmake -+++ b/cmake/max_warnings.cmake -@@ -13,6 +13,8 @@ if(MSVC) - - # Disable broken warnings - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") - elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index d81f25812987fe..65a457c2aada5e 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -1,19 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 - REF libssh2-1.10.0 - SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F + REF "libssh2-${VERSION}" + SHA512 8ae38d76e7fae82843c7c6990760ad5827cb55e2aba096f684b832016614d76983d1871ae0857ba28efcb9fd65018ae0b34420f6841da6bb6c6ccebd9689ec0f HEAD_REF master - PATCHES - 0001-Fix-UWP.patch - 0002-fix-macros.patch - 0003-fix-openssl3.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES zlib ENABLE_ZLIB_COMPRESSION ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND FEATURE_OPTIONS "-DBUILD_STATIC_LIBS:BOOL=OFF") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -27,6 +26,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) @@ -41,10 +41,8 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Do not delete the entire share directory as it contains the *-config.cmake files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -vcpkg_fixup_pkgconfig() - +file(INSTALL "${CURRENT_PORT_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/libssh2/usage b/ports/libssh2/usage new file mode 100644 index 00000000000000..19cb7519821b82 --- /dev/null +++ b/ports/libssh2/usage @@ -0,0 +1,4 @@ +libssh2 provides CMake targets: + + find_package(Libssh2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,Libssh2::libssh2_shared,Libssh2::libssh2_static>) diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 157bf7243c553e..e30291ccc95d08 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libssh2", - "version": "1.10.0", - "port-version": 4, + "version": "1.11.0", "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cc912c15c4c172..ad48ede13601b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4605,8 +4605,8 @@ "port-version": 4 }, "libssh2": { - "baseline": "1.10.0", - "port-version": 4 + "baseline": "1.11.0", + "port-version": 0 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 821615909a1778..1c8910c46453ac 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e57c6157ce67a01ce0b98152d9ccfd544e32b381", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "5d6f965bcf911a4750731aad9785a4b40686a2b3", "version": "1.10.0", From a26fc81350ab139c72dfeae07822ce3db3ca7ebb Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 27 Jun 2023 04:08:05 +0800 Subject: [PATCH 387/533] [vcpkg baseline][dcmtk] Remove the leading spaces of pc file (#32049) * [vcpkg baseline][dcmtk] Adding SKIP_CHECK for vcpkg_fixup_pkgconfig() * Fix the format of pc.in file * Remove local change --- ports/dcmtk/fix-pc-format.patch | 32 ++++++++++++++++++++++++++++++++ ports/dcmtk/portfile.cmake | 3 ++- ports/dcmtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dcmtk.json | 5 +++++ 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 ports/dcmtk/fix-pc-format.patch diff --git a/ports/dcmtk/fix-pc-format.patch b/ports/dcmtk/fix-pc-format.patch new file mode 100644 index 00000000000000..4cbffe98b0121c --- /dev/null +++ b/ports/dcmtk/fix-pc-format.patch @@ -0,0 +1,32 @@ +diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in +index 13c79c0..46fc98a 100644 +--- a/CMake/dcmtk.pc.in ++++ b/CMake/dcmtk.pc.in +@@ -1,14 +1,14 @@ +- prefix="@CMAKE_INSTALL_PREFIX@" +- exec_prefix="${prefix}" +- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" +- includedir="${prefix}/include/" ++prefix="@CMAKE_INSTALL_PREFIX@" ++exec_prefix="${prefix}" ++libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" ++includedir="${prefix}/include/" + +- Name: DCMTK +- Description: DICOM Toolkit (DCMTK) +- URL: https://dcmtk.org +- Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@ +- Requires: @PKGCONF_REQ_PUB@ +- Requires.private: @PKGCONF_REQ_PRIV@ +- Cflags: -I"${includedir}" +- Libs: -L"${libdir}" @PKGCONF_LIBS@ +- Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@ ++Name: DCMTK ++Description: DICOM Toolkit (DCMTK) ++URL: https://dcmtk.org ++Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@ ++Requires: @PKGCONF_REQ_PUB@ ++Requires.private: @PKGCONF_REQ_PRIV@ ++Cflags: -I"${includedir}" ++Libs: -L"${libdir}" @PKGCONF_LIBS@ ++Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@ diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 4dcbeb8247dab8..724876e2741030 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES dcmtk.patch windows-patch.patch + fix-pc-format.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -134,6 +135,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" " vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 7b4067ddab9602..7adfe71059e2c2 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dcmtk", "version": "3.6.7", - "port-version": 4, + "port-version": 5, "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", "homepage": "https://github.com/DCMTK/dcmtk", "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng", diff --git a/versions/baseline.json b/versions/baseline.json index ad48ede13601b5..75c5422d074ce0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2050,7 +2050,7 @@ }, "dcmtk": { "baseline": "3.6.7", - "port-version": 4 + "port-version": 5 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index e0d808fc07986f..0e5e9f7f96381d 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a66dd62879ace07389aae2f77cc909744f9d7458", + "version": "3.6.7", + "port-version": 5 + }, { "git-tree": "99287653b98406054ee56cb8447c38aff0528444", "version": "3.6.7", From 220e72a7049dd024358fe85bc437d70bf077d1ef Mon Sep 17 00:00:00 2001 From: Nukoooo <89713806+Nukoooo@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:24:09 +0800 Subject: [PATCH 388/533] [socket-io-client] Update to latest commit (#32225) * Update socket-io-client to latest commit * Update vcpkg.json * x-add-version --all --- ports/socket-io-client/portfile.cmake | 4 ++-- ports/socket-io-client/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake index a0f97dc5a5d26c..cce84be9ddf2fe 100644 --- a/ports/socket-io-client/portfile.cmake +++ b/ports/socket-io-client/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO socketio/socket.io-client-cpp - REF dbb4547d3160368feaaf55c3338ad085a8f968b8 - SHA512 cbb2a4742d16ba9ee72ca49a56605690ed620c978f51012e0d655a86b110a557b196ffc55af8b0440c1d7cd76d9dffe6f85abd0af300095608434eb9394dc68b + REF b10474e3eaa6b27e75dbc1382ac9af74fdf3fa85 + SHA512 d0529c1fb293bd0a468d224f14e176fc80226dd665d2a947253beabc8fbe1b0b0a939778bce45a2d8f68d10583920329cf404f41d6fd5ccf2d176cec733e8996 HEAD_REF master ) diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index 84ee82e7a9cc40..4540570c5a616d 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,6 +1,6 @@ { "name": "socket-io-client", - "version-date": "2022-08-19", + "version-date": "2023-02-14", "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 75c5422d074ce0..72ba11e4c43925 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7601,7 +7601,7 @@ "port-version": 0 }, "socket-io-client": { - "baseline": "2022-08-19", + "baseline": "2023-02-14", "port-version": 0 }, "sockpp": { diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index fd92a4d62598bf..eb286bda802e6a 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2aa8fb06982abcd0918726ba79bf81edc9000a4b", + "version-date": "2023-02-14", + "port-version": 0 + }, { "git-tree": "f4f6bebb98623c2bf8602d7538ae4c1d7de6c0ad", "version-date": "2022-08-19", From 08172551288fe8239464630aad2774a62cafbf46 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 27 Jun 2023 05:24:50 +0200 Subject: [PATCH 389/533] [gdal] Fix build and symbol visibilty (#32245) * [gdal] Fix quoting * [gdal] Fix shapelib symbol visibility --- ports/gdal/gdal-pr-8005.diff | 61 ++++++++++++++++++++++++++++++++++++ ports/gdal/portfile.cmake | 3 +- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++ 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 ports/gdal/gdal-pr-8005.diff diff --git a/ports/gdal/gdal-pr-8005.diff b/ports/gdal/gdal-pr-8005.diff new file mode 100644 index 00000000000000..4ce105f10e5ec0 --- /dev/null +++ b/ports/gdal/gdal-pr-8005.diff @@ -0,0 +1,61 @@ +diff --git a/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h +index 61eb15ee951..79795835713 100644 +--- a/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h ++++ b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h +@@ -1,3 +1,4 @@ ++/* This is a generated file by dump_symbols.h. *DO NOT EDIT MANUALLY !* */ + #define compare_ints gdal_compare_ints + #define DBFAddField gdal_DBFAddField + #define DBFAddNativeFieldType gdal_DBFAddNativeFieldType +@@ -13,6 +14,7 @@ + #define DBFGetFieldCount gdal_DBFGetFieldCount + #define DBFGetFieldIndex gdal_DBFGetFieldIndex + #define DBFGetFieldInfo gdal_DBFGetFieldInfo ++#define DBFGetLenWithoutExtension gdal_DBFGetLenWithoutExtension + #define DBFGetNativeFieldType gdal_DBFGetNativeFieldType + #define DBFGetNullCharacter gdal_DBFGetNullCharacter + #define DBFGetRecordCount gdal_DBFGetRecordCount +@@ -43,6 +45,7 @@ + #define DBFWriteStringAttribute gdal_DBFWriteStringAttribute + #define DBFWriteTuple gdal_DBFWriteTuple + #define frame_dummy gdal_frame_dummy ++#define SASetupDefaultHooks gdal_SASetupDefaultHooks + #define SBNAddShapeId gdal_SBNAddShapeId + #define SBNCloseDiskTree gdal_SBNCloseDiskTree + #define SBNOpenDiskTree gdal_SBNOpenDiskTree +@@ -66,6 +69,8 @@ + #define SHPDestroyTree gdal_SHPDestroyTree + #define SHPDestroyTreeNode gdal_SHPDestroyTreeNode + #define SHPGetInfo gdal_SHPGetInfo ++#define SHPGetLenWithoutExtension gdal_SHPGetLenWithoutExtension ++#define SHPGetPartVertexCount gdal_SHPGetPartVertexCount + #define SHPGetSubNodeOffset gdal_SHPGetSubNodeOffset + #define SHPOpenDiskTree gdal_SHPOpenDiskTree + #define SHPOpen gdal_SHPOpen +@@ -75,6 +80,7 @@ + #define SHPReadObject gdal_SHPReadObject + #define SHPReallocObjectBufIfNecessary gdal_SHPReallocObjectBufIfNecessary + #define SHPRestoreSHX gdal_SHPRestoreSHX ++#define SHPRewindIsInnerRing gdal_SHPRewindIsInnerRing + #define SHPRewindObject gdal_SHPRewindObject + #define SHPSearchDiskTreeEx gdal_SHPSearchDiskTreeEx + #define SHPSearchDiskTree gdal_SHPSearchDiskTree +@@ -97,6 +103,4 @@ + #define SHPWriteTree gdal_SHPWriteTree + #define SHPWriteTreeLL gdal_SHPWriteTreeLL + #define SHPWriteTreeNode gdal_SHPWriteTreeNode +-#define str_to_upper gdal_str_to_upper + #define SwapWord gdal_SwapWord +-/* This is a generated file by dump_symbols.h. *DO NOT EDIT MANUALLY !* */ +diff --git a/ogr/ogrsf_frmts/shape/shp_vsi.h b/ogr/ogrsf_frmts/shape/shp_vsi.h +index 9ee8056804e..9cbe653bead 100644 +--- a/ogr/ogrsf_frmts/shape/shp_vsi.h ++++ b/ogr/ogrsf_frmts/shape/shp_vsi.h +@@ -31,6 +31,7 @@ + #ifndef SHP_VSI_H_INCLUDED + #define SHP_VSI_H_INCLUDED + ++#include "gdal_shapelib_symbol_rename.h" + #include "cpl_vsi.h" + #include "shapefil.h" + diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 22f989ff7dc49d..59a9859de936b2 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( find-link-libraries.patch fix-gdal-target-interfaces.patch libkml.patch + gdal-pr-8005.diff # Remove in 3.7.1 ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") @@ -91,7 +92,7 @@ vcpkg_cmake_configure( -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}" "-DQHULL_LIBRARY=${qhull_target}" - -DCMAKE_PROJECT_INCLUDE="${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" OPTIONS_DEBUG -DBUILD_APPS=OFF MAYBE_UNUSED_VARIABLES diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 42b6ea96380859..d04746ad9ff8d9 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.7.0", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 72ba11e4c43925..3114193b045fca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2738,7 +2738,7 @@ }, "gdal": { "baseline": "3.7.0", - "port-version": 3 + "port-version": 4 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 07d6fde518f92e..3e77e58fd7187e 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e2de2263a527e2135c8532fcc9967e63378a552", + "version-semver": "3.7.0", + "port-version": 4 + }, { "git-tree": "35cbea48f44c5d0836cd0b6f171396eae2745177", "version-semver": "3.7.0", From 265bf361b62d9573c2163642016dd45920e19a44 Mon Sep 17 00:00:00 2001 From: reito Date: Tue, 27 Jun 2023 11:26:26 +0800 Subject: [PATCH 390/533] [spout2] upgrade to 2.007.010, fix spoutDX include path (#32237) * fix spout2 * fix spout2 --- ports/spout2/fix-dx-keyed.patch | 18 +++++++++++ ports/spout2/fix-include-path.patch | 48 +++++++++++++++++++++++++++++ ports/spout2/portfile.cmake | 7 +++-- ports/spout2/usage | 11 ++----- ports/spout2/vcpkg.json | 2 +- versions/baseline.json | 10 +++--- versions/s-/spout2.json | 5 +++ 7 files changed, 84 insertions(+), 17 deletions(-) create mode 100644 ports/spout2/fix-dx-keyed.patch create mode 100644 ports/spout2/fix-include-path.patch diff --git a/ports/spout2/fix-dx-keyed.patch b/ports/spout2/fix-dx-keyed.patch new file mode 100644 index 00000000000000..08049a967a0d9e --- /dev/null +++ b/ports/spout2/fix-dx-keyed.patch @@ -0,0 +1,18 @@ +Subject: [PATCH] fix dx keyed +--- +Index: SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp +--- a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp (revision e16402c39ed2389692876d7bbd1c7d4a771a5b86) ++++ b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.cpp (revision f3ba250699b87c8004a3430d6b00f3f537af0c0d) +@@ -193,6 +193,7 @@ + m_bSwapRB = false; + m_bAdapt = false; // Receiver switch to the sender's graphics adapter + m_bMemoryShare = GetMemoryShareMode(); // 2.006 memoryshare mode ++ m_bKeyed = false; + + ZeroMemory(&m_SenderInfo, sizeof(SharedTextureInfo)); + ZeroMemory(&m_ShExecInfo, sizeof(m_ShExecInfo)); diff --git a/ports/spout2/fix-include-path.patch b/ports/spout2/fix-include-path.patch new file mode 100644 index 00000000000000..498eab321c4b06 --- /dev/null +++ b/ports/spout2/fix-include-path.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] fixup for vcpkg +--- +Index: SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt b/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt +--- a/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt (revision 62362774c96547d63b502d7efd5cfbf138eb7570) ++++ b/SPOUTSDK/SpoutDirectX/SpoutDX/CMakeLists.txt (revision e16402c39ed2389692876d7bbd1c7d4a771a5b86) +@@ -67,6 +67,10 @@ + SPOUT_BUILD_DLL + SPOUTLIBRARY_EXPORTS + ) ++ ++ ++target_include_directories(SpoutDX_static PRIVATE ../../) ++target_include_directories(SpoutDX PRIVATE ../../) + #/-------------------------------------- . -----------------------------------\# + + +Index: SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h +--- a/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h (revision 62362774c96547d63b502d7efd5cfbf138eb7570) ++++ b/SPOUTSDK/SpoutDirectX/SpoutDX/SpoutDX.h (revision e16402c39ed2389692876d7bbd1c7d4a771a5b86) +@@ -33,12 +33,12 @@ + #define __spoutDX__ + + // Change the path as required +-#include "..\..\SpoutGL\SpoutCommon.h" // for dll build +-#include "..\..\SpoutGL\SpoutSenderNames.h" // for sender creation and update +-#include "..\..\SpoutGL\SpoutDirectX.h" // for creating DX11 textures +-#include "..\..\SpoutGL\SpoutFrameCount.h" // for mutex lock and new frame signal +-#include "..\..\SpoutGL\SpoutCopy.h" // for pixel copy +-#include "..\..\SpoutGL\SpoutUtils.h" // Registry utiities ++#include "SpoutGL\SpoutCommon.h" // for dll build ++#include "SpoutGL\SpoutSenderNames.h" // for sender creation and update ++#include "SpoutGL\SpoutDirectX.h" // for creating DX11 textures ++#include "SpoutGL\SpoutFrameCount.h" // for mutex lock and new frame signal ++#include "SpoutGL\SpoutCopy.h" // for pixel copy ++#include "SpoutGL\SpoutUtils.h" // Registry utiities + + #include // for _getcwd + #include // for PROCESSENTRY32 diff --git a/ports/spout2/portfile.cmake b/ports/spout2/portfile.cmake index 69e31ae85f75e7..e9b0ad830c6ce1 100644 --- a/ports/spout2/portfile.cmake +++ b/ports/spout2/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO leadedge/Spout2 - REF 9db0efadba16e1d884164d348f556922cfc80c50 #v2.007.009 - SHA512 d45613590fb53155c90839cf6eb7fe646ef4ec463b6cd1624aff54870818f0bc4faccded78a6b2c089fa4e8756cf15c7e17def2ef32ac6c34144e562b58c5d8b + REF 62362774c96547d63b502d7efd5cfbf138eb7570 #v2.007.010 + SHA512 89d0dcec719c068e27c2f55605e4b45b32fe3a5e097c821b0aa45f4ee9284e63830bd741ac7bb1bff917190d9a51daa36b452580fc673c05767b7bfcbc9a494f HEAD_REF master + PATCHES + fix-include-path.patch + fix-dx-keyed.patch ) if(VCPKG_CRT_LINKAGE STREQUAL "static") diff --git a/ports/spout2/usage b/ports/spout2/usage index 5562cfaa7dcef1..4f727e01b2f07a 100644 --- a/ports/spout2/usage +++ b/ports/spout2/usage @@ -1,11 +1,8 @@ spout2 provides CMake targets: - # Dynamic Linkage + # SpoutGL find_package(Spout2 CONFIG REQUIRED) target_link_libraries(main PRIVATE Spout2::Spout) - - # Static Linkage - find_package(Spout2 CONFIG REQUIRED) target_link_libraries(main PRIVATE Spout2::Spout_static) # SpoutLibrary @@ -13,8 +10,4 @@ spout2 provides CMake targets: # SpoutDX target_link_libraries(main PRIVATE Spout2::SpoutDX) - - Note: SpoutDX (`dx` feature) is not essential to use DirectX in Spout... It is a sub-set of the - Spout SDK for applications using DirectX rather than OpenGL. It doesn't mean enabling - DirectX ability for Spout. See https://github.com/leadedge/Spout2/tree/master/SPOUTSDK - It is more likely: 'Use only DirectX to implement Spout, and remove all codes that need OpenGL'. + target_link_libraries(main PRIVATE Spout2::SpoutDX_static) diff --git a/ports/spout2/vcpkg.json b/ports/spout2/vcpkg.json index 3986cc75b4edf1..f43102f01fcb19 100644 --- a/ports/spout2/vcpkg.json +++ b/ports/spout2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spout2", - "version-string": "2.007.009", + "version-string": "2.007.010", "description": "Spout is a video frame sharing system for Microsoft Windows, which allows applications to share OpenGL textures in a similar way to Syphon for the Mac.", "homepage": "https://github.com/leadedge/Spout2", "supports": "windows & !uwp & !arm64", diff --git a/versions/baseline.json b/versions/baseline.json index 3114193b045fca..53256d3a9d80e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -484,6 +484,10 @@ "baseline": "1.6", "port-version": 1 }, + "baresip-libre": { + "baseline": "3.2.0", + "port-version": 0 + }, "basisu": { "baseline": "1.11", "port-version": 7 @@ -4480,10 +4484,6 @@ "baseline": "2.1.1", "port-version": 0 }, - "baresip-libre": { - "baseline": "3.2.0", - "port-version": 0 - }, "libredwg": { "baseline": "0.12.5.5178", "port-version": 1 @@ -7733,7 +7733,7 @@ "port-version": 0 }, "spout2": { - "baseline": "2.007.009", + "baseline": "2.007.010", "port-version": 0 }, "sprout": { diff --git a/versions/s-/spout2.json b/versions/s-/spout2.json index 1983a58c086ca7..001eb3becd9c82 100644 --- a/versions/s-/spout2.json +++ b/versions/s-/spout2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3e3dddea59b3f446dab21b4e4e9ca3c397197f6", + "version-string": "2.007.010", + "port-version": 0 + }, { "git-tree": "6f13bac00168667a3628277bf6301fa4a25c954c", "version-string": "2.007.009", From 833015f5aa61cca45e0ec35ebbc0055e30963eb1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 27 Jun 2023 05:26:55 +0200 Subject: [PATCH 391/533] [libmysql] remove duplicated symbols (#32223) * [libmysql] fix duplicated symbols * v db --- ports/libmysql/fix_dup_symbols.patch | 20 ++++++++++++++++++++ ports/libmysql/portfile.cmake | 1 + ports/libmysql/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmysql.json | 5 +++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ports/libmysql/fix_dup_symbols.patch diff --git a/ports/libmysql/fix_dup_symbols.patch b/ports/libmysql/fix_dup_symbols.patch new file mode 100644 index 00000000000000..352fd8af89f055 --- /dev/null +++ b/ports/libmysql/fix_dup_symbols.patch @@ -0,0 +1,20 @@ +diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt +index 058967b..bcd8841 100644 +--- a/client/CMakeLists.txt ++++ b/client/CMakeLists.txt +@@ -43,7 +43,6 @@ MYSQL_ADD_EXECUTABLE(mysql + pattern_matcher.cc + readline.cc + client_query_attributes.cc +- multi_factor_passwordopt-vars.cc + ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc + LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} + ) +@@ -226,7 +226,6 @@ SET(MYSQLBINLOG_SOURCES + ${CMAKE_SOURCE_DIR}/sql/binlog_reader.cc + ${CMAKE_SOURCE_DIR}/sql/stream_cipher.cc + ${CMAKE_SOURCE_DIR}/sql/rpl_log_encryption.cc +- ${CMAKE_SOURCE_DIR}/libbinlogevents/src/trx_boundary_parser.cpp + ) + + SET(MYSQLBINLOG_LIBRARIES diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index a9c879bbf775fe..3a08e3a253a5d0 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( export-cmake-targets.patch Add-target-include-directories.patch homebrew.patch + fix_dup_symbols.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index c7542693af396a..d8995dbc1608c4 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.32", - "port-version": 5, + "port-version": 6, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 53256d3a9d80e2..f384ca730ea169 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4330,7 +4330,7 @@ }, "libmysql": { "baseline": "8.0.32", - "port-version": 5 + "port-version": 6 }, "libnice": { "baseline": "0.1.21", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 9405948c7cd56e..3b5cc843d0898f 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5696eb818512a5f9375068dc057c3e074de4bc3d", + "version": "8.0.32", + "port-version": 6 + }, { "git-tree": "d32101a913ac66b95dff40eb0ce3e315438566ab", "version": "8.0.32", From 7de72f8f838dd19658a7650e2a048f28897ac401 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 27 Jun 2023 05:27:30 +0200 Subject: [PATCH 392/533] [intel-mkl] Fix space in -I flag (#32222) * [intel-mkl] fix space in -I flag * v db --- ports/intel-mkl/portfile.cmake | 1 + ports/intel-mkl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/intel-mkl.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 0e76f77ecc5a77..5642ceeaeea56f 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -126,6 +126,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "-I \${includedir}" "-I\"\${includedir}\"") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5") if(NOT VCPKG_BUILD_TYPE) file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json index 0773404897ae4b..381933937ad174 100644 --- a/ports/intel-mkl/vcpkg.json +++ b/ports/intel-mkl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "intel-mkl", "version": "2023.0.0", - "port-version": 1, + "port-version": 2, "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.", "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index f384ca730ea169..87356c6cd9b07d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3390,7 +3390,7 @@ }, "intel-mkl": { "baseline": "2023.0.0", - "port-version": 1 + "port-version": 2 }, "intelrdfpmathlib": { "baseline": "20U2", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index 6b71917ac97597..5117e181595b73 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d2adb8cb7c54dd3dc17a92c22db24204c638e72", + "version": "2023.0.0", + "port-version": 2 + }, { "git-tree": "285fa0de9d6f05022ce06e53f7c8c21048ff586f", "version": "2023.0.0", From 900c572331e3f83f58a33045bfc9780ce5ffe130 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:28:25 +0800 Subject: [PATCH 393/533] [zeromq] Fix duplicate definition of functions in zeromq and sodium (#32214) * Fix duplicate definition of functions in zeromq and sodium * version * update license * update version --- ports/zeromq/include-dir-gnutls.patch | 38 --------------------------- ports/zeromq/portfile.cmake | 11 ++++---- ports/zeromq/vcpkg.json | 5 ++-- versions/baseline.json | 4 +-- versions/z-/zeromq.json | 5 ++++ 5 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 ports/zeromq/include-dir-gnutls.patch diff --git a/ports/zeromq/include-dir-gnutls.patch b/ports/zeromq/include-dir-gnutls.patch deleted file mode 100644 index b3a8c2b5181a4a..00000000000000 --- a/ports/zeromq/include-dir-gnutls.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 124cbb7..16f0c81 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1382,6 +1382,9 @@ else() - if(NOT MINGW) - add_library(objects OBJECT ${sources}) - set_property(TARGET objects PROPERTY POSITION_INDEPENDENT_CODE ON) -+ if(GNUTLS_FOUND) -+ target_include_directories(objects PRIVATE "${GNUTLS_INCLUDE_DIR}") -+ endif() - endif() - - if(BUILD_SHARED) -@@ -1469,6 +1472,7 @@ if(BUILD_SHARED) - target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT}) - if(GNUTLS_FOUND) - target_link_libraries(libzmq ${GNUTLS_LIBRARIES}) -+ target_include_directories(libzmq PRIVATE "${GNUTLS_INCLUDE_DIR}") - endif() - - if(NSS3_FOUND) -@@ -1518,6 +1522,7 @@ if(BUILD_STATIC) - target_link_libraries(libzmq-static ${CMAKE_THREAD_LIBS_INIT}) - if(GNUTLS_FOUND) - target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES}) -+ target_include_directories(libzmq-static PRIVATE "${GNUTLS_INCLUDE_DIR}") - endif() - - if(LIBBSD_FOUND) -@@ -1590,6 +1595,7 @@ if(BUILD_SHARED) - - if(GNUTLS_FOUND) - target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES}) -+ target_include_directories(${perf-tool} PRIVATE "${GNUTLS_INCLUDE_DIR}") - endif() - - if(LIBBSD_FOUND) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 4c8cf77ba16c11..6d804c6d5be4f3 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF ce6d48c578a08770fb171486750300fd534d0254 - SHA512 e204db3e40d99df2206f9537bf7dbc9bb8994174f4f9c4770dcc7a92622e6ff0e2b1be537d7fff96cfbdb0cdd0174bfd11ba60d08c4bab0ccb4db3ec25c06593 + REF ecc63d0d3b0e1a62c90b58b1ccdb5ac16cb2400a + SHA512 4e8f709691d8f3f64d41cc0f0fd70fe0a676247dc88b1283fa90f41b838f5b83100ccabd18714e5638cfa66c5cec0ac67943a3559d535357ff3499de62e47069 PATCHES fix-arm.patch - include-dir-gnutls.patch # from https://github.com/zeromq/libzmq/pull/4533 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -43,6 +42,9 @@ vcpkg_cmake_configure( "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" MAYBE_UNUSED_VARIABLES USE_PERF_TOOLS + CMAKE_REQUIRE_FIND_PACKAGE_GnuTLS + WITH_LIBBSD + WITH_TLS ) vcpkg_cmake_install() @@ -65,8 +67,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq") vcpkg_fixup_pkgconfig() diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index a4cfb20711e19d..bcafe54b035506 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,10 +1,9 @@ { "name": "zeromq", - "version-date": "2023-01-31", - "port-version": 5, + "version-date": "2023-06-20", "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", - "license": "LGPL-3.0-only", + "license": "MPL-2.0", "supports": "!uwp & !xbox", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 87356c6cd9b07d..870425185c170a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8921,8 +8921,8 @@ "port-version": 0 }, "zeromq": { - "baseline": "2023-01-31", - "port-version": 5 + "baseline": "2023-06-20", + "port-version": 0 }, "zfp": { "baseline": "1.0.0", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index ea48d6ae1e8b76..7b781e8455f209 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3deda40ff74bb4d77071cefabd7d889589452425", + "version-date": "2023-06-20", + "port-version": 0 + }, { "git-tree": "910e9e92155a96a07837641615e3356c98edec9a", "version-date": "2023-01-31", From 550ef936cd765834a6f475dc2566ee06cdaaa48d Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 27 Jun 2023 05:29:26 +0200 Subject: [PATCH 394/533] [stackwalker] update to 2023-06-24 (#32203) Signed-off-by: Vitalii Koshura --- ports/stackwalker/fix-build.patch | 23 ----------------------- ports/stackwalker/portfile.cmake | 3 +-- ports/stackwalker/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/s-/stackwalker.json | 5 +++++ 5 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 ports/stackwalker/fix-build.patch diff --git a/ports/stackwalker/fix-build.patch b/ports/stackwalker/fix-build.patch deleted file mode 100644 index 9193a26055ee9a..00000000000000 --- a/ports/stackwalker/fix-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git "a/Main/StackWalker/StackWalker.h" "b/Main/StackWalker/StackWalker.h" -index 67eb90575..e906dbc26 100644 ---- "a/Main/StackWalker/StackWalker.h" -+++ "b/Main/StackWalker/StackWalker.h" -@@ -229,13 +229,11 @@ protected: - { \ - memset(&c, 0, sizeof(CONTEXT)); \ - c.ContextFlags = contextFlags; \ -- __asm { \ -- call x \ -- x: pop eax \ -- mov c.Eip, eax \ -- mov c.Ebp, ebp \ -- mov c.Esp, esp \ -- }; \ -+ __asm call x \ -+ __asm x: pop eax \ -+ __asm mov c.Eip, eax \ -+ __asm mov c.Ebp, ebp \ -+ __asm mov c.Esp, esp \ - } while (0); - // clang-format on - #endif diff --git a/ports/stackwalker/portfile.cmake b/ports/stackwalker/portfile.cmake index 4c180b05f33f98..4a5c4c4234d51d 100644 --- a/ports/stackwalker/portfile.cmake +++ b/ports/stackwalker/portfile.cmake @@ -4,10 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JochenKalmbach/StackWalker REF "${VERSION}" - SHA512 ce4004f114400ff66e25d7403c52ed4798a0e94d529335995df525f37d4238c750c8b1ee5801f71bd7128d39baa9af18e546a49da8587976720df6e9b372b851 + SHA512 6fe8c5eb6e2d94630d43644a13cf62f1725a9f39115bda2d859461ad0cc6acf27e8a246247bd9b49940fb4ec372559f6d11467e77215d3638f910f2574ac449a HEAD_REF master PATCHES - fix-build.patch # https://github.com/JochenKalmbach/StackWalker/commit/97965daed94f1d859fff691e6ba28759db0f179f fix-exports.patch ) diff --git a/ports/stackwalker/vcpkg.json b/ports/stackwalker/vcpkg.json index f88d23da9ea4a6..d1e311bedcca57 100644 --- a/ports/stackwalker/vcpkg.json +++ b/ports/stackwalker/vcpkg.json @@ -1,9 +1,9 @@ { "name": "stackwalker", - "version": "1.20", + "version-date": "2023-06-24", "description": "StackWalker - Walking the callstack.", "license": "BSD-2-Clause", - "supports": "windows & !arm & !uwp", + "supports": "windows & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 870425185c170a..34cdffe8235c89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7797,7 +7797,7 @@ "port-version": 1 }, "stackwalker": { - "baseline": "1.20", + "baseline": "2023-06-24", "port-version": 0 }, "starlink-ast": { diff --git a/versions/s-/stackwalker.json b/versions/s-/stackwalker.json index 8441c9507b2d04..adf5218a63a577 100644 --- a/versions/s-/stackwalker.json +++ b/versions/s-/stackwalker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d0f7a4241172aa6694d7374784d7aa83798e17", + "version-date": "2023-06-24", + "port-version": 0 + }, { "git-tree": "31a65d527a4476b3ababfd0ec1b9bb78371900ca", "version": "1.20", From 5ae20332a26a21e7f5ba9d9e00dca5b3cd22280b Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Tue, 27 Jun 2023 05:31:26 +0200 Subject: [PATCH 395/533] Update libdjinterop to version 0.19.1 (#32198) --- ports/libdjinterop/portfile.cmake | 4 ++-- ports/libdjinterop/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libdjinterop.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake index 9f5981d25a3b5c..eef119a08e3fa4 100644 --- a/ports/libdjinterop/portfile.cmake +++ b/ports/libdjinterop/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xsco/libdjinterop - REF 0.16.0 - SHA512 7653e3752b8d597a967fb5f83f8b14c0db5d9cdb05a9bb22f6d9f34a890327fafdbd81996ce9af09552b69da4b9f7f0b41d631b1704b11e46e335f205c6886bf + REF ${VERSION} + SHA512 7becb83ab62412b3d437ddee23b248a697b162f6b8a64070cd8a9782a4fce7726baaf12ea193b8e21bcf561a00039ab1ae1f04d00e6cbe8344ec19751779db14 HEAD_REF master ) diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index 3802c293f27136..40d1aba1dd2e18 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdjinterop", - "version": "0.16.0", - "port-version": 1, + "version": "0.19.1", "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 34cdffe8235c89..6ec76bac87cde9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3985,8 +3985,8 @@ "port-version": 1 }, "libdjinterop": { - "baseline": "0.16.0", - "port-version": 1 + "baseline": "0.19.1", + "port-version": 0 }, "libdmx": { "baseline": "1.1.4", diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index ae88933184557b..34afceb7396c0f 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccc1b924f1e3c41f94f22f26ceec66c89f469f74", + "version": "0.19.1", + "port-version": 0 + }, { "git-tree": "07081634d12b7ede73b9921d461f55061410a6c7", "version": "0.16.0", From 245b5fedb35eb811d6c846afa4921733e76ad165 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 27 Jun 2023 05:54:48 +0200 Subject: [PATCH 396/533] [tiff] Update to 4.5.1 (#32010) * [tiff] Update to 4.5.1 * CI --- ports/tiff/portfile.cmake | 13 +++++++------ ports/tiff/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/tiff.json | 5 +++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index a9c290eab0b517..01af6b41b21f17 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,11 +1,9 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libtiff/libtiff REF "v${VERSION}" - SHA512 5227cb7b496ac6829601d8d689233bd8f318c1d04e5ce3457cdd6eac9e4f8c80cd7211d90cd092c61ad38bc8a4949169a13eabd788c46c15bcee1f72519fa022 + SHA512 859331284cd28df56c44644a355ecdd8eece19f0d5cd3e693e37c0fe37115091e46943ffbad784e84af1b39a6fd81cd196af2d4fefe86369258f89050dafaa84 HEAD_REF master PATCHES FindCMath.patch @@ -17,7 +15,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS jpeg jpeg jpeg CMAKE_REQUIRE_FIND_PACKAGE_JPEG lzma lzma - lzma CMAKE_REQUIRE_FIND_PACKAGE_LibLZMA + lzma CMAKE_REQUIRE_FIND_PACKAGE_liblzma tools tiff-tools webp webp webp CMAKE_REQUIRE_FIND_PACKAGE_WebP @@ -31,6 +29,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -Dtiff-docs=OFF -Dtiff-contrib=OFF -Dtiff-tests=OFF @@ -50,7 +49,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +# CMake config wasn't packaged in the past and is not yet usable now, +# cf. https://gitlab.com/libtiff/libtiff/-/merge_requests/496 +# vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/tiff") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") if(EXISTS "${_file}") @@ -61,7 +63,6 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/share" ) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 550fcb6de762f3..00fa2772a64d33 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tiff", - "version": "4.5.0", - "port-version": 3, + "version": "4.5.1", "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6ec76bac87cde9..55269bc6fc5c57 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8017,8 +8017,8 @@ "port-version": 0 }, "tiff": { - "baseline": "4.5.0", - "port-version": 3 + "baseline": "4.5.1", + "port-version": 0 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index b51f8a69a5c518..2ab9123bbbe275 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5510d3f8317c71185268d5128e6a7c24b4d66863", + "version": "4.5.1", + "port-version": 0 + }, { "git-tree": "658dc44e4f5495f0820db6358d8edf74e6ac8d48", "version": "4.5.0", From b799de0c540a4cf8d2a97c9d715b0e7e9ea180fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 27 Jun 2023 07:11:23 +0200 Subject: [PATCH 397/533] [concurrentqueue] Update to 1.0.4 (#32183) * [concurrentqueue] Update to 1.0.4 * [concurrentqueue] Update version files * [concurrentqueue] Remove deprecated vcpkg_minimum_required call * [concurrentqueue] Update version files --- ports/concurrentqueue/portfile.cmake | 8 +++++--- ports/concurrentqueue/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/c-/concurrentqueue.json | 5 +++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake index f570594137b73a..17f4190721f3ba 100644 --- a/ports/concurrentqueue/portfile.cmake +++ b/ports/concurrentqueue/portfile.cmake @@ -1,9 +1,10 @@ # header-only library + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cameron314/concurrentqueue - REF 3747268264d0fa113e981658a99ceeae4dad05b7# v1.0.3 - SHA512 798d61e8e5b87cd1870df20410db18e2fcbc5e4e1d849308663cc0403a0d50d29b72428fc0a39231ae8bcb460c946559bde0f2d22584c335fe849cbcbe607ec2 + REF v${VERSION} + SHA512 a27306d1a7ad725daf5155a8e33a93efd29839708b2147ba703d036c4a92e04cbd8a505d804d2596ccb4dd797e88aca030b1cb34a4eaf09c45abb0ab55e604ea HEAD_REF master ) @@ -26,4 +27,5 @@ configure_file( file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/concurrentqueue/vcpkg.json b/ports/concurrentqueue/vcpkg.json index 25b733d690e522..3572aede27cbee 100644 --- a/ports/concurrentqueue/vcpkg.json +++ b/ports/concurrentqueue/vcpkg.json @@ -1,9 +1,9 @@ { "name": "concurrentqueue", - "version": "1.0.3", - "port-version": 1, + "version": "1.0.4", "description": "A fast multi-producer, multi-consumer lock-free concurrent queue for C++11", "homepage": "https://github.com/cameron314/concurrentqueue", + "license": "BSD-2-Clause OR BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 55269bc6fc5c57..c8e1ad02202d6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1701,8 +1701,8 @@ "port-version": 1 }, "concurrentqueue": { - "baseline": "1.0.3", - "port-version": 1 + "baseline": "1.0.4", + "port-version": 0 }, "configcat": { "baseline": "2.0.1", diff --git a/versions/c-/concurrentqueue.json b/versions/c-/concurrentqueue.json index e17ada662fbbc5..385cb5aacf2c31 100644 --- a/versions/c-/concurrentqueue.json +++ b/versions/c-/concurrentqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9e893a30c08cf74ea4155c9110c47d605e1e534", + "version": "1.0.4", + "port-version": 0 + }, { "git-tree": "2a8223a8b75af74f94551fb342fd576e893c1ba7", "version": "1.0.3", From c3dea019d20e96219af82f10b935d6bb23baeedb Mon Sep 17 00:00:00 2001 From: funsafe-ptr <136802754+funsafe-ptr@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:14:44 +0700 Subject: [PATCH 398/533] [Android Termux] Fix missing `Z_VCPKG_TARGET_TRIPLET_PLAT` (#32157) --- scripts/buildsystems/vcpkg.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 739495fb7ef069..87e31f7f2db797 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -360,6 +360,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_ endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")) set(Z_VCPKG_TARGET_TRIPLET_PLAT freebsd) +elseif(CMAKE_SYSTEM_NAME STREQUAL "Android" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")) + set(Z_VCPKG_TARGET_TRIPLET_PLAT android) endif() if(EMSCRIPTEN) From f3c8c1cf46ff826b9062ad600a86ecf5fd574b92 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Tue, 27 Jun 2023 07:17:15 +0200 Subject: [PATCH 399/533] [gmp] update download urls (#32155) * [gmp] update download urls * line breaks --- .../gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch | 521 ++++++++++++++++++ ports/gmp/portfile.cmake | 15 +- ports/gmp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 + 5 files changed, 533 insertions(+), 12 deletions(-) create mode 100644 ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch diff --git a/ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch b/ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch new file mode 100644 index 00000000000000..b4008a3fee7fdf --- /dev/null +++ b/ports/gmp/gmp-arm64-asm-fix-5f32dbc41afc.patch @@ -0,0 +1,521 @@ + +# HG changeset patch +# User Torbjorn Granlund +# Date 1606685500 -3600 +# Node ID 5f32dbc41afc1f8cd77af1614f0caeb24deb7d7b +# Parent 94c84d919f83ba963ed1809f8e80c7bef32db55c +Avoid the x18 register since it is reserved on Darwin. + +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/aors_n.asm +--- a/mpn/arm64/aors_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/aors_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -68,7 +68,7 @@ + EPILOGUE() + PROLOGUE(func_n) + CLRCY +-L(ent): lsr x18, n, #2 ++L(ent): lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x7, [up] +@@ -77,7 +77,7 @@ + str x13, [rp],#8 + tbnz n, #1, L(b11) + +-L(b01): cbz x18, L(ret) ++L(b01): cbz x17, L(ret) + ldp x4, x5, [up,#8] + ldp x8, x9, [vp,#8] + sub up, up, #8 +@@ -88,7 +88,7 @@ + ldp x10, x11, [vp,#8] + add up, up, #8 + add vp, vp, #8 +- cbz x18, L(end) ++ cbz x17, L(end) + b L(top) + + L(bx0): tbnz n, #1, L(b10) +@@ -101,7 +101,7 @@ + + L(b10): ldp x6, x7, [up] + ldp x10, x11, [vp] +- cbz x18, L(end) ++ cbz x17, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#16] +@@ -114,8 +114,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + stp x12, x13, [rp],#16 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): ADDSUBC x12, x6, x10 + ADDSUBC x13, x7, x11 +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/aorsmul_1.asm +--- a/mpn/arm64/aorsmul_1.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/aorsmul_1.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -32,10 +32,15 @@ + + include(`../config.m4') + +-C cycles/limb +-C Cortex-A53 9.3-9.8 +-C Cortex-A57 7.0 +-C X-Gene 5.0 ++C addmul_1 submul_1 ++C cycles/limb cycles/limb ++C Cortex-A53 9.3-9.8 9.3-9.8 ++C Cortex-A55 9.0-9.5 9.3-9.8 ++C Cortex-A57 7 7 ++C Cortex-A72 ++C Cortex-A73 6 6 ++C X-Gene 5 5 ++C Apple M1 1.75 1.75 + + C NOTES + C * It is possible to keep the carry chain alive between the addition blocks +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/aorsorrlshC_n.asm +--- a/mpn/arm64/aorsorrlshC_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/aorsorrlshC_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -65,14 +65,14 @@ + + ASM_START() + PROLOGUE(func_n) +- lsr x18, n, #2 ++ lsr x6, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x5, [up] + tbnz n, #1, L(b11) + + L(b01): ldr x11, [vp] +- cbz x18, L(1) ++ cbz x6, L(1) + ldp x8, x9, [vp,#8] + lsl x13, x11, #LSH + ADDSUB( x15, x13, x5) +@@ -94,7 +94,7 @@ + ADDSUB( x17, x13, x5) + str x17, [rp],#8 + sub up, up, #8 +- cbz x18, L(end) ++ cbz x6, L(end) + b L(top) + + L(bx0): tbnz n, #1, L(b10) +@@ -107,7 +107,7 @@ + L(b10): CLRRCY( x9) + ldp x10, x11, [vp] + sub up, up, #16 +- cbz x18, L(end) ++ cbz x6, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#16] +@@ -124,8 +124,8 @@ + ADDSUBC(x16, x12, x4) + ADDSUBC(x17, x13, x5) + stp x16, x17, [rp],#16 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x6, x6, #1 ++ cbnz x6, L(top) + + L(end): ldp x4, x5, [up,#16] + extr x12, x10, x9, #RSH +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/cnd_aors_n.asm +--- a/mpn/arm64/cnd_aors_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/cnd_aors_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -65,7 +65,7 @@ + + CLRCY + +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x13, [vp] +@@ -75,7 +75,7 @@ + str x9, [rp] + tbnz n, #1, L(b11) + +-L(b01): cbz x18, L(rt) ++L(b01): cbz x17, L(rt) + ldp x12, x13, [vp,#8] + ldp x10, x11, [up,#8] + sub up, up, #8 +@@ -86,7 +86,7 @@ + L(b11): ldp x12, x13, [vp,#8]! + ldp x10, x11, [up,#8]! + sub rp, rp, #8 +- cbz x18, L(end) ++ cbz x17, L(end) + b L(top) + + L(bx0): ldp x12, x13, [vp] +@@ -99,7 +99,7 @@ + b L(mid) + + L(b10): sub rp, rp, #16 +- cbz x18, L(end) ++ cbz x17, L(end) + + ALIGN(16) + L(top): bic x6, x12, cnd +@@ -116,8 +116,8 @@ + ADDSUBC x9, x11, x7 + ldp x10, x11, [up,#32]! + stp x8, x9, [rp,#32]! +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): bic x6, x12, cnd + bic x7, x13, cnd +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/logops_n.asm +--- a/mpn/arm64/logops_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/logops_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -78,7 +78,7 @@ + + ASM_START() + PROLOGUE(func) +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x7, [up] +@@ -88,7 +88,7 @@ + str x15, [rp],#8 + tbnz n, #1, L(b11) + +-L(b01): cbz x18, L(ret) ++L(b01): cbz x17, L(ret) + ldp x4, x5, [up,#8] + ldp x8, x9, [vp,#8] + sub up, up, #8 +@@ -99,7 +99,7 @@ + ldp x10, x11, [vp,#8] + add up, up, #8 + add vp, vp, #8 +- cbz x18, L(end) ++ cbz x17, L(end) + b L(top) + + L(bx0): tbnz n, #1, L(b10) +@@ -110,7 +110,7 @@ + + L(b10): ldp x6, x7, [up] + ldp x10, x11, [vp] +- cbz x18, L(end) ++ cbz x17, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#16] +@@ -127,8 +127,8 @@ + POSTOP( x12) + POSTOP( x13) + stp x12, x13, [rp],#16 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): LOGOP( x12, x6, x10) + LOGOP( x13, x7, x11) +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/lshift.asm +--- a/mpn/arm64/lshift.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/lshift.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -61,7 +61,7 @@ + add rp, rp_arg, n, lsl #3 + add up, up, n, lsl #3 + sub tnc, xzr, cnt +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x4, [up,#-8] +@@ -69,7 +69,7 @@ + + L(b01): NSHIFT x0, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt1) ++ cbnz x17, L(gt1) + str x2, [rp,#-8] + ret + L(gt1): ldp x4, x5, [up,#-24] +@@ -89,7 +89,7 @@ + PSHIFT x13, x5, cnt + NSHIFT x10, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt2) ++ cbnz x17, L(gt2) + orr x10, x10, x13 + stp x2, x10, [rp,#-16] + ret +@@ -123,11 +123,11 @@ + orr x11, x12, x2 + stp x10, x11, [rp,#-32]! + PSHIFT x2, x4, cnt +-L(lo0): sub x18, x18, #1 ++L(lo0): sub x17, x17, #1 + L(lo3): NSHIFT x10, x6, tnc + PSHIFT x13, x7, cnt + NSHIFT x12, x7, tnc +- cbnz x18, L(top) ++ cbnz x17, L(top) + + L(end): orr x10, x10, x13 + orr x11, x12, x2 +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/lshiftc.asm +--- a/mpn/arm64/lshiftc.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/lshiftc.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -61,7 +61,7 @@ + add rp, rp_arg, n, lsl #3 + add up, up, n, lsl #3 + sub tnc, xzr, cnt +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x4, [up,#-8] +@@ -69,7 +69,7 @@ + + L(b01): NSHIFT x0, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt1) ++ cbnz x17, L(gt1) + mvn x2, x2 + str x2, [rp,#-8] + ret +@@ -90,7 +90,7 @@ + PSHIFT x13, x5, cnt + NSHIFT x10, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt2) ++ cbnz x17, L(gt2) + eon x10, x10, x13 + mvn x2, x2 + stp x2, x10, [rp,#-16] +@@ -125,11 +125,11 @@ + eon x11, x12, x2 + stp x10, x11, [rp,#-32]! + PSHIFT x2, x4, cnt +-L(lo0): sub x18, x18, #1 ++L(lo0): sub x17, x17, #1 + L(lo3): NSHIFT x10, x6, tnc + PSHIFT x13, x7, cnt + NSHIFT x12, x7, tnc +- cbnz x18, L(top) ++ cbnz x17, L(top) + + L(end): eon x10, x10, x13 + eon x11, x12, x2 +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/mul_1.asm +--- a/mpn/arm64/mul_1.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/mul_1.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -56,7 +56,7 @@ + + PROLOGUE(mpn_mul_1) + adds x4, xzr, xzr C clear register and cy flag +-L(com): lsr x18, n, #2 ++L(com): lsr x17, n, #2 + tbnz n, #0, L(bx1) + + L(bx0): mov x11, x4 +@@ -65,7 +65,7 @@ + L(b10): ldp x4, x5, [up] + mul x8, x4, v0 + umulh x10, x4, v0 +- cbz x18, L(2) ++ cbz x17, L(2) + ldp x6, x7, [up,#16]! + mul x9, x5, v0 + b L(mid)-8 +@@ -80,7 +80,7 @@ + str x9, [rp],#8 + tbnz n, #1, L(b10) + +-L(b01): cbz x18, L(1) ++L(b01): cbz x17, L(1) + + L(b00): ldp x6, x7, [up] + mul x8, x6, v0 +@@ -90,8 +90,8 @@ + adcs x12, x8, x11 + umulh x11, x7, v0 + add rp, rp, #16 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x17, x17, #1 ++ cbz x17, L(end) + + ALIGN(16) + L(top): mul x8, x4, v0 +@@ -110,8 +110,8 @@ + stp x12, x13, [rp],#32 + adcs x12, x8, x11 + umulh x11, x7, v0 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): mul x8, x4, v0 + adcs x13, x9, x10 +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/rsh1aors_n.asm +--- a/mpn/arm64/rsh1aors_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/rsh1aors_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -59,7 +59,7 @@ + + ASM_START() + PROLOGUE(func_n) +- lsr x18, n, #2 ++ lsr x6, n, #2 + + tbz n, #0, L(bx0) + +@@ -69,7 +69,7 @@ + + L(b01): ADDSUB x13, x5, x9 + and x10, x13, #1 +- cbz x18, L(1) ++ cbz x6, L(1) + ldp x4, x5, [up],#48 + ldp x8, x9, [vp],#48 + ADDSUBC x14, x4, x8 +@@ -80,8 +80,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + str x17, [rp], #24 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x6, x6, #1 ++ cbz x6, L(end) + b L(top) + + L(1): cset x14, COND +@@ -97,7 +97,7 @@ + ldp x8, x9, [vp],#32 + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 +- cbz x18, L(3) ++ cbz x6, L(3) + ldp x4, x5, [up,#-16] + ldp x8, x9, [vp,#-16] + extr x17, x12, x15, #1 +@@ -117,7 +117,7 @@ + ADDSUB x12, x4, x8 + ADDSUBC x13, x5, x9 + and x10, x12, #1 +- cbz x18, L(2) ++ cbz x6, L(2) + ldp x4, x5, [up,#-16] + ldp x8, x9, [vp,#-16] + ADDSUBC x14, x4, x8 +@@ -134,8 +134,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + add rp, rp, #16 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x6, x6, #1 ++ cbz x6, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#-16] +@@ -152,8 +152,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + stp x16, x17, [rp],#32 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x6, x6, #1 ++ cbnz x6, L(top) + + L(end): extr x16, x15, x14, #1 + extr x17, x12, x15, #1 +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/rshift.asm +--- a/mpn/arm64/rshift.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/rshift.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -60,7 +60,7 @@ + PROLOGUE(mpn_rshift) + mov rp, rp_arg + sub tnc, xzr, cnt +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x5, [up] +@@ -68,7 +68,7 @@ + + L(b01): NSHIFT x0, x5, tnc + PSHIFT x2, x5, cnt +- cbnz x18, L(gt1) ++ cbnz x17, L(gt1) + str x2, [rp] + ret + L(gt1): ldp x4, x5, [up,#8] +@@ -89,7 +89,7 @@ + PSHIFT x13, x4, cnt + NSHIFT x10, x5, tnc + PSHIFT x2, x5, cnt +- cbnz x18, L(gt2) ++ cbnz x17, L(gt2) + orr x10, x10, x13 + stp x10, x2, [rp] + ret +@@ -121,11 +121,11 @@ + orr x11, x12, x2 + stp x11, x10, [rp,#32]! + PSHIFT x2, x5, cnt +-L(lo0): sub x18, x18, #1 ++L(lo0): sub x17, x17, #1 + L(lo3): NSHIFT x10, x7, tnc + NSHIFT x12, x6, tnc + PSHIFT x13, x6, cnt +- cbnz x18, L(top) ++ cbnz x17, L(top) + + L(end): orr x10, x10, x13 + orr x11, x12, x2 +diff -r 94c84d919f83 -r 5f32dbc41afc mpn/arm64/sqr_diag_addlsh1.asm +--- a/mpn/arm64/sqr_diag_addlsh1.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/sqr_diag_addlsh1.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -47,7 +47,7 @@ + ASM_START() + PROLOGUE(mpn_sqr_diag_addlsh1) + ldr x15, [up],#8 +- lsr x18, n, #1 ++ lsr x14, n, #1 + tbz n, #0, L(bx0) + + L(bx1): adds x7, xzr, xzr +@@ -62,8 +62,8 @@ + ldr x17, [up],#16 + ldp x6, x7, [tp],#32 + umulh x11, x15, x15 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x14, x14, #1 ++ cbz x14, L(end) + + ALIGN(16) + L(top): extr x9, x6, x5, #63 +@@ -84,8 +84,8 @@ + extr x8, x5, x4, #63 + stp x12, x13, [rp],#16 + adcs x12, x8, x10 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x14, x14, #1 ++ cbnz x14, L(top) + + L(end): extr x9, x6, x5, #63 + mul x10, x17, x17 + diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 09ebd530456b4b..97c0379fc863b4 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -6,19 +6,14 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_download_distfile( ARCHIVE - URLS "https://gmplib.org/download/gmp/gmp-${VERSION}.tar.xz" + URLS + "https://ftpmirror.gnu.org/gmp/gmp-${VERSION}.tar.xz" + "https://ftp.gnu.org/gnu/gmp/gmp-${VERSION}.tar.xz" + "https://gmplib.org/download/gmp/gmp-${VERSION}.tar.xz" FILENAME "gmp-${VERSION}.tar.xz" SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 ) -# Avoid the x18 register since it is reserved on arm64 osx and windows. -vcpkg_download_distfile( - ARM64PATCH - URLS https://gmplib.org/repo/gmp/raw-rev/5f32dbc41afc - FILENAME gmp-arm64-asm-fix-5f32dbc41afc.patch - SHA512 4a7c50dc0a78e6c297c0ac53129ed367dbf669100a613653987d0eddf175376296254ed26ecce15d02b0544b99e44719af49635e54982b22e745f22e2f8d1eda -) - vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" SOURCE_BASE "v${VERSION}" @@ -28,7 +23,7 @@ vcpkg_extract_source_archive(SOURCE_PATH subdirs.patch msvc_symbol.patch arm64-coff.patch - "${ARM64PATCH}" + gmp-arm64-asm-fix-5f32dbc41afc.patch # Avoid the x18 register since it is reserved on arm64 osx and windows. Source: https://gmplib.org/repo/gmp/raw-rev/5f32dbc41afc ) vcpkg_list(SET OPTIONS) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index a1682aad1bd21b..dab0f3651e7a3d 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 19, + "port-version": 20, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "license": "LGPL-3.0-only OR GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index c8e1ad02202d6b..f9588834f217a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2906,7 +2906,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 19 + "port-version": 20 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 7a4a530e8bf0e0..1bc397368d1d22 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5925ffa7bf1165b7ca3144e4253a19dcfc47a5ad", + "version": "6.2.1", + "port-version": 20 + }, { "git-tree": "e0f2cfc5cc1dea868ccad4363887bf9593b6c021", "version": "6.2.1", From b857d948bc4be10bc58dd85f1125da7bdc7c9973 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 27 Jun 2023 07:18:42 +0200 Subject: [PATCH 400/533] [gstreamer] fix internal deps (#32147) --- ports/gstreamer/vcpkg.json | 20 ++++++++++++++++++-- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index f7a78f64ad866e..ade0512b34859b 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.20.5", - "port-version": 9, + "port-version": 10, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -290,7 +290,16 @@ ] }, "gpl": { - "description": "Allow build of plugins that have (A)GPL-licensed dependencies" + "description": "Allow build of plugins that have (A)GPL-licensed dependencies", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] }, "jpeg": { "description": "Enable support for the JPEG file format", @@ -388,6 +397,13 @@ "features": [ "tools" ] + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index f9588834f217a7..dfd58d5d276cfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3006,7 +3006,7 @@ }, "gstreamer": { "baseline": "1.20.5", - "port-version": 9 + "port-version": 10 }, "gtest": { "baseline": "1.13.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 457316e48c85e0..ce280e87b9d805 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a88414ae4d8f37c01ffc726f3c7eb264edc478", + "version": "1.20.5", + "port-version": 10 + }, { "git-tree": "75810a0d259dd1294e994266d469dde9423dc209", "version": "1.20.5", From f27bfa26dcda061ee3cf5f816475f48d0d01c225 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 27 Jun 2023 07:49:51 +0200 Subject: [PATCH 401/533] [vtk] Use PROJ CMake config (#32138) --- ports/vtk/Findproj.patch | 20 -------------------- ports/vtk/libproj.patch | 20 ++++++++++++++++++++ ports/vtk/portfile.cmake | 2 +- ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 6 files changed, 28 insertions(+), 23 deletions(-) delete mode 100644 ports/vtk/Findproj.patch create mode 100644 ports/vtk/libproj.patch diff --git a/ports/vtk/Findproj.patch b/ports/vtk/Findproj.patch deleted file mode 100644 index f5e1068354308d..00000000000000 --- a/ports/vtk/Findproj.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMake/FindLibPROJ.cmake b/CMake/FindLibPROJ.cmake -index 6f607d4..86c85a9 100644 ---- a/CMake/FindLibPROJ.cmake -+++ b/CMake/FindLibPROJ.cmake -@@ -1,5 +1,5 @@ - find_path(LibPROJ_INCLUDE_DIR -- NAMES proj_api.h proj.h -+ NAMES proj.h - DOC "libproj include directories") - mark_as_advanced(LibPROJ_INCLUDE_DIR) - -@@ -9,7 +9,7 @@ find_library(LibPROJ_LIBRARY_RELEASE - mark_as_advanced(LibPROJ_LIBRARY_RELEASE) - - find_library(LibPROJ_LIBRARY_DEBUG -- NAMES projd -+ NAMES projd proj_d proj NAMES_PER_DIR - DOC "libproj debug library") - mark_as_advanced(LibPROJ_LIBRARY_DEBUG) - diff --git a/ports/vtk/libproj.patch b/ports/vtk/libproj.patch new file mode 100644 index 00000000000000..28ecfe905bafba --- /dev/null +++ b/ports/vtk/libproj.patch @@ -0,0 +1,20 @@ +diff --git a/ThirdParty/libproj/CMakeLists.txt b/ThirdParty/libproj/CMakeLists.txt +index f8888876..d57c4c18 100644 +--- a/ThirdParty/libproj/CMakeLists.txt ++++ b/ThirdParty/libproj/CMakeLists.txt +@@ -4,10 +4,12 @@ vtk_module_third_party( + VERSION "8.1.0" + STANDARD_INCLUDE_DIRS + EXTERNAL +- PACKAGE LibPROJ +- TARGETS LibPROJ::LibPROJ +- USE_VARIABLES LibPROJ_MAJOR_VERSION ++ PACKAGE PROJ ++ CONFIG_MODE ++ TARGETS PROJ::proj ++ USE_VARIABLES PROJ_VERSION_MAJOR + STANDARD_INCLUDE_DIRS) ++set(LibPROJ_MAJOR_VERSION "${PROJ_VERSION_MAJOR}") + + if (NOT VTK_MODULE_USE_EXTERNAL_VTK_libproj) + set(LibPROJ_MAJOR_VERSION "8") diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 72eeb48307cce7..b44520acd210df 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -23,7 +23,7 @@ vcpkg_from_github( PATCHES FindLZMA.patch FindLZ4.patch - Findproj.patch + libproj.patch pegtl.patch pythonwrapper.patch # Required by ParaView to Wrap required classes NoUndefDebug.patch # Required to link against correct Python library depending on build type. diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 26f1cab5ab99e4..14c85b56d3f73e 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 7, + "port-version": 8, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index dfd58d5d276cfa..ac6843ecf9860a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8518,7 +8518,7 @@ }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 7 + "port-version": 8 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index ff008111c0bf92..88b8dc7bfd909d 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f707a1fc800b17b84e545a4aa5b9f2c3c28c6d6", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 8 + }, { "git-tree": "9ec376669498a8b43b3dc1779386dcc383d7cc1f", "version-semver": "9.2.0-pv5.11.0", From 2b316026aa353252bfccd935a7cadbc0d3ca320c Mon Sep 17 00:00:00 2001 From: Simon Altschuler Date: Tue, 27 Jun 2023 07:50:47 +0200 Subject: [PATCH 402/533] [taglib] add usage file (#32128) * [taglib] add usage file * Update taglib.json --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/taglib/portfile.cmake | 1 + ports/taglib/usage | 11 +++++++++++ ports/taglib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/taglib.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/taglib/usage diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index fc7236f5ad225c..fb53b5cf0d4dd6 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -47,3 +47,4 @@ vcpkg_copy_pdbs() file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/taglib/usage b/ports/taglib/usage new file mode 100644 index 00000000000000..09f466f8d67410 --- /dev/null +++ b/ports/taglib/usage @@ -0,0 +1,11 @@ +The taglib package provides pkg-config files: + + find_package(PkgConfig) + + # For taglib + pkg_check_modules(TAGLIB REQUIRED IMPORTED_TARGET taglib) + target_link_libraries(main PRIVATE PkgConfig::TAGLIB) + + # For C bindings + pkg_check_modules(TAGLIB_C REQUIRED IMPORTED_TARGET taglib_c) + target_link_libraries(main PRIVATE PkgConfig::TAGLIB_C) diff --git a/ports/taglib/vcpkg.json b/ports/taglib/vcpkg.json index 9f477c148c9f08..23293859779a06 100644 --- a/ports/taglib/vcpkg.json +++ b/ports/taglib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "taglib", "version-semver": "1.13.0", - "port-version": 1, + "port-version": 2, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", "license": "LGPL-2.1-only OR MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index ac6843ecf9860a..ba71b5fcaf2860 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7906,7 +7906,7 @@ }, "taglib": { "baseline": "1.13.0", - "port-version": 1 + "port-version": 2 }, "taocpp-json": { "baseline": "2020-09-14", diff --git a/versions/t-/taglib.json b/versions/t-/taglib.json index fe866734bb0145..2d3654f86912c5 100644 --- a/versions/t-/taglib.json +++ b/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b5a2b206dc7c7b17ac4a50656a7c3789c2505e", + "version-semver": "1.13.0", + "port-version": 2 + }, { "git-tree": "a3ab8e6485aab876d06d0e43ab29372b54863467", "version-semver": "1.13.0", From e942f068edb0d1f483c67b897ff76c6925fd1dd9 Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Tue, 27 Jun 2023 07:51:48 +0200 Subject: [PATCH 403/533] [qt5-webengine] remove obsolete patches from qt5-webengine (#32219) * [qt5-webengine] remove build_3.with_missing_stdbool_include.patch from qt5-webengine * [qt5-webengine] remove workaround-msvc2022-ice.patch from qt5-webengine * [qt5-webengine] increase port version number * [qt5-webengine] updated versions to include qt5-webengine port version 5.15.10#1 --- ...build_3.with_missing_stdbool_include.patch | 19 ---- ports/qt5-webengine/portfile.cmake | 2 - ports/qt5-webengine/vcpkg.json | 1 + .../workaround-msvc2022-ice.patch | 101 ------------------ versions/baseline.json | 2 +- versions/q-/qt5-webengine.json | 5 + 6 files changed, 7 insertions(+), 123 deletions(-) delete mode 100644 ports/qt5-webengine/build_3.with_missing_stdbool_include.patch delete mode 100644 ports/qt5-webengine/workaround-msvc2022-ice.patch diff --git a/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch b/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch deleted file mode 100644 index 985256049fe1e0..00000000000000 --- a/ports/qt5-webengine/build_3.with_missing_stdbool_include.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/libxml/src/encoding.c -+++ b/src/3rdparty/chromium/third_party/libxml/src/encoding.c -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #ifdef HAVE_CTYPE_H - #include -@@ -2004,7 +2005,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ true); - } - #endif /* LIBXML_ICU_ENABLED */ - else { diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 55fea967783c34..aac87b1a1ee542 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -49,8 +49,6 @@ set(PATCHES common.pri.patch gl.patch build_1.patch build_2.patch - build_3.with_missing_stdbool_include.patch - workaround-msvc2022-ice.patch workaround-msvc2022-missing-include-in-chromium-ui-accessability.patch ) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 364b52cf0acfe2..8161a985c8ed44 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.10", + "port-version": 1, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webengine/workaround-msvc2022-ice.patch b/ports/qt5-webengine/workaround-msvc2022-ice.patch deleted file mode 100644 index 59cc004b622152..00000000000000 --- a/ports/qt5-webengine/workaround-msvc2022-ice.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h -+++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h -@@ -281,15 +281,63 @@ struct MD5CE { - return IntermediateDataToMD5Digest(ProcessMessage(data, n)); - } - -- static constexpr uint64_t Hash64(const char* data, uint32_t n) { -- IntermediateData intermediate = ProcessMessage(data, n); -- return (static_cast(SwapEndian(intermediate.a)) << 32) | -- static_cast(SwapEndian(intermediate.b)); -+ static constexpr uint64_t Hash64(const char* message, uint32_t n) { -+ const uint32_t m = GetPaddedMessageLength(n); -+ IntermediateData intermediate0 = kInitialIntermediateData; -+ for (uint32_t offset = 0; offset < m; offset += 64) { -+ RoundData data = { -+ GetPaddedMessageWord(message, n, m, offset), -+ GetPaddedMessageWord(message, n, m, offset + 4), -+ GetPaddedMessageWord(message, n, m, offset + 8), -+ GetPaddedMessageWord(message, n, m, offset + 12), -+ GetPaddedMessageWord(message, n, m, offset + 16), -+ GetPaddedMessageWord(message, n, m, offset + 20), -+ GetPaddedMessageWord(message, n, m, offset + 24), -+ GetPaddedMessageWord(message, n, m, offset + 28), -+ GetPaddedMessageWord(message, n, m, offset + 32), -+ GetPaddedMessageWord(message, n, m, offset + 36), -+ GetPaddedMessageWord(message, n, m, offset + 40), -+ GetPaddedMessageWord(message, n, m, offset + 44), -+ GetPaddedMessageWord(message, n, m, offset + 48), -+ GetPaddedMessageWord(message, n, m, offset + 52), -+ GetPaddedMessageWord(message, n, m, offset + 56), -+ GetPaddedMessageWord(message, n, m, offset + 60)}; -+ IntermediateData intermediate1 = intermediate0; -+ for (uint32_t i = 0; i < 64; ++i) -+ intermediate1 = ApplyStep(i, data, intermediate1); -+ intermediate0 = Add(intermediate0, intermediate1); -+ } -+ return (static_cast(SwapEndian(intermediate0.a)) << 32) | -+ static_cast(SwapEndian(intermediate0.b)); - } - -- static constexpr uint32_t Hash32(const char* data, uint32_t n) { -- IntermediateData intermediate = ProcessMessage(data, n); -- return SwapEndian(intermediate.a); -+ static constexpr uint32_t Hash32(const char* message, uint32_t n) { -+ const uint32_t m = GetPaddedMessageLength(n); -+ IntermediateData intermediate0 = kInitialIntermediateData; -+ for (uint32_t offset = 0; offset < m; offset += 64) { -+ RoundData data = { -+ GetPaddedMessageWord(message, n, m, offset), -+ GetPaddedMessageWord(message, n, m, offset + 4), -+ GetPaddedMessageWord(message, n, m, offset + 8), -+ GetPaddedMessageWord(message, n, m, offset + 12), -+ GetPaddedMessageWord(message, n, m, offset + 16), -+ GetPaddedMessageWord(message, n, m, offset + 20), -+ GetPaddedMessageWord(message, n, m, offset + 24), -+ GetPaddedMessageWord(message, n, m, offset + 28), -+ GetPaddedMessageWord(message, n, m, offset + 32), -+ GetPaddedMessageWord(message, n, m, offset + 36), -+ GetPaddedMessageWord(message, n, m, offset + 40), -+ GetPaddedMessageWord(message, n, m, offset + 44), -+ GetPaddedMessageWord(message, n, m, offset + 48), -+ GetPaddedMessageWord(message, n, m, offset + 52), -+ GetPaddedMessageWord(message, n, m, offset + 56), -+ GetPaddedMessageWord(message, n, m, offset + 60)}; -+ IntermediateData intermediate1 = intermediate0; -+ for (uint32_t i = 0; i < 64; ++i) -+ intermediate1 = ApplyStep(i, data, intermediate1); -+ intermediate0 = Add(intermediate0, intermediate1); -+ } -+ return SwapEndian(intermediate0.a); - } - }; - ---- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h -+++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h -@@ -26,6 +26,7 @@ - #include - #include - -+#include "absl/base/macros.h" - #include "net/third_party/quiche/src/quic/core/quic_tag.h" - #include "net/third_party/quiche/src/quic/core/quic_types.h" - #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" -@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid( - transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION; - if (!transport_version_is_valid) { - // Iterators are not constexpr in C++14 which Chrome uses. -- constexpr auto supported_transport_versions = SupportedTransportVersions(); -- for (size_t i = 0; i < supported_transport_versions.size(); ++i) { -+ constexpr QuicTransportVersion supported_transport_versions[] = { -+ QUIC_VERSION_IETF_DRAFT_29, -+ QUIC_VERSION_IETF_DRAFT_27, -+ QUIC_VERSION_51, -+ QUIC_VERSION_50, -+ QUIC_VERSION_46, -+ QUIC_VERSION_43}; -+ for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) { - const QuicTransportVersion& trans_vers = supported_transport_versions[i]; - if (trans_vers == transport_version) { - transport_version_is_valid = true; - diff --git a/versions/baseline.json b/versions/baseline.json index ba71b5fcaf2860..04fa0e0473cb06 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6726,7 +6726,7 @@ }, "qt5-webengine": { "baseline": "5.15.10", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.10", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 634dba081ce648..c7359dba460963 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf5ac17e7409f445cbfc1cffc1d8a138a24582a0", + "version": "5.15.10", + "port-version": 1 + }, { "git-tree": "f088e5761d91d1539ecb60aed67afcdb197dccef", "version": "5.15.10", From 766f36b47b411e5a788f06ee9e9cf51420e7172f Mon Sep 17 00:00:00 2001 From: Alex E <36134278+chusitoo@users.noreply.github.com> Date: Tue, 27 Jun 2023 01:52:56 -0400 Subject: [PATCH 404/533] [flatbush] Add new port (#32126) * Add port files * Add version and git-tree * New sha for package * Update git-tree * Update release sha512 * Update git-tree * New pkg as per PR review * And the usual git-tree * More code review fixes * More git-tree stuff --- ports/flatbush/portfile.cmake | 19 +++++++++++++++++++ ports/flatbush/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/f-/flatbush.json | 9 +++++++++ 4 files changed, 49 insertions(+) create mode 100644 ports/flatbush/portfile.cmake create mode 100644 ports/flatbush/vcpkg.json create mode 100644 versions/f-/flatbush.json diff --git a/ports/flatbush/portfile.cmake b/ports/flatbush/portfile.cmake new file mode 100644 index 00000000000000..81760317c59370 --- /dev/null +++ b/ports/flatbush/portfile.cmake @@ -0,0 +1,19 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO chusitoo/flatbush + REF "v${VERSION}" + SHA512 2d1ac3ae04331dd7aa0923c924672db2aef652b2f99a8a36a58c0efe4069f9b2755e343bea887128f02edd0abbf0775743541ca81fdb325ca1022145dde79ff7 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/flatbush) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/flatbush/vcpkg.json b/ports/flatbush/vcpkg.json new file mode 100644 index 00000000000000..67482d973bed2a --- /dev/null +++ b/ports/flatbush/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "flatbush", + "version": "1.1.2", + "description": "A C++11 header-only single file port of Flatbush", + "homepage": "https://github.com/chusitoo/flatbush", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 04fa0e0473cb06..32b69bf469ec1e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2540,6 +2540,10 @@ "baseline": "23.5.26", "port-version": 0 }, + "flatbush": { + "baseline": "1.1.2", + "port-version": 0 + }, "flecs": { "baseline": "3.2.4", "port-version": 0 diff --git a/versions/f-/flatbush.json b/versions/f-/flatbush.json new file mode 100644 index 00000000000000..572c23e5b7891f --- /dev/null +++ b/versions/f-/flatbush.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8c59357025e0ee6a44855c384d3defd0a9ee525d", + "version": "1.1.2", + "port-version": 0 + } + ] +} From 8be970aaeaf19fd2663aaf5888478483f9742e55 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Tue, 27 Jun 2023 01:53:36 -0400 Subject: [PATCH 405/533] [libxmp] Fix post-build issues (#32086) * [libxmp] Avoid building documentation. * [libxmp] Use vcpkg_install_copyright. * [libxmp] Bump port version. --- ports/libxmp/portfile.cmake | 3 ++- ports/libxmp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libxmp.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/libxmp/portfile.cmake b/ports/libxmp/portfile.cmake index 78025a33189cc8..47fcb1826ff6ac 100644 --- a/ports/libxmp/portfile.cmake +++ b/ports/libxmp/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DBUILD_STATIC=${BUILD_STATIC} -DBUILD_SHARED=${BUILD_SHARED} + -DLIBXMP_DOCS=OFF ) vcpkg_cmake_install() @@ -38,4 +39,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/docs/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/COPYING.LIB") diff --git a/ports/libxmp/vcpkg.json b/ports/libxmp/vcpkg.json index 3d7098189a4713..551016eefda247 100644 --- a/ports/libxmp/vcpkg.json +++ b/ports/libxmp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxmp", "version": "4.6.0", + "port-version": 1, "description": "Libxmp is a library that renders module files to PCM data.", "homepage": "https://sourceforge.net/projects/xmp/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 32b69bf469ec1e..d86ade126e15bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4846,7 +4846,7 @@ }, "libxmp": { "baseline": "4.6.0", - "port-version": 0 + "port-version": 1 }, "libxmu": { "baseline": "1.1.3", diff --git a/versions/l-/libxmp.json b/versions/l-/libxmp.json index 8de6ca5d27557d..49323a21482b7a 100644 --- a/versions/l-/libxmp.json +++ b/versions/l-/libxmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd5e84c88c79658a97f5f370b148ea59a1abd344", + "version": "4.6.0", + "port-version": 1 + }, { "git-tree": "9822e97892e95d5804274ce1076e1abbbed706ce", "version": "4.6.0", From f5ab3f86a82e1375f53ea0afc98ef2d38ab16efc Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 28 Jun 2023 03:42:46 +0800 Subject: [PATCH 406/533] [pdcurses] fix incorrect link behavior (#32252) * fix incorrect link behavior * update --- ports/pdcurses/portfile.cmake | 4 ++-- .../pdcurses/unofficial-pdcurses-config.cmake | 18 +++++------------- ports/pdcurses/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pdcurses.json | 5 +++++ 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 4ecc39a21ac049..f1041796e6ed27 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wmcbrine/PDCurses - REF 6c1f95c4fa9f9f105879c2d99dd72a5bf335c046 # 3.9 - SHA512 2d682a3516baaa58a97854aca64d985768b7af76d998240b54afc57ddf2a44894835a1748888f8dd7c1cc8045ede77488284f8adf1b73878879b4b4d3391218d + REF ${VERSION} + SHA512 4fd7c1221c5f34d94069a563dda7a796653148d903bc9023afe134b0f13bdc8b5d30000dfc80ab800e46e58b395ac2fb494d1316b80914998de5bacf0d7f3558 HEAD_REF master PATCHES nmake-install.patch diff --git a/ports/pdcurses/unofficial-pdcurses-config.cmake b/ports/pdcurses/unofficial-pdcurses-config.cmake index 07fb8ce1f25317..804e29e106351c 100644 --- a/ports/pdcurses/unofficial-pdcurses-config.cmake +++ b/ports/pdcurses/unofficial-pdcurses-config.cmake @@ -3,30 +3,22 @@ if(NOT TARGET unofficial::pdcurses::pdcurses) get_filename_component(z_vcpkg_pdcurses_root "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH) get_filename_component(z_vcpkg_pdcurses_root "${z_vcpkg_pdcurses_root}" PATH) - + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_pdcurses_root}/include" ) - + find_library(Z_VCPKG_PDCURSES_LIBRARY_RELEASE NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/lib" NO_DEFAULT_PATH) - find_file(Z_VCPKG_PDCURSES_DLL_RELEASE NAMES pdcurses.dll PATHS "${z_vcpkg_pdcurses_root}/bin" NO_DEFAULT_PATH) if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") - set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_IMPLIB_RELEASE "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") - endif() - if(EXISTS "${Z_VCPKG_PDCURSES_DLL_RELEASE}") - set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_PDCURSES_DLL_RELEASE}") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_PDCURSES_LIBRARY_RELEASE}") endif() find_library(Z_VCPKG_PDCURSES_LIBRARY_DEBUG NAMES pdcurses PATHS "${z_vcpkg_pdcurses_root}/debug/lib" NO_DEFAULT_PATH) - find_file(Z_VCPKG_PDCURSES_DLL_DEBUG NAMES pdcurses.dll PATHS "${z_vcpkg_pdcurses_root}/debug/bin" NO_DEFAULT_PATH) if(EXISTS "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") set_property(TARGET unofficial::pdcurses::pdcurses APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") - set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_IMPLIB_DEBUG "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") + set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_PDCURSES_LIBRARY_DEBUG}") endif() - if(EXISTS "${Z_VCPKG_PDCURSES_DLL_DEBUG}") - set_target_properties(unofficial::pdcurses::pdcurses PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_PDCURSES_DLL_DEBUG}") - endif() - + unset(z_vcpkg_pdcurses_root) endif() diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json index d568179c9a94d0..c9a136e3cfe797 100644 --- a/ports/pdcurses/vcpkg.json +++ b/ports/pdcurses/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdcurses", "version": "3.9", - "port-version": 5, + "port-version": 6, "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", "homepage": "https://pdcurses.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d86ade126e15bc..d5d8c714074415 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6234,7 +6234,7 @@ }, "pdcurses": { "baseline": "3.9", - "port-version": 5 + "port-version": 6 }, "pdqsort": { "baseline": "2019-07-30", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index f6124a65663b06..7760ad05787b4f 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61d47c082b38bc7c50c5b81d730c698dd4cea04f", + "version": "3.9", + "port-version": 6 + }, { "git-tree": "a74893fbd7290450958bf2beddbb59486bb8c04f", "version": "3.9", From 0d1150cbd2f8b3eb9247c51c9f41efbb3be9454b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 28 Jun 2023 03:46:22 +0800 Subject: [PATCH 407/533] [vcpkg baseline][fastrtps] Use more precise version comparison (#32257) --- ports/fastrtps/fix-xtime.patch | 2 +- ports/fastrtps/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fastrtps.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fastrtps/fix-xtime.patch b/ports/fastrtps/fix-xtime.patch index 9a8b4e3495887a..586233d02b1d05 100644 --- a/ports/fastrtps/fix-xtime.patch +++ b/ports/fastrtps/fix-xtime.patch @@ -11,7 +11,7 @@ index 7ca47ae..632c38b 100644 +# MSVC, it will be deleted after release. +############################################################################### +if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") -+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.36.32528.95") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.37.32705.0") + file(READ "${PROJECT_SOURCE_DIR}/include/fastrtps/utils/TimedMutex.hpp" _contents) + string(REPLACE "xtime*" "_timespec64*" _contents "${_contents}") + file(WRITE "${PROJECT_SOURCE_DIR}/include/fastrtps/utils/TimedMutex.hpp" "${_contents}") diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index c44fca36ad4992..0ed31e35e51b0a 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fastrtps", "version": "2.7.0", - "port-version": 1, + "port-version": 2, "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", "homepage": "https://www.eprosima.com/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d5d8c714074415..749c4f2d37cc3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2454,7 +2454,7 @@ }, "fastrtps": { "baseline": "2.7.0", - "port-version": 1 + "port-version": 2 }, "fawdlstty-libfv": { "baseline": "0.0.8", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index 48c486088aec55..06e449faafcffa 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "443f550810af037dae538dc5555d7e069f2896ec", + "version": "2.7.0", + "port-version": 2 + }, { "git-tree": "b2d64bc038a30ea7ad49dc5cb923c0e13618281c", "version": "2.7.0", From cb7d3b4999d2263c8ba5e05df0f300f570135fbc Mon Sep 17 00:00:00 2001 From: JAEHONG KIM <52454344+ralpioxxcs@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:07:58 +0900 Subject: [PATCH 408/533] [libuv] Update to 1.45.0 (#32165) * [libuv] Update to 1.45.0 * [libuv] Update all consuming ports * [libuv] Update versions * resolve port SHA * Add port-version * update version * revert usockets.json --------- Co-authored-by: Zhao Liu --- ports/libuv/fix-build-type.patch | 82 +++++++------------ ports/libuv/portfile.cmake | 8 +- ports/libuv/usage | 2 +- ports/libuv/vcpkg.json | 2 +- ports/luv/fix-find-libuv.patch | 2 +- ports/luv/vcpkg.json | 1 + ports/qpid-proton/fix-dependencies.patch | 6 +- ports/qpid-proton/vcpkg.json | 1 + .../fix-dependency-libuv.patch | 2 +- ports/redis-plus-plus/vcpkg.json | 1 + ports/tensorpipe/use-vcpkg.patch | 6 +- ports/tensorpipe/vcpkg.json | 2 +- ports/usockets/CMakeLists.txt | 6 +- ports/usockets/vcpkg.json | 1 + ports/uvw/fix-find-libuv.patch | 6 +- ports/uvw/vcpkg.json | 1 + ports/wpilib/fix-dependency-libuv.patch | 6 +- ports/wpilib/vcpkg.json | 2 +- .../cmake/fix-dependency-libuv.patch | 6 +- scripts/test_ports/cmake/vcpkg.json | 2 +- versions/baseline.json | 16 ++-- versions/l-/libuv.json | 5 ++ versions/l-/luv.json | 5 ++ versions/q-/qpid-proton.json | 5 ++ versions/r-/redis-plus-plus.json | 5 ++ versions/t-/tensorpipe.json | 5 ++ versions/u-/usockets.json | 5 ++ versions/u-/uvw.json | 5 ++ versions/w-/wpilib.json | 5 ++ 29 files changed, 112 insertions(+), 89 deletions(-) diff --git a/ports/libuv/fix-build-type.patch b/ports/libuv/fix-build-type.patch index 9977e48d025ff6..41235b7a2271af 100644 --- a/ports/libuv/fix-build-type.patch +++ b/ports/libuv/fix-build-type.patch @@ -1,72 +1,46 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac52412..15d5cb2 100644 +index 93733dd0..769025cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -381,7 +381,7 @@ endif() - if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD") - list(APPEND uv_test_libraries util) - endif() -- -+if (BUILD_SHARED_LIBS) - add_library(uv SHARED ${uv_sources}) - target_compile_definitions(uv - INTERFACE -@@ -401,7 +401,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390") - set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX) - endif() - target_link_libraries(uv ${uv_libraries}) +@@ -460,8 +460,7 @@ if(LIBUV_BUILD_SHARED) + endif() + target_link_libraries(uv ${uv_libraries}) + set_target_properties(uv PROPERTIES OUTPUT_NAME "uv") +-endif() - +else() add_library(uv_a STATIC ${uv_sources}) target_compile_definitions(uv_a PRIVATE ${uv_defines}) target_compile_options(uv_a PRIVATE ${uv_cflags}) -@@ -416,7 +416,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390") - set_target_properties(uv_a PROPERTIES LINKER_LANGUAGE CXX) +@@ -480,6 +479,7 @@ set_target_properties(uv_a PROPERTIES OUTPUT_NAME "uv") + if(MSVC) + set_target_properties(uv_a PROPERTIES PREFIX "lib") endif() - target_link_libraries(uv_a ${uv_libraries}) -- +endif() + if(LIBUV_BUILD_TESTS) # Small hack: use ${uv_test_sources} now to get the runner skeleton, - # before the actual tests are added. -@@ -659,26 +659,39 @@ string(REPLACE ";" " " LIBS "${LIBS}") - file(STRINGS configure.ac configure_ac REGEX ^AC_INIT) - string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" PACKAGE_VERSION "${configure_ac}") - set(UV_VERSION_MAJOR "${CMAKE_MATCH_1}") -+if (BUILD_SHARED_LIBS) - # The version in the filename is mirroring the behaviour of autotools. - set_target_properties(uv PROPERTIES - VERSION ${UV_VERSION_MAJOR}.0.0 - SOVERSION ${UV_VERSION_MAJOR}) -+endif() - set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) - set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(prefix ${CMAKE_INSTALL_PREFIX}) -+if (BUILD_SHARED_LIBS) - configure_file(libuv.pc.in libuv.pc @ONLY) -+else() - configure_file(libuv-static.pc.in libuv-static.pc @ONLY) -+endif() - +@@ -737,10 +737,6 @@ configure_file(libuv-static.pc.in libuv-static.pc @ONLY) install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) --install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc -+if (BUILD_SHARED_LIBS) -+install(FILES ${PROJECT_BINARY_DIR}/libuv.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES LICENSE-extra DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +-install(TARGETS uv_a EXPORT libuvConfig +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(EXPORT libuvConfig + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv + NAMESPACE libuv::) +@@ -757,6 +753,11 @@ if(LIBUV_BUILD_SHARED) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +else() +install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+endif() -+if (BUILD_SHARED_LIBS) - install(TARGETS uv EXPORT libuvConfig - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+else() - install(TARGETS uv_a EXPORT libuvConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() - install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++install(TARGETS uv_a EXPORT libuvConfig ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() if(MSVC) + diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 036bb2676b32f3..2cfc46ae25e027 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,16 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF 0c1fa696aa502eb749c2c4735005f41ba00a27b8 #v1.44.2 - SHA512 4b63745d48c5318d75ef3580fc6d6288b1ca26a25f69fbef2af4b6fe1d1fe1255986cbb1fb5124e1ba6cd324868ebccdc6f6965e08e3e0fbde29f22e7e20ce89 + REF "v${VERSION}" + SHA512 a156dd0ed06bc7c50515f46ef6e5636d870288636f442ce9ec46716e22fdaa664ce49e432f4737c81e9c6013b34ed150e7420ab9fc316ed23281096954359774 HEAD_REF v1.x PATCHES fix-build-type.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBUV_BUILD_SHARED) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLIBUV_BUILD_TESTS=OFF + -DLIBUV_BUILD_BENCH=OFF + -DLIBUV_BUILD_SHARED=${LIBUV_BUILD_SHARED} -DQEMU=OFF -DASAN=OFF -DTSAN=OFF diff --git a/ports/libuv/usage b/ports/libuv/usage index b93ab285523e98..60de86a856d3bc 100644 --- a/ports/libuv/usage +++ b/ports/libuv/usage @@ -1,4 +1,4 @@ libuv provides CMake targets: find_package(libuv CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,uv_a,uv>) + target_link_libraries(main PRIVATE $,libuv::uv_a,libuv::uv>) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 1393311a9aee1b..cfb3b0fc42a031 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libuv", - "version-semver": "1.44.2", + "version-semver": "1.45.0", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/ports/luv/fix-find-libuv.patch b/ports/luv/fix-find-libuv.patch index 9816fe3bdc6eee..1a94fc4445606f 100644 --- a/ports/luv/fix-find-libuv.patch +++ b/ports/luv/fix-find-libuv.patch @@ -9,7 +9,7 @@ index e63a431..163bada 100644 - find_package(Libuv REQUIRED) - include_directories(${LIBUV_INCLUDE_DIR}) + find_package(libuv CONFIG REQUIRED) -+ set(LIBUV_LIBRARIES $,uv_a,uv>) ++ set(LIBUV_LIBRARIES $,libuv::uv_a,libuv::uv>) else (WITH_SHARED_LIBUV) include_directories(deps/libuv/include) add_subdirectory(deps/libuv EXCLUDE_FROM_ALL) diff --git a/ports/luv/vcpkg.json b/ports/luv/vcpkg.json index 292eb6dd375b3f..69fc5a01ab82dc 100644 --- a/ports/luv/vcpkg.json +++ b/ports/luv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "luv", "version-semver": "1.44.2", + "port-version": 1, "description": "Bare libuv bindings for lua", "homepage": "https://github.com/luvit/luv", "license": "Apache-2.0", diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch index ecf5e64c06ac1d..dfc5985fccd0a0 100644 --- a/ports/qpid-proton/fix-dependencies.patch +++ b/ports/qpid-proton/fix-dependencies.patch @@ -9,10 +9,10 @@ index 27b40e7..81de970 100644 - find_package(Libuv) + find_package(Libuv NAMES libuv CONFIG) if (Libuv_FOUND) -+ if (TARGET uv) -+ add_library(Libuv::Libuv ALIAS uv) ++ if (TARGET libuv::uv) ++ add_library(Libuv::Libuv ALIAS libuv::uv) + else() -+ add_library(Libuv::Libuv ALIAS uv_a) ++ add_library(Libuv::Libuv ALIAS libuv::uv_a) + endif() set (PROACTOR_OK libuv) set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common}) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index d88940026d1079..28d5dfbc7d7512 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qpid-proton", "version": "0.38.0", + "port-version": 1, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", diff --git a/ports/redis-plus-plus/fix-dependency-libuv.patch b/ports/redis-plus-plus/fix-dependency-libuv.patch index 0fddcc898d6cf6..02045ddb970189 100644 --- a/ports/redis-plus-plus/fix-dependency-libuv.patch +++ b/ports/redis-plus-plus/fix-dependency-libuv.patch @@ -9,7 +9,7 @@ index e85a158..e67681c 100644 - find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h) - find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv) + find_package(libuv CONFIG REQUIRED) -+ set(REDIS_PLUS_PLUS_ASYNC_LIB $,uv_a,uv>) ++ set(REDIS_PLUS_PLUS_ASYNC_LIB $,libuv::uv_a,libuv::uv>) else() message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC") endif() diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 118ba4564c900e..9830185b8030a8 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "redis-plus-plus", "version-semver": "1.3.9", + "port-version": 1, "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", diff --git a/ports/tensorpipe/use-vcpkg.patch b/ports/tensorpipe/use-vcpkg.patch index b69d01c1870163..4afcd1aa2058b7 100644 --- a/ports/tensorpipe/use-vcpkg.patch +++ b/ports/tensorpipe/use-vcpkg.patch @@ -9,10 +9,10 @@ index efcffc2..dd9bd16 100644 -find_package(uv REQUIRED) -list(APPEND TP_LINK_LIBRARIES uv::uv) +find_package(libuv CONFIG REQUIRED) -+if (TARGET uv) -+list(APPEND TP_LINK_LIBRARIES uv) ++if (TARGET libuv::uv) ++list(APPEND TP_LINK_LIBRARIES libuv::uv) +else() -+list(APPEND TP_LINK_LIBRARIES uv_a) ++list(APPEND TP_LINK_LIBRARIES libuv::uv_a) +endif() ### shm diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index 3efe75d8656375..47f5427f6d3476 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorpipe", "version-date": "2022-03-16", - "port-version": 3, + "port-version": 4, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "license": "BSD-3-Clause", diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index b2daed66d7e370..3de28081397958 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -13,10 +13,10 @@ else() endif() find_package(libuv CONFIG REQUIRED) -if (TARGET uv) - set(LIBUV_LIBRARY uv) +if (TARGET libuv::uv) + set(LIBUV_LIBRARY libuv::uv) else() - set(LIBUV_LIBRARY uv_a) + set(LIBUV_LIBRARY libuv::uv_a) endif() file(GLOB SOURCES src/*.c src/eventing/*.c) diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index ca0c8ac3555e2b..bf7558ffbed468 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "usockets", "version": "0.8.6", + "port-version": 1, "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", "license": "Apache-2.0", diff --git a/ports/uvw/fix-find-libuv.patch b/ports/uvw/fix-find-libuv.patch index 2fc3a91d58c2dc..7fff3f37ea2400 100644 --- a/ports/uvw/fix-find-libuv.patch +++ b/ports/uvw/fix-find-libuv.patch @@ -8,10 +8,10 @@ index 289c006..180383f 100644 endif() + +find_package(libuv CONFIG REQUIRED) -+if (TARGET uv) -+ target_link_libraries(uvw PRIVATE uv) ++if (TARGET libuv::uv) ++ target_link_libraries(uvw PRIVATE libuv::uv) +else() -+ target_link_libraries(uvw PRIVATE uv_a) ++ target_link_libraries(uvw PRIVATE libuv::uv_a) +endif() + install( diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json index b499b2ebcf6f45..66eae4f4bcbc1f 100644 --- a/ports/uvw/vcpkg.json +++ b/ports/uvw/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uvw", "version": "3.0.0", + "port-version": 1, "description": "A compilable static library, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", "license": "MIT", diff --git a/ports/wpilib/fix-dependency-libuv.patch b/ports/wpilib/fix-dependency-libuv.patch index e5c0ca8f11ab0a..4f681bbc6da8b0 100644 --- a/ports/wpilib/fix-dependency-libuv.patch +++ b/ports/wpilib/fix-dependency-libuv.patch @@ -22,10 +22,10 @@ index 559c8ed..0fe60e9 100644 - find_package(unofficial-libuv CONFIG REQUIRED) - target_link_libraries(wpiutil unofficial::libuv::libuv) + find_package(libuv CONFIG REQUIRED) -+ if (TARGET uv) -+ target_link_libraries(wpiutil uv) ++ if (TARGET libuv::uv) ++ target_link_libraries(wpiutil libuv::uv) + else() -+ target_link_libraries(wpiutil uv_a) ++ target_link_libraries(wpiutil libuv::uv_a) + endif() endif() diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json index c928da52447643..b5a1b5ea42b052 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wpilib", "version-date": "2020-03-02", - "port-version": 3, + "port-version": 4, "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", "homepage": "https://github.com/wpilibsuite/allwpilib", "license": null, diff --git a/scripts/test_ports/cmake/fix-dependency-libuv.patch b/scripts/test_ports/cmake/fix-dependency-libuv.patch index 5402a788780193..e847f6549d1f84 100644 --- a/scripts/test_ports/cmake/fix-dependency-libuv.patch +++ b/scripts/test_ports/cmake/fix-dependency-libuv.patch @@ -18,10 +18,10 @@ index fdfe456..ef2d329 100644 "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!") endif() - set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV) -+ if (TARGET uv) -+ set(CMAKE_LIBUV_LIBRARIES uv) ++ if (TARGET libuv::uv) ++ set(CMAKE_LIBUV_LIBRARIES libuv::uv) + else() -+ set(CMAKE_LIBUV_LIBRARIES uv_a) ++ set(CMAKE_LIBUV_LIBRARIES libuv::uv_a) + endif() else() set(CMAKE_LIBUV_LIBRARIES cmlibuv) diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json index 7795c3f61758e6..f1c6364d902650 100644 --- a/scripts/test_ports/cmake/vcpkg.json +++ b/scripts/test_ports/cmake/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cmake", "version": "3.22.2", - "port-version": 3, + "port-version": 4, "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.", "homepage": "https://cmake.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 749c4f2d37cc3f..48f7b4fe7a2167 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4725,7 +4725,7 @@ "port-version": 13 }, "libuv": { - "baseline": "1.44.2", + "baseline": "1.45.0", "port-version": 0 }, "libuvc": { @@ -5074,7 +5074,7 @@ }, "luv": { "baseline": "1.44.2", - "port-version": 0 + "port-version": 1 }, "lv2": { "baseline": "1.18.2", @@ -6566,7 +6566,7 @@ }, "qpid-proton": { "baseline": "0.38.0", - "port-version": 0 + "port-version": 1 }, "qscintilla": { "baseline": "2.13.4", @@ -7106,7 +7106,7 @@ }, "redis-plus-plus": { "baseline": "1.3.9", - "port-version": 0 + "port-version": 1 }, "refl-cpp": { "baseline": "0.12.3", @@ -7966,7 +7966,7 @@ }, "tensorpipe": { "baseline": "2022-03-16", - "port-version": 3 + "port-version": 4 }, "termcolor": { "baseline": "2.1.0", @@ -8326,7 +8326,7 @@ }, "usockets": { "baseline": "0.8.6", - "port-version": 0 + "port-version": 1 }, "usrsctp": { "baseline": "0.9.5.0", @@ -8362,7 +8362,7 @@ }, "uvw": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "uwebsockets": { "baseline": "20.44.0", @@ -8682,7 +8682,7 @@ }, "wpilib": { "baseline": "2020-03-02", - "port-version": 3 + "port-version": 4 }, "wren": { "baseline": "0.4.0", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 0b2382838eecbf..0bc61e3180c472 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c99175c380930fd7a51719f7247618cceaa51529", + "version-semver": "1.45.0", + "port-version": 0 + }, { "git-tree": "dad61360b9c0fb825e23a4ccc01dcd9658e2f253", "version-semver": "1.44.2", diff --git a/versions/l-/luv.json b/versions/l-/luv.json index 18de69d6e66412..4bdcced043e20f 100644 --- a/versions/l-/luv.json +++ b/versions/l-/luv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d18a8a0efcd76a0b4615d85c8bda26dd4ba1b7ad", + "version-semver": "1.44.2", + "port-version": 1 + }, { "git-tree": "dfb9cba0c0da80351b575c758df8f2b03048315f", "version-semver": "1.44.2", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 474a7fdbd50e32..d722b9145b5f83 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a69d30375c0d5848b12cbdcaab4820b9d639223", + "version": "0.38.0", + "port-version": 1 + }, { "git-tree": "848bfbdf75b68fadddcddd6c501d095a8f21f63d", "version": "0.38.0", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 48c6e2eb06e690..e85115ec4c7c8d 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c31ae593f450352915471514d517a772cd5099b", + "version-semver": "1.3.9", + "port-version": 1 + }, { "git-tree": "ce8c8a22b5a791c7a3a96d72d5e2ce47881db17c", "version-semver": "1.3.9", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 7f1840473f11c3..daf61f2055afaa 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f470079788d337b13d5a7fb0b4f3663863f3c385", + "version-date": "2022-03-16", + "port-version": 4 + }, { "git-tree": "ea5e9e44827c85ad455621231cb7ca1f2447cdd9", "version-date": "2022-03-16", diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index 7f5b80c9fb4f4b..069f37b805b5e6 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "178ef570c3acdb03066628f05aa564af7609f48c", + "version": "0.8.6", + "port-version": 1 + }, { "git-tree": "648715b141f4bb501ebc83d09da547ee0b3fe467", "version": "0.8.6", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index a6fc4153db01e4..af496ea743f399 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bc0402d4aa7c5cbb9f934c0e7c68fec4acdcfc", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "ffc751aa641f583e42aad836b6bd7766661f789a", "version": "3.0.0", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index b4a4397f39ff9b..2a0a89ea43d65b 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e62481ee582e81ab3ba9fe7ad99a89fa1671c230", + "version-date": "2020-03-02", + "port-version": 4 + }, { "git-tree": "1593dcc61c40d6205be6d47e3623dc6bb3ddbad3", "version-date": "2020-03-02", From 055b31ae32c90b4c1189305093027b458429de48 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 28 Jun 2023 02:09:45 +0200 Subject: [PATCH 409/533] [linux ci] install golang-go for boringssl (#32096) --- scripts/azure-pipelines/linux/provision-image.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index dafaa37e0aa673..9a280d2b328bac 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -88,6 +88,9 @@ APT_PACKAGES="$APT_PACKAGES libxtst-dev" ## required by bond APT_PACKAGES="$APT_PACKAGES haskell-stack" +## required by boringssl +APT_PACKAGES="$APT_PACKAGES golang-go" + ## CUDA APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \ cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \ From f24c387d4a1fc83d681f05c91a86608911ea361e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Jun 2023 05:36:59 +0200 Subject: [PATCH 410/533] [luajit] Set strip options (#32248) --- ports/luajit/portfile.cmake | 6 +++++- ports/luajit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 4688fcb2983e50..242636a3d25c19 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -52,14 +52,18 @@ else() endif() vcpkg_list(SET make_options "EXECUTABLE_SUFFIX=${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(strip_options "") # cf. src/Makefile if(VCPKG_TARGET_IS_OSX) vcpkg_list(APPEND make_options "TARGET_SYS=Darwin") + set(strip_options " -x") elseif(VCPKG_TARGET_IS_IOS) vcpkg_list(APPEND make_options "TARGET_SYS=iOS") + set(strip_options " -x") elseif(VCPKG_TARGET_IS_LINUX) vcpkg_list(APPEND make_options "TARGET_SYS=Linux") elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_list(APPEND make_options "TARGET_SYS=Windows") + set(strip_options " --strip-unneeded") endif() set(dasm_archs "") @@ -84,7 +88,7 @@ else() OPTIONS ${make_options} "TARGET_AR=${VCPKG_DETECTED_CMAKE_AR} rcus" - "TARGET_STRIP=${VCPKG_DETECTED_CMAKE_STRIP}" + "TARGET_STRIP=${VCPKG_DETECTED_CMAKE_STRIP}${strip_options}" ) endif() diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 6eb2ddc091b305..f128baf5d42a63 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", "version-date": "2023-01-04", - "port-version": 1, + "port-version": 2, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 48f7b4fe7a2167..208a024042482f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5054,7 +5054,7 @@ }, "luajit": { "baseline": "2023-01-04", - "port-version": 1 + "port-version": 2 }, "luasec": { "baseline": "1.3.1", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index b1e59fa1a56b1a..68b517537ee739 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b724aa5af80b253739609f1173da343d55251cd", + "version-date": "2023-01-04", + "port-version": 2 + }, { "git-tree": "5a564decc9569af8e940353cab9623b6f93f3a4b", "version-date": "2023-01-04", From 453d496badb8b7d9e2b8b5bd5ebc07eb8d61efb9 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 28 Jun 2023 05:37:31 +0200 Subject: [PATCH 411/533] [matplotplusplus] fix opengl feature (#32227) Co-authored-by: Zhao Liu --- ports/matplotplusplus/fix-dependencies.patch | 4 ++-- ports/matplotplusplus/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/matplotplusplus.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/matplotplusplus/fix-dependencies.patch b/ports/matplotplusplus/fix-dependencies.patch index 7a7f48f126e3d8..46be79a615f7e7 100644 --- a/ports/matplotplusplus/fix-dependencies.patch +++ b/ports/matplotplusplus/fix-dependencies.patch @@ -208,7 +208,7 @@ index fe9ad53..b06ed7e 100644 # https://github.com/Dav1dde/glad - find_package(GLAD QUIET) -+ find_package(GLAD name glad CONFIG REQUIRED) ++ find_package(GLAD NAMES glad CONFIG REQUIRED) if (NOT GLAD_FOUND AND NOT TARGET glad) # Use CPM only if not found, to avoid ODR violations # find_package(GLAD REQUIRE) would suffice if it worked well @@ -217,7 +217,7 @@ index fe9ad53..b06ed7e 100644 # https://github.com/glfw/glfw - find_package(glfw3 QUIET) -+ find_package(GLFW3 name glfw3 CONFIG REQUIRED) ++ find_package(GLFW3 NAMES glfw3 CONFIG REQUIRED) if (NOT GLFW3_FOUND AND NOT TARGET glfw) # Use CPM only if not found, to avoid ODR violations # find_package(glfw3 REQUIRE) would suffice if it worked well diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json index cd8242c255702d..6b6795991f9331 100644 --- a/ports/matplotplusplus/vcpkg.json +++ b/ports/matplotplusplus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "matplotplusplus", "version": "1.2.0", + "port-version": 1, "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 208a024042482f..2c530e08ccc72c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5198,7 +5198,7 @@ }, "matplotplusplus": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "matroska": { "baseline": "1.7.1", diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json index 587c8a330f0262..ff11423e6a132d 100644 --- a/versions/m-/matplotplusplus.json +++ b/versions/m-/matplotplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99828f36e20657952b4574a84c4281f684a0afeb", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "4e65bffccaa1a5061002c38b7bdf6a0e464caf39", "version": "1.2.0", From bd83734ce9b07ab3f54a1230805ef41460bf790e Mon Sep 17 00:00:00 2001 From: Christopher Swenson Date: Wed, 28 Jun 2023 01:01:12 -0700 Subject: [PATCH 412/533] [swenson-sort] Add new port for sort.h (#32251) * Add sort port for sort.h [sort.h](https://github.com/swenson/sort) is a fast C header library with many different sorting algorithms. There's not a build process, so the port is just copying the header file. Most people usually just copied the header into their project, but I thought having a vcpkg might make it easier to use sort.h * Move sort to swenson-sort --- ports/swenson-sort/portfile.cmake | 12 ++++++++++++ ports/swenson-sort/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/s-/swenson-sort.json | 9 +++++++++ 4 files changed, 32 insertions(+) create mode 100644 ports/swenson-sort/portfile.cmake create mode 100644 ports/swenson-sort/vcpkg.json create mode 100644 versions/s-/swenson-sort.json diff --git a/ports/swenson-sort/portfile.cmake b/ports/swenson-sort/portfile.cmake new file mode 100644 index 00000000000000..b3af3d83e31ef4 --- /dev/null +++ b/ports/swenson-sort/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library, no build +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO swenson/sort + REF 5820a8094e4a2ae1c88ac8f8df7735c332ee62ff # accessed on 2023-06-26 + SHA512 fbe89ba5c5531f46250e2b8128ea5f1d7bac642a590a2f6e5f2cc3befa61f175b8f1fc28317377cde50357e8947ddc7ba8e0751437cf2c9fb91b7469511be15a + FILE_DISAMBIGUATOR 2 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/sort.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/swenson-sort/vcpkg.json b/ports/swenson-sort/vcpkg.json new file mode 100644 index 00000000000000..2f27a90f58cf25 --- /dev/null +++ b/ports/swenson-sort/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "swenson-sort", + "version-date": "2021-05-22", + "description": "sort.h is an implementation of a ton of sorting algorithms in C with a user-defined type that is provided at include time.", + "homepage": "https://github.com/swenson/sort", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 2c530e08ccc72c..84123d66ad8abd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7888,6 +7888,10 @@ "baseline": "6.0.0", "port-version": 0 }, + "swenson-sort": { + "baseline": "2021-05-22", + "port-version": 0 + }, "symengine": { "baseline": "0.10.1", "port-version": 0 diff --git a/versions/s-/swenson-sort.json b/versions/s-/swenson-sort.json new file mode 100644 index 00000000000000..9cf81c73e3f71e --- /dev/null +++ b/versions/s-/swenson-sort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "df8ebeee5f40cc3cfc5d7c88e858621ef3622270", + "version-date": "2021-05-22", + "port-version": 0 + } + ] +} From 259b39e58c3d08112c06c3fbb64da10f70d00aec Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 28 Jun 2023 01:01:43 -0700 Subject: [PATCH 413/533] [x264] update to r3107 (#32262) * [x264] update to r3107 * update version --------- Co-authored-by: Zhao Liu --- ports/x264/portfile.cmake | 4 ++-- ports/x264/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/x-/x264.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 5125496ea037ca..9a4e24a9e0776d 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/x264 - REF baee400fa9ced6f5481a728138fed6e867b0ff7f # 0.164.3095 in pc file, to be updated below - SHA512 3c7147457cbe0fea20cf3ed8cf7bbdca9ac15060cf86f81b9b5b54b018f922964e91b3c38962c81fedef92bc5b14489e04d0966d03d2b7a85b4dabab6ad816a2 + REF eaa68fad9e5d201d42fde51665f2d137ae96baf0 # 0.164.3107 in pc file, to be updated below + SHA512 9181b222e7f8bbde4331141ff399e1ef20d3e2e7a8f939b373fbe08df6f3caa99b992afb0e559cc19f78c96f0105b88b2eb4e4b935484e25b2c15da7903d179b HEAD_REF stable PATCHES uwp-cflags.patch diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 7a2a82573bdb57..ec4d35e7287c96 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,6 @@ { "name": "x264", - "version": "0.164.3095", - "port-version": 5, + "version": "0.164.3107", "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 84123d66ad8abd..f447de2c05f0fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8721,8 +8721,8 @@ "port-version": 2 }, "x264": { - "baseline": "0.164.3095", - "port-version": 5 + "baseline": "0.164.3107", + "port-version": 0 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 79bed1919b1627..b1f6d3ccaa4fbf 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fdfc4bb17ed8a4942a78dafd2ca5174d0695774", + "version": "0.164.3107", + "port-version": 0 + }, { "git-tree": "36ff38fabd741ddef6ccf4c207ef99058383c0bb", "version": "0.164.3095", From 896800c86f430d0cc22a42850ee6b711e5043a48 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Jun 2023 10:06:03 +0200 Subject: [PATCH 414/533] [libssh] Update to 0.10.5 (#32231) * [libssh] Update to 0.10.5 * Fix pc file for mingw on linux * Fix exported config * Update ci baseline * Update usage * Revert "Update ci baseline" --------- Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/libssh/0001-export-pkgconfig-file.patch | 4 +-- ports/libssh/portfile.cmake | 30 +++++++++++-------- ports/libssh/usage | 2 +- ports/libssh/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/l-/libssh.json | 5 ++++ 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/ports/libssh/0001-export-pkgconfig-file.patch b/ports/libssh/0001-export-pkgconfig-file.patch index 368ba83b8ca19b..9e325b84ef899d 100644 --- a/ports/libssh/0001-export-pkgconfig-file.patch +++ b/ports/libssh/0001-export-pkgconfig-file.patch @@ -18,7 +18,7 @@ index 741dc61..42f0e8f 100644 + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -lmbedcrypto -lpthread") + else () + if (WIN32) -+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -llibcrypto -lUser32 -lCrypt32") ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc "\nLibs.private: -llibcrypto -luser32 -lcrypt32") + else () + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " libcrypto\nLibs.private:") + endif () @@ -27,7 +27,7 @@ index 741dc61..42f0e8f 100644 + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lpthread") + endif () + if (WIN32) -+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lws2_32 -lShell32 -lAdvapi32") ++ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc " -lws2_32 -lshell32 -ladvapi32") + endif () install( FILES diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 7117211348a583..21747388a5307b 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -1,8 +1,10 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL https://git.libssh.org/projects/libssh.git - REF 9941e89f307e73352d887cac14e4e26b481a0a82 # Latest commit on 2022-11-23 - FETCH_REF master +vcpkg_download_distfile(distfile + URLS https://www.libssh.org/files/0.10/libssh-${VERSION}.tar.xz + FILENAME libssh-${VERSION}.tar.xz + SHA512 2b758f9df2b5937865d4aee775ffeafafe3ae6739a89dfc470e38c7394e3c3cb5fcf8f842fdae04929890ee7e47bf8f50e3a38e82dfd26a009f3aae009d589e0 +) +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${distfile}" PATCHES 0001-export-pkgconfig-file.patch 0002-mingw_for_Android.patch @@ -35,7 +37,6 @@ vcpkg_cmake_configure( -DWITH_SYMBOL_VERSIONING=OFF) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() #Fixup pthread naming if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) @@ -55,14 +56,19 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ) endif() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh) +file(READ "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" cmake_config) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" - ".dll" - ".lib" - ) + string(REPLACE ".dll" ".lib" cmake_config "${cmake_config}") endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" +"include(CMakeFindDependencyMacro) +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_dependency(Threads) +${cmake_config} +") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libssh/usage b/ports/libssh/usage index 39cb551c35213c..12998496cb6ed9 100644 --- a/ports/libssh/usage +++ b/ports/libssh/usage @@ -1,4 +1,4 @@ -The package libssh is compatible with built-in CMake targets: +libssh provides CMake targets: find_package(libssh CONFIG REQUIRED) target_link_libraries(main PRIVATE ssh) diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index dfdc88278f68e5..3d756a52afaf22 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libssh", - "version": "0.10.4+20221123", - "port-version": 4, + "version": "0.10.5", "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index f447de2c05f0fb..e4787152e25362 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4605,8 +4605,8 @@ "port-version": 3 }, "libssh": { - "baseline": "0.10.4+20221123", - "port-version": 4 + "baseline": "0.10.5", + "port-version": 0 }, "libssh2": { "baseline": "1.11.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index b2e799dd002df8..fe66450574cbd8 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6af07ebaeb4ab52ff509bc7637ad1d278d3d16b", + "version": "0.10.5", + "port-version": 0 + }, { "git-tree": "d2f4d398d1b82025b8aec8dba4e844f867286d38", "version": "0.10.4+20221123", From 4e06e78fd1c41e8a9c5187d70a03eb71c2083e99 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Jun 2023 10:11:23 +0200 Subject: [PATCH 415/533] [seacas] Fix libexodus dllexport (#32137) * [seacas] Fix libexodus dllexport * [seacas] Refresh patch --- ports/seacas/deps-and-shared.patch | 52 ++++++++++++++---------------- ports/seacas/portfile.cmake | 1 + ports/seacas/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/seacas.json | 5 +++ 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/ports/seacas/deps-and-shared.patch b/ports/seacas/deps-and-shared.patch index 32eb1c047b01bd..eff08367ebb489 100644 --- a/ports/seacas/deps-and-shared.patch +++ b/ports/seacas/deps-and-shared.patch @@ -101,7 +101,7 @@ diff --git a/cmake/tribits/common_tpls/FindTPLCGNS.cmake b/cmake/tribits/common_ index 37c329cd4..9d221f64f 100644 --- a/cmake/tribits/common_tpls/FindTPLCGNS.cmake +++ b/cmake/tribits/common_tpls/FindTPLCGNS.cmake -@@ -45,12 +45,12 @@ if ((CGNS_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR CGNS_FORCE_MODERN) +@@ -45,14 +45,14 @@ if ((CGNS_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR CGNS_FORCE_MODERN) print_var(CGNS_ALLOW_MODERN) print_var(CGNS_FORCE_MODERN) message("-- Using find_package(CGNS ${minimum_modern_CGNS_version} CONFIG) ...") @@ -113,11 +113,12 @@ index 37c329cd4..9d221f64f 100644 tribits_extpkg_create_imported_all_libs_target_and_config_file( CGNS - INNER_FIND_PACKAGE_NAME CGNS -+ INNER_FIND_PACKAGE_NAME cgns - IMPORTED_TARGETS_FOR_ALL_LIBS CGNS::cgns) ++ INNER_FIND_PACKAGE_NAME cgns + IMPORTED_TARGETS_FOR_ALL_LIBS CGNS::CGNS) set(TPL_CGNS_NOT_FOUND FALSE) endif() + diff --git a/cmake/tribits/common_tpls/FindTPLHDF5.cmake b/cmake/tribits/common_tpls/FindTPLHDF5.cmake index 716068c28..3d8fc8e76 100644 --- a/cmake/tribits/common_tpls/FindTPLHDF5.cmake @@ -134,8 +135,7 @@ index 716068c28..3d8fc8e76 100644 @@ -17,7 +17,7 @@ if (Netcdf_ALLOW_MODERN) tribits_extpkg_create_imported_all_libs_target_and_config_file( HDF5 -- INNER_FIND_PACKAGE_NAME HDF5 -+ INNER_FIND_PACKAGE_NAME HDF5 + INNER_FIND_PACKAGE_NAME HDF5 - IMPORTED_TARGETS_FOR_ALL_LIBS ${HDF5_EXPORT_LIBRARIES}) + IMPORTED_TARGETS_FOR_ALL_LIBS hdf5::hdf5) set(HDF5_INTERNAL_IS_MODERN TRUE) @@ -181,10 +181,6 @@ index c2c98f4be..9626cdb92 100644 PATH_SUFFIXES ${cgns_lib_suffixes}) endif() -diff --git a/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake b/cmake/tribits/common_tpls/find_modules/FindHDF5-donotuse.cmake -similarity index 100% -rename from cmake/tribits/common_tpls/find_modules/FindHDF5.cmake -rename to cmake/tribits/common_tpls/find_modules/FindHDF5-donotuse.cmake diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt index ef391f1c6..a4869415b 100644 --- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt @@ -217,44 +213,44 @@ diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/l index 2ed3ec4ab..f80f697f1 100644 --- a/packages/seacas/libraries/exodus/CMakeLists.txt +++ b/packages/seacas/libraries/exodus/CMakeLists.txt -@@ -1,5 +1,5 @@ - TRIBITS_SUBPACKAGE(Exodus) -- -+set(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}" CACHE BOOL "") - if (SEACASExodus_ENABLE_STATIC) - INCLUDE(InstallSymLink) - endif() -@@ -46,6 +46,8 @@ if (SEACASExodus_ENABLE_SHARED) - set_property(TARGET exodus_shared PROPERTY C_STANDARD 99) - set_target_properties(exodus_shared PROPERTIES OUTPUT_NAME exodus) - INSTALL(TARGETS exodus_shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) -+ target_compile_definitions(exodus_shared PRIVATE exoIIc_EXPORTS) -+ target_compile_definitions(exodus PRIVATE exoIIc_EXPORTS) - endif() +@@ -13,6 +13,7 @@ FILE(GLOB SOURCES src/ex_*.c) + if (NOT ${PACKAGE_NAME}_HIDE_DEPRECATED_CODE) + FILE(GLOB DEP_SOURCES src/deprecated/ex_*.c) endif() ++set(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}") + TRIBITS_CONFIGURE_FILE(exodus_config.h) + + if (NOT ${EXODUS_THREADSAFE}) +@@ -32,6 +33,9 @@ TRIBITS_ADD_LIBRARY( + HEADERS ${HEADERS} + SOURCES ${SOURCES} ${DEP_SOURCES} + ) ++if(BUILD_SHARED_LIBS) ++ target_compile_definitions(exodus PRIVATE exoIIc_EXPORTS) ++endif() + + set_property(TARGET exodus PROPERTY C_STANDARD 99) diff --git a/packages/seacas/libraries/exodus/cmake/exodus_config.h.in b/packages/seacas/libraries/exodus/cmake/exodus_config.h.in index e4dcd51f2..a88254ab7 100644 --- a/packages/seacas/libraries/exodus/cmake/exodus_config.h.in +++ b/packages/seacas/libraries/exodus/cmake/exodus_config.h.in -@@ -4,4 +4,19 @@ +@@ -4,4 +4,17 @@ @SEACAS_DEPRECATED_DECLARATIONS@ +#cmakedefine EXODUSII_BUILD_SHARED_LIBS -+#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || \ -+ defined(__MINGW32__) || defined(_WIN64) || defined(__MINGW64__) -+#if defined(EXODUSII_BUILD_SHARED_LIBS) ++#if defined(_WIN32) ++# if defined(EXODUSII_BUILD_SHARED_LIBS) +# if defined(exoIIc_EXPORTS) +# define EXODUS_EXPORT __declspec( dllexport ) extern +# else +# define EXODUS_EXPORT __declspec( dllimport ) extern +# endif -+#endif ++# endif +#else +# define EXODUS_EXPORT extern +#endif -+ + #endif diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index a5b0bcfb8ce1db..a2b622aa4309c7 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-headers.patch fix-fmt-10.patch ) +file(REMOVE "${SOURCE_PATH}/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake") if(HDF5_WITH_PARALLEL AND NOT "mpi" IN_LIST FEATURES) message(WARNING "${HDF5_WITH_PARALLEL} Enabling MPI in seacas.") diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 002c91b33838d2..d18427453539ad 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 4, + "port-version": 5, "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", "homepage": "https://github.com/sandialabs/seacas", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e4787152e25362..d4bf6fe212efb7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7402,7 +7402,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 4 + "port-version": 5 }, "seal": { "baseline": "4.1.1", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 102d0aeb645fdc..faa6b3c98d9f54 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0107d3359b2fa880981554b822946ccb2109baea", + "version-date": "2022-11-22", + "port-version": 5 + }, { "git-tree": "709e85621b7fe043156154d04e5d9c174e47fab9", "version-date": "2022-11-22", From 4a1035927d26de8601513a0591ba99213d3bcfbc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:13:10 +0200 Subject: [PATCH 416/533] Check for failed msys2 downloads in issues (#31991) * Check for failed msys2 downloads * Trigger Build --- .github/workflows/check_issues.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_issues.yml b/.github/workflows/check_issues.yml index c8db5c942592f6..4dee442c9b6a01 100644 --- a/.github/workflows/check_issues.yml +++ b/.github/workflows/check_issues.yml @@ -6,7 +6,7 @@ on: - opened jobs: - missing-windows-sdk-issue: + check-for-common-issues: runs-on: ubuntu-latest permissions: issues: write @@ -20,6 +20,8 @@ jobs: repo: context.repo.repo }; let issue = await github.rest.issues.get(issue_query) + + // missing-windows-sdk-issue let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/; if (reg.test(issue.data.body)){ await github.rest.issues.removeAllLabels(issue_query); @@ -30,3 +32,13 @@ jobs: await github.rest.issues.createComment({...issue_query, body}); // Close the issue? } + + // msys2 download fails => old vcpkg version + reg = /error: https:\/\/repo\.msys2\.org\/.*: failed: status code 404/; + if (reg.test(issue.data.body)){ + await github.rest.issues.removeAllLabels(issue_query); + await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]}); + let body = "Try updating your vcpkg version via `git pull` to resolve this issue. MSYS2 downloads are removed from the upstream servers from time to time, so using an up-to-date vcpkg version is necessary." + await github.rest.issues.createComment({...issue_query, body}); + // Close the issue? + } From cfa560b585b4b17eaa26c74845924fc1f76ef74e Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 29 Jun 2023 02:13:26 +0800 Subject: [PATCH 417/533] [angle] Add missing GL define (#32042) * [angle] Add missing GL define * version * add version * version --- ports/angle/cmake-buildsystem/PlatformWin.cmake | 1 + ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/angle/cmake-buildsystem/PlatformWin.cmake b/ports/angle/cmake-buildsystem/PlatformWin.cmake index 7f318056ab0fef..97ac61915f74c5 100644 --- a/ports/angle/cmake-buildsystem/PlatformWin.cmake +++ b/ports/angle/cmake-buildsystem/PlatformWin.cmake @@ -61,6 +61,7 @@ if(USE_OPENGL) list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_OPENGL + ANGLE_ENABLE_GL_DESKTOP_BACKEND ) endif() endif() diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index afbb120c7faa94..d4b8e411b01724 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 3, + "port-version": 4, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index b4d510d3594c29..dab9401de84158 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5963e0a9c6de152e825e610333e626e8a9df144", + "version-string": "chromium_5414", + "port-version": 4 + }, { "git-tree": "d5671959f9f2a59ecd232c72df54682bb10a14be", "version-string": "chromium_5414", diff --git a/versions/baseline.json b/versions/baseline.json index d4bf6fe212efb7..53a2a8389de2af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 3 + "port-version": 4 }, "annoy": { "baseline": "1.17.2", From a293ce5897b839da7c22fbb2dc07943e3646f58a Mon Sep 17 00:00:00 2001 From: gotnone Date: Wed, 28 Jun 2023 13:14:43 -0500 Subject: [PATCH 418/533] Fix [concurrencpp] build failure (#32035) (#32037) Co-authored-by: Stanley Pinchak --- ports/concurrencpp/fix-include-path.patch | 8 ++++++++ ports/concurrencpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/concurrencpp.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/concurrencpp/fix-include-path.patch b/ports/concurrencpp/fix-include-path.patch index 7984255979acb7..5130187d631bbc 100644 --- a/ports/concurrencpp/fix-include-path.patch +++ b/ports/concurrencpp/fix-include-path.patch @@ -10,3 +10,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt install( TARGETS concurrencpp +@@ -126,7 +126,6 @@ install( + COMPONENT concurrencpp_Development + INCLUDES + DESTINATION "${concurrencpp_include_directory}" +- COMPONENT concurrencpp_Development + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + COMPONENT concurrencpp_Runtime + NAMELINK_COMPONENT concurrencpp_Development diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json index 1d4e50280b0a27..f7970ae27d8e2e 100644 --- a/ports/concurrencpp/vcpkg.json +++ b/ports/concurrencpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "concurrencpp", "version": "0.1.6", - "port-version": 1, + "port-version": 2, "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", "homepage": "https://github.com/David-Haim/concurrencpp/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 53a2a8389de2af..5570f9780c7561 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1698,7 +1698,7 @@ }, "concurrencpp": { "baseline": "0.1.6", - "port-version": 1 + "port-version": 2 }, "concurrentqueue": { "baseline": "1.0.4", diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json index 355c1ec7583be8..290ddb66c4647d 100644 --- a/versions/c-/concurrencpp.json +++ b/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80e475aa0cf6a50936090964cdd032108453eade", + "version": "0.1.6", + "port-version": 2 + }, { "git-tree": "692f9ce2162c5dd6ee54170400c4df33aaec6b5d", "version": "0.1.6", From 20e22191dc757ba4dad5e7259119c62e977a3f5b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 29 Jun 2023 23:32:40 +0200 Subject: [PATCH 419/533] [cppfs] Fix ssh dependendencies (#32286) --- ports/cppfs/cmake-export-fix.patch | 46 ------------------- ports/cppfs/portfile.cmake | 24 ++++++++-- ...Crypto-fix.patch => ssh-dependencies.diff} | 27 ++++------- ports/cppfs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppfs.json | 5 ++ 6 files changed, 35 insertions(+), 71 deletions(-) delete mode 100644 ports/cppfs/cmake-export-fix.patch rename ports/cppfs/{LibCrypto-fix.patch => ssh-dependencies.diff} (54%) diff --git a/ports/cppfs/cmake-export-fix.patch b/ports/cppfs/cmake-export-fix.patch deleted file mode 100644 index 34470000249e09..00000000000000 --- a/ports/cppfs/cmake-export-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea9fd15..c62c6fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,7 +124,7 @@ endif() - if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL) - # Install into the system (/usr/bin or /usr/local/bin) - set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ -- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake -+ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/ - set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/ - set(INSTALL_DATA "share/${project}") # /usr/[local]/share/ - set(INSTALL_BIN "bin") # /usr/[local]/bin -@@ -183,7 +183,7 @@ add_subdirectory(deploy) - install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime) - - # Install cmake find script for the project --install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev) -+# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev) - - # Install the project meta files - install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime) -diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt -index aa37eda..e8a59e0 100644 ---- a/source/cppfs/CMakeLists.txt -+++ b/source/cppfs/CMakeLists.txt -@@ -283,7 +283,7 @@ perform_health_checks( - - # Library - install(TARGETS ${target} -- EXPORT "${target}-export" COMPONENT dev -+ EXPORT "${target}-config" COMPONENT dev - RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime - LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime - ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev -@@ -302,8 +302,8 @@ install(DIRECTORY - ) - - # CMake config --install(EXPORT ${target}-export -+install(EXPORT ${target}-config - NAMESPACE ${META_PROJECT_NAME}:: -- DESTINATION ${INSTALL_CMAKE}/${target} -+ DESTINATION ${INSTALL_CMAKE} - COMPONENT dev - ) diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake index 64eeb2127c559b..183069f25d177e 100644 --- a/ports/cppfs/portfile.cmake +++ b/ports/cppfs/portfile.cmake @@ -5,27 +5,41 @@ vcpkg_from_github( SHA512 da1e09f79d9e65e7676784f47196645aabe1e1284f0ea5e48e845a244f5d49f5ea4b032f9e2e38c8e6a29657ebe636c9b1c9a4601c4bbc7637e7f592c52a8961 HEAD_REF master PATCHES - LibCrypto-fix.patch - cmake-export-fix.patch + ssh-dependencies.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ssh OPTION_BUILD_SSH_BACKEND + ssh CMAKE_REQUIRE_FIND_PACKAGE_LibSSH2 + ssh CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL + ssh CMAKE_REQUIRE_FIND_PACKAGE_ZLIB ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DOPTION_BUILD_TESTS=Off - -DOPTION_FORCE_SYSTEM_DIR_INSTALL=On + -DCMAKE_DISABLE_FIND_PACKAGE_cppcheck=ON + -DCMAKE_DISABLE_FIND_PACKAGE_clang_tidy=ON + -DOPTION_BUILD_TESTS=OFF + -DOPTION_FORCE_SYSTEM_DIR_INSTALL=ON ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cppfs/cmake/cppfs") +# Overwriting original config +file(WRITE "${CURRENT_PACKAGES_DIR}/share/cppfs/cppfs-config.cmake" " +if(NOT \"${BUILD_SHARED_LIBS}\" AND \"${OPTION_BUILD_SSH_BACKEND}\") + include(CMakeFindDependencyMacro) + find_dependency(Libssh2 CONFIG) + find_dependency(OpenSSL) + find_dependency(ZLIB) +endif() +include(\"\${CMAKE_CURRENT_LIST_DIR}/cppfs-export.cmake\") +") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/cppfs/LibCrypto-fix.patch b/ports/cppfs/ssh-dependencies.diff similarity index 54% rename from ports/cppfs/LibCrypto-fix.patch rename to ports/cppfs/ssh-dependencies.diff index 144d2aabe723de..28d9e92e381ad5 100644 --- a/ports/cppfs/LibCrypto-fix.patch +++ b/ports/cppfs/ssh-dependencies.diff @@ -15,29 +15,19 @@ diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt index aa37eda..d29176a 100644 --- a/source/cppfs/CMakeLists.txt +++ b/source/cppfs/CMakeLists.txt -@@ -4,18 +4,18 @@ +@@ -4,9 +4,9 @@ # - find_package(LibSSH2) +-find_package(LibSSH2) -find_package(LibCrypto) -+# find_package(LibCrypto) ++find_package(LibSSH2 NAMES Libssh2) find_package(ZLIB) find_package(OpenSSL) ++set(LibCrypto_FOUND "${OpenSSL_FOUND}") --if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND) -+if (LibSSH2_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND) + if (LibSSH2_FOUND AND LibCrypto_FOUND AND ZLIB_FOUND AND OpenSSL_FOUND) set(SSH_DEPS_MET TRUE) - else() - set(SSH_DEPS_MET FALSE) - endif() - - if (OPTION_BUILD_SSH_BACKEND AND NOT SSH_DEPS_MET) -- message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, LibCrypto: ${LibCrypto_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}") -+ message(FATAL_ERROR "Requested to build ssh module but not all dependencies are found! LibSSH2: ${LibSSH2_FOUND}, ZLIB: ${ZLIB_FOUND}, OpenSSL: ${OpenSSL_FOUND}") - endif() - - -@@ -207,10 +207,9 @@ target_link_libraries(${target} +@@ -207,10 +207,10 @@ target_link_libraries(${target} if (OPTION_BUILD_SSH_BACKEND) target_link_libraries(${target} PRIVATE @@ -45,8 +35,9 @@ index aa37eda..d29176a 100644 - ${LIBSSH2_LIBRARY} - ${LIBCRYPTO_LIBRARY} - ${ZLIB_LIBRARY} -+ Libssh2::libssh2 -+ OpenSSL::SSL OpenSSL::Crypto ++ OpenSSL::SSL ++ $,Libssh2::libssh2_shared,Libssh2::libssh2_static> ++ OpenSSL::Crypto + ZLIB::ZLIB ) diff --git a/ports/cppfs/vcpkg.json b/ports/cppfs/vcpkg.json index 02f8f7e4a7c5be..a86f0d82c438b8 100644 --- a/ports/cppfs/vcpkg.json +++ b/ports/cppfs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppfs", "version": "1.3.0", - "port-version": 2, + "port-version": 3, "description": "Cross-platform C++ file system library supporting multiple backends", "license": "MIT", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 5570f9780c7561..2f74277f9c52ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1798,7 +1798,7 @@ }, "cppfs": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "cppgraphqlgen": { "baseline": "4.5.3", diff --git a/versions/c-/cppfs.json b/versions/c-/cppfs.json index 530b7a7fd30cb6..9284ea9b8cb5ed 100644 --- a/versions/c-/cppfs.json +++ b/versions/c-/cppfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "effae8e598d06cff2d1c7b0a084e6394ff1ee6ed", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "d018bbc2767ee2fec0398bd1131e5ae70d1ad5cf", "version": "1.3.0", From 82f37d39c4d07c598348b084153a0d3803bd48dd Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 30 Jun 2023 05:33:07 +0800 Subject: [PATCH 420/533] [baresip-libre] use c11 standard (#32235) * use c11 standard * fix patch * fix usage --- ports/baresip-libre/portfile.cmake | 3 ++- ports/baresip-libre/use-c11.patch | 15 +++++++++++++++ ports/baresip-libre/vcpkg.json | 1 + versions/b-/baresip-libre.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/baresip-libre/use-c11.patch diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index 8f3a5dc11f83e9..5af407973423eb 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF main PATCHES wip.patch + use-c11.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBRE_BUILD_SHARED) @@ -26,7 +27,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libre) +vcpkg_cmake_config_fixup(PACKAGE_NAME libre CONFIG_PATH lib/cmake/libre) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/baresip-libre/use-c11.patch b/ports/baresip-libre/use-c11.patch new file mode 100644 index 00000000000000..6c9547431be4ee --- /dev/null +++ b/ports/baresip-libre/use-c11.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b364219..fd662d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,6 +32,10 @@ else() + set(PROJECT_VERSION_FULL ${PROJECT_VERSION}) + endif() + ++if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std:c11" ) ++endif() ++ + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) + + ############################################################################## diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index e91604b4ed78f2..586d1ea74443e7 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,7 @@ { "name": "baresip-libre", "version": "3.2.0", + "port-version": 1, "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 7d606ccd037b33..687cfb8086d1f9 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c32aafef7c464cd6b860327ea35759e708f96a77", + "version": "3.2.0", + "port-version": 1 + }, { "git-tree": "64ff48f8f4f42472f614ddece58f1249217d252c", "version": "3.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2f74277f9c52ca..8917044c48c11f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -486,7 +486,7 @@ }, "baresip-libre": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "basisu": { "baseline": "1.11", From 3dd12b903561148b931de27f10f7f603db8e0171 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Fri, 30 Jun 2023 06:34:16 +0900 Subject: [PATCH 421/533] [botan] Use bash from PATH rather then /bin (#32285) * [botan] Use bash from PATH rather then /bin (microsoft/vcpkg#32284) The configure script used to invoke python during the build process contains a shebang that invokes /bin/bash independend of whatever bash would usually resolve to. This breaks compilation on FreeBSD, where bash isn't part of the operating system. Rather then /bin/bash, invoke /usr/bin/env bash, which resolves the bash command by iterating PATH. * [botan] bump portrevision (microsoft/vcpkg#32284) * [botan] regenerate versions repository (microsoft/vcpkg#32284) --- ports/botan/configure | 2 +- ports/botan/vcpkg.json | 2 +- versions/b-/botan.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/botan/configure b/ports/botan/configure index 7e18931908f23f..e125299738d133 100755 --- a/ports/botan/configure +++ b/ports/botan/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index db28c4df05176e..d8f0e4e72536a0 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.19.3", - "port-version": 1, + "port-version": 2, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 9d2996c2a47324..ab55eb09922052 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "575322265c701c0ff15d79c65a47ad38e7958235", + "version": "2.19.3", + "port-version": 2 + }, { "git-tree": "7b9240ee18f12e8acaedf11613aa6bc1d7aad9d5", "version": "2.19.3", diff --git a/versions/baseline.json b/versions/baseline.json index 8917044c48c11f..b7112812021dc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1250,7 +1250,7 @@ }, "botan": { "baseline": "2.19.3", - "port-version": 1 + "port-version": 2 }, "box2d": { "baseline": "2.4.1", From 8602701c9d9381a3bce696e0f2e114e83a2d4397 Mon Sep 17 00:00:00 2001 From: Timothy Werquin Date: Thu, 29 Jun 2023 23:35:12 +0200 Subject: [PATCH 422/533] [z3] Update to 4.12.2 (#32281) Updates the z3 port to 4.12.2 to fix building on macOS. --- ports/z3/fix-cstdint-include.patch | 12 ++++++++++++ ports/z3/portfile.cmake | 5 +++-- ports/z3/remove-flag-overrides.patch | 6 +++--- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 6 ++++++ 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 ports/z3/fix-cstdint-include.patch diff --git a/ports/z3/fix-cstdint-include.patch b/ports/z3/fix-cstdint-include.patch new file mode 100644 index 00000000000000..fe3a1fcdba5112 --- /dev/null +++ b/ports/z3/fix-cstdint-include.patch @@ -0,0 +1,12 @@ +diff --git a/src/util/tptr.h b/src/util/tptr.h +index 6213b2efa..2a35af535 100644 +--- a/src/util/tptr.h ++++ b/src/util/tptr.h +@@ -20,6 +20,7 @@ Revision History: + #pragma once + + #include "util/machine.h" ++#include + + #define TAG_SHIFT PTR_ALIGNMENT + #define ALIGNMENT_VALUE (1 << PTR_ALIGNMENT) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index d9558d75a11210..5a8ca23df302c8 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,11 +5,12 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.11.0 - SHA512 a3fd7e013948de6683b16aca03641bb845d02187152bebdee8c62c2a3f80a7710a1d3b9aef9c1490c2340571bb225f457928ac57a2ed28c0084ced34bcf3e905 + REF z3-4.12.2 + SHA512 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2 HEAD_REF master PATCHES fix-install-path.patch + fix-cstdint-include.patch remove-flag-overrides.patch ) diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index e7dbc81b0b6e31..d50e6120ffc621 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -5,8 +5,8 @@ index 477410ba8..fcca03917 100644 @@ -1,7 +1,6 @@ # Enforce some CMake policies cmake_minimum_required(VERSION 3.4) - + -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.11.0.0 LANGUAGES CXX) - + project(Z3 VERSION 4.12.2.0 LANGUAGES CXX) + ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index fad42df394250d..7f44e4c51e0c8c 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.11.0", + "version": "4.12.2", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b7112812021dc7..4246cb09950cb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8913,7 +8913,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.11.0", + "baseline": "4.12.2", "port-version": 0 }, "z4kn4fein-semver": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index a1cca9f3bc8f43..504c2034a897aa 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,11 @@ { "versions": [ + { + "git-tree": "dcef04d626f19434eaf9d2a3afb43d927bbd372e", + "version": "4.12.2", + "port-version": 0 + }, + { "git-tree": "4c57981e593026824fe9bedff234a82c13765e29", "version": "4.11.0", From e48cf9488f27490749f321087576b167838a176b Mon Sep 17 00:00:00 2001 From: Michael <73815580+michaelmigliore@users.noreply.github.com> Date: Thu, 29 Jun 2023 23:35:57 +0200 Subject: [PATCH 423/533] [usd] Fix hash after repository redirect (#32279) --- ports/usd/portfile.cmake | 4 ++-- ports/usd/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/usd.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index 854ddb23f1be85..d650740e45b1f2 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -14,9 +14,9 @@ string(REGEX REPLACE "^([0-9]+)[.]([0-9])\$" "\\1.0\\2" USD_VERSION "${VERSION}" vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO PixarAnimationStudios/USD + REPO PixarAnimationStudios/OpenUSD REF "v${USD_VERSION}" - SHA512 fd3e7a90f837a5d016d94be34747b2c1daed3f01f252e4b1aa5cb195f32acaecca9373b8f5c7be9c235148f04b0afa47da9462b357ef1dd1e11cf20a7225ae66 + SHA512 6669191c3497e244c958949b62a749958ab01e8e1edc7b3476d59c31395e147acf6f4ba7aae069c5ceab7fe2eb321e81e4e5f66beb72814be36e0fec98d3d034 HEAD_REF master PATCHES fix_build-location.patch diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index be8e363dfa4bc5..5f3dd840bad368 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "usd", "version": "23.5", - "port-version": 2, + "port-version": 3, "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4246cb09950cb3..465a1846eafa05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8326,7 +8326,7 @@ }, "usd": { "baseline": "23.5", - "port-version": 2 + "port-version": 3 }, "usockets": { "baseline": "0.8.6", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 9a872953e7f54e..e772a406a61be5 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a589441a5a488b6ad5d797ae17dab850b8b03620", + "version": "23.5", + "port-version": 3 + }, { "git-tree": "b5cb814be5a5aec9d600aeb98cd2126f407ca062", "version": "23.5", From 5a4b4e412162dbb7d276cde25b2adc5faad1fc17 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 29 Jun 2023 23:38:45 +0200 Subject: [PATCH 424/533] [ace] Upgrade to 7.1.1 (#32275) * [ace] Upgrade to 7.1.1 * ports/ace/portfile.cmake: * ports/ace/vcpkg.json: * Fixed error * ports/ace/vcpkg.json: * Updated baseline * versions/a-/ace.json: * versions/baseline.json: --- ports/ace/portfile.cmake | 4 ++-- ports/ace/vcpkg.json | 3 +-- versions/a-/ace.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index b2b4af77fca4e1..9732047e5541ff 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz" FILENAME "ACE-TAO-${VERSION}.tar.gz" - SHA512 a40a4761d396f1e7dc96287075810a3d874794f56057cf1f18b2bd27fbb89e024c2926890fd0a8efe825c31865c382b91e90477d78cba64877b93ba9909b7da2 + SHA512 ab1317e626f1b312cd72e6c10f7b51088e5de4db8fa3bca013a98b07aad4edfb5e1f42a4f58c970f968417852b305f298a34e0fde053a1f52754ebe3761f314c ) else() # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz" FILENAME "ACE-src-${VERSION}.tar.gz" - SHA512 716b27e347e013b866fa08f7ab182c60faf108e8000089b90717db86d6dd92d8c7e776d4850be27c5f50c8e31543f573ce19466efcd9b4b7bc8836eec5447860 + SHA512 1605fdf7a78bfce090bc8b14137f9aafd23019712672f6cd041284656ce2bae0baff954124166aeb16a0565887e1d87b2d10dc2ec5981c4e38fc8d0b39a97934 ) endif() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 3280d76579ec88..4e51b9a65f0418 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ace", - "version": "7.1.0", - "port-version": 1, + "version": "7.1.1", "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 6f62b3cab5fa46..239ed101031c1b 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8efd3ae98a66b7cb6de80d09db896b13a6300e7", + "version": "7.1.1", + "port-version": 0 + }, { "git-tree": "df4ee7b5111a86e0bc99f45b39447bff68d102bd", "version": "7.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 465a1846eafa05..3838cb9182a5af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -25,8 +25,8 @@ "port-version": 3 }, "ace": { - "baseline": "7.1.0", - "port-version": 1 + "baseline": "7.1.1", + "port-version": 0 }, "acl": { "baseline": "2.3.1", From 6c6cef934edaa8e55a928d521e95d9039f22cc7d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 29 Jun 2023 14:40:07 -0700 Subject: [PATCH 425/533] [lua] update to 5.4.6 (#32271) * [lua] update to 5.4.6 * update version --------- Co-authored-by: Zhao Liu --- ports/lua/fix-ios-system.patch | 12 ++++++------ ports/lua/portfile.cmake | 6 +++--- ports/lua/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/lua.json | 5 +++++ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ports/lua/fix-ios-system.patch b/ports/lua/fix-ios-system.patch index 3e98ce228ac7d2..f51c9449b97089 100644 --- a/ports/lua/fix-ios-system.patch +++ b/ports/lua/fix-ios-system.patch @@ -1,23 +1,23 @@ diff --git a/src/loslib.c b/src/loslib.c -index e65e188..3595601 100644 +index ad5a927..7812011 100644 --- a/src/loslib.c +++ b/src/loslib.c -@@ -3,7 +3,9 @@ - ** Standard Operating System library +@@ -4,6 +4,10 @@ ** See Copyright Notice in lua.h */ -- + +#if defined(__APPLE__) +#include +#endif ++ #define loslib_c #define LUA_LIB -@@ -143,7 +145,12 @@ static int os_execute (lua_State *L) { +@@ -143,7 +147,12 @@ static int os_execute (lua_State *L) { const char *cmd = luaL_optstring(L, 1, NULL); int stat; errno = 0; -- stat = system(cmd); +- stat = l_system(cmd); +#if defined(__APPLE__) && !TARGET_OS_OSX + // system() is __IOS_PROHIBITED, __WATCHOS_PROHIBITED, and __TVOS_PROHIBITED. + stat = 127; // error: shell execution failed diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 6eeeeb1ffecfa8..293e06e4861120 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.lua.org/ftp/lua-5.4.4.tar.gz" - FILENAME "lua-5.4.4.tar.gz" - SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21 + URLS "https://www.lua.org/ftp/lua-${VERSION}.tar.gz" + FILENAME "lua-${VERSION}.tar.gz" + SHA512 d90c6903355ee1309cb0d92a8a024522ff049091a117ea21efb585b5de35776191cd67d17a65b18c2f9d374795b7c944f047576f0e3fe818d094b26f0e4845c5 ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index a98f37bd1d436c..b1170fc59040ba 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,7 +1,6 @@ { "name": "lua", - "version": "5.4.4", - "port-version": 7, + "version": "5.4.6", "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 3838cb9182a5af..4680e9b19f25f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5033,8 +5033,8 @@ "port-version": 0 }, "lua": { - "baseline": "5.4.4", - "port-version": 7 + "baseline": "5.4.6", + "port-version": 0 }, "lua-compat53": { "baseline": "0.10", diff --git a/versions/l-/lua.json b/versions/l-/lua.json index b1ca86671cee00..0cdae44d1dad2f 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a25521a101ee330fd29139a6d4f377be3d814326", + "version": "5.4.6", + "port-version": 0 + }, { "git-tree": "804a148ba3bbecf8f998d38c682eaee628725fbb", "version": "5.4.4", From ca02a48b10604c63653f4a51c8ed9f47dfcd7420 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 30 Jun 2023 05:41:04 +0800 Subject: [PATCH 426/533] [drogon] Fix gcc13 compilation errors (#32270) * Fix gcc13 compilation errors. * update version --- ports/drogon/fix_gcc13.patch | 12 ++++++++++++ ports/drogon/portfile.cmake | 1 + ports/drogon/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/drogon.json | 7 ++++++- 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/drogon/fix_gcc13.patch diff --git a/ports/drogon/fix_gcc13.patch b/ports/drogon/fix_gcc13.patch new file mode 100644 index 00000000000000..deb15f5b798799 --- /dev/null +++ b/ports/drogon/fix_gcc13.patch @@ -0,0 +1,12 @@ +diff --git a/lib/inc/drogon/RateLimiter.h b/lib/inc/drogon/RateLimiter.h +index 6940321..2c5f039 100644 +--- a/lib/inc/drogon/RateLimiter.h ++++ b/lib/inc/drogon/RateLimiter.h +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + namespace drogon + { diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 7cc8f30f3f9881..13be0f135a3aae 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES vcpkg.patch drogon_config.patch + fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563 ) vcpkg_check_features( diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index f6cec6448d9003..1d66805eb02cc9 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,7 @@ { "name": "drogon", "version": "1.8.4", + "port-version": 1, "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/", diff --git a/versions/baseline.json b/versions/baseline.json index 4680e9b19f25f1..d77f83940e31ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2182,7 +2182,7 @@ }, "drogon": { "baseline": "1.8.4", - "port-version": 0 + "port-version": 1 }, "dstorage": { "baseline": "1.2.0", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 2d560f616e5f92..1fcfc4a95656b3 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,9 +1,14 @@ { "versions": [ + { + "git-tree": "29376f140626e1d34d6ca573b5a00e6dd7006d2f", + "version": "1.8.4", + "port-version": 1 + }, { "git-tree": "92af14d325c1fce661625e6adef2cf633acb5a37", "version": "1.8.4", - "port-version": 0 + "port-version": 0 }, { "git-tree": "670f02828b60f7a11c6b7a7feff0396d6cec4483", From 51beb92ce4a74064f596a72ea4273e7c66d5b03c Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 30 Jun 2023 05:42:28 +0800 Subject: [PATCH 427/533] [zeromq] Enable libsodium with feature curve (#32269) * [zeromq] Enable libsodium with feature curve * format json * update version * add port-version * version * feature * version * missing * version --- ports/zeromq/portfile.cmake | 1 + ports/zeromq/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/z-/zeromq.json | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 6d804c6d5be4f3..4b33b2bbba2461 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_check_features( draft ENABLE_DRAFTS websockets ENABLE_WS websockets-secure WITH_TLS + curve ENABLE_CURVE ) set(PLATFORM_OPTIONS "") diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index bcafe54b035506..d6c0434cccbf64 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zeromq", "version-date": "2023-06-20", + "port-version": 1, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "MPL-2.0", @@ -16,13 +17,23 @@ } ], "features": { + "curve": { + "description": "Enable CURVE security" + }, "draft": { "description": "Build and install draft APIs" }, "sodium": { "description": "Using libsodium for CURVE security", "dependencies": [ - "libsodium" + "libsodium", + { + "name": "zeromq", + "default-features": false, + "features": [ + "curve" + ] + } ] }, "websockets": { diff --git a/versions/baseline.json b/versions/baseline.json index d77f83940e31ba..10555eb829f586 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8930,7 +8930,7 @@ }, "zeromq": { "baseline": "2023-06-20", - "port-version": 0 + "port-version": 1 }, "zfp": { "baseline": "1.0.0", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 7b781e8455f209..2b1b76c31866c8 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f361429d0511b651b4f7b98f0dc47adf2601843", + "version-date": "2023-06-20", + "port-version": 1 + }, { "git-tree": "3deda40ff74bb4d77071cefabd7d889589452425", "version-date": "2023-06-20", From 9055f88ba53a99f51e3c733fe9c79703dc23d57d Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 30 Jun 2023 05:44:18 +0800 Subject: [PATCH 428/533] [magnum] Fix compile feature-wavaudioimporter error (#32256) * Fix compile wavaudioimporter error * update version * Fix compile feature-wavaudioimporter error * update version --- ports/magnum/004-fix-FindOpenAL.patch | 13 +++++++++++++ ports/magnum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magnum.json | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ports/magnum/004-fix-FindOpenAL.patch b/ports/magnum/004-fix-FindOpenAL.patch index 4222fb24783f54..f108612f069f89 100644 --- a/ports/magnum/004-fix-FindOpenAL.patch +++ b/ports/magnum/004-fix-FindOpenAL.patch @@ -10,3 +10,16 @@ index 64371a4..375ca58 100644 if(BUILD_PLUGINS_STATIC) set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1) +diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +index f4172d4..bdfd9da 100644 +--- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt ++++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +@@ -24,6 +24,8 @@ + # + + find_package(Corrade REQUIRED PluginManager) ++include(CMakeFindDependencyMacro) ++find_dependency(OpenAL) + + if(BUILD_PLUGINS_STATIC) + set(MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC 1) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index 774a05389ec65d..ab30bc9721715a 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 12, + "port-version": 13, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 10555eb829f586..bdb68a293a523f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5110,7 +5110,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 12 + "port-version": 13 }, "magnum-extras": { "baseline": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index e71d5548299be4..9b91c79c404723 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0adac5f186692119e9a2b9826ac5ed7357ed8a1", + "version-string": "2020.06", + "port-version": 13 + }, { "git-tree": "8ea35ff59474f3e0eaf9c13c2d5b4bae6519d651", "version-string": "2020.06", From f89c4f1052cd6c42444e2fd7a720af7706fba41b Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sat, 1 Jul 2023 09:32:57 +0900 Subject: [PATCH 429/533] Update async-mqtt version to 1.0.5. (#32302) --- ports/async-mqtt/portfile.cmake | 2 +- ports/async-mqtt/vcpkg.json | 2 +- versions/a-/async-mqtt.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 27c8cdd81dfc59..9647cf9b9b5c18 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 e790f59a28ac7f841b0a3320fc11ecf705a6e800526f990a81ec7d290c1db0bfe83a0d879ba997f890e658dbe2d6cb30f89e7e9e28dc96b7494a96986f689747 + SHA512 99b4e5d3ad810f26fcd0c95af9a1ee7ceb85341553236a3f4dd73222abbe915379a6df0475d912723ec72e16b55e089c646adcdfb8d4547c471081bba6bc97e3 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index 9e2bbde05297b4..ce1a90fa711493 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "1.0.4", + "version": "1.0.5", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index e2cfe1ffd269cd..efe5805a24408b 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d6da6090c0d80cca553b35ad733f0f3a879f0f7", + "version": "1.0.5", + "port-version": 0 + }, { "git-tree": "12788eb6a749ef28ef1dca9d6ab141bdf0458208", "version": "1.0.4", diff --git a/versions/baseline.json b/versions/baseline.json index bdb68a293a523f..f37e874493a5b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,7 +257,7 @@ "port-version": 0 }, "async-mqtt": { - "baseline": "1.0.4", + "baseline": "1.0.5", "port-version": 0 }, "asynch": { From 655390c9e3860678e8f29b6f61db6b8976059a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Sat, 1 Jul 2023 02:33:54 +0200 Subject: [PATCH 430/533] [igraph] update to 0.10.5 (#32301) * [igraph] update to 0.10.5 * [igraph] x-add-version --- ports/igraph/portfile.cmake | 6 +++--- ports/igraph/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/igraph.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 84271b4df34f73..1cd2ac464a6a65 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -4,9 +4,9 @@ # - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/igraph/igraph/releases/download/0.10.4/igraph-0.10.4.tar.gz" - FILENAME "igraph-0.10.4.tar.gz" - SHA512 71bcec5f0ba100aae7614753f9232a4221580b822b4dc120e3a80eab59d70c42aedddb00728eb13faf7e522332c514c2e030314c416ded8a70e5de990ea8039b + URLS "https://github.com/igraph/igraph/releases/download/0.10.5/igraph-0.10.5.tar.gz" + FILENAME "igraph-0.10.5.tar.gz" + SHA512 1d0460528a77ecc2947eae1ff19d1c0921469718b4c75c946b9686dc19b4e3ec7c8ac724bcf45bb42f4b6b328151522eb45fe4cfa955e03cce54c9968387e285 ) vcpkg_extract_source_archive( diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index e2056a13c11b4a..4e91a62f40d07f 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,7 +1,6 @@ { "name": "igraph", - "version": "0.10.4", - "port-version": 1, + "version": "0.10.5", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index f37e874493a5b2..b37d7d40f42988 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3309,8 +3309,8 @@ "port-version": 0 }, "igraph": { - "baseline": "0.10.4", - "port-version": 1 + "baseline": "0.10.5", + "port-version": 0 }, "iir1": { "baseline": "1.9.1", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index 1788d80adad54b..4346e291a90d50 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c7854267587378a0a276b4cba6267d950042f77", + "version": "0.10.5", + "port-version": 0 + }, { "git-tree": "b366fc43d220a0243a9e16860dee50c62ea4cf35", "version": "0.10.4", From b18a96f435d6c48c9074e423447bee69b57c738a Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:34:48 +0800 Subject: [PATCH 431/533] [google-cloud-cpp] update to 2.12.0 (#32299) * [google-cloud-cpp] update to 2.12.0 * version --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 03217528d65c3b..1e47eefa2ad5f1 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v${VERSION} - SHA512 d8515906b81e5bb8babe76bdbcba9462eeb9906e7099772d47d871483fa26fbc86943c41c1a916003c0bce767d15ebbbf870699ef75f2fdbcb61f9879d8b4017 + REF "v${VERSION}" + SHA512 206d07eb65da472a9cc743ef6de0ddc7c0e13833cb990dc2415681be7c2a9d8ddfac6a25880ff3dbd2c73257d2ad8f7b8331cc1755e31d85bdb5386a12c91dbe HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 7ca46bcdd06a94..35e4be6b78fbb9 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.11.0", + "version": "2.12.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b37d7d40f42988..80628d2fd2b798 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2921,7 +2921,7 @@ "port-version": 3 }, "google-cloud-cpp": { - "baseline": "2.11.0", + "baseline": "2.12.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 05d532cdc03874..fbe18d1f1db3a2 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7179212beeb134849f381dbe2c200580cc37c97", + "version": "2.12.0", + "port-version": 0 + }, { "git-tree": "0a4dc6845aca21d78853e4f6bc11e9bc5174b7b2", "version": "2.11.0", From b74dfa1fe1291a2045cc9e23c4fb1ee499b20b3d Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:35:35 +0800 Subject: [PATCH 432/533] [nowide] Update to 11.3.0 (#32296) * update nowide * update version --------- Co-authored-by: Monica --- ports/nowide/portfile.cmake | 8 ++++---- ports/nowide/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nowide.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/nowide/portfile.cmake b/ports/nowide/portfile.cmake index 959124d3365303..c251db04d5cdf0 100644 --- a/ports/nowide/portfile.cmake +++ b/ports/nowide/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/boostorg/nowide/releases/download/v11.2.0/nowide_standalone_v11.2.0.tar.gz" - FILENAME "nowide_standalone_v11.2.0.tar.gz" - SHA512 c3748921b85648aa0e89970f2ab24588cbc72d05edd7ddf4f61a607d9ecbddd45e9e6799d2ed83386c43045b9487693e027494a81b11a6a7bdfaa939d1251938 + URLS "https://github.com/boostorg/nowide/releases/download/v${VERSION}/nowide_standalone_v${VERSION}.tar.gz" + FILENAME "nowide_standalone_v${VERSION}.tar.gz" + SHA512 68e4d4b11db7265bf91e90b16e35ef2ea3a8ad80031b122067393a4cb89e20e26bacff81c7abddfc7a84d22c0d545875d7ba40b0288c665fb82028f08f957524 ) vcpkg_extract_source_archive( @@ -20,4 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nowide) 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") diff --git a/ports/nowide/vcpkg.json b/ports/nowide/vcpkg.json index 7fac7ad53d164f..311b6e35e11e11 100644 --- a/ports/nowide/vcpkg.json +++ b/ports/nowide/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nowide", - "version": "11.2.0", - "port-version": 1, + "version": "11.3.0", "description": "Boost nowide module (standalone)", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 80628d2fd2b798..4ca6693b33d36e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5721,8 +5721,8 @@ "port-version": 4 }, "nowide": { - "baseline": "11.2.0", - "port-version": 1 + "baseline": "11.3.0", + "port-version": 0 }, "nrf-ble-driver": { "baseline": "4.1.4", diff --git a/versions/n-/nowide.json b/versions/n-/nowide.json index 57612b6970c002..ba5bcdea165179 100644 --- a/versions/n-/nowide.json +++ b/versions/n-/nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d782a748c6b9013ca434f77a3c2b1838fce734d", + "version": "11.3.0", + "port-version": 0 + }, { "git-tree": "d91d4dcfdca6cb36e7c2235e9a14ccc131ed165e", "version": "11.2.0", From d10528c848332390a71b670fa91ddb936c14d758 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 30 Jun 2023 17:36:41 -0700 Subject: [PATCH 433/533] [cairo] Add usage (#32294) * [cairo] Add usage * update version --- ports/cairo/portfile.cmake | 7 ++++--- ports/cairo/usage | 11 +++++++++++ ports/cairo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 5 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 ports/cairo/usage diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index a78d97f955a14a..f53211eff5f6c2 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -1,4 +1,3 @@ - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(PATCHES fix_clang-cl_build.patch) endif() @@ -7,7 +6,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH GITLAB_URL https://gitlab.freedesktop.org REPO cairo/cairo - REF ${VERSION} + REF "${VERSION}" SHA512 e12f4b05326c1ac7d930e18d95398dc9c65f3af9745d7fd301ef1663dd378feeb43acc47de17fd082d0acf96e9fc60310557c24e3fe8af06d17931590c7759c6 PATCHES cairo_static_fix.patch @@ -50,7 +49,8 @@ endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${OPTIONS} + OPTIONS + ${OPTIONS} -Dtests=disabled -Dzlib=enabled -Dpng=enabled @@ -85,5 +85,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/cairo/usage b/ports/cairo/usage new file mode 100644 index 00000000000000..0ebb90033d337d --- /dev/null +++ b/ports/cairo/usage @@ -0,0 +1,11 @@ +The package cairo can be imported via CMake FindPkgConfig module: + + # cairo + find_package(PkgConfig REQUIRED) + pkg_check_modules(cairo REQUIRED IMPORTED_TARGET cairo) + target_link_libraries(main PkgConfig::cairo) + + # cairo-script-interpreter + find_package(PkgConfig REQUIRED) + pkg_check_modules(cairo-script-interpreter REQUIRED IMPORTED_TARGET cairo-script-interpreter) + target_link_libraries(main PkgConfig::cairo-script-interpreter) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 9cafa207f99a2f..5971251b4f53d1 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.8", - "port-version": 1, + "port-version": 2, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4ca6693b33d36e..0dbadff42603f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1362,7 +1362,7 @@ }, "cairo": { "baseline": "1.17.8", - "port-version": 1 + "port-version": 2 }, "cairomm": { "baseline": "1.16.2", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 5bb572493aa71a..9f241e3adbfa91 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e94aef48f94b5cdac2387269b5f2ad421a684873", + "version": "1.17.8", + "port-version": 2 + }, { "git-tree": "b28395e25157c57307d10e37eba8c9018dcd8f75", "version": "1.17.8", From 4a3c366f2d0d0eaf034bfa649124768df7cfe813 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Sat, 1 Jul 2023 09:37:52 +0900 Subject: [PATCH 434/533] [openssl] Use bash from PATH rather then /bin (#32289) * [openssl] Use bash from PATH rather then /bin (microsoft/vcpkg#32288) The configure script used to invoke python during the build process contains a shebang that invokes /bin/bash independend of whatever bash would usually resolve to. This breaks compilation on FreeBSD, where bash isn't part of the operating system. Rather then /bin/bash, invoke /usr/bin/env bash, which resolves the bash command by iterating PATH * [openssl] regenerate versions registries (microsoft/vcpkg#32288) --- ports/openssl/unix/configure | 2 +- ports/openssl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/openssl/unix/configure b/ports/openssl/unix/configure index 5599aaa0f688e1..2d49b3d166b41a 100755 --- a/ports/openssl/unix/configure +++ b/ports/openssl/unix/configure @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 9f49558ce91e2f..bf5565c66a7c2f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.1.1", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0dbadff42603f2..aba29fcc688b83 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6030,7 +6030,7 @@ }, "openssl": { "baseline": "3.1.1", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 5f4c258b8e02ce..2d8962a9ff2025 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da3981b5b899f4e74db269ca4854f4bf05d9d387", + "version": "3.1.1", + "port-version": 1 + }, { "git-tree": "dc8edd2b6e1e1552688c29dc46d5cd5c9183804b", "version": "3.1.1", From 64adda19c86e89526b5e27703a193c14477cce07 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sun, 2 Jul 2023 02:34:54 -0700 Subject: [PATCH 435/533] [vcpkg baseline][halide] Add x86-windows=fail in ci.baseline.txt temporarily (#32320) --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cd9e3427f4f496..1a49a3f2643532 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -548,6 +548,7 @@ gul14:x64-android=fail gz-tools2:arm-neon-android=fail gz-tools2:x64-android=fail gz-tools2:arm64-android=fail +halide:x86-windows=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail From 45482edecd3f0823dc9a528eff47b9dc62c94cbc Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 6 Jul 2023 02:17:45 +0800 Subject: [PATCH 436/533] fix pipelines (#32298) Co-authored-by: Monica Co-authored-by: Zhao Liu --- scripts/ci.baseline.txt | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1a49a3f2643532..fa96df4294238f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -242,12 +242,6 @@ coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail coin-or-ipopt:x64-linux=fail -# there is an ICE in VS2022 with colmap in release mode -colmap:x86-windows=fail -colmap:x64-windows=fail -colmap:x64-windows-static=fail -colmap:x64-windows-static-md=fail - concurrencpp:arm-neon-android=fail concurrencpp:arm64-android=fail concurrencpp:x64-android=fail @@ -517,10 +511,6 @@ graphicsmagick:x64-uwp=fail graphicsmagick:arm-neon-android=fail graphicsmagick:arm64-android=fail graphicsmagick:x64-android=fail -graphicsmagick:x64-windows-static-md=fail -graphicsmagick:x64-windows-static=fail -graphicsmagick:x64-windows=fail -graphicsmagick:x86-windows=fail graphqlparser:arm-neon-android=fail graphqlparser:arm64-android=fail graphqlparser:arm64-osx=fail # python2 required @@ -882,8 +872,6 @@ live555:x64-android=fail live555:x64-osx=fail live555:arm64-osx=fail live555:x64-uwp=fail -# fails due to an outdated gcc version -llfio:x64-linux=fail llgl:arm-neon-android=fail llgl:arm64-android=fail llgl:x64-android=fail @@ -924,7 +912,6 @@ memorymodule:x64-android=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -mfl:x64-linux=fail # requires a c++20 compiler mfx-dispatch:arm-neon-android=fail mfx-dispatch:arm64-android=fail mfx-dispatch:x64-android=fail @@ -961,9 +948,6 @@ moos-core:x64-android=fail mozjpeg:arm-neon-android=fail mozjpeg:arm64-android=fail mozjpeg:x64-android=fail -mp-units:arm-neon-android=fail -mp-units:arm64-android=fail -mp-units:x64-android=fail mp3lame:arm-neon-android=fail mp3lame:arm64-android=fail mp3lame:x64-android=fail From 0786980ca268fecaffcd6e5364c5a08b3fe51ba3 Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Thu, 6 Jul 2023 02:18:26 +0800 Subject: [PATCH 437/533] [highway] Bump to 1.0.4 (#32403) * [highway] Bump to 1.0.4 * update version database --- ports/highway/portfile.cmake | 3 ++- ports/highway/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/h-/highway.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/highway/portfile.cmake b/ports/highway/portfile.cmake index e6ef22ae352d0f..107e7d937ce37d 100644 --- a/ports/highway/portfile.cmake +++ b/ports/highway/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/highway REF "${VERSION}" - SHA512 fc419c862e1686b6278081e8e10da41dc2bdfbd386a29b59e21a57375a47d3eeb5c7297e3078c78007b212121d936640b192a26a16c941e73cf599f24e081021 + SHA512 75aaa0a3f97c6b044acb146ac4db20c1d813c4215b9c1620e72352d00c136939db7059f599122d6600e385bffa8b24d7fd9c1fe09772f4941e5300767a8c68dd HEAD_REF master ) @@ -20,6 +20,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hwy) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hwy/highway_export.h" "defined(HWY_SHARED_DEFINE)" "1") diff --git a/ports/highway/vcpkg.json b/ports/highway/vcpkg.json index bc7b5cdd35ecde..bffa7b51884a57 100644 --- a/ports/highway/vcpkg.json +++ b/ports/highway/vcpkg.json @@ -1,6 +1,6 @@ { "name": "highway", - "version-semver": "1.0.3", + "version": "1.0.4", "description": "Performance-portable, length-agnostic SIMD with runtime dispatch", "homepage": "https://github.com/google/highway", "license": "Apache-2.0", @@ -8,6 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index aba29fcc688b83..2236248ef24142 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3157,7 +3157,7 @@ "port-version": 0 }, "highway": { - "baseline": "1.0.3", + "baseline": "1.0.4", "port-version": 0 }, "hikogui": { diff --git a/versions/h-/highway.json b/versions/h-/highway.json index db26d19029c6c4..ecee4825353e8f 100644 --- a/versions/h-/highway.json +++ b/versions/h-/highway.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d516ee6b19d52dce62aae1d9ced2b7d9b18cb5cf", + "version": "1.0.4", + "port-version": 0 + }, { "git-tree": "c5445e6987068f7752475cf5f26c3402d3d8ef82", "version-semver": "1.0.3", From 6807b8de6b2b283a3a5a0c2f356edad9c04b7d0a Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 6 Jul 2023 02:20:04 +0800 Subject: [PATCH 438/533] [arrayfire] Fix compilation missing macro variables (#32388) * fix build * fix build * update version * update version --- ports/arrayfire/build.patch | 47 ++++++++++++++++++++++++++++ ports/arrayfire/vcpkg.json | 3 +- ports/clblast/fix_install_path.patch | 16 ++++++++++ ports/clblast/portfile.cmake | 12 ++----- ports/clblast/vcpkg.json | 2 +- versions/a-/arrayfire.json | 5 +++ versions/baseline.json | 4 +-- versions/c-/clblast.json | 5 +++ 8 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 ports/clblast/fix_install_path.patch diff --git a/ports/arrayfire/build.patch b/ports/arrayfire/build.patch index b102dea9a677b2..a87c02ffb66481 100644 --- a/ports/arrayfire/build.patch +++ b/ports/arrayfire/build.patch @@ -218,3 +218,50 @@ index d618ff2..9f51739 100644 ) set_target_properties(opencl_sort_by_key_${SBK_TYPE} +diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt +index b543433..9b5923b 100644 +--- a/src/backend/opencl/CMakeLists.txt ++++ b/src/backend/opencl/CMakeLists.txt +@@ -432,12 +432,9 @@ if(AF_OPENCL_BLAS_LIBRARY STREQUAL "clBLAS") + PRIVATE + clBLAS::clBLAS) + elseif(AF_OPENCL_BLAS_LIBRARY STREQUAL "CLBlast") +- include(build_CLBlast) ++ find_package(CLBlast CONFIG REQUIRED) + target_compile_definitions(afopencl PRIVATE USE_CLBLAST) +- target_link_libraries(afopencl +- PRIVATE +- CLBlast) +- add_dependencies(afopencl CLBlast-ext) ++ target_link_libraries(afopencl PRIVATE clblast) + endif() + + +diff --git a/src/backend/opencl/homography.cpp b/src/backend/opencl/homography.cpp +index 3b598b0..2815923 100644 +--- a/src/backend/opencl/homography.cpp ++++ b/src/backend/opencl/homography.cpp +@@ -39,7 +39,7 @@ int homography(Array &bestH, const Array &x_src, + ::std::min(iter, static_cast( + log(1.f - LMEDSConfidence) / + log(1.f - pow(1.f - LMEDSOutlierRatio, 4.f)))); +- err = createValueArray(af::dim4(nsamples, iter), FLT_MAX); ++ err = createValueArray(af::dim4(nsamples, iter), std::numeric_limits::max()); + } else { + // Avoid passing "null" cl_mem object to kernels + err = createEmptyArray(af::dim4(1)); +diff --git a/src/backend/opencl/kernel/homography.hpp b/src/backend/opencl/kernel/homography.hpp +index b84e599..90d0c80 100644 +--- a/src/backend/opencl/kernel/homography.hpp ++++ b/src/backend/opencl/kernel/homography.hpp +@@ -39,7 +39,9 @@ std::array getHomographyKernels(const af_homography_type htype) { + }; + options.emplace_back(getTypeBuildDefinition()); + options.emplace_back(DefineKeyValue( +- EPS, (std::is_same::value ? DBL_EPSILON : FLT_EPSILON))); ++ EPS, (std::is_same::value ++ ? std::numeric_limits::epsilon() ++ : std::numeric_limits::epsilon()))); + if (htype == AF_HOMOGRAPHY_RANSAC) { + options.emplace_back(DefineKey(RANSAC)); + } diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index b635b12e6f7f91..b816ea88610156 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrayfire", "version-semver": "3.8.0", - "port-version": 4, + "port-version": 5, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", "homepage": "https://github.com/arrayfire/arrayfire", "license": "BSD-3-Clause", @@ -42,6 +42,7 @@ "opencl": { "description": "ArrayFire OpenCL backend", "dependencies": [ + "clblast", "clfft", "opencl" ] diff --git a/ports/clblast/fix_install_path.patch b/ports/clblast/fix_install_path.patch new file mode 100644 index 00000000000000..12744c548bbd15 --- /dev/null +++ b/ports/clblast/fix_install_path.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d28050..e2a060d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -347,7 +347,10 @@ endif() + # Installs the library + include(GNUInstallDirs) + +-install(TARGETS clblast EXPORT CLBlast DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS clblast EXPORT CLBlast ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + install(FILES include/clblast_half.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + if(OPENCL) + install(FILES include/clblast.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index 74e7e3d4b87f89..700165dafc41c2 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 1.5.2 SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100 HEAD_REF master + PATCHES + fix_install_path.patch ) vcpkg_cmake_configure( @@ -14,16 +16,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll") - endif() -endif() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json index bc77f3498f545c..1156d22d3cd2d9 100644 --- a/ports/clblast/vcpkg.json +++ b/ports/clblast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clblast", "version": "1.5.2", - "port-version": 2, + "port-version": 3, "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "homepage": "https://github.com/CNugteren/CLBlast", "license": "Apache-2.0", diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json index 1bcc6fc7f35608..034ec71f52bef1 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e9b4b24be953b97638224c3563759c7d8a86602", + "version-semver": "3.8.0", + "port-version": 5 + }, { "git-tree": "37adfc5544ac7301c3ff4a8e16d84804d45b566a", "version-semver": "3.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2236248ef24142..51ff5a9ced1fa9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -218,7 +218,7 @@ }, "arrayfire": { "baseline": "3.8.0", - "port-version": 4 + "port-version": 5 }, "arrow": { "baseline": "12.0.1", @@ -1558,7 +1558,7 @@ }, "clblast": { "baseline": "1.5.2", - "port-version": 2 + "port-version": 3 }, "clfft": { "baseline": "2.12.2", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index 8ae9e3d638a86a..58ab898277eb3a 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d3c066f06df46440c055d265aa2dee1c21a9971", + "version": "1.5.2", + "port-version": 3 + }, { "git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0", "version": "1.5.2", From 8a3152cb84ef74b3e52a9d5275c845143dd7eca6 Mon Sep 17 00:00:00 2001 From: recsater Date: Thu, 6 Jul 2023 03:22:14 +0900 Subject: [PATCH 439/533] [cudnn] Fix cudnn on arm64 architecture (#32384) * update for arm64 * update for arm64 --------- Co-authored-by: recsater --- ports/cudnn/portfile.cmake | 4 ++-- ports/cudnn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cudnn.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index b22507e3df5a78..5b2993efefbb3c 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -4,11 +4,11 @@ vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VE # Try to find CUDNN if it exists; only download if it doesn't exist find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ PATH_SUFFIXES cuda/include include) message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ /usr/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}") if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index b498acd7a9a290..32d5756884a54e 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 9, + "port-version": 10, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 51ff5a9ced1fa9..09a9a49a7f651e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1942,7 +1942,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 9 + "port-version": 10 }, "cunit": { "baseline": "2.1.3", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 91538d8b6a2a1e..fbe1b3f5e0d290 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "406576a41668942aa5f0be5ee12ea54239be2d84", + "version": "7.6.5", + "port-version": 10 + }, { "git-tree": "77f6c8d8f5669619fde9b2bc596a406d0fee2839", "version": "7.6.5", From 96bbc0e5e311b15c83dce0f369bb2e854773fc2b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 5 Jul 2023 20:25:06 +0200 Subject: [PATCH 440/533] [libffi] Fix mingw output name, cleanup (#32381) * [libffi] Fix output name * [libffi] Cleanup --- ports/libffi/CMakeLists.txt | 14 ++++------- ports/libffi/libffiConfig.cmake.in | 2 -- ports/libffi/portfile.cmake | 38 +++++++++--------------------- ports/libffi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libffi.json | 5 ++++ 6 files changed, 22 insertions(+), 41 deletions(-) diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt index 21da1306c8ece1..146b0329148e89 100644 --- a/ports/libffi/CMakeLists.txt +++ b/ports/libffi/CMakeLists.txt @@ -1,16 +1,6 @@ cmake_minimum_required(VERSION 3.9) project(libffi C ASM) -set(CMAKE_SHARED_LIBRARY_PREFIX) -set(CMAKE_STATIC_LIBRARY_PREFIX) - -if(NOT CMAKE_SYSTEM_PROCESSOR) - set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}") -endif() - -# config variables for ffi.h.in -set(VERSION 3.4.4) - set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64 mips64el riscv32 riscv64) string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor) @@ -220,6 +210,10 @@ endif() add_library(libffi ${FFI_SOURCES}) +if(CMAKE_STATIC_LIBRARY_PREFIX STREQUAL "lib") + set_target_properties(libffi PROPERTIES OUTPUT_NAME ffi) +endif() + install(TARGETS libffi EXPORT ${PROJECT_NAME}Targets RUNTIME DESTINATION bin diff --git a/ports/libffi/libffiConfig.cmake.in b/ports/libffi/libffiConfig.cmake.in index ebdf1488acdd0a..d25083ef5e59e6 100644 --- a/ports/libffi/libffiConfig.cmake.in +++ b/ports/libffi/libffiConfig.cmake.in @@ -1,7 +1,5 @@ @PACKAGE_INIT@ -include(CMakeFindDependencyMacro) - if(NOT TARGET libffi) include("${CMAKE_CURRENT_LIST_DIR}/libffiTargets.cmake") endif() diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 086ead770d4812..0b118c3c1ad033 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libffi/libffi @@ -15,13 +13,15 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h" + "-DVERSION=${VERSION}" OPTIONS_DEBUG -DFFI_SKIP_HEADERS=ON ) vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() -# Create pkgconfig file set(PACKAGE_VERSION ${VERSION}) set(prefix "${CURRENT_INSTALLED_DIR}") set(exec_prefix "\${prefix}") @@ -29,9 +29,7 @@ set(libdir "\${prefix}/lib") set(toolexeclibdir "\${libdir}") set(includedir "\${prefix}/include") configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) - -# debug -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if (NOT VCPKG_BUILD_TYPE) set(prefix "${CURRENT_INSTALLED_DIR}/debug") set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") @@ -39,30 +37,16 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(includedir "\${prefix}/../include") configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY) endif() - -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() - -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" - "-lffi" "-llibffi") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" - "-lffi" "-llibffi") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" " -lffi" " -llibffi") + if(NOT DEFINED VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" " -lffi" " -llibffi") endif() endif() vcpkg_fixup_pkgconfig() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" - " *know* they are going to link with the static library. */" - " *know* they are going to link with the static library. */ - -#define FFI_BUILDING -" - ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" "!defined FFI_BUILDING" "0") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 6c4c452a5db249..21868bd9eba2ce 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.4", - "port-version": 1, + "port-version": 2, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 09a9a49a7f651e..b0f83f5cc62758 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4046,7 +4046,7 @@ }, "libffi": { "baseline": "3.4.4", - "port-version": 1 + "port-version": 2 }, "libfido2": { "baseline": "1.13.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index a5e726fd6c0f6f..c8a9458b344b22 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df29b345dbd3f713c6bad15ca3d5f19ec961d79f", + "version": "3.4.4", + "port-version": 2 + }, { "git-tree": "2422375e9ac93e01de0b511e1181000c340da613", "version": "3.4.4", From f95171761e117acaf7fb3cbb9ebb730f5adbe78d Mon Sep 17 00:00:00 2001 From: ZeeWanderer Date: Wed, 5 Jul 2023 21:26:03 +0300 Subject: [PATCH 441/533] [blend2d] update port to 2023-06-16 (#32372) * [blend2d] update port to 2023-06-16 * [blend2d] update versions --- ports/blend2d/portfile.cmake | 4 ++-- ports/blend2d/vcpkg.json | 2 +- versions/b-/blend2d.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 575cb0835f9f37..699b01a231cd0b 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 452d549751188b04367b5af46c040cb737f5f76c # commited on 2023-05-11 - SHA512 e2d3a0f5b956aadde5498f3aa4fb0663db8ad525cc909da080315fddf9f6322632a62761f0fe94ddb7c6347896e42c62e7e03e944843b3ca3400326eddc4ffcc + REF 7f292c15bafd8a7d92791f421cecb2ce84a75da8 # commited on 2023-06-16 + SHA512 dfd97a27b88bd94753b1404cbe63989186185bb6700b5c65a22b48e14fec7392038e328f30ea71a893c7bbee376f6017b4cdc2bf596259146be601d934c4fbdf HEAD_REF master ) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 22ffc51bf65e0c..93e862195cf895 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blend2d", - "version": "0.10", + "version-date": "2023-06-16", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 184f4903f707db..91f7c26ec92825 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e16be134e98cabefdf318161ef7f74d83b0512d", + "version-date": "2023-06-16", + "port-version": 0 + }, { "git-tree": "d6de437ccd239433cc34d21212797c4755a6c8f4", "version": "0.10", diff --git a/versions/baseline.json b/versions/baseline.json index b0f83f5cc62758..eecaae47deb92c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -605,7 +605,7 @@ "port-version": 0 }, "blend2d": { - "baseline": "0.10", + "baseline": "2023-06-16", "port-version": 0 }, "blingfire": { From 6346fb4ea8aa30d00fe1d19ffa131a8fc2a83df7 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 6 Jul 2023 02:26:41 +0800 Subject: [PATCH 442/533] [simdjson] Update to 3.2.0 (#32369) * [simdjson] Update to 3.2.0 * [simdjson] Overwrite version --- ports/simdjson/portfile.cmake | 2 +- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index b672d179530f91..cc9146cefaafd2 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO simdjson/simdjson REF "v${VERSION}" HEAD_REF master - SHA512 bdddf6a1afbe289fa075cbe05d9f70c29c61fa824be52e414d8344bd1c77117634bf44122629980e69571cf4bad1da5f2b9818ea878290cc360913fb2279d3e5 + SHA512 02723d05fe88cfc69c1ec3eef92ae9e7da169a99645992829d4e40a00edecb98e21593dc9e04aeb2959cbcdbb8f40bb464daef9eb26cf3bd344c39271f6add2e ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index be59b4a4f76a94..52de92e8090489 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version": "3.1.8", + "version": "3.2.0", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index eecaae47deb92c..a39c80b3487cf1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7525,7 +7525,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "3.1.8", + "baseline": "3.2.0", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 1fbbc79b371beb..89d5fb44e4ebbc 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cfad57f29374b71827cbe3861a7f22558afedce", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "d62e75a24f4a107faf802fc187d3cf72e0041c51", "version": "3.1.8", From b990e9576c5d9d05bab4aef54bd6a5391c22a434 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 6 Jul 2023 02:30:46 +0800 Subject: [PATCH 443/533] fix messing header (#32367) --- ports/sleepy-discord/fix-boost.patch | 13 ------------- ports/sleepy-discord/fix-messing-header.patch | 12 ++++++++++++ ports/sleepy-discord/portfile.cmake | 2 ++ ports/sleepy-discord/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sleepy-discord.json | 5 +++++ 6 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 ports/sleepy-discord/fix-boost.patch create mode 100644 ports/sleepy-discord/fix-messing-header.patch diff --git a/ports/sleepy-discord/fix-boost.patch b/ports/sleepy-discord/fix-boost.patch deleted file mode 100644 index a8279182dea92e..00000000000000 --- a/ports/sleepy-discord/fix-boost.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sleepy_discord/CMakeLists.txt b/sleepy_discord/CMakeLists.txt -index 6c134141..2d115985 100644 ---- a/sleepy_discord/CMakeLists.txt -+++ b/sleepy_discord/CMakeLists.txt -@@ -84,7 +84,7 @@ if (NOT ONLY_SLEEPY_DISCORD) - elseif(USE_BOOST_ASIO) - #Look for boost as an alt - find_package(Boost REQUIRED) -- list(APPEND LIBRARIES_TO_LINK ${Boost_LIBRARIES}) -+ list(APPEND LIBRARIES_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}") - list(APPEND LIB_CONFIG "EXISTENT_BOOST_ASIO") - list(APPEND LIB_CONFIG "EXISTENT_ASIO") - list(APPEND REQUIRED_PACKAGES "Boost") diff --git a/ports/sleepy-discord/fix-messing-header.patch b/ports/sleepy-discord/fix-messing-header.patch new file mode 100644 index 00000000000000..bc82a0aa8f9db7 --- /dev/null +++ b/ports/sleepy-discord/fix-messing-header.patch @@ -0,0 +1,12 @@ +diff --git a/include/sleepy_discord/zlib_compression.h b/include/sleepy_discord/zlib_compression.h +index 9d95c58..b2d418e 100644 +--- a/include/sleepy_discord/zlib_compression.h ++++ b/include/sleepy_discord/zlib_compression.h +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + namespace SleepyDiscord { + //This Queue is basicly a single linked list with the back and size stored diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index f43133c4fb2f72..ad28383cb465ff 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_from_github( REF 70b9ec13427ea68de6f4213e9dfec6129fbab21b SHA512 c91fbb9a672257c63ee83b40b62961b89568ca33081048b440876c390a2a2e11c602aaf43a6c9485fd85a91248f34a70d7b9ea769d0cfcd4b35b80d58a6ad737 HEAD_REF develop + PATCHES + fix-messing-header.patch ) # Handle version data here to prevent issues from doing this twice in parallel diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 50058d8b14fabe..372532255afc67 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sleepy-discord", "version-date": "2022-02-05", - "port-version": 1, + "port-version": 2, "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a39c80b3487cf1..db05028a4d8d6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7562,7 +7562,7 @@ }, "sleepy-discord": { "baseline": "2022-02-05", - "port-version": 1 + "port-version": 2 }, "slikenet": { "baseline": "2021-06-07", diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 663ead090d7aa9..0d382ccf9f31af 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "594857bed2d04f35b594acbf4f1488c4ae4c4ad0", + "version-date": "2022-02-05", + "port-version": 2 + }, { "git-tree": "7d9b72be7b331d4451d11594b175b0e1f97a75ab", "version-date": "2022-02-05", From 8b86af2c8c9a77769c641506a0a4a8c4385a0bee Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:32:59 -0700 Subject: [PATCH 444/533] [geogram] Enable MacOs+Arm64 build (#32366) * [geogram] Enable MacOs+Arm64 build * update version --------- Co-authored-by: Zhao Liu --- ports/geogram/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/geogram.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index 68f71d10b0fc32..51233ba8986f05 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,10 +1,11 @@ { "name": "geogram", "version": "1.8.3", + "port-version": 1, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://github.com/BrunoLevy/geogram", "license": "BSD-3-Clause", - "supports": "!uwp & !(osx & arm64)", + "supports": "!uwp", "dependencies": [ "blas", "lapack", diff --git a/versions/baseline.json b/versions/baseline.json index db05028a4d8d6b..192274c40ac34c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2770,7 +2770,7 @@ }, "geogram": { "baseline": "1.8.3", - "port-version": 0 + "port-version": 1 }, "geographiclib": { "baseline": "2.2", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index c4987cd8bb97f8..a75e45274eb8bd 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee6286e71522b6c0bd498066597094e57ff505b4", + "version": "1.8.3", + "port-version": 1 + }, { "git-tree": "86346ad187bf9f8b54be1e50b3bb52dd4c69171d", "version": "1.8.3", From 83802f216044dcb7723e2f591d044877a3310194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 5 Jul 2023 20:34:38 +0200 Subject: [PATCH 445/533] [quill] Update to 3.1.0 (#32350) * [quill] Update to 3.1.0 * [quill] Update version files --- ports/quill/portfile.cmake | 3 +-- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 8a8536bb41bb84..990ab1e837e763 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_minimum_required(VERSION 2022-11-10) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 667c05771006a7ca5c3ea26d2232f344334cc8177800321a24bb3968c6145e0dbeb4a52c601bbfdace96000d1dd53934ba2ffb447b545673bb5f2671b7f9cef7 + SHA512 c38b56c655dff8b7f9218a465256a7c19f2544b46e4a0139cc06c98a6365c9611e40b6a6f2ee47f5eb5019194899806d600d5f72b844cc20377cc35cce0e22bd HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 71e10d9ff73f4d..543347f78d53d9 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.0.2", + "version": "3.1.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 192274c40ac34c..cb4af692f879a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6969,7 +6969,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.0.2", + "baseline": "3.1.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 8d2ebe76e91fa7..552df7fb8cefa1 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "115bc3d12264c44fbbe7fbe6469044e7b873aa9a", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "9b47e691385beaa29c7906dad0b911602c601ccd", "version": "3.0.2", From 66e2046ef6f25940a9706cb6f94e810d7fbfa44f Mon Sep 17 00:00:00 2001 From: Alex E <36134278+chusitoo@users.noreply.github.com> Date: Wed, 5 Jul 2023 14:35:11 -0400 Subject: [PATCH 446/533] [flatbush] update to v1.2.0 (#32344) * Add release v1.2.0 * Baseline and git-tree --- ports/flatbush/portfile.cmake | 2 +- ports/flatbush/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flatbush.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flatbush/portfile.cmake b/ports/flatbush/portfile.cmake index 81760317c59370..43deaaf88e5aba 100644 --- a/ports/flatbush/portfile.cmake +++ b/ports/flatbush/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chusitoo/flatbush REF "v${VERSION}" - SHA512 2d1ac3ae04331dd7aa0923c924672db2aef652b2f99a8a36a58c0efe4069f9b2755e343bea887128f02edd0abbf0775743541ca81fdb325ca1022145dde79ff7 + SHA512 c2671a8885bc1299efdfa38f1947b98697aeb9ee156622cd71fbdf8a7741e5fa0306f5d85867e6dd683fb80c9d74fa9cd9809b47797183a0bbcab7ee57df165e HEAD_REF master ) diff --git a/ports/flatbush/vcpkg.json b/ports/flatbush/vcpkg.json index 67482d973bed2a..150b4c910f4d6e 100644 --- a/ports/flatbush/vcpkg.json +++ b/ports/flatbush/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flatbush", - "version": "1.1.2", + "version": "1.2.0", "description": "A C++11 header-only single file port of Flatbush", "homepage": "https://github.com/chusitoo/flatbush", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index cb4af692f879a3..4e0c43d945d029 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2541,7 +2541,7 @@ "port-version": 0 }, "flatbush": { - "baseline": "1.1.2", + "baseline": "1.2.0", "port-version": 0 }, "flecs": { diff --git a/versions/f-/flatbush.json b/versions/f-/flatbush.json index 572c23e5b7891f..9e04d810b81da5 100644 --- a/versions/f-/flatbush.json +++ b/versions/f-/flatbush.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9a8b3e1671e29e5a3ad36935f66f7d7bac0e0ab", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "8c59357025e0ee6a44855c384d3defd0a9ee525d", "version": "1.1.2", From 768634b5673ee2a5d6148125bcc7120ae2d21e9c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 5 Jul 2023 20:36:37 +0200 Subject: [PATCH 447/533] [osg] Fix examples and tools (#32335) * [osg] Fix sdl patch * [osg] Fix examples and tools --- ports/osg/fix-sdl.patch | 13 ------------- ports/osg/portfile.cmake | 21 ++++++++++++--------- ports/osg/vcpkg.json | 10 ++++++---- versions/baseline.json | 2 +- versions/o-/osg.json | 5 +++++ 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/ports/osg/fix-sdl.patch b/ports/osg/fix-sdl.patch index be0030fea4f16f..c779235ff084f7 100644 --- a/ports/osg/fix-sdl.patch +++ b/ports/osg/fix-sdl.patch @@ -12,16 +12,3 @@ index 81328ea..c735419 100644 FIND_PACKAGE(SDL) FIND_PACKAGE(Poppler-glib) FIND_PACKAGE(RSVG) -diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp -index 9de15b1..ae96e11 100644 ---- a/examples/osgmovie/osgmovie.cpp -+++ b/examples/osgmovie/osgmovie.cpp -@@ -691,7 +691,7 @@ int main(int argc, char** argv) - - #if USE_SDL || USE_SDL2 - --#include "SDL.h" -+#include - - static void soundReadCallback(void * user_data, uint8_t * data, int datalen) - { diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 868e6ddb59e584..f61e0a6d954d13 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -139,19 +139,22 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() set(osg_plugins_subdir "osgPlugins-${OSG_VER}") +vcpkg_list(SET tools) +if("examples" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND tools osg2cpp osgshaderpipeline) +endif() if("tools" IN_LIST FEATURES) - set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") - file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") - file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${osg_plugins_subdir}") - if(NOT VCPKG_BUILD_TYPE) - file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") - file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/${osg_plugins_subdir}") - endif() - - set(tools osgversion present3D) + list(APPEND tools osgversion present3D) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND tools osgviewer osgarchive osgconv osgfilecache) endif() +endif() +if(tools) + set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") + if(NOT osg_plugins STREQUAL "") + file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${osg_plugins_subdir}") + endif() vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) endif() diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 9cf0765685839b..f27b33c37fff16 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 19, + "port-version": 20, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, @@ -90,7 +90,8 @@ "name": "osg", "default-features": false, "features": [ - "freetype" + "freetype", + "plugins" ] }, "sdl2" @@ -134,7 +135,7 @@ "description": "Set to ON to generate CPack configuration files and packaging targets" }, "plugins": { - "description": "Build most OSG Plugins", + "description": "Build most OSG plugins", "dependencies": [ { "name": "curl", @@ -206,7 +207,8 @@ "name": "osg", "default-features": false, "features": [ - "freetype" + "freetype", + "plugins" ] } ] diff --git a/versions/baseline.json b/versions/baseline.json index 4e0c43d945d029..7b3c0836a21cae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6110,7 +6110,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 19 + "port-version": 20 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 1b99314dceea00..829b4ea465cb25 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87727f247e97af37e53f77acadff05d6d06559d0", + "version": "3.6.5", + "port-version": 20 + }, { "git-tree": "50d656eed69f1bb2d38d5ead688d555f4faf8224", "version": "3.6.5", From 56f8e9a798d2bd47de658f1d667d6c0e3aa76387 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 5 Jul 2023 20:38:10 +0200 Subject: [PATCH 448/533] [libepoxy] More platforms (#32332) * [libepoxy] Fix android builds * [libepoxy] uwp is unsupported * [libepoxy] windows staticcrt is unsupported Initialization code is in DllMain, so dynamic linkage is required, so avoid static CRT. --- ports/libepoxy/portfile.cmake | 12 ++++++++++++ ports/libepoxy/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 6 ------ versions/baseline.json | 2 +- versions/l-/libepoxy.json | 5 +++++ 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 42cc13134c2a33..d39b95423d1bd8 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -16,11 +16,16 @@ vcpkg_from_github( if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) set(OPTIONS -Dglx=no -Degl=no -Dx11=false) +elseif(VCPKG_TARGET_IS_ANDROID) + set(OPTIONS -Dglx=no -Degl=yes -Dx11=false) else() set(OPTIONS -Dglx=yes -Degl=yes -Dx11=true) endif() if(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS -Dc_std=c99) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND OPTIONS "-Dc_args=-DEPOXY_PUBLIC=extern") + endif() endif() vcpkg_configure_meson( @@ -34,6 +39,13 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/epoxy/common.h" "# if defined(_MSC_VER)" "# if defined(_WIN32)") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/epoxy/common.h" "__declspec(dllimport)" "") + endif() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json index cb75b5943cc825..8c736266e38d63 100644 --- a/ports/libepoxy/vcpkg.json +++ b/ports/libepoxy/vcpkg.json @@ -1,14 +1,15 @@ { "name": "libepoxy", "version": "1.5.10", - "port-version": 1, + "port-version": 2, "description": "Epoxy is a library for handling OpenGL function pointer management for you", "homepage": "https://github.com/anholt/libepoxy", "license": "MIT", + "supports": "!uwp & !(windows & staticcrt)", "dependencies": [ { "name": "egl-registry", - "platform": "linux" + "platform": "!osx & !windows" }, { "name": "vcpkg-tool-meson", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fa96df4294238f..5d4bff6663365f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -651,9 +651,6 @@ libcpplocate:x64-android=fail libcrafter:arm-neon-android=fail libcrafter:arm64-android=fail libcrafter:x64-android=fail -libepoxy:arm-neon-android=fail -libepoxy:arm64-android=fail -libepoxy:x64-android=fail libgit2:arm-neon-android=fail libgit2:arm64-android=fail libgit2:x64-android=fail @@ -664,9 +661,6 @@ libgpg-error:x64-android=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail -libepoxy:arm-uwp=fail -libepoxy:x64-uwp=fail -libepoxy:x64-windows-static=fail libevhtp:x86-windows=fail libevhtp:x64-windows=fail libevhtp:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 7b3c0836a21cae..662f24e00faffe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4018,7 +4018,7 @@ }, "libepoxy": { "baseline": "1.5.10", - "port-version": 1 + "port-version": 2 }, "libevent": { "baseline": "2.1.12+20230128", diff --git a/versions/l-/libepoxy.json b/versions/l-/libepoxy.json index 516e3df45d3661..b004fce9a678e1 100644 --- a/versions/l-/libepoxy.json +++ b/versions/l-/libepoxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df7389605ff392a312b77b633ca658167c14221a", + "version": "1.5.10", + "port-version": 2 + }, { "git-tree": "76a3ae8e21ad9736741ecc58522805647fdbb7b9", "version": "1.5.10", From 4ee00ae12db963bd9a344fff4eb155b5663f2629 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Thu, 6 Jul 2023 03:39:18 +0900 Subject: [PATCH 449/533] Update async-mqtt version to 1.0.6. (#32326) --- ports/async-mqtt/portfile.cmake | 2 +- ports/async-mqtt/vcpkg.json | 2 +- versions/a-/async-mqtt.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 9647cf9b9b5c18..a498744a1c59c0 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 99b4e5d3ad810f26fcd0c95af9a1ee7ceb85341553236a3f4dd73222abbe915379a6df0475d912723ec72e16b55e089c646adcdfb8d4547c471081bba6bc97e3 + SHA512 e191079bfbf0382be28acaf1944170902cf5bdcd517870647a4b938ec8eb966f1690eafefb9c6f408c659b70571c5fe0493586b91e1f2eedd24378f4abbe493f HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index ce1a90fa711493..c3025e2f7635c8 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "1.0.5", + "version": "1.0.6", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index efe5805a24408b..a1b7decb21a74a 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd1032beeb26ec19d1a9c384b0c8335249292e66", + "version": "1.0.6", + "port-version": 0 + }, { "git-tree": "5d6da6090c0d80cca553b35ad733f0f3a879f0f7", "version": "1.0.5", diff --git a/versions/baseline.json b/versions/baseline.json index 662f24e00faffe..a49a70db478f67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,7 +257,7 @@ "port-version": 0 }, "async-mqtt": { - "baseline": "1.0.5", + "baseline": "1.0.6", "port-version": 0 }, "asynch": { From ef7202aff90bb3ed417a61452ed8b03ac8174545 Mon Sep 17 00:00:00 2001 From: Daniele Pallastrelli <5451767+daniele77@users.noreply.github.com> Date: Wed, 5 Jul 2023 20:39:50 +0200 Subject: [PATCH 450/533] [cli] Update the version to 2.1 (#32324) * [cli] Update the version to 2.1 * [cli] Update the version to 2.1 --- ports/cli/portfile.cmake | 4 ++-- ports/cli/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cli.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake index f80c55f821fc97..5a5b3121894f75 100644 --- a/ports/cli/portfile.cmake +++ b/ports/cli/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/cli - REF v2.0.2 - SHA512 5a9b96ec59c6b51733c906b1e1815e4fb2cc645599b81a15a3cb0220fd9360bbc3f8e5fdab063c0050188c587e1448cac0629d96437181ddf86555165b79f812 + REF v2.1.0 + SHA512 dbc08c4f215a215ef77c9f61b01331e13709272b290c0e9859f72c4ed16e7dc108e368014c4cb82c0bbb1d2c6e07f416e93595ee6ff08af00225aa0a3630110b HEAD_REF master ) diff --git a/ports/cli/vcpkg.json b/ports/cli/vcpkg.json index 357e663dac4aca..daa01c258b2035 100644 --- a/ports/cli/vcpkg.json +++ b/ports/cli/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "2.0.2", + "version": "2.1.0", "description": "A library for interactive command line interfaces in modern C++", "homepage": "https://github.com/daniele77/cli", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index a49a70db478f67..82f6dd26dc4be5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1565,7 +1565,7 @@ "port-version": 6 }, "cli": { - "baseline": "2.0.2", + "baseline": "2.1.0", "port-version": 0 }, "cli11": { diff --git a/versions/c-/cli.json b/versions/c-/cli.json index 3e0b9f99055e52..c42c5c55a74181 100644 --- a/versions/c-/cli.json +++ b/versions/c-/cli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8333092a454e35d835756f955c12622342964b05", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "72fd89f268dc5d3318561366f54ee6aed341669f", "version": "2.0.2", From 99ce9f2f2bac221dfb75186306cd4815035f80d2 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 6 Jul 2023 02:40:31 +0800 Subject: [PATCH 451/533] [enet] export .pc file (#32316) * export .pc file * update --- ports/enet/CMakeLists.txt | 3 +++ ports/enet/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/enet.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/enet/CMakeLists.txt b/ports/enet/CMakeLists.txt index a82e7aa4a7427a..d17150b3da516f 100644 --- a/ports/enet/CMakeLists.txt +++ b/ports/enet/CMakeLists.txt @@ -88,6 +88,9 @@ endif() set(ENET_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/enet) +configure_file ("${CMAKE_SOURCE_DIR}/libenet.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libenet.pc" @ONLY) +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libenet.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + install(TARGETS enet EXPORT unofficial-enet-config ARCHIVE DESTINATION lib LIBRARY DESTINATION lib diff --git a/ports/enet/vcpkg.json b/ports/enet/vcpkg.json index 7d2a4289af6ba7..00dedec90653a4 100644 --- a/ports/enet/vcpkg.json +++ b/ports/enet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "enet", "version": "1.3.17", - "port-version": 1, + "port-version": 2, "description": "Reliable UDP networking library", "homepage": "https://github.com/lsalzman/enet", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 82f6dd26dc4be5..30ff0c73081627 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2322,7 +2322,7 @@ }, "enet": { "baseline": "1.3.17", - "port-version": 1 + "port-version": 2 }, "ensmallen": { "baseline": "2.19.0", diff --git a/versions/e-/enet.json b/versions/e-/enet.json index b2f8a6fee12635..895ebb97da529d 100644 --- a/versions/e-/enet.json +++ b/versions/e-/enet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17a08430b1e76eae1ff5ea036084bee2d9a09775", + "version": "1.3.17", + "port-version": 2 + }, { "git-tree": "a31699670612c88cdf69dd80af975d44c10ac1f6", "version": "1.3.17", From 64ce615ac18787d7ba4889d1fd9db51cefda5358 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:43:14 -0700 Subject: [PATCH 452/533] [libdjinterop] Fix find_package error (#32312) * [libdjinterop] Fix find_package error * update version * apply suggestion * update version * Disable find boost * update version --- ports/libdjinterop/portfile.cmake | 12 ++++++++---- ports/libdjinterop/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libdjinterop.json | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake index eef119a08e3fa4..7cf2c9b95c4328 100644 --- a/ports/libdjinterop/portfile.cmake +++ b/ports/libdjinterop/portfile.cmake @@ -1,18 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xsco/libdjinterop - REF ${VERSION} + REF "${VERSION}" SHA512 7becb83ab62412b3d437ddee23b248a697b162f6b8a64070cd8a9782a4fce7726baaf12ea193b8e21bcf561a00039ab1ae1f04d00e6cbe8344ec19751779db14 HEAD_REF master ) -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON + ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DjInterop) +vcpkg_cmake_config_fixup(PACKAGE_NAME djinterop CONFIG_PATH lib/cmake/DjInterop) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index 40d1aba1dd2e18..5349af1ae6c860 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdjinterop", "version": "0.19.1", + "port-version": 1, "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 30ff0c73081627..0587f456be3ead 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3990,7 +3990,7 @@ }, "libdjinterop": { "baseline": "0.19.1", - "port-version": 0 + "port-version": 1 }, "libdmx": { "baseline": "1.1.4", diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index 34afceb7396c0f..cdc617a01fec37 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "997b5a399c620329f5f77f2bff49ffc4413bc2c9", + "version": "0.19.1", + "port-version": 1 + }, { "git-tree": "ccc1b924f1e3c41f94f22f26ceec66c89f469f74", "version": "0.19.1", From c9d07d4690a011d390fc62f954bdb13955409a7b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 5 Jul 2023 20:45:35 +0200 Subject: [PATCH 453/533] [pfring] Update version and portfile (#32280) --- ports/pfring/makefile.patch | 59 ----------- ports/pfring/portfile.cmake | 85 ++++++---------- ports/pfring/use-vcpkg-libpcap.patch | 146 --------------------------- ports/pfring/vcpkg.json | 11 +- scripts/ci.baseline.txt | 8 -- versions/baseline.json | 4 +- versions/p-/pfring.json | 5 + 7 files changed, 42 insertions(+), 276 deletions(-) delete mode 100644 ports/pfring/makefile.patch delete mode 100644 ports/pfring/use-vcpkg-libpcap.patch diff --git a/ports/pfring/makefile.patch b/ports/pfring/makefile.patch deleted file mode 100644 index cc17fb1f7f2db8..00000000000000 --- a/ports/pfring/makefile.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4b377c628..39cbf5cb4 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,10 +1,12 @@ - all: -- cd kernel; make -- cd userland; ./configure; make -- cd drivers; make -+ $(MAKE) -C kernel; -+ #cd kernel; make -+ cd userland; ./configure; -+ $(MAKE) -C userland; -+ $(MAKE) -C drivers; - - install: -- cd userland; make install -+ $(MAKE) install -C userland; - - clean: - -cd kernel; make clean -diff --git a/userland/Makefile b/userland/Makefile -index 959470c0f..e35ca8de7 100644 ---- a/userland/Makefile -+++ b/userland/Makefile -@@ -9,22 +9,22 @@ lib/Makefile: - config: lib/Makefile - - libpfring: config -- cd lib; make -+ $(MAKE) -C lib - - build_nbpf: config -- cd nbpf; make -+ $(MAKE) -C nbpf - - build_c++: libpfring -- cd c++; make -+ $(MAKE) -C c++ - - tcpdump/Makefile: - cd tcpdump; ./configure --with_system_libpcap=yes - - build_tcpdump: libpfring tcpdump/Makefile -- cd tcpdump; make -+ $(MAKE) -C tcpdump - - build_extcap: libpfring -- cd wireshark/extcap; make -+ $(MAKE) -C wireshark/extcap - - ################### - -@@ -46,4 +46,4 @@ extcap_clean: - cd wireshark/extcap; make clean - - install: libpfring -- cd lib; make install -+ $(MAKE) -C lib install diff --git a/ports/pfring/portfile.cmake b/ports/pfring/portfile.cmake index 9ef1667355f4fd..12b7338f293149 100644 --- a/ports/pfring/portfile.cmake +++ b/ports/pfring/portfile.cmake @@ -1,63 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ntop/PF_RING - REF 582fa09bc58411cfe6f27facd7e6438924f779d2 - SHA512 78dd2d2f9df259483196905f80a904534632a835f742d1f8b3ad645ea80f2dad78356960a2b35e2678525786a7344fa248b708bd3f86101c43fb36c7abc05598 + REF "${VERSION}" + SHA512 de86fb2ead8af63a3b73026225ac2dba9ae97c90d0925e30c63ed75f1d1f7f057b6ab586b06dd24fdbbfdce694048b72bbdd35fc4de0c22508701a6c3ee7c7a2 HEAD_REF dev - PATCHES - use-vcpkg-libpcap.patch - makefile.patch ) -file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") -endif() -set(ENV{VCPKG_LIBPCAP_DIR} "${CURRENT_INSTALLED_DIR}") -vcpkg_build_make() -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/kernel") +file(COPY "${SOURCE_PATH}/kernel/linux/pf_ring.h" DESTINATION "${CURRENT_BUILDTREES_DIR}/kernel/linux") -vcpkg_copy_pdbs() +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) -# Install manually because pfring cannot set prefix -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - - if (VCPKG_BUILD_TYPE STREQUAL debug) - file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") - file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}) - - file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/debug/include) - endif() - - file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") - file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() -endif() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - set(PFRING_OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - - file(GLOB_RECURSE PFRING_KO_FILES "${PFRING_OBJ_DIR}/*.ko") - file(INSTALL ${PFRING_KO_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - - file(GLOB_RECURSE PFRING_LIBS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(INSTALL ${PFRING_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB_RECURSE PFRING_DLLS "${PFRING_OBJ_DIR}/*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") - file(INSTALL ${PFRING_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - endif() - - file(INSTALL ${SOURCE_PATH}/userland/lib/pfring.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -endif() +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "userland" + COPY_SOURCE + OPTIONS + --disable-archopt +) +string(REPLACE "dynamic" "shared" install_target "install-${VCPKG_LIBRARY_LINKAGE}") +vcpkg_install_make( + SUBPATH "lib" + INSTALL_TARGET "${install_target}" + OPTIONS + "LEX=${FLEX}" + "YACC=${BISON}" +) -#Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright( + COMMENT [[ +The user-space PF_RING library source code is distributed under the LGPLv2.1. +The library is built using binary objects from the userland/lib/libs directory +which adds an NTOP END USER LICENSE AGREEMENT. +]] + FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/userland/lib/libs/EULA.txt" +) diff --git a/ports/pfring/use-vcpkg-libpcap.patch b/ports/pfring/use-vcpkg-libpcap.patch deleted file mode 100644 index e005442bf7c350..00000000000000 --- a/ports/pfring/use-vcpkg-libpcap.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff --git a/userland/Makefile b/userland/Makefile -index d5392c09..959470c0 100644 ---- a/userland/Makefile -+++ b/userland/Makefile -@@ -1,4 +1,4 @@ --all: libpfring pcap build_examples build_examples_zc build_examples_ft build_extcap -+all: libpfring build_extcap - # build_tcpdump build_c++ - - ################### -@@ -14,52 +14,25 @@ libpfring: config - build_nbpf: config - cd nbpf; make - --libpcap/Makefile: -- cd libpcap; ./configure --enable-ipv6 --enable-dbus=no --without-libnl --with-snf=no --disable-bluetooth --disable-canusb --with-dag=no -- --pcap: libpfring libpcap/Makefile -- cd libpcap; make -- --build_examples: config -- cd examples; make -- --build_examples_zc: config -- cd examples_zc; make -- --build_examples_ft: config -- cd examples_ft; make -- - build_c++: libpfring - cd c++; make - - tcpdump/Makefile: -- cd tcpdump; ./configure -+ cd tcpdump; ./configure --with_system_libpcap=yes - --build_tcpdump: libpfring pcap tcpdump/Makefile -+build_tcpdump: libpfring tcpdump/Makefile - cd tcpdump; make - --build_extcap: libpfring pcap -+build_extcap: libpfring - cd wireshark/extcap; make - - ################### - --clean: libpfring_clean pcap_clean examples_clean examples_ft_clean examples_zc_clean c++_clean tcpdump_clean nbpf_clean extcap_clean -+clean: libpfring_clean c++_clean tcpdump_clean nbpf_clean extcap_clean - - libpfring_clean: - cd lib; make clean - --pcap_clean: -- if test -f libpcap/config.status; then cd libpcap; make clean; fi -- --examples_clean: -- cd examples; make clean -- --examples_zc_clean: -- cd examples_zc; make clean -- --examples_ft_clean: -- cd examples_ft; make clean -- - c++_clean: - cd c++; make clean - -@@ -72,8 +45,5 @@ nbpf_clean: - extcap_clean: - cd wireshark/extcap; make clean - --install: libpfring pcap examples examples_zc examples_ft -+install: libpfring - cd lib; make install -- cd libpcap; make install -- cd examples; make install -- cd examples_zc; make install -diff --git a/userland/c++/Makefile.in b/userland/c++/Makefile.in -index 02bf5164..b0442d84 100644 ---- a/userland/c++/Makefile.in -+++ b/userland/c++/Makefile.in -@@ -1,8 +1,7 @@ - CPP=g++ -g - - KERNEL_DIR=../../kernel --LIBPCAP_DIR=../libpcap --INCLUDE=-I$(KERNEL_DIR) -I$(LIBPCAP_DIR) -I../lib `../lib/pfring_config --include` -+INCLUDE=-I$(KERNEL_DIR) -I$(VCPKG_LIBPCAP_DIR)/include -I../lib `../lib/pfring_config --include` - LIBPFRING_CPP=libpfring_cpp.a - RANLIB=ranlib - OBJ=PFring.o -@@ -11,7 +10,7 @@ LIBS=../lib/libpfring.a `../lib/pfring_config --libs` -lpthread - all: $(LIBPFRING_CPP) pf_test - - pf_test: pf_test.cpp $(LIBPFRING_CPP) -- $(CPP) $(INCLUDE) $< $(LIBPFRING_CPP) -o $@ $(LIBS) $(LIBPCAP_DIR)/libpcap.a @SYSLIBS@ -+ $(CPP) $(INCLUDE) $< $(LIBPFRING_CPP) -o $@ $(LIBS) $(VCPKG_LIBPCAP_DIR)/lib/libpcap.a @SYSLIBS@ - - $(LIBPFRING_CPP): $(OBJ) - @rm -f $@ -diff --git a/userland/snort/pfring-daq-module-zc/Makefile.am b/userland/snort/pfring-daq-module-zc/Makefile.am -index 7123de18..45998688 100644 ---- a/userland/snort/pfring-daq-module-zc/Makefile.am -+++ b/userland/snort/pfring-daq-module-zc/Makefile.am -@@ -4,5 +4,5 @@ ACLOCAL_AMFLAGS = -I m4 - - pkglib_LTLIBRARIES = daq_pfring_zc.la - daq_pfring_zc_la_SOURCES = daq_pfring_zc.c --daq_pfring_zc_la_CFLAGS = -DBUILDING_SO -I../../libpcap --daq_pfring_zc_la_LDFLAGS = -module -export-dynamic -avoid-version -shared -lrt ../../libpcap/libpcap.a -+daq_pfring_zc_la_CFLAGS = -DBUILDING_SO -I${VCPKG_LIBPCAP_DIR}/include -+daq_pfring_zc_la_LDFLAGS = -module -export-dynamic -avoid-version -shared -lrt ${VCPKG_LIBPCAP_DIR}/lib/libpcap.a -diff --git a/userland/tcpdump-4.9.2/Makefile.in b/userland/tcpdump-4.9.2/Makefile.in -index e2c74d13..47d9e2cc 100644 ---- a/userland/tcpdump-4.9.2/Makefile.in -+++ b/userland/tcpdump-4.9.2/Makefile.in -@@ -373,7 +373,7 @@ TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -t - - all: $(PROG) $(LIBNETDISSECT) - --$(PROG): $(OBJ) @V_PCAPDEP@ -+$(PROG): $(OBJ) $(VCPKG_LIBPCAP_DIR)/lib/libpcap.a - @rm -f $@ - $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) - -diff --git a/userland/wireshark/extcap/Makefile.in b/userland/wireshark/extcap/Makefile.in -index 970b9680..3e34ccc8 100644 ---- a/userland/wireshark/extcap/Makefile.in -+++ b/userland/wireshark/extcap/Makefile.in -@@ -20,14 +20,13 @@ LIBPFRING = ${PFRINGDIR}/libpfring.a - # - O_FLAG = -O2 -DHAVE_PF_RING - EXTRA_LIBS = --PCAPDIR = ../../libpcap --LIBPCAP = ${PCAPDIR}/libpcap.a ${EXTRA_LIBS} -+LIBPCAP = ${VCPKG_LIBPCAP_DIR}/lib/libpcap.a ${EXTRA_LIBS} - - # - # Search directories - # - PFRING_KERNEL=../../../kernel --INCLUDE = -I${PFRING_KERNEL} -I${PFRINGDIR} -I${PCAPDIR} -Ithird-party `../../lib/pfring_config --include` -+INCLUDE = -I${PFRING_KERNEL} -I${PFRINGDIR} -I${VCPKG_LIBPCAP_DIR}/include -Ithird-party `../../lib/pfring_config --include` - - # - # C compiler and flags diff --git a/ports/pfring/vcpkg.json b/ports/pfring/vcpkg.json index d0f6d91917f833..14b48ba057b8fe 100644 --- a/ports/pfring/vcpkg.json +++ b/ports/pfring/vcpkg.json @@ -1,11 +1,8 @@ { "name": "pfring", - "version-date": "2019-10-17", - "port-version": 4, - "description": "PF_RING™ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.", + "version": "8.4.0", + "description": "Library to interface with the PF_RING™ kernel module for processing packets at high-rates while providing a consistent API.", "homepage": "https://github.com/ntop/PF_RING", - "supports": "!windows", - "dependencies": [ - "libpcap" - ] + "license": null, + "supports": "linux" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5d4bff6663365f..08f7276268285d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1167,14 +1167,6 @@ paho-mqtt:x64-uwp=fail pcl:arm-neon-android=fail pcl:arm64-android=fail pcl:x64-android=fail -pfring:arm-neon-android=fail -pfring:arm64-android=fail -pfring:x64-android=fail -pfring:x64-osx=fail -pfring:arm64-osx=fail -# pfring on Linux currently fails because its build scripts enable warnings as -# errors, and warnings trigger with the Linux kernel headers in the Azure images. -pfring:x64-linux=fail pixman:arm-neon-android=fail pixman:arm64-android=fail platform-folders:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 0587f456be3ead..21cd0f5031862b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6257,8 +6257,8 @@ "port-version": 1 }, "pfring": { - "baseline": "2019-10-17", - "port-version": 4 + "baseline": "8.4.0", + "port-version": 0 }, "pfultz2-linq": { "baseline": "2019-05-14", diff --git a/versions/p-/pfring.json b/versions/p-/pfring.json index c16247064e56fd..089731ba8528d0 100644 --- a/versions/p-/pfring.json +++ b/versions/p-/pfring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bb6f251467f6c02a873020247ec2982935dc9f3", + "version": "8.4.0", + "port-version": 0 + }, { "git-tree": "ed3dbffb4364b80331f2b986435bad956f39ad09", "version-date": "2019-10-17", From 6359494ca1b34423786da18365f9d79963b0340a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 5 Jul 2023 20:48:02 +0200 Subject: [PATCH 454/533] [xerces-c] Fix dependencies (#32259) * [xerces-c] Don't pick unused libnsl * [xerces-c] Add network feature * [xerces-c] Update supports/baseline * [xerces] More dependency fixes * [libe57] Not supported on android --- ports/libe57/vcpkg.json | 3 +- ports/xerces-c/dependencies.patch | 65 ++++++++++++++++++++++++++++++- ports/xerces-c/portfile.cmake | 3 ++ ports/xerces-c/vcpkg.json | 9 ++++- scripts/ci.baseline.txt | 5 --- versions/baseline.json | 4 +- versions/l-/libe57.json | 5 +++ versions/x-/xerces-c.json | 5 +++ 8 files changed, 88 insertions(+), 11 deletions(-) diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json index 8688922e123ca7..396a28bc666e54 100644 --- a/ports/libe57/vcpkg.json +++ b/ports/libe57/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libe57", "version-semver": "1.1.332", - "port-version": 3, + "port-version": 4, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", "license": "BSL-1.0", + "supports": "!android", "dependencies": [ "boost-crc", "boost-filesystem", diff --git a/ports/xerces-c/dependencies.patch b/ports/xerces-c/dependencies.patch index 01b5cab27d4e86..84f80c0d32bfb0 100644 --- a/ports/xerces-c/dependencies.patch +++ b/ports/xerces-c/dependencies.patch @@ -1,8 +1,54 @@ +diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake +index 7a63f1f..22ea65b 100644 +--- a/cmake/XercesNetAccessorSelection.cmake ++++ b/cmake/XercesNetAccessorSelection.cmake +@@ -23,7 +23,7 @@ option(network "Network support" ON) + + if(network) + find_library(SOCKET_LIBRARY socket) +- find_library(NSL_LIBRARY nsl) ++ set(NSL_LIBRARY "" CACHE INTERNAL "Not used") + + # netaccessors in order of preference + +diff --git a/cmake/XercesTranscoderSelection.cmake b/cmake/XercesTranscoderSelection.cmake +index 4ff5b16..48e274c 100644 +--- a/cmake/XercesTranscoderSelection.cmake ++++ b/cmake/XercesTranscoderSelection.cmake +@@ -25,6 +25,7 @@ + + if(ICU_FOUND) + list(APPEND transcoders icu) ++ set(TRANSCODER_REQUIRES "icu-uc") + endif() + + # MacOS +@@ -41,6 +42,20 @@ endif() + + # GNU iconv + ++if(NOT transcoder AND NOT transcoders AND NOT WIN32) ++ find_package(Iconv) ++ set(FIND_DEPENDENCY_ICONV "${Iconv_FOUND}") ++ if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) ++ list(APPEND libxerces_c_DEPS Iconv::Iconv) ++ set(TRANSCODER_LIBS "-liconv -lcharset") ++ list(APPEND CMAKE_REQUIRED_LIBRARIES Iconv::Iconv) ++ include(CheckSymbolExists) ++ check_symbol_exists(iconv_open "iconv.h" HAVE_ICONV_OPEN) ++ check_symbol_exists(iconv_close "iconv.h" HAVE_ICONV_CLOSE) ++ check_symbol_exists(iconv "iconv.h" HAVE_ICONV) ++ endif() ++endif() ++ + check_include_file_cxx(iconv.h HAVE_ICONV_H) + check_include_file_cxx(wchar.h HAVE_WCHAR_H) + check_include_file_cxx(string.h HAVE_STRING_H) diff --git a/src/XercesCConfig.cmake.in b/src/XercesCConfig.cmake.in -index aa8fc2e..07ec56d 100644 +index aa8fc2e..754c425 100644 --- a/src/XercesCConfig.cmake.in +++ b/src/XercesCConfig.cmake.in -@@ -1,5 +1,11 @@ +@@ -1,5 +1,14 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) @@ -10,7 +56,22 @@ index aa8fc2e..07ec56d 100644 +if("@CMAKE_REQUIRE_FIND_PACKAGE_ICU@") + find_dependency(ICU COMPONENTS uc data) +endif() ++if("@FIND_DEPENDENCY_ICONV@") ++ find_dependency(Iconv) ++endif() + include(${CMAKE_CURRENT_LIST_DIR}/XercesCConfigInternal.cmake) add_library(XercesC::XercesC INTERFACE IMPORTED) +diff --git a/xerces-c.pc.in b/xerces-c.pc.in +index 16b18c7..077296b 100644 +--- a/xerces-c.pc.in ++++ b/xerces-c.pc.in +@@ -7,5 +7,6 @@ Name: Xerces-C++ + Description: Validating XML parser library for C++ + Version: @VERSION@ + Libs: -L${libdir} -lxerces-c +-Libs.private: @CURL_LIBS@ ++Libs.private: @CURL_LIBS@ @TRANSCODER_LIBS@ ++Requires.private: @TRANSCODER_REQUIRES@ + Cflags: -I${includedir} diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 307909c04c2936..2dda3eabf23388 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS options FEATURES icu CMAKE_REQUIRE_FIND_PACKAGE_ICU + network network INVERTED_FEATURES icu CMAKE_DISABLE_FIND_PACKAGE_ICU ) @@ -47,6 +48,8 @@ vcpkg_cmake_configure( -DDISABLE_SAMPLES=ON -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON ${options} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_CURL ) vcpkg_cmake_install() diff --git a/ports/xerces-c/vcpkg.json b/ports/xerces-c/vcpkg.json index 94c8a41dc174fa..7d9885d79b3f61 100644 --- a/ports/xerces-c/vcpkg.json +++ b/ports/xerces-c/vcpkg.json @@ -1,10 +1,11 @@ { "name": "xerces-c", "version": "3.2.4", - "port-version": 2, + "port-version": 3, "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", "homepage": "https://github.com/apache/xerces-c", "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ { "name": "libiconv", @@ -19,6 +20,9 @@ "host": true } ], + "default-features": [ + "network" + ], "features": { "icu": { "description": "ICU support", @@ -26,6 +30,9 @@ "icu" ] }, + "network": { + "description": "Network support" + }, "xmlch-wchar": { "description": "XMLCh type uses wchar_t" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 08f7276268285d..bc83d64295617a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1669,11 +1669,6 @@ xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail xbitmaps:x64-android=fail xbitmaps:x64-osx=skip -xerces-c:arm-neon-android=fail -xerces-c:arm-uwp=fail -xerces-c:arm64-android=fail -xerces-c:x64-android=fail -xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail yara:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 21cd0f5031862b..f75fe926cc01f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4002,7 +4002,7 @@ }, "libe57": { "baseline": "1.1.332", - "port-version": 3 + "port-version": 4 }, "libe57format": { "baseline": "3.0.0", @@ -8786,7 +8786,7 @@ }, "xerces-c": { "baseline": "3.2.4", - "port-version": 2 + "port-version": 3 }, "xeus": { "baseline": "0.24.3", diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json index cefe0269e3fd99..4947e5a8b72a45 100644 --- a/versions/l-/libe57.json +++ b/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5a7a88a7e28608ff30f48533cec32ac07f6f7c2", + "version-semver": "1.1.332", + "port-version": 4 + }, { "git-tree": "ecdcbb16ecd99e8d8a25b7dde4b2b1f040c5c3ed", "version-semver": "1.1.332", diff --git a/versions/x-/xerces-c.json b/versions/x-/xerces-c.json index ad6889a0d72dcf..36dffce1d6f1ed 100644 --- a/versions/x-/xerces-c.json +++ b/versions/x-/xerces-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4026f062e68881d5a72ecd5d900c70a46f92a8d9", + "version": "3.2.4", + "port-version": 3 + }, { "git-tree": "2eabf69ed6317e6b9b9fbb7cdb19e884a762f545", "version": "3.2.4", From dad2e6f2aa3b680c69aaba67f10e2b4b9b4861e9 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 5 Jul 2023 20:50:46 +0200 Subject: [PATCH 455/533] [gperftools] update supports expressions (#32152) --- ports/gperftools/vcpkg.json | 10 ++++++---- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/g-/gperftools.json | 5 +++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json index bfd064adb4ccd4..fa3b3cb77ade43 100644 --- a/ports/gperftools/vcpkg.json +++ b/ports/gperftools/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gperftools", "version-date": "2019-09-02", - "port-version": 4, + "port-version": 5, "description": "A set of tools for performance profiling and memory checking", "homepage": "https://github.com/gperftools/gperftools", - "supports": "!(arm | arm64 | uwp)", + "supports": "!(arm & windows) & !uwp & !android", "dependencies": [ { "name": "vcpkg-cmake", @@ -14,10 +14,12 @@ ], "features": { "override": { - "description": "Override allocators" + "description": "Override allocators", + "supports": "windows" }, "tools": { - "description": "Build gperftools CLI tools" + "description": "Build gperftools CLI tools", + "supports": "windows" } } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bc83d64295617a..83966c17d3eb71 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -501,10 +501,6 @@ gmmlib:x64-windows=fail gmmlib:x86-windows=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail -gperftools:arm-uwp=fail -gperftools:arm64-windows=fail -gperftools:x64-android=fail -gperftools:x64-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail # graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251 diff --git a/versions/baseline.json b/versions/baseline.json index f75fe926cc01f1..cfba11ddb807f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2942,7 +2942,7 @@ }, "gperftools": { "baseline": "2019-09-02", - "port-version": 4 + "port-version": 5 }, "gpgme": { "baseline": "1.18.0", diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json index 25059fb3c11f6b..e842314d0aef74 100644 --- a/versions/g-/gperftools.json +++ b/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0840bfaf247735ffd902de5536b4ce2f411a77e3", + "version-date": "2019-09-02", + "port-version": 5 + }, { "git-tree": "f6296ad4ccaeca6a3f7747fc173c78cb8f21b095", "version-date": "2019-09-02", From d06a9228450bac8c2161901703f5de74473e7034 Mon Sep 17 00:00:00 2001 From: simon987 Date: Wed, 5 Jul 2023 14:54:06 -0400 Subject: [PATCH 456/533] [libmupdf] add ocr feature (#32084) * add libmupdf ocr feature WIP * Fix compile defs * Fix ocr feature * Add version * increment libmupdf port version * add libmupdf version * revert version change --- ports/libmupdf/CMakeLists.txt | 31 +++++++++++++++++++++++++++++-- ports/libmupdf/portfile.cmake | 7 +++++++ ports/libmupdf/vcpkg.json | 12 +++++++++++- versions/baseline.json | 2 +- versions/l-/libmupdf.json | 5 +++++ 5 files changed, 53 insertions(+), 4 deletions(-) diff --git a/ports/libmupdf/CMakeLists.txt b/ports/libmupdf/CMakeLists.txt index 95ec646f8bd03f..9e3b5030d53db0 100644 --- a/ports/libmupdf/CMakeLists.txt +++ b/ports/libmupdf/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.9) -project(libmupdf C) +project(libmupdf) + +option(ENABLE_OCR "Build with OCR" OFF) set(CMAKE_DEBUG_POSTFIX d) @@ -25,11 +27,20 @@ find_package(ZLIB REQUIRED) find_package(OpenJPEG CONFIG REQUIRED) find_library(JBIG2DEC_LIB NAMES jbig2decd jbig2dec) -file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c") +if (ENABLE_OCR) + find_package(Leptonica CONFIG REQUIRED) + find_package(Tesseract CONFIG REQUIRED) +endif() + +file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c" "source/*.h") list(FILTER SOURCES EXCLUDE REGEX "source/tools/[a-z]*\\.c$") list(FILTER SOURCES EXCLUDE REGEX "source/tests/.*.c$") list(FILTER SOURCES EXCLUDE REGEX "source/fitz/output-docx.c") +if (ENABLE_OCR) + list(APPEND SOURCES "source/fitz/tessocr.cpp") +endif() + add_library(libmupdf ${SOURCES}) if(WIN32) @@ -37,6 +48,14 @@ if(WIN32) else() target_compile_definitions(libmupdf PRIVATE -DHAVE_PTHREAD=1 -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DMEMENTO_MUPDF_HACKS -DFZ_ENABLE_DOCX_OUTPUT=0 -DFZ_ENABLE_ODT_OUTPUT=0) endif() + + +if (ENABLE_OCR) + target_compile_definitions(libmupdf PRIVATE -DHAVE_TESSERACT=1 -DHAVE_LEPTONICA=1) +else() + target_compile_definitions(libmupdf PRIVATE -DOCR_DISABLED=1) +endif() + target_include_directories(libmupdf PUBLIC include @@ -45,6 +64,14 @@ target_include_directories(libmupdf ${JPEG_INCLUDE_DIR} ${HARFBUZZ_INCLUDE} ) + +if (ENABLE_OCR) +target_include_directories(libmupdf + PRIVATE + ${Leptonica_INCLUDE_DIRS} +) +endif() + target_link_libraries(libmupdf PRIVATE openjp2 freetype diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index 450bc9d0c0c045..1f9fbf4b23b907 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -12,11 +12,18 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ocr ENABLE_OCR +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json index 5aa9dac50ab1d4..b3e9330bd1bd5a 100644 --- a/ports/libmupdf/vcpkg.json +++ b/ports/libmupdf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmupdf", "version": "1.22.1", + "port-version": 1, "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", "license": "AGPL-3.0-only", @@ -19,5 +20,14 @@ "host": true }, "zlib" - ] + ], + "features": { + "ocr": { + "description": "Enable OCR support", + "dependencies": [ + "leptonica", + "tesseract" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index cfba11ddb807f3..c5e9424bed29a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4330,7 +4330,7 @@ }, "libmupdf": { "baseline": "1.22.1", - "port-version": 0 + "port-version": 1 }, "libmysql": { "baseline": "8.0.32", diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index 585c4b5dd4c73e..e17fd0daa4fc0b 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06c0e6bccfaf2ab9f729bfc79318da68cb4897dc", + "version": "1.22.1", + "port-version": 1 + }, { "git-tree": "c1684ff15eed2c86ba792de4e92d21b2ea58c188", "version": "1.22.1", From fb9be49cc9c2cbbee0591ac09334137baddcd129 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 6 Jul 2023 02:59:03 +0800 Subject: [PATCH 457/533] [folly/fbthrift/proxygen/wangle/fizz] update to 2023.07.03.00 (#32380) * update to 2023.07.03.00 * update fbthrift/proxygen/wangle/fizz * update --- ports/fbthrift/portfile.cmake | 7 +++++-- ports/fbthrift/vcpkg.json | 2 +- ports/fizz/portfile.cmake | 4 ++-- ports/fizz/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 3 +-- ports/proxygen/portfile.cmake | 4 ++-- ports/proxygen/vcpkg.json | 2 +- ports/wangle/portfile.cmake | 4 ++-- ports/wangle/vcpkg.json | 2 +- versions/baseline.json | 12 ++++++------ versions/f-/fbthrift.json | 5 +++++ versions/f-/fizz.json | 5 +++++ versions/f-/folly.json | 5 +++++ versions/p-/proxygen.json | 5 +++++ versions/w-/wangle.json | 5 +++++ 16 files changed, 48 insertions(+), 21 deletions(-) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 5c2b0411bbe63c..c83da27c427d6b 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 b9f7bb7037cbc24ba18928cfad8673fd321ec095dec5fa6ca5b6c51b468873bbefde4326d39faa916747f4273b5a4003d60c0f6f755bfce095f9d3e8946bcb46 + SHA512 abba38b2451459f86735c010a9492875a70aa9935978a2032a7882b3d37a136c17bc7ffcd70aff617539e5602302df2957ba153f8fc8dcae866e9baf364261a2 HEAD_REF master PATCHES fix-glog.patch @@ -43,6 +43,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/http2/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/core/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/inmemory/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/client/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/framing/parser/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/transport/rocket/server/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/test" @@ -74,4 +77,4 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index fe7f39aea1db39..0eab2d95be815e 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2023.05.15.00", + "version-string": "2023.07.03.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index cd386f2ed5959d..71525003906417 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 6b057a0610e12e1bbfa668f0233d0daf0ce872247deaa9301bd8b842c7c01afd78812fe2170479b128852c4bf22dffd4a5d84b1970e59e4e82f35b0fb7e54e5e + SHA512 c7140b61529ee024e3c99e65d175acb8277fa7bc0090019188481b57c5253d8f5b96a01c28df4a1d00bae67e1f9079d409c2a7f526e933c7fe2f3c2a12fd92ac HEAD_REF master PATCHES 0001-fix-libsodium.patch @@ -38,4 +38,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 35e5c5cf47ee51..be0f1d45fb26c8 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2023.05.15.00", + "version-string": "2023.07.03.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 9ed1afeced040f..22462d0ff28da1 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 8be640c0b87c85929aa0af2e147ef9556e24f777d80dc7d06019b7edc9b5738635ad3db9dea94f99f1a9eb7eb48e91d78a42d08bcb19b98a279fb805da41bf82 + SHA512 6e9433c65d91ff1af51b74e7153ce3d116484d6eb9cbe72747bad902bcb237fccffc35897c63ee3612fa633164b62884a94f511b7039112e2725851ad2719776 HEAD_REF main PATCHES reorder-glog-gflags.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 7fe89263123e5d..f93a7ac82f9f02 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2023.05.22.00", - "port-version": 1, + "version-string": "2023.07.03.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 24b7a7f144c928..2793234344ac7e 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 b08110c4bb4d83a80786aa517edc88d2d9233934705a5deb3da70542251c737113500a11a4cd55d72928635be7c2833e806d1c5391892269a0dd1fe8d4e80187 + SHA512 e4f9af0092e810455f029bbd0b6abc152ac90742f88f75f49722bbb99427fb752429852f97d7c15c158d3ef007981bf37a0f61fa7855f1662c19af95bd39307c HEAD_REF master PATCHES remove-register.patch @@ -29,4 +29,4 @@ vcpkg_copy_pdbs() 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") diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 927729615c7248..de1a86dd50ccae 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2023.05.15.00", + "version-string": "2023.07.03.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 378dfb90f23725..230e29115a85aa 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 aa87614f9630fd325e848bef38c520b85a57eaf0e3dd5cb3421a0bb55322fbdf9c22b153436d703eb30ac9f8c4d02bfb71b9313acd16c412609216eb0ca16109 + SHA512 c1dbde9f0c7b9c2edc192123b8420fe6a56038a7dbe90cbef91578ea0e9ebe890de45d3c8aa8bec376fce30e76e3b709a5353b79a91f8e6e63159c97197242a6 HEAD_REF master PATCHES fix-config-cmake.patch @@ -49,4 +49,4 @@ file(REMOVE_RECURSE ) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 46109a2a82b0ed..5cfae3e98e3e43 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2023.05.15.00", + "version-string": "2023.07.03.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index c5e9424bed29a8..fc717412da41d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2465,7 +2465,7 @@ "port-version": 0 }, "fbthrift": { - "baseline": "2023.05.15.00", + "baseline": "2023.07.03.00", "port-version": 0 }, "fcl": { @@ -2505,7 +2505,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2023.05.15.00", + "baseline": "2023.07.03.00", "port-version": 0 }, "flann": { @@ -2581,8 +2581,8 @@ "port-version": 0 }, "folly": { - "baseline": "2023.05.22.00", - "port-version": 1 + "baseline": "2023.07.03.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -6489,7 +6489,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2023.05.15.00", + "baseline": "2023.07.03.00", "port-version": 0 }, "psimd": { @@ -8569,7 +8569,7 @@ "port-version": 4 }, "wangle": { - "baseline": "2023.05.15.00", + "baseline": "2023.07.03.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 287b0be4cf8b66..6ee27770436029 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2384982312ce0a1ee08ff0da69ff562e3690ffe", + "version-string": "2023.07.03.00", + "port-version": 0 + }, { "git-tree": "4ad62e4d34a61f43fee3a61b14aae377ed73249a", "version-string": "2023.05.15.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index b3dc373275aff7..6951cd7291f353 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "813216afa42f8549aac52519655ab62f8d552c64", + "version-string": "2023.07.03.00", + "port-version": 0 + }, { "git-tree": "81e1764f1bcde018ea8a73fc36c4f4d14b03e978", "version-string": "2023.05.15.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 9c7702e07233df..5779adc0833c4f 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16c4e4b0e25b9eb99d5a4b17de525a42a1ecdf48", + "version-string": "2023.07.03.00", + "port-version": 0 + }, { "git-tree": "e5c2e858383fffea763ce85c2672d1d2aeead9e6", "version-string": "2023.05.22.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 687773730a87a9..c5a11420ca8281 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c24a9089256797b853fdf56833eafa213a51f2d", + "version-string": "2023.07.03.00", + "port-version": 0 + }, { "git-tree": "8b7e41b105fbb8e30443037e04098621d31a4fb2", "version-string": "2023.05.15.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index f3e570fa2b98c5..3af037ee84a02a 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "105b20279ba475028db9848e6acc0950843e103c", + "version-string": "2023.07.03.00", + "port-version": 0 + }, { "git-tree": "05744fe658f891ca87fd5cdad73a382ace640bed", "version-string": "2023.05.15.00", From 87a38a4fd559762aad5cfffe522782c1995f4ba0 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 5 Jul 2023 21:01:38 +0200 Subject: [PATCH 458/533] [fftw3] fix openmp on macos (#30833) Co-authored-by: Monica --- ports/fftw3/fix-openmp.patch | 13 +++++++++++++ ports/fftw3/portfile.cmake | 31 ++++++++++++------------------- ports/fftw3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 5 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 ports/fftw3/fix-openmp.patch diff --git a/ports/fftw3/fix-openmp.patch b/ports/fftw3/fix-openmp.patch new file mode 100644 index 00000000000000..27b874803b8e57 --- /dev/null +++ b/ports/fftw3/fix-openmp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ce438a3..43c74be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -356,7 +356,7 @@ if (OPENMP_FOUND) + target_link_libraries (${fftw3_lib}_omp ${fftw3_lib}) + target_link_libraries (${fftw3_lib}_omp ${CMAKE_THREAD_LIBS_INIT}) + list (APPEND subtargets ${fftw3_lib}_omp) +- target_compile_options (${fftw3_lib}_omp PRIVATE ${OpenMP_C_FLAGS}) ++ target_link_libraries (${fftw3_lib}_omp OpenMP::OpenMP_C) + endif () + + foreach(subtarget ${subtargets}) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 62c3861b8c001a..3542d68603635a 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -6,13 +6,14 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES omp_test.patch patch_targets.patch fftw3_arch_fix.patch aligned_malloc.patch bigobj.patch + fix-openmp.patch ) vcpkg_check_features( @@ -29,28 +30,20 @@ vcpkg_check_features( set(ENABLE_FLOAT_CMAKE fftw3f) set(ENABLE_LONG_DOUBLE_CMAKE fftw3l) -set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3) +set(Z_DEFAULT_PRECISION_CMAKE fftw3) -foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION) - if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE") - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -D${PRECISION}=ON - -DENABLE_OPENMP=${ENABLE_OPENMP} - -DENABLE_THREADS=${HAVE_THREADS} - -DWITH_COMBINED_THREADS=${HAVE_THREADS} - -DBUILD_TESTS=OFF - ) - else() - vcpkg_cmake_configure( +foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE Z_DEFAULT_PRECISION) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -D${PRECISION}=ON ${FEATURE_OPTIONS} -DBUILD_TESTS=OFF - ) - endif() + -DCMAKE_REQUIRE_FIND_PACKAGE_OpenMP=ON + MAYBE_UNUSED_VARIABLES + CMAKE_REQUIRE_FIND_PACKAGE_OpenMP + Z_DEFAULT_PRECISION + ) vcpkg_cmake_install() @@ -71,5 +64,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index e1c6aae6076dbd..3b464f29b8ed8b 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 6, + "port-version": 7, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index fc717412da41d3..445835eb516f03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2490,7 +2490,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 6 + "port-version": 7 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index efe42e22b5d422..831fa5e543ca02 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b1eac37609e9187b1ddf4666cc564ce6e07e891", + "version": "3.3.10", + "port-version": 7 + }, { "git-tree": "a23ec27bf6a069ab7b60cc7c3b890a9224bf341c", "version": "3.3.10", From 84aba9a5c3b84043916f462db7985007cc404c03 Mon Sep 17 00:00:00 2001 From: Julianus Pfeuffer Date: Wed, 5 Jul 2023 21:10:22 +0200 Subject: [PATCH 459/533] [coin-or-cbc] Add new port (#31607) * [cbc] Add new port * Add dependencies * [cgl] Update version to rebuild * [cbc] Update CMakeLists.txt [cgl] Revert the version * Update * add version file * adapt to new version * fix dependency name. VCPKG IS NOT CONSISTENT HERE * rename with coinor prefix, as this seems to be the standard. try different approach copied from cgl * accidentally renamed portfile * version??? * forgot add rename * quotes * try autoconf/make * more make changes * try cmake again * ifcase * try make again * really try make * add dependency libs to conf call * randomly copy stuff from other ports * without-miplib3 * try non-release version (after autoconf fixes) as in the other ports. * fix hash * skip autoconf?? * add macro patch * patch format?? * Update dep.patch * patch * weird caching?? * ???????? * sha * superfluous config options * cleanup * vcpkg commands * pkgconf patch for win * disable glpk since I do not plan to add it as a feature for now. * after conutils include * fix version * Update version database * Update ports/coin-or-cbc/portfile.cmake * Update version database * Apply suggestions from code review Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * add back AUTOCONFIG * try with autconfig and without configure.ac patch * Update version database * Update version database * cleanup * Update version database * chagne * Update version database --------- Co-authored-by: NancyLi1013 Co-authored-by: Jim Wang (Beyondsoft Corporation) Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/coin-or-cbc/disable_glpk.patch | 14 ++++++++++ ports/coin-or-cbc/pkgconf_win.patch | 13 ++++++++++ ports/coin-or-cbc/portfile.cmake | 39 ++++++++++++++++++++++++++++ ports/coin-or-cbc/vcpkg.json | 13 ++++++++++ versions/baseline.json | 4 +++ versions/c-/coin-or-cbc.json | 9 +++++++ 6 files changed, 92 insertions(+) create mode 100644 ports/coin-or-cbc/disable_glpk.patch create mode 100644 ports/coin-or-cbc/pkgconf_win.patch create mode 100644 ports/coin-or-cbc/portfile.cmake create mode 100644 ports/coin-or-cbc/vcpkg.json create mode 100644 versions/c-/coin-or-cbc.json diff --git a/ports/coin-or-cbc/disable_glpk.patch b/ports/coin-or-cbc/disable_glpk.patch new file mode 100644 index 00000000000000..18785807977a7b --- /dev/null +++ b/ports/coin-or-cbc/disable_glpk.patch @@ -0,0 +1,14 @@ +diff --git a/src/CbcSolver.cpp b/src/CbcSolver.cpp +index 93da884..1c9d463 100644 +--- a/src/CbcSolver.cpp ++++ b/src/CbcSolver.cpp +@@ -32,6 +32,9 @@ + void CbcCrashHandler(int sig); + #endif + ++// glpk currently not supported ++#undef COINUTILS_HAS_GLPK ++ + #ifdef COINUTILS_HAS_GLPK + #include "glpk.h" + #endif diff --git a/ports/coin-or-cbc/pkgconf_win.patch b/ports/coin-or-cbc/pkgconf_win.patch new file mode 100644 index 00000000000000..a498394d1bb187 --- /dev/null +++ b/ports/coin-or-cbc/pkgconf_win.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 3a63499..2d12129 100755 +--- a/configure ++++ b/configure +@@ -17932,8 +17932,6 @@ fi + + COIN_PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + +- +- COIN_PKG_CONFIG_PATH="${expanded_libdir}/pkgconfig:${COIN_PKG_CONFIG_PATH}" + if test -n "$PKG_CONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG path is \"$COIN_PKG_CONFIG_PATH\"" >&5 + printf "%s\n" "$as_me: $PKG_CONFIG path is \"$COIN_PKG_CONFIG_PATH\"" >&6;} diff --git a/ports/coin-or-cbc/portfile.cmake b/ports/coin-or-cbc/portfile.cmake new file mode 100644 index 00000000000000..721828b0b37d1b --- /dev/null +++ b/ports/coin-or-cbc/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coin-or/Cbc + REF 6f83969e50b6f67c60654704c1f71f970c621a3b + SHA512 f56b5806b2acffe7259410254640009f9b7a27713972d771b1083a05ca197a65715b007f42f0b8bf6e87b2a889e2889a7466222e0b06f01a4c5297cbaf455c4d + PATCHES + pkgconf_win.patch + disable_glpk.patch +) + +file(COPY "${CURRENT_INSTALLED_DIR}/share/coin-or-buildtools/" DESTINATION "${SOURCE_PATH}") + +set(ENV{ACLOCAL} "aclocal -I \"${SOURCE_PATH}/BuildTools\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + --with-coinutils + --with-clp + --with-cgl + --with-osi + --without-ositests + --without-sample + --without-netlib + --without-miplib3 + --enable-relocatable + --disable-readline +) + +vcpkg_install_make() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/coin-or-cbc/vcpkg.json b/ports/coin-or-cbc/vcpkg.json new file mode 100644 index 00000000000000..9125149358ce16 --- /dev/null +++ b/ports/coin-or-cbc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "coin-or-cbc", + "version-date": "2023-02-01", + "description": "Cbc (Coin-or branch and cut) is an open-source mixed integer linear programming solver written in C++.", + "homepage": "https://github.com/coin-or/Cbc", + "license": "EPL-2.0", + "dependencies": [ + "coin-or-cgl", + "coin-or-clp", + "coin-or-osi", + "coinutils" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 445835eb516f03..2b766f887dc842 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1648,6 +1648,10 @@ "baseline": "2023-02-02", "port-version": 0 }, + "coin-or-cbc": { + "baseline": "2023-02-01", + "port-version": 0 + }, "coin-or-cgl": { "baseline": "2023-02-01", "port-version": 0 diff --git a/versions/c-/coin-or-cbc.json b/versions/c-/coin-or-cbc.json new file mode 100644 index 00000000000000..225d570ca03b8c --- /dev/null +++ b/versions/c-/coin-or-cbc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0ed0ac8c729439ae3549b949ff6a02c803eabb34", + "version-date": "2023-02-01", + "port-version": 0 + } + ] +} From 228987a6fdbd56739a16d47eacf6e79d71a47973 Mon Sep 17 00:00:00 2001 From: Alesiani Marco Date: Wed, 5 Jul 2023 21:20:45 +0200 Subject: [PATCH 460/533] [omniverse-physx-sdk] Add new port (#31506) * [omniverse-physx-sdk] add new port * test * new direct cmake invocation * Windows fixes * Cleanup * Cleanup * license update * Fix for windows * fix crt * new fix for CRT * another tentative for crt * new fixes * crt linkage * win32 dynamic/static fixes * updated * wrapper modified * Refactoring to config as requested * fixed paths for config * new test * fixing gpu port * fixups for bin dirs * more fixes, win pending for dll * new * useless removed * cleanup * fixed static * custom targets * fix static * Moved target to unofficial * remove vcpkg-cmake-wrapper.cmake * dropped custom logic * modified config with find_file * linux fixes * mods * Refactoring and usage * do not copy freeglut dlls over * addresses https://github.com/microsoft/vcpkg/pull/31506#pullrequestreview-1466815035 * tentative deps download * Removed override generator * removed hardcoded generator/toolchain * usage refactoring, changed target defines * Restored CRT linkage (toolchain failed) * refactored * Removed useless var * namespaced better * modified linux not to use 7z * consistent extract paths * fixed linux extraction * No more CRT in port/config, moved GPU accel to bin dir, usage refactored * retriggering build * updated to tools dir only release * usage refactor * refactor * usage refactor * refactor * desc update * updated * updated desc * small comment change * fixup * fixup * Removed baseline failures * Update versions/baseline.json Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> --------- Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> --- .../omniverse-physx-sdk-config.cmake | 117 ++++++ ports/omniverse-physx-sdk/portfile.cmake | 336 ++++++++++++++++++ ports/omniverse-physx-sdk/usage | 30 ++ ports/omniverse-physx-sdk/vcpkg.json | 22 ++ versions/baseline.json | 4 + versions/o-/omniverse-physx-sdk.json | 9 + 6 files changed, 518 insertions(+) create mode 100644 ports/omniverse-physx-sdk/omniverse-physx-sdk-config.cmake create mode 100644 ports/omniverse-physx-sdk/portfile.cmake create mode 100644 ports/omniverse-physx-sdk/usage create mode 100644 ports/omniverse-physx-sdk/vcpkg.json create mode 100644 versions/o-/omniverse-physx-sdk.json diff --git a/ports/omniverse-physx-sdk/omniverse-physx-sdk-config.cmake b/ports/omniverse-physx-sdk/omniverse-physx-sdk-config.cmake new file mode 100644 index 00000000000000..763c7daa7a7e29 --- /dev/null +++ b/ports/omniverse-physx-sdk/omniverse-physx-sdk-config.cmake @@ -0,0 +1,117 @@ +# omniverse-physx-sdk-config.cmake (from which unofficial-omniverse-physx-sdk-config.cmake is generated) +# A user's CMakeLists.txt should: +# find_package(unofficial-omniverse-physx-sdk CONFIG REQUIRED) +# target_link_libraries(main PRIVATE unofficial::omniverse-physx-sdk::sdk) +# the GPU acceleration .so/.dll libraries are in the port's tools/ directory (needed for late binding). +# See the usage file for more info and more detailed explanation on how to use this. + +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + +if(NOT TARGET unofficial::omniverse-physx-sdk) + # Find include and library directories (up one level multiple times) + get_filename_component(z_vcpkg_omniverse_physx_sdk_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(z_vcpkg_omniverse_physx_sdk_prefix "${z_vcpkg_omniverse_physx_sdk_prefix}" PATH) + get_filename_component(z_vcpkg_omniverse_physx_sdk_prefix "${z_vcpkg_omniverse_physx_sdk_prefix}" PATH) + + get_filename_component(OMNIVERSE-PHYSX-SDK_INCLUDE_DIRS "${z_vcpkg_omniverse_physx_sdk_prefix}/include/physx" ABSOLUTE) + get_filename_component(OMNIVERSE-PHYSX-SDK_RELEASE_LIBS_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/lib" ABSOLUTE) + get_filename_component(OMNIVERSE-PHYSX-SDK_DEBUG_LIBS_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/debug/lib" ABSOLUTE) + get_filename_component(OMNIVERSE-PHYSX-SDK_RELEASE_BIN_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/bin" ABSOLUTE) + get_filename_component(OMNIVERSE-PHYSX-SDK_DEBUG_BIN_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/debug/bin" ABSOLUTE) + get_filename_component(OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR "${z_vcpkg_omniverse_physx_sdk_prefix}/tools" ABSOLUTE) + + # Find main library files + find_library(OMNIVERSE-PHYSX-SDK_LIBRARY_RELEASE NAMES PhysX_static_64 PhysX_64 PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_LIBS_DIR}" NO_DEFAULT_PATH) + find_library(OMNIVERSE-PHYSX-SDK_LIBRARY_DEBUG NAMES PhysX_static_64 PhysX_64 PATHS "${OMNIVERSE-PHYSX-SDK_DEBUG_LIBS_DIR}" NO_DEFAULT_PATH) + + # Finally create the imported target that users will link against + set(OMNIVERSE-PHYSX-SDK_LIBRARIES "") + add_library(unofficial::omniverse-physx-sdk::sdk UNKNOWN IMPORTED) + + # Set IMPORTED_IMPLIB for the main target in case of dynamic libraries + if (WIN32 AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set_target_properties(unofficial::omniverse-physx-sdk::sdk PROPERTIES + IMPORTED_IMPLIB_RELEASE "${OMNIVERSE-PHYSX-SDK_LIBRARY_RELEASE}" + IMPORTED_IMPLIB_DEBUG "${OMNIVERSE-PHYSX-SDK_LIBRARY_DEBUG}" + ) + endif() + + set_target_properties(unofficial::omniverse-physx-sdk::sdk PROPERTIES + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" + IMPORTED_LOCATION_RELEASE "${OMNIVERSE-PHYSX-SDK_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${OMNIVERSE-PHYSX-SDK_LIBRARY_DEBUG}" + INTERFACE_INCLUDE_DIRECTORIES "${OMNIVERSE-PHYSX-SDK_INCLUDE_DIRS}" + ) + + # Add compile definitions to the target for debug/release builds + target_compile_definitions(unofficial::omniverse-physx-sdk::sdk INTERFACE $<$:_DEBUG>) + + set(lib_names + PhysXExtensions + PhysXPvdSDK + PhysXCharacterKinematic + PhysXCooking + PhysXCommon + PhysXFoundation + PhysXVehicle + ) + if(WIN32) + list(APPEND lib_names PhysXVehicle2) + endif() + + foreach(name IN LISTS lib_names) + find_library(OMNIVERSE_${name}_LIBRARY_RELEASE + NAMES ${name}_static_64 ${name}_64 # ... all candidates, only one should be installed for a given triplet + PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_LIBS_DIR}" + NO_DEFAULT_PATH + REQUIRED + ) + find_library(OMNIVERSE_${name}_LIBRARY_DEBUG + NAMES ${name}_static_64 ${name}_64 # ... all candidates, only one should be installed for a given triplet + PATHS "${OMNIVERSE-PHYSX-SDK_DEBUG_LIBS_DIR}" + NO_DEFAULT_PATH + # not REQUIRED, due to release-only builds + ) + add_library(unofficial::omniverse-physx-sdk::${name} UNKNOWN IMPORTED) + set_target_properties(unofficial::omniverse-physx-sdk::${name} + PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE" + IMPORTED_LOCATION_RELEASE "${OMNIVERSE_${name}_LIBRARY_RELEASE}" + ) + if(OMNIVERSE_${name}_LIBRARY_DEBUG) + set_target_properties(unofficial::omniverse-physx-sdk::${name} + PROPERTIES + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" + IMPORTED_LOCATION_DEBUG "${OMNIVERSE_${name}_LIBRARY_DEBUG}" + ) + endif() + set_property(TARGET unofficial::omniverse-physx-sdk::sdk APPEND PROPERTY + INTERFACE_LINK_LIBRARIES unofficial::omniverse-physx-sdk::${name} + ) + select_library_configurations(OMNIVERSE_${name}) + endforeach() + + # Lastly also provide a target for clients to link with the GPU library (optional, provided by NVIDIA and downloaded through packman) + + # Find GPU library files (these are used at late-binding to enable GPU acceleration) + if(WIN32) + find_file(OMNIVERSE-PHYSX-SDK-GPU_LIBRARY_RELEASE NAMES PhysXGpu_64.dll PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR}" NO_DEFAULT_PATH) + find_file(OMNIVERSE-PHYSX-SDK-GPU_DEVICE_LIBRARY_RELEASE NAMES PhysXDevice64.dll PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR}" NO_DEFAULT_PATH) + elseif(UNIX) + find_file(OMNIVERSE-PHYSX-SDK-GPU_LIBRARY_RELEASE NAMES libPhysXGpu_64.so PATHS "${OMNIVERSE-PHYSX-SDK_RELEASE_TOOLS_DIR}" NO_DEFAULT_PATH) + endif() + + # Create imported targets for GPU library (only release is used) + add_library(unofficial::omniverse-physx-sdk::gpu-library SHARED IMPORTED) + set_target_properties(unofficial::omniverse-physx-sdk::gpu-library PROPERTIES + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" + IMPORTED_LOCATION "${OMNIVERSE-PHYSX-SDK-GPU_LIBRARY_RELEASE}" + ) + if(WIN32) + add_library(unofficial::omniverse-physx-sdk::gpu-device-library SHARED IMPORTED) + set_target_properties(unofficial::omniverse-physx-sdk::gpu-device-library PROPERTIES + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" + IMPORTED_LOCATION "${OMNIVERSE-PHYSX-SDK-GPU_DEVICE_LIBRARY_RELEASE}" + ) + endif() +endif() diff --git a/ports/omniverse-physx-sdk/portfile.cmake b/ports/omniverse-physx-sdk/portfile.cmake new file mode 100644 index 00000000000000..f61ee564bbad82 --- /dev/null +++ b/ports/omniverse-physx-sdk/portfile.cmake @@ -0,0 +1,336 @@ +############################################################################################################### +# Port for Omniverse PhysX 5 - NVIDIA Corporation +# Written by Marco Alesiani +# Note: this port is NOT officially supported by NVIDIA. +# This port is also not a replacement for the 'physx' port: the newest Omniverse PhysX dropped support +# for many platforms so the old one will continue to be community maintained to support all previous platforms. +############################################################################################################### + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NVIDIA-Omniverse/PhysX + REF 104.2-physx-5.1.3 # newest tag + SHA512 63838192cc7da45bc7f26d6204b48c5593afd976853378e6749a6c112b9079a9586ecceb85f088ce54678fe8ccfa22cc9a5a9c255e8fa8d01cf7a84aa5b269a7 + HEAD_REF release/104.2 +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(VCPKG_BUILD_STATIC_LIBS TRUE) +else() + set(VCPKG_BUILD_STATIC_LIBS FALSE) +endif() +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_LINK_CRT_STATICALLY TRUE) +else() + set(VCPKG_LINK_CRT_STATICALLY FALSE) +endif() + +# Target platform detection for packman (the NVIDIA dependency downloader) and CMake options settings +if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM_OPTIONS + -DPX_BUILDSNIPPETS=OFF + -DPX_BUILDPVDRUNTIME=OFF + -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS} + ) + set(targetPlatform "linux") +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(PLATFORM_OPTIONS + -DPX_BUILDSNIPPETS=OFF + -DPX_BUILDPVDRUNTIME=OFF + -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS} + ) + set(targetPlatform "linuxAarch64") +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + + set(PLATFORM_OPTIONS + -DPX_BUILDSNIPPETS=OFF + -DPX_BUILDPVDRUNTIME=OFF + -DPX_GENERATE_STATIC_LIBRARIES=${VCPKG_BUILD_STATIC_LIBS} + -DNV_USE_STATIC_WINCRT=${VCPKG_LINK_CRT_STATICALLY} + -DPX_FLOAT_POINT_PRECISE_MATH=OFF + ) + + # Note: it would have been more correct to specify "win64" here, but we specify this so that packman can download + # the right dependencies on windows (see the "platforms" field in the dependencies.xml), that will also later + # set up the correct PM_xxx environment variables that we can pass to the cmake generation invocation to find + # whatever the PhysX project needs. Note that vc17(2022) is not required: the latest repo is guaranteed to work + # with vc15, vc16 and vc17 on x64 Windows. The binaries for these platforms downloaded by packman should be the same. + set(targetPlatform "vc17win64") +else() + message(FATAL_ERROR "Unsupported platform/architecture combination") +endif() + + +######################## Download required deps ############################## + +set($ENV{PM_PATHS} "") + +vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/CMakeModules%401.28.trunk.32494385.7z" + FILENAME "CMakeModules.7z" + SHA512 cccb0347d27a2b1391ffd3285fa19ca884fed91d8bf2e1683f86efad8aa0151a6e27080a6bec8975be585e4a51dd92cf85ac0cacf12ba28dce6e6efe74f57202 +) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(7Z) + set(ENV{PM_CMakeModules_PATH} "${CURRENT_BUILDTREES_DIR}/CMakeModules_dep") + file(MAKE_DIRECTORY "$ENV{PM_CMakeModules_PATH}") + vcpkg_execute_required_process( + COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_CMakeModules_PATH}" "-y" "-bso0" "-bsp0" + WORKING_DIRECTORY "$ENV{PM_CMakeModules_PATH}" + LOGNAME "extract-CMakeModules" + ) +else() + vcpkg_extract_source_archive(CMAKEMODULES_SOURCE_PATH + NO_REMOVE_ONE_LEVEL + ARCHIVE "${ARCHIVE}" + BASE_DIRECTORY CMakeModules_dep + ) + set(ENV{PM_CMakeModules_PATH} "${CMAKEMODULES_SOURCE_PATH}") +endif() +message(STATUS "Extracted dependency to $ENV{PM_CMakeModules_PATH}") +list(APPEND ENV{PM_PATHS} $ENV{PM_CMakeModules_PATH}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40104.2-5.1.264.32487460-public.zip" + FILENAME "PhysXGpu.zip" + SHA512 6bd0384c134d909b0c2d32b9639dde5d8a90b3de74e1971b913d646f284d3dd042e3cfd0d4a868e57370621e23e76001b3eac47ac235c6dd798328e199471502 +) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(7Z) + set(ENV{PM_PhysXGpu_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXGpu_dep") + file(MAKE_DIRECTORY "$ENV{PM_PhysXGpu_PATH}") + vcpkg_execute_required_process( + COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_PhysXGpu_PATH}" "-y" "-bso0" "-bsp0" + WORKING_DIRECTORY "$ENV{PM_PhysXGpu_PATH}" + LOGNAME "extract-PhysXGpu" + ) +else() + vcpkg_extract_source_archive(PHYSXGPU_SOURCE_PATH + NO_REMOVE_ONE_LEVEL + ARCHIVE "${ARCHIVE}" + BASE_DIRECTORY PhysXGpu_dep + ) + set(ENV{PM_PhysXGpu_PATH} "${PHYSXGPU_SOURCE_PATH}") +endif() +message(STATUS "Extracted dependency to $ENV{PM_PhysXGpu_PATH}") +list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXGpu_PATH}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXDevice%4018.12.7.4.7z" + FILENAME "PhysXDevice.7z" + SHA512 c20eb2f1e0dcb9d692cb718ca7e3a332291e72a09614f37080f101e5ebc1591033029f0f1e6fba33a17d4c9f59f13e561f3fc81cee34cd53d50b579c01dd3f3c +) +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{PM_PhysXDevice_PATH} "${CURRENT_BUILDTREES_DIR}/PhysXDevice_dep") + file(MAKE_DIRECTORY "$ENV{PM_PhysXDevice_PATH}") + vcpkg_find_acquire_program(7Z) + vcpkg_execute_required_process( + COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_PhysXDevice_PATH}" "-y" "-bso0" "-bsp0" + WORKING_DIRECTORY "$ENV{PM_PhysXDevice_PATH}" + LOGNAME "extract-PhysXDevice" + ) +else() + vcpkg_extract_source_archive(PHYSXDEVICE_SOURCE_PATH + NO_REMOVE_ONE_LEVEL + ARCHIVE "${ARCHIVE}" + BASE_DIRECTORY PhysXDevice_dep + ) + set(ENV{PM_PhysXDevice_PATH} "${PHYSXDEVICE_SOURCE_PATH}") +endif() +message(STATUS "Extracted dependency to $ENV{PM_PhysXDevice_PATH}") +list(APPEND ENV{PM_PATHS} $ENV{PM_PhysXDevice_PATH}) + +if(targetPlatform STREQUAL "vc17win64") + set(ENV{PM_freeglut_PATH} "${CURRENT_BUILDTREES_DIR}/freeglut_dep") + file(MAKE_DIRECTORY "$ENV{PM_freeglut_PATH}") + vcpkg_download_distfile(ARCHIVE + URLS "https://d4i3qtqj3r0z5.cloudfront.net/freeglut-windows%403.4_1.1.7z" + FILENAME "freeglut.7z" + SHA512 c01cb75dd466d6889a72d7236669bfce841cc6da9e0edb4208c4affb5ca939f28d64bc3d988bc85d98c589b0b42ac3464f606c89f6c113106669fc9fe84000e5 + ) + vcpkg_find_acquire_program(7Z) + vcpkg_execute_required_process( + COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_freeglut_PATH}" "-y" "-bso0" "-bsp0" + WORKING_DIRECTORY "$ENV{PM_freeglut_PATH}" + LOGNAME "extract-freeglut" + ) + message(STATUS "Extracted dependency to $ENV{PM_freeglut_PATH}") + list(APPEND ENV{PM_PATHS} $ENV{PM_freeglut_PATH}) +endif() + +######################## Now generate ALL cmake parameters according to our distribution ############################## + +set(PHYSX_ROOT_DIR "${SOURCE_PATH}/physx") + +# Set common parameters +set(common_params -DCMAKE_PREFIX_PATH=$ENV{PM_PATHS} -DPHYSX_ROOT_DIR=${PHYSX_ROOT_DIR} -DPX_OUTPUT_LIB_DIR=${PHYSX_ROOT_DIR} -DPX_OUTPUT_BIN_DIR=${PHYSX_ROOT_DIR}) + +# Set platform and compiler specific parameters +if(targetPlatform STREQUAL "linuxAarch64") + set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/linux-aarch64/PhysX) + set(platformCMakeParams -DTARGET_BUILD_PLATFORM=linux -DPX_OUTPUT_ARCH=arm) +elseif(targetPlatform STREQUAL "linux") + set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/linux/PhysX) + set(platformCMakeParams -DTARGET_BUILD_PLATFORM=linux -DPX_OUTPUT_ARCH=x86) +elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win64 + set(cmakeParams -DCMAKE_INSTALL_PREFIX=${PHYSX_ROOT_DIR}/install/vc17win64/PhysX) + set(platformCMakeParams -DTARGET_BUILD_PLATFORM=windows -DPX_OUTPUT_ARCH=x86) +endif() + +# Also make sure the packman-downloaded GPU driver is found as a binary +list(APPEND platformCMakeParams -DPHYSX_PHYSXGPU_PATH=${PM_PhysXGpu_PATH}/bin) + +# Anyway the above only works for clang, see +# source/compiler/cmake/linux/CMakeLists.txt:164 +# to avoid problems, we copy _immediately_ the extra binaries +if(targetPlatform STREQUAL "linuxAarch64") + file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.aarch64/checked/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.aarch64/debug") + file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.aarch64/release/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.aarch64/release") +elseif(targetPlatform STREQUAL "linux") + file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.clang/checked/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.clang/debug") + file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/linux.clang/release/libPhysXGpu_64.so" DESTINATION "${SOURCE_PATH}/physx/bin/linux.clang/release") +elseif(targetPlatform STREQUAL "vc17win64") + file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/win.x86_64.vc141.mt/checked/PhysXGpu_64.dll" DESTINATION "${SOURCE_PATH}/physx/bin/vc17win64/debug") + file(COPY "$ENV{PM_PhysXGpu_PATH}/bin/win.x86_64.vc141.mt/release/PhysXGpu_64.dll" DESTINATION "${SOURCE_PATH}/physx/bin/vc17win64/release") +endif() + +set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams}) + +# Finally invoke cmake to configure the PhysX project +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" + GENERATOR "${generator}" + WINDOWS_USE_MSBUILD + OPTIONS + -DCMAKE_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} + ${PLATFORM_OPTIONS} + -DPHYSX_ROOT_DIR=${PHYSX_ROOT_DIR} + ${cmakeParams} + OPTIONS_DEBUG + -DNV_USE_DEBUG_WINCRT=TRUE + DISABLE_PARALLEL_CONFIGURE + MAYBE_UNUSED_VARIABLES + PX_OUTPUT_ARCH + PHYSX_PHYSXGPU_PATH +) + +# Compile and install in vcpkg's final installation directories all of the include headers and binaries for debug/release +vcpkg_cmake_install() + +######################## Extract to final vcpkg install locations and fixup artifacts in wrong dirs ############################## + +message("[PHYSX BUILD COMPLETED] Extracting build artifacts to vcpkg installation locations..") + +# Artifacts paths are similar to //[artifact] however vcpkg expects +# libraries, binaries and headers to be respectively in ${CURRENT_PACKAGES_DIR}/lib or ${CURRENT_PACKAGES_DIR}/debug/lib, +# ${CURRENT_PACKAGES_DIR}/bin or ${CURRENT_PACKAGES_DIR}/debug/bin and ${CURRENT_PACKAGES_DIR}/include. +# This function accepts a DIRECTORY named variable specifying the 'lib' or 'bin' destination directory and a SUFFIXES named +# variable which specifies a list of suffixes to extract in that folder (e.g. all the .lib or .pdb) +function(copy_in_vcpkg_destination_folder_physx_artifacts) + macro(_copy_up _IN_DIRECTORY _OUT_DIRECTORY) + foreach(_SUFFIX IN LISTS _fpa_SUFFIXES) + file(GLOB_RECURSE _ARTIFACTS + LIST_DIRECTORIES false + "${SOURCE_PATH}/physx/${_IN_DIRECTORY}/*${_SUFFIX}" + ) + if(_ARTIFACTS) + file(COPY ${_ARTIFACTS} DESTINATION "${CURRENT_PACKAGES_DIR}/${_OUT_DIRECTORY}") + endif() + endforeach() + endmacro() + + cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN}) + _copy_up("bin/*/release" "${_fpa_DIRECTORY}") # could be physx/bin/linux.clang/release or physx/bin/win.x86_64.vc142.mt/release + _copy_up("bin/*/debug" "debug/${_fpa_DIRECTORY}") +endfunction() + +# Create output directories +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Packman also downloads the Gpu driver shared library, so we'll place it in bin and debug/bin + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +copy_in_vcpkg_destination_folder_physx_artifacts( + DIRECTORY "lib" + SUFFIXES ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX} +) + +if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Also copy whatever .so/.dll were built. Remember that there should be NO /bin directory (nor debug/bin) + # when using static linkage + copy_in_vcpkg_destination_folder_physx_artifacts( + DIRECTORY "bin" + SUFFIXES ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} ".pdb" + ) +endif() + +# Special treatment is reserved for the PhysXGpu_64 shared library (downloaded by packman). +# This is a 3rd party "optional functionality" dependency. +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +set(GPULIBNAMES "") +if(targetPlatform STREQUAL "linuxAarch64" OR targetPlatform STREQUAL "linux") + list(APPEND GPULIBNAMES "libPhysXGpu_64.so" "libPhysXDevice64.so") +elseif(targetPlatform STREQUAL "vc17win64") # Again: this will work for any Win64 + list(APPEND GPULIBNAMES "PhysXGpu_64.dll" "PhysXDevice64.dll") +endif() + +function(_copy_single_files_from_dir_to_destdir _IN_FILES _IN_DIR _OUT_DIR) + file(GLOB_RECURSE _ARTIFACTS + LIST_DIRECTORIES false + "${_IN_DIR}" + ) + foreach(_ARTIFACT IN LISTS _ARTIFACTS) + foreach(_FILE IN LISTS _IN_FILES) + if("${_ARTIFACT}" MATCHES "${_FILE}") + file(COPY "${_ARTIFACT}" DESTINATION "${_OUT_DIR}") + endif() + endforeach() + endforeach() +endfunction() + +# Put it in binary directories, it's an optional component (only release binaries should go in tools/) +_copy_single_files_from_dir_to_destdir("${GPULIBNAMES}" "${SOURCE_PATH}/physx/bin/*/release/*" "${CURRENT_PACKAGES_DIR}/tools") + +# Copy headers to port's destination folder +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") + +# Renaming trick to finally have final folder structure as ${CURRENT_PACKAGES_DIR}/include/physx +file(RENAME "${SOURCE_PATH}/physx/include" "${SOURCE_PATH}/physx/physx") +file(COPY "${SOURCE_PATH}/physx/physx" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Remove useless build directories +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/source" + "${CURRENT_PACKAGES_DIR}/source" +) + +# Install the cmake config that users will use, replace -if any- only @variables@ +configure_file("${CMAKE_CURRENT_LIST_DIR}/omniverse-physx-sdk-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/unofficial-omniverse-physx-sdk-config.cmake" @ONLY) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") +file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share/") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-omniverse-physx-sdk + CONFIG_PATH share/omniverse-physx-sdk) + +# Remove fixup wrong directories +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(targetPlatform STREQUAL "vc17win64") + # Remove freeglut (cannot be skipped in public release builds, but unnecessary) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/freeglut.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/freeglutd.dll" + ) +endif() + +# Install license and usage file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +message("[VCPKG Omniverse PhysX port execution completed]") diff --git a/ports/omniverse-physx-sdk/usage b/ports/omniverse-physx-sdk/usage new file mode 100644 index 00000000000000..3463facfd25648 --- /dev/null +++ b/ports/omniverse-physx-sdk/usage @@ -0,0 +1,30 @@ +[Sample port usage] +omniverse-physx-sdk provides CMake targets: + + cmake_minimum_required(VERSION 3.15) + + find_package(unofficial-omniverse-physx-sdk CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::omniverse-physx-sdk::sdk) + + # Optional: import the defined target to copy over the GPU acceleration libraries (3rd party provided by NVIDIA) + if(TARGET unofficial::omniverse-physx-sdk::gpu-library) + if(UNIX) + # Add rpath setting to find .so libraries on unix based systems + set_target_properties(main PROPERTIES + BUILD_WITH_INSTALL_RPATH TRUE + INSTALL_RPATH "$ORIGIN" + ) + endif() + add_custom_command(TARGET main POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + $ + $) + if(WIN32) + add_custom_command(TARGET main POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + $ + $) + endif() + else() + message(WARNING "GPU acceleration library target not defined - GPU acceleration will NOT be available!") + endif() diff --git a/ports/omniverse-physx-sdk/vcpkg.json b/ports/omniverse-physx-sdk/vcpkg.json new file mode 100644 index 00000000000000..07618621130bf3 --- /dev/null +++ b/ports/omniverse-physx-sdk/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "omniverse-physx-sdk", + "version": "5.1.3", + "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port differs from the other 'physx' port (pointing to a repo no longer officially supported by NVIDIA) in supported platforms. It guarantees support only for Omniverse supported platforms. This port is NOT officially supported by NVIDIA.", + "homepage": "https://github.com/NVIDIA-Omniverse/PhysX", + "license": "BSD-3-Clause", + "supports": "(windows & x64 & !mingw & !uwp) | (linux & x64) | (linux & arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2b766f887dc842..b63324e27d54b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5864,6 +5864,10 @@ "baseline": "4.3.0", "port-version": 1 }, + "omniverse-physx-sdk": { + "baseline": "5.1.3", + "port-version": 0 + }, "ompl": { "baseline": "1.5.1", "port-version": 5 diff --git a/versions/o-/omniverse-physx-sdk.json b/versions/o-/omniverse-physx-sdk.json new file mode 100644 index 00000000000000..168f54c5fafbab --- /dev/null +++ b/versions/o-/omniverse-physx-sdk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b52f26ab4b10a8ff473da92959ba29ce9d297711", + "version": "5.1.3", + "port-version": 0 + } + ] +} From 9c5ff901d22fd7cc3b16ba2f4035351e6db7182c Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 7 Jul 2023 01:39:03 +0800 Subject: [PATCH 461/533] [ada-url] Update to 2.5.1 (#32413) * [ada-url] Update to 2.5.1 * [ada-url] Bump version --- ports/ada-url/portfile.cmake | 2 +- ports/ada-url/vcpkg.json | 2 +- versions/a-/ada-url.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake index b67f8ccd6b4637..7be9a68d4e1155 100644 --- a/ports/ada-url/portfile.cmake +++ b/ports/ada-url/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ada-url/ada REF "v${VERSION}" - SHA512 689dcdc3e89f2ae51e039f6d354efea3231d3ff025c58f572596d87cebd7d5f2bf5ca8c530df8514369a14831dfdb1c65bc1d93a0ece579031eb3f0dd47548c0 + SHA512 bb3814af0728b924a6685cfa510f1ccf7ced692850c55849e42c88c07234e0f8fc19426ecfdd1c1ef84543041b0604da312e02b98bd7c8cd2609f8a5ed3ae224 HEAD_REF main ) diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json index a0981262bac9fb..9ad56e78b62238 100644 --- a/ports/ada-url/vcpkg.json +++ b/ports/ada-url/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ada-url", - "version": "2.4.2", + "version": "2.5.1", "description": "WHATWG-compliant and fast URL parser written in modern C++", "homepage": "https://ada-url.com/", "license": "MIT", diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json index 26721671950682..cb0c0276d36eb1 100644 --- a/versions/a-/ada-url.json +++ b/versions/a-/ada-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e613c15954b7650fd68c9f46109ba536dad6a27a", + "version": "2.5.1", + "port-version": 0 + }, { "git-tree": "184ab96a9e448d759aafb20f540502f43b5fc7f9", "version": "2.4.2", diff --git a/versions/baseline.json b/versions/baseline.json index b63324e27d54b9..d4c1936b21bb67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -37,7 +37,7 @@ "port-version": 14 }, "ada-url": { - "baseline": "2.4.2", + "baseline": "2.5.1", "port-version": 0 }, "ade": { From 277affef6cbbd4d025916c914c9b0a594d6902f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= Date: Thu, 6 Jul 2023 13:40:02 -0400 Subject: [PATCH 462/533] [tree-similarity] Fix wrong port name in usage file (#32409) * Fix typo in usage file * Update port version * Add missing newline at end of usage file * Update versions/t-/tree-similarity.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --------- Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/tree-similarity/usage | 6 +++--- ports/tree-similarity/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tree-similarity.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/tree-similarity/usage b/ports/tree-similarity/usage index 0206b3f76372fb..dbdef89643c923 100644 --- a/ports/tree-similarity/usage +++ b/ports/tree-similarity/usage @@ -1,4 +1,4 @@ -The package idyntree provides CMake targets: +tree-similarity provides CMake targets: - find_path(TREE_SIMILARITY_INCLUDE_DIRS "tree-similiarity") - target_include_directories(main PRIVATE ${TREE_SIMILARITY_INCLUDE_DIRS}) \ No newline at end of file + find_path(TREE_SIMILARITY_INCLUDE_DIRS "tree-similiarity") + target_include_directories(main PRIVATE ${TREE_SIMILARITY_INCLUDE_DIRS}) diff --git a/ports/tree-similarity/vcpkg.json b/ports/tree-similarity/vcpkg.json index 8b6c90a0a0870f..cb14a3f4d018da 100644 --- a/ports/tree-similarity/vcpkg.json +++ b/ports/tree-similarity/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tree-similarity", "version-semver": "0.1.1", + "port-version": 1, "description": "Tree edit distance (TED) and similarity measurement library, offering multiple algorithm implementation such as APTED and LGM.", "homepage": "https://github.com/DatabaseGroup/tree-similarity", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d4c1936b21bb67..50fb8f89b4b323 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8198,7 +8198,7 @@ }, "tree-similarity": { "baseline": "0.1.1", - "port-version": 0 + "port-version": 1 }, "tree-sitter": { "baseline": "0.20.6", diff --git a/versions/t-/tree-similarity.json b/versions/t-/tree-similarity.json index 2893d0b504c2c0..a13df722d9eb6f 100644 --- a/versions/t-/tree-similarity.json +++ b/versions/t-/tree-similarity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3319b799dc1e36bc50a52468b9acdafaaf0cf380", + "version-semver": "0.1.1", + "port-version": 1 + }, { "git-tree": "d7f5637a5f1a5c0ba5d50a5734a69c6d190ac75d", "version-semver": "0.1.1", From 080c75d1bf96f915519b6c361529c5f6d89c1c0c Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 7 Jul 2023 01:41:03 +0800 Subject: [PATCH 463/533] [marl] Update to latest commit (#32408) * update marl * update version --------- Co-authored-by: Monica --- ports/marl/portfile.cmake | 6 +++--- ports/marl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/marl.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/marl/portfile.cmake b/ports/marl/portfile.cmake index 53cb52f850a9e6..a165d6cad7e480 100644 --- a/ports/marl/portfile.cmake +++ b/ports/marl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/marl - REF 9929747c9ba6354691dbacaf14f9b35433871e5b #2022-03-02 - SHA512 454399485d292526333417474a312302aaff90cf63bc06a95c2e8b87cb92eaea547457ba3c06413e079ca29f9ea64990b9da467aeaec6ec2aa3233efddab2407 + REF aa9e85b2189d6f5dbba6909275661b37dfb5de69 #2023-06-28 + SHA512 fc4869d791608fa9198da896b6687fcc79e830766f3192ca6d7b28ba3156a06618901677e66f0b08a472a602a62d88f09ff49917a6749f410d92c2911f14d736 HEAD_REF main ) @@ -31,4 +31,4 @@ vcpkg_copy_pdbs() 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") diff --git a/ports/marl/vcpkg.json b/ports/marl/vcpkg.json index c641ba3e6bd591..f6af1f7b14deb4 100644 --- a/ports/marl/vcpkg.json +++ b/ports/marl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "marl", - "version-date": "2022-03-02", + "version-date": "2023-06-28", "description": "A hybrid thread/fiber task scheduler written in modern C++", "homepage": "https://github.com/google/marl", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 50fb8f89b4b323..7cb394a6b00b93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5173,7 +5173,7 @@ "port-version": 2 }, "marl": { - "baseline": "2022-03-02", + "baseline": "2023-06-28", "port-version": 0 }, "matchit": { diff --git a/versions/m-/marl.json b/versions/m-/marl.json index fe8b7b988d5041..9246a34682164a 100644 --- a/versions/m-/marl.json +++ b/versions/m-/marl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a91c2cc68fc789dfe15333d97f138dc5e900ee3", + "version-date": "2023-06-28", + "port-version": 0 + }, { "git-tree": "b6430e8be3b742d1466c45570a5d4946c427dd25", "version-date": "2022-03-02", From 9c2a4a1640df8acb120398485d5793f3860e2754 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 7 Jul 2023 01:41:40 +0800 Subject: [PATCH 464/533] [iir1] Update to 1.9.4 (#32370) * [iir1] Update to 1.9.4 * [iir1] Overwrite version --- ports/iir1/fix-shared-lib.patch | 20 ++++++++++++++ ports/iir1/fix-shared-static.patch | 42 ------------------------------ ports/iir1/portfile.cmake | 14 +++++++--- ports/iir1/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/iir1.json | 5 ++++ 6 files changed, 37 insertions(+), 48 deletions(-) create mode 100644 ports/iir1/fix-shared-lib.patch delete mode 100644 ports/iir1/fix-shared-static.patch diff --git a/ports/iir1/fix-shared-lib.patch b/ports/iir1/fix-shared-lib.patch new file mode 100644 index 00000000000000..1299dcd64b420e --- /dev/null +++ b/ports/iir1/fix-shared-lib.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dd67df..3840ff8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,7 @@ set_target_properties(iir PROPERTIES + PUBLIC_HEADER Iir.h + PRIVATE_HEADER "${LIBINCLUDE}") + ++if(BUILD_SHARED_LIBS) + install(TARGETS iir EXPORT iir-targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -91,6 +92,7 @@ install(TARGETS iir EXPORT iir-targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir) ++endif() + + include(JoinPaths) + diff --git a/ports/iir1/fix-shared-static.patch b/ports/iir1/fix-shared-static.patch deleted file mode 100644 index cfa29a122eab8a..00000000000000 --- a/ports/iir1/fix-shared-static.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,9 +12,11 @@ cmake_policy(SET CMP0048 NEW) # set VERSION in project() - cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH by default - - include(GNUInstallDirs) -+if(BUILD_TESTING) - add_subdirectory(test) - add_subdirectory(demo) - enable_testing () -+endif() - - if (MSVC) - add_compile_options(/W4) -@@ -47,6 +49,8 @@ set(LIBINCLUDE - iir/State.h - iir/Types.h) - -+if(BUILD_SHARED_LIBS) -+ - add_library(iir SHARED ${LIBSRC}) - add_library(iir::iir ALIAS iir) - -@@ -73,6 +77,8 @@ install(TARGETS iir EXPORT iir-targets - - configure_file(iir.pc.in iir.pc @ONLY) - -+else(BUILD_SHARED_LIBS) -+ - add_library(iir_static STATIC ${LIBSRC}) - add_library(iir::iir_static ALIAS iir_static) - -@@ -97,6 +103,8 @@ install(TARGETS iir_static EXPORT iir-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir) - -+endif(BUILD_SHARED_LIBS) -+ - install(EXPORT iir-targets - DESTINATION lib/cmake/iir - NAMESPACE iir:: diff --git a/ports/iir1/portfile.cmake b/ports/iir1/portfile.cmake index 0a4d87c2b65a15..90e17ddcc4b129 100644 --- a/ports/iir1/portfile.cmake +++ b/ports/iir1/portfile.cmake @@ -1,23 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO berndporr/iir1 - REF 1.9.1 - SHA512 115692fb82637d21c2cbff974d931ef12a5c7fd8502560e2b807ceed69b1a6a4e05898aff37b089ccda7c4aa32e97e71f7e6007998ec52f6122da33eb222112e + REF "${VERSION}" + SHA512 e69b79ba48aa5d5ec2ddb0a31461ac4c15b0489df80fddc1f1f8adc143726fa189dc0dd94a0ed2bb7aa73712f953e27b345a762120ab2d10f54f57a868f0ea42 HEAD_REF master PATCHES - fix-shared-static.patch + fix-shared-lib.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" IIR1_INSTALL_STATIC) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TESTING=OFF + -DIIR1_INSTALL_STATIC=${IIR1_INSTALL_STATIC} + -DIIR1_BUILD_TESTING=OFF + -DIIR1_BUILD_DEMO=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME iir CONFIG_PATH lib/cmake/iir) +vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/iir1/vcpkg.json b/ports/iir1/vcpkg.json index 781d68b2d0a19d..dc4fef275c5270 100644 --- a/ports/iir1/vcpkg.json +++ b/ports/iir1/vcpkg.json @@ -1,6 +1,6 @@ { "name": "iir1", - "version": "1.9.1", + "version": "1.9.4", "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7cb394a6b00b93..9c64ac2401282e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3317,7 +3317,7 @@ "port-version": 0 }, "iir1": { - "baseline": "1.9.1", + "baseline": "1.9.4", "port-version": 0 }, "ijg-libjpeg": { diff --git a/versions/i-/iir1.json b/versions/i-/iir1.json index 3d176ff4dc4929..a303a1549addac 100644 --- a/versions/i-/iir1.json +++ b/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2d76abe2dc41ff907a66db3a54a510edc322d2d", + "version": "1.9.4", + "port-version": 0 + }, { "git-tree": "b684559e0b19d393deae83fdf6e2182937942a76", "version": "1.9.1", From 936c5eeeb47649199640d2b7bcf8a86826691ccb Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 7 Jul 2023 01:43:48 +0800 Subject: [PATCH 465/533] [croncpp] Update to latest commit (#32368) * update croncpp * update version * update portfile.cmake * update git-tree * update version format * update version --------- Co-authored-by: Monica --- ports/croncpp/0001-fix-cmake.patch | 82 ------------------------------ ports/croncpp/no-test.patch | 17 ------- ports/croncpp/portfile.cmake | 16 +++--- ports/croncpp/vcpkg.json | 5 +- versions/baseline.json | 4 +- versions/c-/croncpp.json | 5 ++ 6 files changed, 16 insertions(+), 113 deletions(-) delete mode 100644 ports/croncpp/0001-fix-cmake.patch delete mode 100644 ports/croncpp/no-test.patch diff --git a/ports/croncpp/0001-fix-cmake.patch b/ports/croncpp/0001-fix-cmake.patch deleted file mode 100644 index 735c9df34a7072..00000000000000 --- a/ports/croncpp/0001-fix-cmake.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 30db118abd484c59efada27d9d6956b5f68bcee6 Mon Sep 17 00:00:00 2001 -From: Robert Kesterson -Date: Fri, 4 Sep 2020 16:31:55 +0000 -Subject: [PATCH] vcpkg - ---- - CMakeLists.txt | 47 +++++++++++++++++++++++++++++++++++++++++++-- - croncppConfig.cmake | 1 + - 2 files changed, 46 insertions(+), 2 deletions(-) - create mode 100644 croncppConfig.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9114b39..8d46e6b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.7.0) --project(croncpp) -+project(croncpp VERSION 1.0.0) - - if(WIN32) - message(status "Setting MSVC flags") -@@ -24,4 +24,47 @@ if(BUILD_TESTS) - endif() - - add_subdirectory(benchmark) --add_subdirectory(test) -\ No newline at end of file -+add_subdirectory(test) -+ -+add_library( croncpp INTERFACE ) -+add_library( croncpp::croncpp ALIAS croncpp ) -+ -+include(GNUInstallDirs) -+target_include_directories( croncpp INTERFACE -+ $ -+ $ ) -+ -+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) -+ # public headers will get installed: -+ set_target_properties( croncpp PROPERTIES PUBLIC_HEADER include/croncpp.h ) -+endif () -+ -+ -+set( version_config "${CMAKE_CURRENT_BINARY_DIR}/croncppConfigVersion.cmake" ) -+ -+include( CMakePackageConfigHelpers ) -+write_basic_package_version_file( "${version_config}" -+ VERSION ${PROJECT_VERSION} -+ COMPATIBILITY SameMajorVersion ) -+ -+message(STATUS "CMAKE_INSTALL_INCLUDEDIR = ${CMAKE_INSTALL_INCLUDEDIR}") -+ -+install( TARGETS croncpp -+ EXPORT croncppConfig -+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/croncpp ) -+export( TARGETS croncpp NAMESPACE croncpp:: FILE croncppTargets.cmake ) -+if (CMAKE_VERSION VERSION_LESS 3.15) -+ install( -+ FILES include/croncpp.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/croncpp ) -+endif () -+ -+set( CONFIG_LOC "share/croncpp" ) -+ -+install( EXPORT croncppConfig -+ FILE croncppTargets.cmake -+ NAMESPACE croncpp:: -+ DESTINATION ${CONFIG_LOC} ) -+install ( -+ FILES croncppConfig.cmake "${version_config}" -+ DESTINATION ${CONFIG_LOC}) -diff --git a/croncppConfig.cmake b/croncppConfig.cmake -new file mode 100644 -index 0000000..3c4702c ---- /dev/null -+++ b/croncppConfig.cmake -@@ -0,0 +1 @@ -+include( "${CMAKE_CURRENT_LIST_DIR}/croncppTargets.cmake" ) --- -2.20.1 - diff --git a/ports/croncpp/no-test.patch b/ports/croncpp/no-test.patch deleted file mode 100644 index 0860e3f10a49a7..00000000000000 --- a/ports/croncpp/no-test.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index a82e605..405f306 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,3 +1,4 @@ -+if(BUILD_TESTS) - cmake_minimum_required(VERSION 3.7.0) - project(test_croncpp) - -@@ -9,7 +10,6 @@ file(GLOB SOURCES "*.cpp" "include/*.cpp") - - add_executable(test_croncpp ${SOURCES} ${headers}) - --if(BUILD_TESTS) - enable_testing() - - add_test(NAME "test_croncpp" COMMAND "test_croncpp" "-r compact") diff --git a/ports/croncpp/portfile.cmake b/ports/croncpp/portfile.cmake index bfdd2f84fd7614..5c67633813d63f 100644 --- a/ports/croncpp/portfile.cmake +++ b/ports/croncpp/portfile.cmake @@ -1,26 +1,24 @@ +set(VCPKG_BUILD_TYPE release) # header-only port vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariusbancila/croncpp - REF 11cce4666a06c40346c7ba380ddd90c53806809d #master on 9/4/2020 - SHA512 8f4d892ce90d8eca3711b21728bb599bf64857b20c0b143c5277687d0b6e5d5b8bf3e6dc7f9e8d028ba4e5ee711a5a9e750bcc2f771177d2f659c0c19e12207a + REF e817348a2dcd77b968c0b87a43274932b9800f4b # 2023-03-30 + SHA512 aee687f4e8d7ce85aa9ba3a9e551443353abc20af9face62b618ce55ffa7a4632a4cd0c02c46e43c52b7f1797d62006183776a2d7fad48473bb964af79c2d531 HEAD_REF master - PATCHES - 0001-fix-cmake.patch - no-test.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TESTS=OFF + -DCRONCPP_BUILD_TESTS=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/croncpp/vcpkg.json b/ports/croncpp/vcpkg.json index e41db7b7732997..ec003cab84b54e 100644 --- a/ports/croncpp/vcpkg.json +++ b/ports/croncpp/vcpkg.json @@ -1,8 +1,7 @@ { "name": "croncpp", - "version-date": "2020-09-04", - "port-version": 3, - "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.", + "version-date": "2023-03-30", + "description": "croncpp is a C++11/14/17 header-only cross-platform library for handling CRON expressions.", "homepage": "https://github.com/mariusbancila/croncpp", "license": "MIT", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9c64ac2401282e..02dad68a508339 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,8 +1889,8 @@ "port-version": 0 }, "croncpp": { - "baseline": "2020-09-04", - "port-version": 3 + "baseline": "2023-03-30", + "port-version": 0 }, "crossguid": { "baseline": "2021-10-22", diff --git a/versions/c-/croncpp.json b/versions/c-/croncpp.json index 99f598042fc628..1eea5b9ff49613 100644 --- a/versions/c-/croncpp.json +++ b/versions/c-/croncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13457e7a1989326119d3e30d7ce8c4d2809697c4", + "version-date": "2023-03-30", + "port-version": 0 + }, { "git-tree": "0fb4aefe39d2d695cb5cc89a4f3c92e4229605f5", "version-date": "2020-09-04", From 3a5f4bf44af2302a1c298aa8d118b451d0610bab Mon Sep 17 00:00:00 2001 From: Alesiani Marco Date: Thu, 6 Jul 2023 19:56:05 +0200 Subject: [PATCH 466/533] [omniverse-physx-sdk] Updated omniverse-pysx-sdk to 105.0 (Kit 105.0, PhysX SDK 5.2.1) (#32420) * Updated to 105.0 * New version --- ports/omniverse-physx-sdk/portfile.cmake | 37 ++++-------------------- ports/omniverse-physx-sdk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/omniverse-physx-sdk.json | 5 ++++ 4 files changed, 13 insertions(+), 33 deletions(-) diff --git a/ports/omniverse-physx-sdk/portfile.cmake b/ports/omniverse-physx-sdk/portfile.cmake index f61ee564bbad82..f262d4d3044602 100644 --- a/ports/omniverse-physx-sdk/portfile.cmake +++ b/ports/omniverse-physx-sdk/portfile.cmake @@ -9,9 +9,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIA-Omniverse/PhysX - REF 104.2-physx-5.1.3 # newest tag - SHA512 63838192cc7da45bc7f26d6204b48c5593afd976853378e6749a6c112b9079a9586ecceb85f088ce54678fe8ccfa22cc9a5a9c255e8fa8d01cf7a84aa5b269a7 - HEAD_REF release/104.2 + REF 105.0-physx-5.2.1 # newest tag + SHA512 d1c27d79d9c54a6ea0a79f5fa3ccd0b7821a48116c765b185442809d21fdd20086e2bfd6408d8a87e1507e0b951f1d9efb794f33d53bc05ab017fa50a41ba770 + HEAD_REF main ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -66,34 +66,9 @@ endif() set($ENV{PM_PATHS} "") vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/CMakeModules%401.28.trunk.32494385.7z" - FILENAME "CMakeModules.7z" - SHA512 cccb0347d27a2b1391ffd3285fa19ca884fed91d8bf2e1683f86efad8aa0151a6e27080a6bec8975be585e4a51dd92cf85ac0cacf12ba28dce6e6efe74f57202 -) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_find_acquire_program(7Z) - set(ENV{PM_CMakeModules_PATH} "${CURRENT_BUILDTREES_DIR}/CMakeModules_dep") - file(MAKE_DIRECTORY "$ENV{PM_CMakeModules_PATH}") - vcpkg_execute_required_process( - COMMAND "${7Z}" x "${ARCHIVE}" "-o$ENV{PM_CMakeModules_PATH}" "-y" "-bso0" "-bsp0" - WORKING_DIRECTORY "$ENV{PM_CMakeModules_PATH}" - LOGNAME "extract-CMakeModules" - ) -else() - vcpkg_extract_source_archive(CMAKEMODULES_SOURCE_PATH - NO_REMOVE_ONE_LEVEL - ARCHIVE "${ARCHIVE}" - BASE_DIRECTORY CMakeModules_dep - ) - set(ENV{PM_CMakeModules_PATH} "${CMAKEMODULES_SOURCE_PATH}") -endif() -message(STATUS "Extracted dependency to $ENV{PM_CMakeModules_PATH}") -list(APPEND ENV{PM_PATHS} $ENV{PM_CMakeModules_PATH}) - -vcpkg_download_distfile(ARCHIVE - URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40104.2-5.1.264.32487460-public.zip" - FILENAME "PhysXGpu.zip" - SHA512 6bd0384c134d909b0c2d32b9639dde5d8a90b3de74e1971b913d646f284d3dd042e3cfd0d4a868e57370621e23e76001b3eac47ac235c6dd798328e199471502 + URLS "https://d4i3qtqj3r0z5.cloudfront.net/PhysXGpu%40105.0-5.2.498.33012328-public-signed.7z" + FILENAME "PhysXGpu.7z" + SHA512 b834d4e0ed7d015d33d03862e30ad8296974e605bd4de49d9cfa168958d8e3b67a9b52cc1f2169f25c32211e1880de1ff7f76edae4d4a1b1f12dc6d1873c2d8e ) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(7Z) diff --git a/ports/omniverse-physx-sdk/vcpkg.json b/ports/omniverse-physx-sdk/vcpkg.json index 07618621130bf3..84a540d071bc39 100644 --- a/ports/omniverse-physx-sdk/vcpkg.json +++ b/ports/omniverse-physx-sdk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "omniverse-physx-sdk", - "version": "5.1.3", + "version": "5.2.1", "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port differs from the other 'physx' port (pointing to a repo no longer officially supported by NVIDIA) in supported platforms. It guarantees support only for Omniverse supported platforms. This port is NOT officially supported by NVIDIA.", "homepage": "https://github.com/NVIDIA-Omniverse/PhysX", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 02dad68a508339..ba66310b086c45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5865,7 +5865,7 @@ "port-version": 1 }, "omniverse-physx-sdk": { - "baseline": "5.1.3", + "baseline": "5.2.1", "port-version": 0 }, "ompl": { diff --git a/versions/o-/omniverse-physx-sdk.json b/versions/o-/omniverse-physx-sdk.json index 168f54c5fafbab..d2a2627269cb40 100644 --- a/versions/o-/omniverse-physx-sdk.json +++ b/versions/o-/omniverse-physx-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58beb4786b3ae288d6412d1ca9140c33ef1b2cb7", + "version": "5.2.1", + "port-version": 0 + }, { "git-tree": "b52f26ab4b10a8ff473da92959ba29ce9d297711", "version": "5.1.3", From 5c4654cf3fae557007a4668f664d68e807f8530e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:05:14 +0200 Subject: [PATCH 467/533] [wampcc] fix feature examples under gcc-11 (#32410) --- ports/wampcc/gcc-11.patch | 19 +++++++++++++++++++ ports/wampcc/portfile.cmake | 2 ++ ports/wampcc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wampcc.json | 5 +++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ports/wampcc/gcc-11.patch diff --git a/ports/wampcc/gcc-11.patch b/ports/wampcc/gcc-11.patch new file mode 100644 index 00000000000000..2a49f5aeffd610 --- /dev/null +++ b/ports/wampcc/gcc-11.patch @@ -0,0 +1,19 @@ +diff --git a/examples/message_server/message_subscriber.cc b/examples/message_server/message_subscriber.cc +index ba40a332..4ac75ef7 100644 +--- a/examples/message_server/message_subscriber.cc ++++ b/examples/message_server/message_subscriber.cc +@@ -7,13 +7,9 @@ + + #include "wampcc/kernel.h" + #include "wampcc/data_model.h" +-#include "wampcc/tcp_socket.h" +-#include "wampcc/wamp_session.h" + #include "wampcc/rawsocket_protocol.h" + +-#include +-#include +- ++#include + + void on_string_change(const wampcc::string_subscription& sub) + { diff --git a/ports/wampcc/portfile.cmake b/ports/wampcc/portfile.cmake index 1d46d9a2b582d0..93aaa4db81ca11 100644 --- a/ports/wampcc/portfile.cmake +++ b/ports/wampcc/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_from_github( REF 43d10a7ccf37ec1b895742712dd4a05577b73ff1 SHA512 e830d26de00e8f5f378145f06691cb16121c40d3bd2cd663fad9a97db37251a11b56053178b619e3a2627f0cd518b6290a8381b26e517a9f16f0246d2f91958e HEAD_REF master + PATCHES + gcc-11.patch # https://github.com/darrenjs/wampcc/commit/d1a8c6dcabcc32e9d9774f306555e9080d871c2f ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/wampcc/vcpkg.json b/ports/wampcc/vcpkg.json index ed8f2792ce39c5..3775d5dffc32a0 100644 --- a/ports/wampcc/vcpkg.json +++ b/ports/wampcc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wampcc", "version-date": "2019-09-04", - "port-version": 4, + "port-version": 5, "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.", "license": "MIT", "supports": "!(windows & arm64)", diff --git a/versions/baseline.json b/versions/baseline.json index ba66310b086c45..af8f545f89a132 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8574,7 +8574,7 @@ }, "wampcc": { "baseline": "2019-09-04", - "port-version": 4 + "port-version": 5 }, "wangle": { "baseline": "2023.07.03.00", diff --git a/versions/w-/wampcc.json b/versions/w-/wampcc.json index 07bdca8b22ecf0..9578ec2828bea8 100644 --- a/versions/w-/wampcc.json +++ b/versions/w-/wampcc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69c3d159720746a5321085dab7b543c1c95eed85", + "version-date": "2019-09-04", + "port-version": 5 + }, { "git-tree": "acfd463862ba55ebabe1f0b0105da56b965d5b90", "version-date": "2019-09-04", From 517c8dc2f6f7d87d17b1a08df2f91e552a9fba12 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 6 Jul 2023 20:28:54 +0200 Subject: [PATCH 468/533] [z_vcpkg_apply_patches] core.filemode=true (#32392) --- scripts/cmake/z_vcpkg_apply_patches.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/z_vcpkg_apply_patches.cmake b/scripts/cmake/z_vcpkg_apply_patches.cmake index 77af63b3b78463..9a270ba2b36638 100644 --- a/scripts/cmake/z_vcpkg_apply_patches.cmake +++ b/scripts/cmake/z_vcpkg_apply_patches.cmake @@ -19,7 +19,7 @@ function(z_vcpkg_apply_patches) message(STATUS "Applying patch ${patch}") set(logname "patch-${TARGET_TRIPLET}-${patchnum}") vcpkg_execute_in_download_mode( - COMMAND "${GIT}" -c core.longpaths=true -c core.autocrlf=false --work-tree=. --git-dir=.git apply "${absolute_patch}" --ignore-whitespace --whitespace=nowarn --verbose + COMMAND "${GIT}" -c core.longpaths=true -c core.autocrlf=false -c core.filemode=true --work-tree=. --git-dir=.git apply "${absolute_patch}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/${logname}-out.log" ERROR_VARIABLE error WORKING_DIRECTORY "${arg_SOURCE_PATH}" From 4016ce410c32c64af89501469c66ecca204e6764 Mon Sep 17 00:00:00 2001 From: Yuri Bogomolov Date: Thu, 6 Jul 2023 22:33:12 +0400 Subject: [PATCH 469/533] [libev] add port (#32278) * [libev] add port * review fixes * fix version * review fix * fix version commit sha --- ports/libev/libevConfig.cmake | 25 +++++++++++++++++++++++++ ports/libev/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/libev/vcpkg.json | 8 ++++++++ versions/baseline.json | 4 ++++ versions/l-/libev.json | 9 +++++++++ 5 files changed, 73 insertions(+) create mode 100644 ports/libev/libevConfig.cmake create mode 100644 ports/libev/portfile.cmake create mode 100644 ports/libev/vcpkg.json create mode 100644 versions/l-/libev.json diff --git a/ports/libev/libevConfig.cmake b/ports/libev/libevConfig.cmake new file mode 100644 index 00000000000000..c2515584161456 --- /dev/null +++ b/ports/libev/libevConfig.cmake @@ -0,0 +1,25 @@ +if(NOT TARGET unofficial::libev::libev) + get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + + add_library(unofficial::libev::libev UNKNOWN IMPORTED) + + set_target_properties(unofficial::libev::libev PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + find_library(LIBEV_LIBRARY_DEBUG NAMES ev libev PATHS "${_IMPORT_PREFIX}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(EXISTS "${LIBEV_LIBRARY_DEBUG}") + set_property(TARGET unofficial::libev::libev APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::libev::libev PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBEV_LIBRARY_DEBUG}") + endif() + + find_library(LIBEV_LIBRARY_RELEASE NAMES ev libev PATHS "${_IMPORT_PREFIX}/" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(EXISTS "${LIBEV_LIBRARY_RELEASE}") + set_property(TARGET unofficial::libev::libev APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::libev::libev PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBEV_LIBRARY_RELEASE}") + endif() + + unset(_IMPORT_PREFIX) +endif() diff --git a/ports/libev/portfile.cmake b/ports/libev/portfile.cmake new file mode 100644 index 00000000000000..edbe54408d6ab5 --- /dev/null +++ b/ports/libev/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_download_distfile(ARCHIVE + URLS "http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz" + FILENAME "libev-4.33.tar.gz" + SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libevConfig.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libev/vcpkg.json b/ports/libev/vcpkg.json new file mode 100644 index 00000000000000..4ea0372e81dd68 --- /dev/null +++ b/ports/libev/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libev", + "version": "4.33", + "description": "libev is a high-performance event loop/event model with lots of features.", + "homepage": "http://software.schmorp.de/pkg/libev.html", + "license": "BSD-2-Clause OR GPL-2.0-or-later", + "supports": "!windows" +} diff --git a/versions/baseline.json b/versions/baseline.json index af8f545f89a132..501d584cd7193f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4024,6 +4024,10 @@ "baseline": "1.5.10", "port-version": 2 }, + "libev": { + "baseline": "4.33", + "port-version": 0 + }, "libevent": { "baseline": "2.1.12+20230128", "port-version": 0 diff --git a/versions/l-/libev.json b/versions/l-/libev.json new file mode 100644 index 00000000000000..de71987e96fc87 --- /dev/null +++ b/versions/l-/libev.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8602cc86e0ede2c2f32fb03b1e2bfd0698331bf3", + "version": "4.33", + "port-version": 0 + } + ] +} From fa0ff80b1c6f4e3fc2fd4b68865d3bf1ffb8f190 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 6 Jul 2023 20:35:29 +0200 Subject: [PATCH 470/533] [vk-bootstrap] Fix CMake config for non-windows (#32330) * [vk-bootstrap] Fix CMake config for non-windows * [vk-bootstrap] Switch to vulkan-headers * Simplify --- ports/vk-bootstrap/portfile.cmake | 6 ++- ports/vk-bootstrap/vcpkg.json | 3 +- ports/vk-bootstrap/vk-bootstrap-config.cmake | 38 ++++++++++++------- .../vk-bootstrap-targets-debug.cmake | 12 ------ .../vk-bootstrap-targets-release.cmake | 12 ------ versions/baseline.json | 2 +- versions/v-/vk-bootstrap.json | 5 +++ 7 files changed, 36 insertions(+), 42 deletions(-) delete mode 100644 ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake delete mode 100644 ports/vk-bootstrap/vk-bootstrap-targets-release.cmake diff --git a/ports/vk-bootstrap/portfile.cmake b/ports/vk-bootstrap/portfile.cmake index fee8029a976af3..19a68be7f249ad 100644 --- a/ports/vk-bootstrap/portfile.cmake +++ b/ports/vk-bootstrap/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -20,6 +22,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/${PORT}-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-release.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-debug.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vk-bootstrap-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/vk-bootstrap/vcpkg.json b/ports/vk-bootstrap/vcpkg.json index 9b4db0ed7c3e6d..163137d37d3144 100644 --- a/ports/vk-bootstrap/vcpkg.json +++ b/ports/vk-bootstrap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vk-bootstrap", "version": "0.7", + "port-version": 1, "description": "Vulkan bootstraping library", "homepage": "https://github.com/charles-lunarg/vk-bootstrap", "license": "MIT", @@ -9,6 +10,6 @@ "name": "vcpkg-cmake", "host": true }, - "vulkan" + "vulkan-headers" ] } diff --git a/ports/vk-bootstrap/vk-bootstrap-config.cmake b/ports/vk-bootstrap/vk-bootstrap-config.cmake index 4d2244eae84289..39ebda5c98eaa7 100644 --- a/ports/vk-bootstrap/vk-bootstrap-config.cmake +++ b/ports/vk-bootstrap/vk-bootstrap-config.cmake @@ -1,14 +1,24 @@ -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - -add_library(vk-bootstrap::vk-bootstrap SHARED IMPORTED) -set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" -) - -get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -file(GLOB CONFIG_FILES "${_DIR}/vk-bootstrap-targets-*.cmake") -foreach(f ${CONFIG_FILES}) - include(${f}) -endforeach() +if(NOT TARGET vk-bootstrap::vk-bootstrap) + get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + + add_library(vk-bootstrap::vk-bootstrap UNKNOWN IMPORTED) + set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include") + + find_library(Z_VCPKG_VKBOOTSTRAP_LIBRARY_RELEASE NAMES vk-bootstrap PATHS "${_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH REQUIRED) + set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_VKBOOTSTRAP_LIBRARY_RELEASE}") + + find_library(Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG NAMES vk-bootstrap PATHS "${_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH) + if(Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG) + set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG}") + endif() + + if(CMAKE_DL_LIBS) + set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS}) + endif() + + unset(_IMPORT_PREFIX) +endif() diff --git a/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake b/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake deleted file mode 100644 index ec882d433665a9..00000000000000 --- a/ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake +++ /dev/null @@ -1,12 +0,0 @@ -#---------------------------------------------------------------- -# Generated CMake target import file for configuration "Debug". -#---------------------------------------------------------------- - -set(CMAKE_IMPORT_FILE_VERSION 1) - -set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) -set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES - IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/vk-bootstrap.lib" -) - -set(CMAKE_IMPORT_FILE_VERSION) diff --git a/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake b/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake deleted file mode 100644 index a25d3be076c46e..00000000000000 --- a/ports/vk-bootstrap/vk-bootstrap-targets-release.cmake +++ /dev/null @@ -1,12 +0,0 @@ -#---------------------------------------------------------------- -# Generated CMake target import file for configuration "Debug". -#---------------------------------------------------------------- - -set(CMAKE_IMPORT_FILE_VERSION 1) - -set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES - IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/vk-bootstrap.lib" -) - -set(CMAKE_IMPORT_FILE_VERSION) diff --git a/versions/baseline.json b/versions/baseline.json index 501d584cd7193f..fc17e71afe18cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8506,7 +8506,7 @@ }, "vk-bootstrap": { "baseline": "0.7", - "port-version": 0 + "port-version": 1 }, "vkfft": { "baseline": "1.2.31", diff --git a/versions/v-/vk-bootstrap.json b/versions/v-/vk-bootstrap.json index c4a5b579b29045..d123b38ca636a5 100644 --- a/versions/v-/vk-bootstrap.json +++ b/versions/v-/vk-bootstrap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff20e17db240f974d3afaae76bcf2afbe96a068c", + "version": "0.7", + "port-version": 1 + }, { "git-tree": "76afd9e4fb4d1ac5c3329b5f2db845a3923d4aa6", "version": "0.7", From d1e11918f5c88c1dd364b93e1452fea69bacd479 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 6 Jul 2023 21:34:39 +0200 Subject: [PATCH 471/533] [vcpkg-ci-llvm] Find cacheable feature sets (#32352) * [vcpkg-ci-llvm] Find cacheable feature sets * [vcpkg-ci-llvm] Isolate utils, not tools; Move flang to linux * [vcpkg-ci-llvm] Move flang to !static * [vcpkg-ci-llvm] Move flang to !static & !x86 * [vcpkg-ci-llvm] Move flang to linux --- scripts/test_ports/vcpkg-ci-llvm/vcpkg.json | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json index eb563a5114da76..7c76a68221a919 100644 --- a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -9,8 +9,8 @@ "name": "llvm", "default-features": false, "features": [ - "bolt", "clang", + "default-targets", "disable-assertions", "disable-clang-static-analyzer", "enable-abi-breaking-checks", @@ -22,26 +22,29 @@ "enable-zlib", "lld", "lldb", - "openmp", - "polly", - "target-aarch64", - "target-amdgpu", - "target-arm", - "target-webassembly", - "target-x86", "tools" ] }, { - "$comment": "Only for osx artifact upload in CI succeeds when these features are enabled", + "$comment": "Platform restriction due to CI artifact upload quirks; features which need utils", "name": "llvm", "default-features": false, "features": [ - "flang", - "target-all", + "bolt", + "openmp", + "polly", "utils" ], - "platform": "osx" + "platform": "!static" + }, + { + "$comment": "Platform restriction due to CI artifact upload quirks; flang", + "name": "llvm", + "default-features": false, + "features": [ + "flang" + ], + "platform": "linux" } ] } From 61c166277f8de15ace592b08eecdcb46def75782 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:04:03 +0800 Subject: [PATCH 472/533] [live555] update to 2023-06-20 (#32414) * update version * update version * update version * update version * fix the use of operator * update version --- ports/live555/CMakeLists.txt | 1 + ports/live555/fix_operator_overload.patch | 13 +++++++++++++ ports/live555/portfile.cmake | 7 ++++--- ports/live555/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/live555.json | 5 +++++ 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 ports/live555/fix_operator_overload.patch diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt index 2e306c83a60f10..d5b71ea1629244 100644 --- a/ports/live555/CMakeLists.txt +++ b/ports/live555/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.5) project(live555 C CXX) +set(CMAKE_CXX_STANDARD 20) include_directories( BasicUsageEnvironment/include groupsock/include diff --git a/ports/live555/fix_operator_overload.patch b/ports/live555/fix_operator_overload.patch new file mode 100644 index 00000000000000..09206185cca1f9 --- /dev/null +++ b/ports/live555/fix_operator_overload.patch @@ -0,0 +1,13 @@ +diff --git a/liveMedia/MPEGVideoStreamFramer.cpp b/liveMedia/MPEGVideoStreamFramer.cpp +index 59c4656..a705e68 100644 +--- a/liveMedia/MPEGVideoStreamFramer.cpp ++++ b/liveMedia/MPEGVideoStreamFramer.cpp +@@ -129,7 +129,7 @@ void MPEGVideoStreamFramer + fPictureTimeBase = fFrameRate == 0.0 ? 0.0 : tc.pictures/fFrameRate; + fTcSecsBase = (((tc.days*24)+tc.hours)*60+tc.minutes)*60+tc.seconds; + fHaveSeenFirstTimeCode = True; +- } else if (fCurGOPTimeCode == fPrevGOPTimeCode) { ++ } else if (fCurGOPTimeCode.TimeCode::operator==(fPrevGOPTimeCode)) { + // The time code has not changed since last time. Adjust for this: + fPicturesAdjustment += picturesSinceLastGOP; + } else { diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index fedfdb368e955d..04843e9424aa6d 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.06.10.tar.gz" - FILENAME "live.2023.06.10.tar.gz" - SHA512 634f90db6339ebef6c6bc28f382034150e04e1bcc26d651da8823de7ed8a62bd648737fdf8be0c2734ba17a2516033af48e85b256170eaf30a2c484ede2d2004 + URLS "http://live555.com/liveMedia/public/live.2023.06.20.tar.gz" + FILENAME "live.2023.06.20.tar.gz" + SHA512 dad8cb279aa020a50ffe0e049e37ba872df52da930a75f44abbd8b07db10ba4174b1b96c0a2f4f678972d167c1bab8c5fc2bdc5ef1916c43618f12134293f672 ) vcpkg_extract_source_archive( @@ -11,6 +11,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES fix-RTSPClient.patch + fix_operator_overload.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 4467303c4d37ed..d1434ef0baadcd 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,7 +1,6 @@ { "name": "live555", - "version-date": "2023-06-10", - "port-version": 1, + "version-date": "2023-06-20", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index fc17e71afe18cc..a675e0d28db3f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4961,8 +4961,8 @@ "port-version": 2 }, "live555": { - "baseline": "2023-06-10", - "port-version": 1 + "baseline": "2023-06-20", + "port-version": 0 }, "llfio": { "baseline": "2023-03-13", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 112411781b5a01..1dd656796bf0e6 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3145196c0ec759988b77ab9ef787f426b0efc02d", + "version-date": "2023-06-20", + "port-version": 0 + }, { "git-tree": "e7944bec69900cba45393bcacfb4d903a3569300", "version-date": "2023-06-10", From 4c397835c472e1a49b47ca5172c71fa56e497796 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Fri, 7 Jul 2023 18:08:38 +0200 Subject: [PATCH 473/533] [rocksdb] update to v8.3.2, add/rework features (#29093) * add more options and remove unused CMake variables * add version * [rocksdb] fix liburing option * update version * [rocksdb] disable debug runtime for Release configuration (Windows only) * update version * [rocksdb] remove processor-specific features * [rocksdb] update v7.10.2 * add version * [rocksdb] update to v8.0.0 * add version * add version * modify version * add version * [rocksdb] update to v8.3.2, build shared library, update ci.basline.txt * update version * [rocksdb] PORTABLE option has been modified in v8.3, it should be equal to 1 * clean up ci.baseline.txt * =update version * revert "clean up ci.baseline.txt" * remove unnecessary lines * update version * update ci.baseline.txt * update version * [rocksdb] remove JeMalloc * update version --- .../0004-fix-dependency-in-config.patch | 9 ++++- ports/rocksdb/portfile.cmake | 37 ++++++++----------- ports/rocksdb/vcpkg.json | 29 +++++++++++---- scripts/ci.baseline.txt | 3 -- versions/baseline.json | 2 +- versions/r-/rocksdb.json | 5 +++ 6 files changed, 51 insertions(+), 34 deletions(-) diff --git a/ports/rocksdb/0004-fix-dependency-in-config.patch b/ports/rocksdb/0004-fix-dependency-in-config.patch index 7688b7763e0f95..59098ca22e63c0 100644 --- a/ports/rocksdb/0004-fix-dependency-in-config.patch +++ b/ports/rocksdb/0004-fix-dependency-in-config.patch @@ -1,8 +1,13 @@ diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in -index 0bd14be11..f9f6aa878 100644 +index 0bd14be11..ad07f018a 100644 --- a/cmake/RocksDBConfig.cmake.in +++ b/cmake/RocksDBConfig.cmake.in -@@ -37,7 +37,7 @@ if(@WITH_LZ4@) +@@ -33,11 +33,11 @@ if(@WITH_BZ2@) + endif() + + if(@WITH_LZ4@) +- find_dependency(lz4) ++ find_dependency(lz4 CONFIG) endif() if(@WITH_ZSTD@) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 30512023f740e6..b76979c7b5957d 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb REF "v${VERSION}" - SHA512 2f6fb50c5bb506665950520347104f666fcc29c7df5d806ccdf8c682f10043a0ea3c57b889871812951c5a5101ea8cf318b42b16383e5e6223e8c70e8a55e127 + SHA512 6640deb2aeef493a36125a081c0a1f5fa0e15636ad824088d26c03bacee95af742d833bb7e601952aa0d278563025934049a8195ab14c1cd18e29636fe5f64d7 HEAD_REF main PATCHES 0002-only-build-one-flavor.patch @@ -18,14 +16,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_BUILD_SHARED) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "lz4" WITH_LZ4 - "snappy" WITH_SNAPPY - "zlib" WITH_ZLIB - "zstd" WITH_ZSTD - "bzip2" WITH_BZ2 - "tbb" WITH_TBB - INVERTED_FEATURES - "tbb" CMAKE_DISABLE_FIND_PACKAGE_TBB + "liburing" WITH_LIBURING + "snappy" WITH_SNAPPY + "lz4" WITH_LZ4 + "zlib" WITH_ZLIB + "zstd" WITH_ZSTD + "bzip2" WITH_BZ2 + "numa" WITH_NUMA + "tbb" WITH_TBB ) vcpkg_cmake_configure( @@ -35,22 +33,19 @@ vcpkg_cmake_configure( -DWITH_TESTS=OFF -DWITH_BENCHMARK_TOOLS=OFF -DWITH_TOOLS=OFF - -DUSE_RTTI=1 + -DUSE_RTTI=ON -DROCKSDB_INSTALL_ON_WINDOWS=ON -DFAIL_ON_WARNINGS=OFF -DWITH_MD_LIBRARY=${WITH_MD_LIBRARY} - -DPORTABLE=ON - -DCMAKE_DEBUG_POSTFIX=d + -DPORTABLE=1 # Minimum CPU arch to support, or 0 = current CPU, 1 = baseline CPU -DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED} - -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_NUMA - CMAKE_DISABLE_FIND_PACKAGE_gtest - CMAKE_DISABLE_FIND_PACKAGE_TBB - CMAKE_DEBUG_POSTFIX + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d + -DWITH_RUNTIME_DEBUG=ON + OPTIONS_RELEASE + -DWITH_RUNTIME_DEBUG=OFF ) vcpkg_cmake_install() diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index 5da2f250f5e0e5..bb712a55953a02 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rocksdb", - "version": "8.0.0", + "version": "8.3.2", "description": "A library that provides an embeddable, persistent key-value store for fast storage", "homepage": "https://github.com/facebook/rocksdb", "license": "GPL-2.0-only OR Apache-2.0", + "supports": "!uwp & !(arm & !arm64 & android)", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,41 +16,55 @@ } ], "default-features": [ + "liburing", "zlib" ], "features": { "bzip2": { - "description": "bzip2 support in rocksdb", + "description": "build with bzip2", "dependencies": [ "bzip2" ] }, + "liburing": { + "description": "build with liburing", + "dependencies": [ + { + "name": "liburing", + "platform": "linux" + } + ] + }, "lz4": { - "description": "lz4 support in rocksdb", + "description": "build with lz4", "dependencies": [ "lz4" ] }, + "numa": { + "description": "build with NUMA policy support", + "supports": "linux" + }, "snappy": { - "description": "snappy support in rocksdb", + "description": "build with SNAPPY", "dependencies": [ "snappy" ] }, "tbb": { - "description": "tbb support in rocksdb", + "description": "build with Threading Building Blocks (TBB)", "dependencies": [ "tbb" ] }, "zlib": { - "description": "zlib support in rocksdb", + "description": "build with zlib", "dependencies": [ "zlib" ] }, "zstd": { - "description": "zstd support in rocksdb", + "description": "build with zstd", "dependencies": [ "zstd" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 83966c17d3eb71..181477e95957ed 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1311,9 +1311,6 @@ rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip rhash:arm64-windows=fail -rocksdb:arm-neon-android=fail -rocksdb:arm-uwp=fail -rocksdb:x64-uwp=fail rpclib:arm64-windows=fail rpclib:arm-uwp=fail rpclib:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index a675e0d28db3f2..32595bf791c9cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7205,7 +7205,7 @@ "port-version": 0 }, "rocksdb": { - "baseline": "8.0.0", + "baseline": "8.3.2", "port-version": 0 }, "rpclib": { diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index dcbeb37ee3f59d..be4b0c2a63e860 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d5c9033fedfbf0a9e993125f5511616b894f493", + "version": "8.3.2", + "port-version": 0 + }, { "git-tree": "284f182a8687ee7818ab84d5e7ada9bd5612cfcb", "version": "8.0.0", From f38a59359b9cb9f971485090558d6f30088d68b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 7 Jul 2023 18:13:30 +0200 Subject: [PATCH 474/533] [imgui] Update to 1.89.7 (#32393) * [imgui] Update to 1.89.7 * [imgui] Update version files * [implot] Fix build failure with imgui 1.89.7 * [implot] Update version files --- ports/imgui/portfile.cmake | 6 ++-- ports/imgui/vcpkg.json | 3 +- ports/implot/fix-build.patch | 54 ++++++++++++++++++++++++++++++++++++ ports/implot/vcpkg.json | 2 +- versions/baseline.json | 6 ++-- versions/i-/imgui.json | 5 ++++ versions/i-/implot.json | 5 ++++ 7 files changed, 72 insertions(+), 9 deletions(-) diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index a20684baf98765..35ff5d9ef628fc 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,8 +4,8 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF 823a1385a269d923d35b82b2f470f3ae1fa8b5a3 - SHA512 fcb93d5a02d80c81f53ef097d8462625fb6b81687a87930ef8e56b54a5b7288d263e3e9cee88a831e0b972cbd5b22043442261bbd1da874cbe4a414fcea33725 + REF dc3e531ff28450bff73fde0163b1d076b6bb5605 + SHA512 c716d90c57a036f0117eb02814c3ed164db31727f604fb7568e8413dfba73b678e09c6405a2af52e12522cb766fcf585a97a69b33097349b66755e5b9b04fd06 HEAD_REF docking ) else() @@ -13,7 +13,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF v${VERSION} - SHA512 d48a2763eb9102874b41ae426e0e883e71e3d37f1a9bfcaf64ef8189ae23ea8cc688a49587daba072630f203e738b1c74bad34505be95e7aeb1de1161021bb8e + SHA512 69023cbff02287cb6409b08079d21469680222ca985fd1acd658dcf704c615cb2d74668821dc4830bef70be6033640b0528d3a103b70ebeb4b7563576305bf80 HEAD_REF master ) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index f3eb99d7411088..2a19feac922ee6 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,7 +1,6 @@ { "name": "imgui", - "version": "1.89.6", - "port-version": 1, + "version": "1.89.7", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/ports/implot/fix-build.patch b/ports/implot/fix-build.patch index f0e89b7bcb6d26..faf08938d0ac43 100644 --- a/ports/implot/fix-build.patch +++ b/ports/implot/fix-build.patch @@ -12,3 +12,57 @@ index 997d96f..fb1ff02 100644 #include "imgui.h" //----------------------------------------------------------------------------- +diff --git a/implot.cpp b/implot.cpp +index b76ffb7..22e4261 100644 +--- a/implot.cpp ++++ b/implot.cpp +@@ -132,6 +132,11 @@ You can read releases logs https://github.com/epezent/implot/releases for more d + #define ImDrawFlags_RoundCornersAll ImDrawCornerFlags_All + #endif + ++// Support for pre-1.89.7 versions. ++#if (IMGUI_VERSION_NUM < 18966) ++#define ImGuiButtonFlags_AllowOverlap ImGuiButtonFlags_AllowItemOverlap ++#endif ++ + // Visual Studio warnings + #ifdef _MSC_VER + #pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen +@@ -1802,7 +1807,7 @@ bool UpdateInput(ImPlotPlot& plot) { + + // BUTTON STATE ----------------------------------------------------------- + +- const ImGuiButtonFlags plot_button_flags = ImGuiButtonFlags_AllowItemOverlap ++ const ImGuiButtonFlags plot_button_flags = ImGuiButtonFlags_AllowOverlap + | ImGuiButtonFlags_PressedOnClick + | ImGuiButtonFlags_PressedOnDoubleClick + | ImGuiButtonFlags_MouseButtonLeft +@@ -1812,7 +1817,9 @@ bool UpdateInput(ImPlotPlot& plot) { + | plot_button_flags; + + const bool plot_clicked = ImGui::ButtonBehavior(plot.PlotRect,plot.ID,&plot.Hovered,&plot.Held,plot_button_flags); +- ImGui::SetItemAllowOverlap(); ++#if (IMGUI_VERSION_NUM < 18966) ++ ImGui::SetItemAllowOverlap(); // Handled by ButtonBehavior() ++#endif + + if (plot_clicked) { + if (!ImHasFlag(plot.Flags, ImPlotFlags_NoBoxSelect) && IO.MouseClicked[gp.InputMap.Select] && ImHasFlag(IO.KeyMods, gp.InputMap.SelectMod)) { +@@ -3378,7 +3385,7 @@ bool BeginSubplots(const char* title, int rows, int cols, const ImVec2& size, Im + ImGui::KeepAliveID(sep_id); + const ImRect sep_bb = ImRect(subplot.GridRect.Min.x, ypos-SUBPLOT_SPLITTER_HALF_THICKNESS, subplot.GridRect.Max.x, ypos+SUBPLOT_SPLITTER_HALF_THICKNESS); + bool sep_hov = false, sep_hld = false; +- const bool sep_clk = ImGui::ButtonBehavior(sep_bb, sep_id, &sep_hov, &sep_hld, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_AllowItemOverlap | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnDoubleClick); ++ const bool sep_clk = ImGui::ButtonBehavior(sep_bb, sep_id, &sep_hov, &sep_hld, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnDoubleClick); + if ((sep_hov && G.HoveredIdTimer > SUBPLOT_SPLITTER_FEEDBACK_TIMER) || sep_hld) { + if (sep_clk && ImGui::IsMouseDoubleClicked(0)) { + float p = (subplot.RowRatios[r] + subplot.RowRatios[r+1])/2; +@@ -3408,7 +3415,7 @@ bool BeginSubplots(const char* title, int rows, int cols, const ImVec2& size, Im + ImGui::KeepAliveID(sep_id); + const ImRect sep_bb = ImRect(xpos-SUBPLOT_SPLITTER_HALF_THICKNESS, subplot.GridRect.Min.y, xpos+SUBPLOT_SPLITTER_HALF_THICKNESS, subplot.GridRect.Max.y); + bool sep_hov = false, sep_hld = false; +- const bool sep_clk = ImGui::ButtonBehavior(sep_bb, sep_id, &sep_hov, &sep_hld, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_AllowItemOverlap | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnDoubleClick); ++ const bool sep_clk = ImGui::ButtonBehavior(sep_bb, sep_id, &sep_hov, &sep_hld, ImGuiButtonFlags_FlattenChildren | ImGuiButtonFlags_PressedOnClick | ImGuiButtonFlags_PressedOnDoubleClick); + if ((sep_hov && G.HoveredIdTimer > SUBPLOT_SPLITTER_FEEDBACK_TIMER) || sep_hld) { + if (sep_clk && ImGui::IsMouseDoubleClicked(0)) { + float p = (subplot.ColRatios[c] + subplot.ColRatios[c+1])/2; diff --git a/ports/implot/vcpkg.json b/ports/implot/vcpkg.json index 4146030c93559e..e6457f6f7f009f 100644 --- a/ports/implot/vcpkg.json +++ b/ports/implot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "implot", "version": "0.14", - "port-version": 1, + "port-version": 2, "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 32595bf791c9cf..5b432877bbae8a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3341,8 +3341,8 @@ "port-version": 0 }, "imgui": { - "baseline": "1.89.6", - "port-version": 1 + "baseline": "1.89.7", + "port-version": 0 }, "imgui-sfml": { "baseline": "2.5", @@ -3358,7 +3358,7 @@ }, "implot": { "baseline": "0.14", - "port-version": 1 + "port-version": 2 }, "indicators": { "baseline": "2.3", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index d5b4434c71102d..f49ce3c2fa7f2a 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b44fd53ec5a9aa2f9b272bab4a9a5d97e0aa82f", + "version": "1.89.7", + "port-version": 0 + }, { "git-tree": "a6ac001e889c4162a36f628cbfd921aadcb1b602", "version": "1.89.6", diff --git a/versions/i-/implot.json b/versions/i-/implot.json index 1b016573941cf3..af38224ba3439d 100644 --- a/versions/i-/implot.json +++ b/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ecadd10832f0628f406b27e5470c3d35db6824c", + "version": "0.14", + "port-version": 2 + }, { "git-tree": "d43f2b42e6c869ff277987364c11f7c1e6e01938", "version": "0.14", From 6a93a1d2affb3063aa2ca0d95a0bcfc107f59607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Fri, 7 Jul 2023 12:18:28 -0400 Subject: [PATCH 475/533] [mysql-connector-cpp] Fix incorrect usage of MAYBE_UNUSED_VARIABLES (#32406) * fix build variables * update version * update version * properly quote everything * update version --- ports/mysql-connector-cpp/portfile.cmake | 19 +++++++++++-------- ports/mysql-connector-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mysql-connector-cpp.json | 5 +++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ports/mysql-connector-cpp/portfile.cmake b/ports/mysql-connector-cpp/portfile.cmake index 8eb35a2a1f0cee..7b2a2b8ff6293f 100644 --- a/ports/mysql-connector-cpp/portfile.cmake +++ b/ports/mysql-connector-cpp/portfile.cmake @@ -27,19 +27,22 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" WINDOWS_USE_MSBUILD OPTIONS - -DWITH_SSL=${CURRENT_INSTALLED_DIR} - -DWITH_LZ4=${CURRENT_INSTALLED_DIR} - -DWITH_ZLIB=${CURRENT_INSTALLED_DIR} - -DWITH_ZSTD=${CURRENT_INSTALLED_DIR} - -DWITH_PROTOBUF=${CURRENT_INSTALLED_DIR} + "-DWITH_SSL=${CURRENT_INSTALLED_DIR}" + "-DWITH_LZ4=${CURRENT_INSTALLED_DIR}" + "-DWITH_ZLIB=${CURRENT_INSTALLED_DIR}" + "-DWITH_ZSTD=${CURRENT_INSTALLED_DIR}" + "-DWITH_PROTOBUF=${CURRENT_INSTALLED_DIR}" -DBUILD_STATIC=${BUILD_STATIC} -DSTATIC_MSVCRT=${STATIC_MSVCRT} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DWITH_JDBC=${WITH_JDBC} # the following variables are only used by jdbc + "-DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql" + "-DMYSQL_LIB_DIR=${CURRENT_INSTALLED_DIR}" + "-DWITH_BOOST=${CURRENT_INSTALLED_DIR}" MAYBE_UNUSED_VARIABLES # and they are windows only - -DMYSQL_INCLUDE_DIR="${CURRENT_INSTALLED_DIR}/include/mysql" - -DMYSQL_LIB_DIR=${CURRENT_INSTALLED_DIR} - -DWITH_BOOST=${CURRENT_INSTALLED_DIR} + MYSQL_INCLUDE_DIR + MYSQL_LIB_DIR + WITH_BOOST ) vcpkg_cmake_install() diff --git a/ports/mysql-connector-cpp/vcpkg.json b/ports/mysql-connector-cpp/vcpkg.json index 7751be5ef660e5..c52ad5b5b210eb 100644 --- a/ports/mysql-connector-cpp/vcpkg.json +++ b/ports/mysql-connector-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mysql-connector-cpp", "version": "8.0.32", + "port-version": 1, "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", "homepage": "https://github.com/mysql/mysql-connector-cpp", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5b432877bbae8a..8ba22a7951edf8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5542,7 +5542,7 @@ }, "mysql-connector-cpp": { "baseline": "8.0.32", - "port-version": 0 + "port-version": 1 }, "nameof": { "baseline": "0.10.2", diff --git a/versions/m-/mysql-connector-cpp.json b/versions/m-/mysql-connector-cpp.json index c7eea3c356194f..c5b154f2226c42 100644 --- a/versions/m-/mysql-connector-cpp.json +++ b/versions/m-/mysql-connector-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89b1c4d68211753ab836de3dde9664a3d611b78e", + "version": "8.0.32", + "port-version": 1 + }, { "git-tree": "b78f858b560a7a1fb4d13646a7652f86465885fd", "version": "8.0.32", From 88f5e897a7c410dfb162744edd4f38883b4e5519 Mon Sep 17 00:00:00 2001 From: Adam Casey Date: Fri, 7 Jul 2023 17:25:07 +0100 Subject: [PATCH 476/533] [bde] Updated to 3.117.0 (#31961) * Update bde port Disable windows and arm, at least for now It'd be great to enable arm64-osx (macos?) soon * Update version in bde.json * Remove ci.baseline.txt skip. * Fix version database. * fix port-version * Stop building for android, osx I don't specifically know why these don't work, but linux is the primary platform so let's fix these another time Also remove the cxx17 flag for now - we'll need to address this at some point but for now this should satisfy the feature flag requirements. * Review comments * Remove WINDOWS_USE_MSBUILD * Update versions --------- Co-authored-by: Oleg Subbotin Co-authored-by: Billy Robert O'Neal III --- ports/bde/portfile.cmake | 142 +++++++++------------------------------ ports/bde/vcpkg.json | 15 ++++- scripts/ci.baseline.txt | 3 - versions/b-/bde.json | 5 ++ versions/baseline.json | 4 +- 5 files changed, 51 insertions(+), 118 deletions(-) diff --git a/ports/bde/portfile.cmake b/ports/bde/portfile.cmake index 63d4a8422529cb..92017b0a848977 100644 --- a/ports/bde/portfile.cmake +++ b/ports/bde/portfile.cmake @@ -1,133 +1,55 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --library-type=static) -set(BDE_VERSION 3.2.0.0) -set(BDE_TOOLS_VERSION 1.x) +set(BDE_TOOLS_VERSION "${VERSION}") -# Paths used in build -set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bde-${BDE_VERSION}) -set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bde-${BDE_VERSION}) - -# Acquire Python 2 and add it to PATH -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) +# Acquire Python and add it to PATH +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) # Acquire BDE Tools and add them to PATH vcpkg_from_github( OUT_SOURCE_PATH TOOLS_PATH REPO "bloomberg/bde-tools" - REF d4b1a7670829228f4ec81ecdccc598ce03ae8e80 - SHA512 80af734c080adb225d5369157301ae0af18e02b1912351e34d23f5f2ba4e19f9ae2b5a367923f036330c9f9afd11a90cdf12680eb3e59b4297a312a1b713f17f - HEAD_REF master + REF "${BDE_TOOLS_VERSION}" + SHA512 3c39da8d1ea40459e36e11ada93cc2821ae1b16a831f93cccab463996394a400cc08bb1654642eae1aa5187f139d7fb80c4729e464051eee182133eb8a74158d + HEAD_REF main ) + message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}") -if(VCPKG_CMAKE_SYSTEM_NAME) - set(ENV{PATH} "$ENV{PATH}:${PYTHON2_EXE_PATH}") - set(ENV{PATH} "$ENV{PATH}:${TOOLS_PATH}/bin") -else() - set(ENV{PATH} "$ENV{PATH};${PYTHON2_EXE_PATH}") - set(ENV{PATH} "$ENV{PATH};${TOOLS_PATH}/bin") -endif() +vcpkg_add_to_path("${PYTHON3_EXE_PATH}") +vcpkg_add_to_path("${TOOLS_PATH}/bin") # Acquire BDE sources vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "bloomberg/bde" - REF 3720d132d0879f19b9084cca62ebc75f1f24e1a3 - SHA512 234ebb71997f5b7d3951584235ead10f977689cef323ae1c198629a6b1995b1481d8a1515d827c46df10209bdc66e1f3cc7780dafee9ca0ff4172be47c460d78 - HEAD_REF master -) - -# Clean up previous builds -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - -# Identify waf executable and calculate configure args -if(VCPKG_CMAKE_SYSTEM_NAME) - set(WAF_COMMAND waf) -else() - set(WAF_COMMAND waf.bat) -endif() -set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --use-flat-include-dir) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=32) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=64) -else() - message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() -if(VCPKG_TARGET_IS_WINDOWS) - set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=static) -else() - set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") -endif() - -# Configure debug -message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") -vcpkg_execute_required_process( - COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS} - --prefix=${CURRENT_PACKAGES_DIR}/debug --out=${SOURCE_PATH_DEBUG} - --build-type=debug - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME configure-${TARGET_TRIPLET}--dbg -) -message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") - -# Build debug -message(STATUS "Building ${TARGET_TRIPLET}-dbg") -vcpkg_execute_required_process( - COMMAND ${WAF_COMMAND} build - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}--dbg -) -message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - -# Install debug -message(STATUS "Installing ${TARGET_TRIPLET}-dbg") -vcpkg_execute_required_process( - COMMAND ${WAF_COMMAND} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME install-${TARGET_TRIPLET}--dbg + REF "${VERSION}" + SHA512 810b4a06a08739dcd990751dd543aa7dc58355f9d64a7c96ef0cf45c81501946434db42ad5bcf5d16110d5a463586b587ce09a446136e824298f39a8a871b490 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBDE_BUILD_TARGET_CPP17=ON + -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_STANDARD_REQUIRED=ON + -DCMAKE_CXX_EXTENSIONS=OFF + -DBBS_BUILD_SYSTEM=1 + "-DBdeBuildSystem_DIR:PATH=${TOOLS_PATH}/BdeBuildSystem" + OPTIONS_RELEASE + -DBDE_BUILD_TARGET_OPT=1 + OPTIONS_DEBUG + -DBDE_BUILD_TARGET_DBG=1 ) -# Include files should not be duplicated -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# pkg-config files should point to correct include directory -file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") -foreach(PC_FILE_NAME ${PC_FILES}) - file(READ "${PC_FILE_NAME}" _contents) - string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/../include" _contents "${_contents}") - file(WRITE "${PC_FILE_NAME}" "${_contents}") -endforeach() -message(STATUS "Installing ${TARGET_TRIPLET}-dbg done") - -# Configure release -message(STATUS "Configuring ${TARGET_TRIPLET}-rel") -vcpkg_execute_required_process( - COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS} - --prefix=${CURRENT_PACKAGES_DIR} --out=${SOURCE_PATH_RELEASE} - --build-type=release - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME configure-${TARGET_TRIPLET}--rel -) -message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") # Build release -message(STATUS "Building ${TARGET_TRIPLET}-rel") -vcpkg_execute_required_process( - COMMAND ${WAF_COMMAND} build - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME build-${TARGET_TRIPLET}--rel -) -message(STATUS "Building ${TARGET_TRIPLET}-rel done") +vcpkg_cmake_build() # Install release -message(STATUS "Installing ${TARGET_TRIPLET}-rel") -vcpkg_execute_required_process( - COMMAND ${WAF_COMMAND} install - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME install-${TARGET_TRIPLET}--rel -) -message(STATUS "Installing ${TARGET_TRIPLET}-rel done") +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json index b4e77488fd083c..0cda0f4a028f0f 100644 --- a/ports/bde/vcpkg.json +++ b/ports/bde/vcpkg.json @@ -1,7 +1,16 @@ { "name": "bde", - "version": "3.2.0.0", - "port-version": 5, + "version": "3.117.0.0", "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", - "supports": "!windows & !arm" + "supports": "!windows & !arm & !android & !osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 181477e95957ed..5b653a921dfb99 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -71,9 +71,6 @@ azure-identity-cpp:x64-android=fail backward-cpp:arm-neon-android=fail backward-cpp:arm64-android=fail backward-cpp:x64-android=fail -bde:x64-android=fail -# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 -bde:x64-linux=fail bento4:arm-neon-android=fail berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail diff --git a/versions/b-/bde.json b/versions/b-/bde.json index 5d27e439a963b9..0bef8a8678bda3 100644 --- a/versions/b-/bde.json +++ b/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8fc4329574711907399309f06012a486d373c64", + "version": "3.117.0.0", + "port-version": 0 + }, { "git-tree": "7ce72f2854f44eee806e6e5f3e97d29897549787", "version": "3.2.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8ba22a7951edf8..c9bbb3ea12a7ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -501,8 +501,8 @@ "port-version": 0 }, "bde": { - "baseline": "3.2.0.0", - "port-version": 5 + "baseline": "3.117.0.0", + "port-version": 0 }, "bdwgc": { "baseline": "8.2.4", From b25f6bffd41a3ea7c4244187d9d9fa4777e0c591 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 7 Jul 2023 19:09:39 +0200 Subject: [PATCH 477/533] [curl] Update libssh2/brotli/c-ares dependencies (#32287) * [curl] Fix libssh2 dependency * Revise dependencies patching * Fix pc file * Cleanup --- ports/curl/0023-fix-find-cares.patch | 29 ------------- ports/curl/cmake-project-include.cmake | 8 +--- ports/curl/dependencies.patch | 60 ++++++++++++++++++++++++++ ports/curl/portfile.cmake | 2 +- ports/curl/vcpkg-cmake-wrapper.cmake | 14 +++--- ports/curl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++ 8 files changed, 77 insertions(+), 44 deletions(-) delete mode 100644 ports/curl/0023-fix-find-cares.patch create mode 100644 ports/curl/dependencies.patch diff --git a/ports/curl/0023-fix-find-cares.patch b/ports/curl/0023-fix-find-cares.patch deleted file mode 100644 index 4aa11acfa1c6e7..00000000000000 --- a/ports/curl/0023-fix-find-cares.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in -index 496a92d0e..564415ef6 100644 ---- a/CMake/curl-config.cmake.in -+++ b/CMake/curl-config.cmake.in -@@ -30,6 +30,9 @@ endif() - if(@USE_ZLIB@) - find_dependency(ZLIB @ZLIB_VERSION_MAJOR@) - endif() -+if(@USE_ARES@) -+ find_dependency(c-ares) -+endif() - - include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") - check_required_components("@PROJECT_NAME@") -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b43520751..dbf62751f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -169,8 +169,8 @@ set(CURL_LIBS "") - - if(ENABLE_ARES) - set(USE_ARES 1) -- find_package(CARES REQUIRED) -- list(APPEND CURL_LIBS ${CARES_LIBRARY}) -+ find_package(c-ares CONFIG REQUIRED) -+ list(APPEND CURL_LIBS c-ares::cares) - endif() - - include(CurlSymbolHiding) diff --git a/ports/curl/cmake-project-include.cmake b/ports/curl/cmake-project-include.cmake index 27254864c20ce2..c43df547fc8f5d 100644 --- a/ports/curl/cmake-project-include.cmake +++ b/ports/curl/cmake-project-include.cmake @@ -13,6 +13,7 @@ function(vcpkg_curl_flatten input output) list(REMOVE_AT input_libs 0) while(input_libs) list(POP_BACK input_libs lib) + string(REGEX REPLACE "^.\$" "\\1" lib "${lib}") if(TARGET "${lib}") set(import_lib "") set(import_location "") @@ -69,13 +70,6 @@ function(vcpkg_curl_flatten input output) set("${output}" "${output_libs}" PARENT_SCOPE) endfunction() -if(CURL_USE_LIBSSH2) - find_package(Libssh2 CONFIG REQUIRED) - set(LIBSSH2_FOUND TRUE) - get_target_property(LIBSSH2_INCLUDE_DIR Libssh2::libssh2 INTERFACE_INCLUDE_DIRECTORIES) - set(LIBSSH2_LIBRARY Libssh2::libssh2) -endif() - if(USE_LIBIDN2) find_package(PkgConfig REQUIRED) pkg_check_modules(LIBIDN2 REQUIRED libidn2) diff --git a/ports/curl/dependencies.patch b/ports/curl/dependencies.patch new file mode 100644 index 00000000000000..8999a367e8bbaf --- /dev/null +++ b/ports/curl/dependencies.patch @@ -0,0 +1,60 @@ +diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in +index dbe4ed2..267108e 100644 +--- a/CMake/curl-config.cmake.in ++++ b/CMake/curl-config.cmake.in +@@ -30,6 +30,15 @@ endif() + if(@USE_ZLIB@) + find_dependency(ZLIB @ZLIB_VERSION_MAJOR@) + endif() ++if("@USE_ARES@") ++ find_dependency(c-ares CONFIG) ++endif() ++if("@USE_LIBSSH2@") ++ find_dependency(Libssh2 CONFIG) ++endif() ++if("@HAVE_BROTLI@") ++ find_dependency(unofficial-brotli CONFIG) ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") + check_required_components("@PROJECT_NAME@") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42c9ae4..8c42d91 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,8 @@ set(CURL_LIBS "") + + if(ENABLE_ARES) + set(USE_ARES 1) +- find_package(CARES REQUIRED) ++ find_package(CARES NAMES c-ares CONFIG REQUIRED) ++ set(CARES_LIBRARY c-ares::cares) + list(APPEND CURL_LIBS ${CARES_LIBRARY}) + endif() + +@@ -522,7 +523,9 @@ endif() + option(CURL_BROTLI "Set to ON to enable building curl with brotli support." OFF) + set(HAVE_BROTLI OFF) + if(CURL_BROTLI) +- find_package(Brotli QUIET) ++ find_package(BROTLI NAMES unofficial-brotli REQUIRED) ++ set(BROTLI_INCLUDE_DIRS "") ++ set(BROTLI_LIBRARIES "unofficial::brotli::brotlidec") + if(BROTLI_FOUND) + set(HAVE_BROTLI ON) + set(CURL_LIBS "${BROTLI_LIBRARIES};${CURL_LIBS}") # For 'ld' linker. Emulate `list(PREPEND ...)` to stay compatible with )?" "${OPENSSL_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}") endif() - if(_curl_link_libraries MATCHES "Libssh2::libssh2") + if(_curl_link_libraries MATCHES "Libssh2::libssh2_(shared|static)") # TODO: move find_dependency(Libssh2 CONFIG) into CURL config + set(_libssh2_target "${CMAKE_MATCH_0}") find_package(Libssh2 CONFIG QUIET) - get_target_property(_libssh2_LIBRARY_DEBUG Libssh2::libssh2 IMPORTED_IMPLIB_DEBUG) - get_target_property(_libssh2_LIBRARY_RELEASE Libssh2::libssh2 IMPORTED_IMPLIB_RELEASE) + get_target_property(_libssh2_LIBRARY_DEBUG "${_libssh2_target}" IMPORTED_IMPLIB_DEBUG) + get_target_property(_libssh2_LIBRARY_RELEASE "${_libssh2_target}" IMPORTED_IMPLIB_RELEASE) if(NOT IMPORTED_IMPLIB_DEBUG AND NOT IMPORTED_IMPLIB_RELEASE) - get_target_property(_libssh2_LIBRARY_DEBUG Libssh2::libssh2 IMPORTED_LOCATION_DEBUG) - get_target_property(_libssh2_LIBRARY_RELEASE Libssh2::libssh2 IMPORTED_LOCATION_RELEASE) + get_target_property(_libssh2_LIBRARY_DEBUG "${_libssh2_target}" IMPORTED_LOCATION_DEBUG) + get_target_property(_libssh2_LIBRARY_RELEASE "${_libssh2_target}" IMPORTED_LOCATION_RELEASE) endif() select_library_configurations(_libssh2) - string(REGEX REPLACE "([\$]<[^;]*)?Libssh2::libssh2([^;]*>)?" "${_libssh2_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}") + string(REGEX REPLACE "([\$]<[^;]*)?${_libssh2_target}([^;]*>)?" "${_libssh2_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}") unset(_libssh2_LIBRARIES) unset(_libssh2_LIBRARY_DEBUG) unset(_libssh2_LIBRARY_RELEASE) + unset(_libssh2_target) endif() if(_curl_link_libraries MATCHES "::") message(WARNING "CURL_LIBRARIES list at least one target. This will not work for use cases where targets are not resolved.") diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 0a08a1a9d21c37..78f11d53d8b53e 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.1.2", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index c9bbb3ea12a7ce..81fbec8b9fcd65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1954,7 +1954,7 @@ }, "curl": { "baseline": "8.1.2", - "port-version": 0 + "port-version": 1 }, "curlpp": { "baseline": "2018-06-15", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 3f36e6a8a9c03b..ba17a0c9fb0c32 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d8ee40552d5b1c103d52b2b28d9577cb45e2593", + "version": "8.1.2", + "port-version": 1 + }, { "git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d", "version": "8.1.2", From 4016bcea25b50d4064a739f30e131c7bbb2028fd Mon Sep 17 00:00:00 2001 From: Ben Westover Date: Fri, 7 Jul 2023 13:10:40 -0400 Subject: [PATCH 478/533] [sentry-native] Allow ARM builds on Linux (#32116) --- ports/sentry-native/vcpkg.json | 2 +- versions/s-/sentry-native.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index ab75bd7eb1a56d..7bca16cc35c12d 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -4,7 +4,7 @@ "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", - "supports": "osx | (!arm & !uwp)", + "supports": "osx | linux | (!arm & !uwp)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 1ba39bba4457ef..c374da31ce92e0 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "29eccf6f70b601b7e5ba3b94e0cbc38fe707b2fa", + "git-tree": "fd5779f3ac082cce4ffa01f13b9ed0f9f4f74d73", "version": "0.6.4", "port-version": 0 }, From 243b4c860457d27d93b230c67eebf145bf7af283 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 7 Jul 2023 10:14:11 -0700 Subject: [PATCH 479/533] [azure-*-cpp] Update to July Release for Core and Identity Packages (#32425) * [azure-identity-cpp] Update to 1.5.1 ## 1.5.1 (2023-07-06) ### Bugs Fixed - [#4723]](https://github.com/Azure/azure-sdk-for-cpp/issues/4723) Accept a wider variety of token responses. * [azure-core-cpp] Update to 1.10.1 ## 1.10.1 (2023-07-06) ### Breaking Changes - [[#4662]](https://github.com/Azure/azure-sdk-for-cpp/issues/4662) `Azure::Core::Operation::GetRawResponseInternal()` is now deprecated and no longer requires an overload. ### Other Changes - Empty diagnostic messages will no longer be generated. * [azure-core-amqp-cpp] Update to 1.0.0-beta.1 ## 1.0.0-beta.1 (2023-07-06) ### Features Added - Initial release * Dependency search fix * Dependency link fix * x-add-version --------- Co-authored-by: Anton Kolesnyk --- .../00100-fix_dependency.patch | 43 +++++++++++++++++++ ports/azure-core-amqp-cpp/portfile.cmake | 21 +++++++++ ports/azure-core-amqp-cpp/vcpkg.json | 27 ++++++++++++ ports/azure-core-cpp/portfile.cmake | 5 ++- ports/azure-core-cpp/vcpkg.json | 2 +- ports/azure-identity-cpp/portfile.cmake | 5 ++- ports/azure-identity-cpp/vcpkg.json | 2 +- versions/a-/azure-core-amqp-cpp.json | 9 ++++ versions/a-/azure-core-cpp.json | 5 +++ versions/a-/azure-identity-cpp.json | 5 +++ versions/baseline.json | 8 +++- 11 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 ports/azure-core-amqp-cpp/00100-fix_dependency.patch create mode 100644 ports/azure-core-amqp-cpp/portfile.cmake create mode 100644 ports/azure-core-amqp-cpp/vcpkg.json create mode 100644 versions/a-/azure-core-amqp-cpp.json diff --git a/ports/azure-core-amqp-cpp/00100-fix_dependency.patch b/ports/azure-core-amqp-cpp/00100-fix_dependency.patch new file mode 100644 index 00000000000000..b9776531869365 --- /dev/null +++ b/ports/azure-core-amqp-cpp/00100-fix_dependency.patch @@ -0,0 +1,43 @@ +diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt +index 4af39728..f888b1ba 100644 +--- a/sdk/core/azure-core-amqp/CMakeLists.txt ++++ b/sdk/core/azure-core-amqp/CMakeLists.txt +@@ -31,7 +31,7 @@ if(NOT AZ_ALL_LIBRARIES) + endif() + + find_package(uamqp CONFIG REQUIRED) +-find_package(umock_c) ++find_package(umock_c CONFIG REQUIRED) + find_package(azure_macro_utils_c CONFIG REQUIRED) + find_package(azure_c_shared_utility CONFIG REQUIRED) + +@@ -101,8 +101,8 @@ add_library(Azure::azure-core-amqp ALIAS azure-core-amqp) + # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF + create_code_coverage(core azure-core-amqp azure-core-amqp-tests "tests?/*;samples?/*") + +-# uAMQP's headers require the manual addition of umock_c and azure_macro_utils_c to the target link libraries. +-target_link_libraries(azure-core-amqp PRIVATE uamqp umock_c azure_macro_utils_c PUBLIC Azure::azure-core) ++# uAMQP's headers require the manual addition of umock_c, azure_macro_utils_c, and aziotsharedutil to the target link libraries. ++target_link_libraries(azure-core-amqp PRIVATE uamqp umock_c azure_macro_utils_c aziotsharedutil PUBLIC Azure::azure-core) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") + generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION}) +diff --git a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in +index 989c8be1..176bc75f 100644 +--- a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in ++++ b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in +@@ -4,9 +4,12 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) +-find_dependency(azure-core-cpp "1.9.0-beta.1") ++find_dependency(azure-core-cpp) + +-find_dependency(azure-uamqp-c) ++find_dependency(uamqp) ++find_dependency(umock_c) ++find_dependency(azure_macro_utils_c) ++find_dependency(azure_c_shared_utility) + + include("${CMAKE_CURRENT_LIST_DIR}/azure-core-amqp-cppTargets.cmake") + diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake new file mode 100644 index 00000000000000..97ee21a9b14069 --- /dev/null +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-core-amqp_1.0.0-beta.1 + SHA512 4fc520c546cd395d4c50a9385d33db09b50865046b5383b1442057d4ac78ffc6a6be221af6aef3dcb938ffde1927e8de4270d5b1c9cf5d97ac8b1581b51d014b + PATCHES + 00100-fix_dependency.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core-amqp/" + OPTIONS + -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json new file mode 100644 index 00000000000000..686fceca473b87 --- /dev/null +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "azure-core-amqp-cpp", + "version-semver": "1.0.0-beta.1", + "description": [ + "Microsoft Azure AMQP SDK for C++", + "This library provides AMQP functionality to Azure SDK services." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-amqp", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.9.0-beta.1" + }, + "azure-uamqp-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 2c99f04a2dc488..a13e5d1304a01d 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.10.0 - SHA512 8917d5a3934a743bd8b44dacc12c3cd410cd59f1fa596c36a50f78562a1c7fe7a189c762e4099f3b24d23fcf5dcb0243ac3f139f1d345e6283ff4b5db418ecda + REF azure-core_1.10.1 + SHA512 498deebd853070b367f4fc07ac6b54a8ec4850ad5152da81728e909838f89aa0c1d2c2996267ad343bb06f6ebaedf151973359298dee6ad3b49949af016eb568 ) vcpkg_check_features( @@ -17,6 +17,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 1b14cfbc5aa7c1..2f382691f1f3e7 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.10.0", + "version-semver": "1.10.1", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index fa24cb7b5f63dc..a71124e3832206 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.5.0 - SHA512 1f96c2c9a056e83e083d9d8bc6c55fce1bc84b1ccee0a980c4b09d13b364551a1760c8a44232e5786b179fd60bea4b5b05c6cadd6b7fb270979a606a895bb7b6 + REF azure-identity_1.5.1 + SHA512 f3e12c0685ec7a1cde724feafbc84a8aa66688ed7b54bb9c4787d516aee3142310863013a5d49869e1a1e64af8f5ce908640fee64190bc9c2f9715e3afa833bc ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/sdk/identity/azure-identity/" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 057682c67891f7..998a923f5a74b3 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-identity-cpp", - "version-semver": "1.5.0", + "version-semver": "1.5.1", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json new file mode 100644 index 00000000000000..09b01e2569d890 --- /dev/null +++ b/versions/a-/azure-core-amqp-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c42a4ff250d353e2d0764b8f58dfec820b3cea69", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 081e2dd93fd8c2..d0aa36ca1550d3 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52af14a3a0795d87c3fd9f09b9026c91fcae4b81", + "version-semver": "1.10.1", + "port-version": 0 + }, { "git-tree": "b74424cb6faf3443c02effba66f048e0539437aa", "version-semver": "1.10.0", diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 6c68537e7752ab..07a947a7da9944 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2855fbb155aacc587ca1e2d518ab2e8369e6d8c0", + "version-semver": "1.5.1", + "port-version": 0 + }, { "git-tree": "abdd671a9667a8b13e439410503d5bb582189fdc", "version-semver": "1.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index 81fbec8b9fcd65..a1ed66a5b080c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -396,8 +396,12 @@ "baseline": "2023-01-18", "port-version": 1 }, + "azure-core-amqp-cpp": { + "baseline": "1.0.0-beta.1", + "port-version": 0 + }, "azure-core-cpp": { - "baseline": "1.10.0", + "baseline": "1.10.1", "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { @@ -405,7 +409,7 @@ "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.5.0", + "baseline": "1.5.1", "port-version": 0 }, "azure-iot-sdk-c": { From dafef74af53669ef1cc9015f55e0ce809ead62aa Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 7 Jul 2023 13:16:49 -0400 Subject: [PATCH 480/533] [google-cloud-cpp] update to latest release (v2.13.0) (#32391) --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 62 ++++++++++++++++++++++++++- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 1e47eefa2ad5f1..7e28745d4670e4 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 206d07eb65da472a9cc743ef6de0ddc7c0e13833cb990dc2415681be7c2a9d8ddfac6a25880ff3dbd2c73257d2ad8f7b8331cc1755e31d85bdb5386a12c91dbe + SHA512 b708945b5cdfe49e17208f7ff372064cce8844c0ed9e0a60f291a4a0b4d01b886997e8365e3802740d8914e58426d91cf3db1b37261c60d9661579212231c2ee HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 35e4be6b78fbb9..c164216372d010 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.12.0", + "version": "2.13.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -380,6 +380,18 @@ } ] }, + "datafusion": { + "description": "Cloud Data Fusion API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "datamigration": { "description": "Database Migration API C++ Client Library", "dependencies": [ @@ -732,6 +744,30 @@ } ] }, + "metastore": { + "description": "Dataproc Metastore API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "migrationcenter": { + "description": "Migration Center API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "monitoring": { "description": "Cloud Monitoring API C++ Client Library", "dependencies": [ @@ -768,6 +804,18 @@ } ] }, + "networksecurity": { + "description": "Secure Web Proxy API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "notebooks": { "description": "Notebooks API C++ Client Library", "dependencies": [ @@ -876,6 +924,18 @@ } ] }, + "rapidmigrationassessment": { + "description": "Rapid Migration Assessment C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "recommender": { "description": "Recommender C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a1ed66a5b080c5..21663895831f21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2929,7 +2929,7 @@ "port-version": 3 }, "google-cloud-cpp": { - "baseline": "2.12.0", + "baseline": "2.13.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index fbe18d1f1db3a2..47cabeb10a377c 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c067a236b62d38d1f56a658b086039bf22441c4a", + "version": "2.13.0", + "port-version": 0 + }, { "git-tree": "f7179212beeb134849f381dbe2c200580cc37c97", "version": "2.12.0", From a9f6994ced04f5813e8295949226a228456fbd29 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Mon, 10 Jul 2023 18:53:25 +0200 Subject: [PATCH 481/533] [fdk-aac] add license field and use vcpkg_install_copyright() (#32467) * [fdk-aac] add license field and use vcpkg_install_copyright() * Update version database --- ports/fdk-aac/portfile.cmake | 2 +- ports/fdk-aac/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fdk-aac.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake index 4b44fb0626885b..81b4f0e8f1a491 100644 --- a/ports/fdk-aac/portfile.cmake +++ b/ports/fdk-aac/portfile.cmake @@ -32,5 +32,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/NOTICE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fdk-aac/vcpkg.json b/ports/fdk-aac/vcpkg.json index 046d06500152d3..5b9cb2a02325e9 100644 --- a/ports/fdk-aac/vcpkg.json +++ b/ports/fdk-aac/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fdk-aac", "version-semver": "2.0.2", - "port-version": 1, + "port-version": 2, "description": "A standalone Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android. Uses a fork without HE-AAC, HE-AACv2, or xHE-AAC support to avoid patent licensing and GPL compatibility issues when built without the he-aac option.", "homepage": "https://gitlab.freedesktop.org/wtaymans/fdk-aac-stripped", + "license": "FDK-AAC", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 21663895831f21..15ea275c2f04c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2482,7 +2482,7 @@ }, "fdk-aac": { "baseline": "2.0.2", - "port-version": 1 + "port-version": 2 }, "fdlibm": { "baseline": "5.3", diff --git a/versions/f-/fdk-aac.json b/versions/f-/fdk-aac.json index 31c4b7a24ff37c..6ff3b4e9a89d03 100644 --- a/versions/f-/fdk-aac.json +++ b/versions/f-/fdk-aac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85e6f9518580daf2454d9db89b0e813d0e9d4008", + "version-semver": "2.0.2", + "port-version": 2 + }, { "git-tree": "56f6b0699ef8d63059cd4ecb1bdc7613104d7cf8", "version-semver": "2.0.2", From 48b9da7ef02e076c527964bd3e72d8d588b8c6ce Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:53:57 -0700 Subject: [PATCH 482/533] [ghc-filesystem] update to 1.5.14 (#32462) * [ghc-filesystem] update to 1.5.14 * update version --------- Co-authored-by: Zhao Liu --- ports/ghc-filesystem/portfile.cmake | 4 ++-- ports/ghc-filesystem/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/ghc-filesystem.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ghc-filesystem/portfile.cmake b/ports/ghc-filesystem/portfile.cmake index 0e469fd5ef8e24..a1d5e9b3841c0a 100644 --- a/ports/ghc-filesystem/portfile.cmake +++ b/ports/ghc-filesystem/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gulrak/filesystem - REF v1.5.12 + REF "v${VERSION}" HEAD_REF master - SHA512 2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c + SHA512 6eae921485ecdaf4b8329a568b1f4f612ee491fc5fdeafce9c8000b9bf1a73b6fa4e07d0d4ddf05be49efe79e9bddfbcc0aba85529cb016668797a8d89eb9b82 ) set(VCPKG_BUILD_TYPE release) # header-only port diff --git a/ports/ghc-filesystem/vcpkg.json b/ports/ghc-filesystem/vcpkg.json index 6f292c2d74f8f9..11e4a5c4262bc4 100644 --- a/ports/ghc-filesystem/vcpkg.json +++ b/ports/ghc-filesystem/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ghc-filesystem", - "version": "1.5.12", + "version": "1.5.14", "description": "An implementation of C++17 std::filesystem for C++11/C++14/C++17/C++20 on Windows, macOS, Linux and FreeBSD", "homepage": "https://github.com/gulrak/filesystem", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 15ea275c2f04c6..83e378aa783f71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2821,7 +2821,7 @@ "port-version": 7 }, "ghc-filesystem": { - "baseline": "1.5.12", + "baseline": "1.5.14", "port-version": 0 }, "gherkin-c": { diff --git a/versions/g-/ghc-filesystem.json b/versions/g-/ghc-filesystem.json index 7b9a6689a035fb..6513b4580690ee 100644 --- a/versions/g-/ghc-filesystem.json +++ b/versions/g-/ghc-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f97ed716062394f0aefd66abc090cbdcc4dff1ae", + "version": "1.5.14", + "port-version": 0 + }, { "git-tree": "5b9f92d368901abd7af0b622f0c32f7e76e62093", "version": "1.5.12", From cc80359416dafa4f3c227b068203c5b7cf6bfacc Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 10 Jul 2023 18:54:16 +0200 Subject: [PATCH 483/533] [mongo-cxx-driver] Update to 3.7.2 (#32459) --- ports/mongo-cxx-driver/fix-msvc-cxx17.patch | 13 ------------- ports/mongo-cxx-driver/portfile.cmake | 5 +---- ports/mongo-cxx-driver/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mongo-cxx-driver.json | 5 +++++ 5 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 ports/mongo-cxx-driver/fix-msvc-cxx17.patch diff --git a/ports/mongo-cxx-driver/fix-msvc-cxx17.patch b/ports/mongo-cxx-driver/fix-msvc-cxx17.patch deleted file mode 100644 index be52e99b799420..00000000000000 --- a/ports/mongo-cxx-driver/fix-msvc-cxx17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/bsoncxx/stdx/make_unique.hpp b/src/bsoncxx/stdx/make_unique.hpp -index d954eae..c4dea9d 100644 ---- a/src/bsoncxx/stdx/make_unique.hpp -+++ b/src/bsoncxx/stdx/make_unique.hpp -@@ -48,7 +48,7 @@ using ::boost::make_unique; - BSONCXX_INLINE_NAMESPACE_END - } // namespace bsoncxx - --#elif __cplusplus >= 201402L -+#elif __cplusplus >= 201402L || defined(_MSVC_LANG) - - #include - diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index b2634c28888e66..a356e69c410e71 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,14 +1,11 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 d30404b0201bd211633b167d874406598481c69de85a00034dfde8b6bc38cced59f7b705327c239b16231f9570bfc2bf29659fef9bb18338fcb8af04403169e2 + SHA512 de4737fab399e342c8153b2a14d097e54250fd66ca58c3120634bc08cb1943dc2808b81adf8e7a2f7edeb12607ae418c887667548600eee585ba5b27ebdf16b5 HEAD_REF master PATCHES fix-dependencies.patch - fix-msvc-cxx17.patch ) file(WRITE "${SOURCE_PATH}/build/VERSION_CURRENT" "${VERSION}") diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 83782350d7867c..7927358b5eea49 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.7.0", + "version": "3.7.2", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 83e378aa783f71..d64d5b932cc663 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5389,7 +5389,7 @@ "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.7.0", + "baseline": "3.7.2", "port-version": 0 }, "mongoose": { diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 55cd6285a8c2cb..3c0b826398daae 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00588be07af8844394ca81106324a42f5d29d684", + "version": "3.7.2", + "port-version": 0 + }, { "git-tree": "b1003de5a9787e8f819b67f4ca0fdf709af706e5", "version": "3.7.0", From 12e5fc3aede9bb04650280eff7ed4065f4be8f24 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Mon, 10 Jul 2023 12:54:41 -0400 Subject: [PATCH 484/533] [spdlog] Update to 1.12.0 (#32457) * [spdlog] Update to 1.12.0. * [spdlog] Update baseline. --- ports/spdlog/fmt-10-support.patch | 39 ------------------------------- ports/spdlog/fmt-header.patch | 13 ----------- ports/spdlog/portfile.cmake | 5 +--- ports/spdlog/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/spdlog.json | 5 ++++ 6 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 ports/spdlog/fmt-10-support.patch delete mode 100644 ports/spdlog/fmt-header.patch diff --git a/ports/spdlog/fmt-10-support.patch b/ports/spdlog/fmt-10-support.patch deleted file mode 100644 index 6717370e4e3c88..00000000000000 --- a/ports/spdlog/fmt-10-support.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001 -From: H1X4 <10332146+H1X4Dev@users.noreply.github.com> -Date: Fri, 31 Mar 2023 20:39:32 +0300 -Subject: [PATCH] fix build for master fmt (non-bundled) (#2694) - -* fix build for master fmt (non-bundled) - -* update fmt_runtime_string macro - -* fix build of updated macro ---- - include/spdlog/common.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index e69201a81..5f671c5c6 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string; - template - using remove_cvref_t = typename std::remove_cv::type>::type; - -+template -+#if FMT_VERSION >= 90101 -+using fmt_runtime_string = fmt::runtime_format_string; -+#else -+using fmt_runtime_string = fmt::basic_runtime; -+#endif -+ - // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, - // in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view - template - struct is_convertible_to_basic_format_string - : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> -+ std::is_convertible>::value || std::is_same, fmt_runtime_string>::value> - {}; - - # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/ports/spdlog/fmt-header.patch b/ports/spdlog/fmt-header.patch deleted file mode 100644 index 670d5a2f03edfb..00000000000000 --- a/ports/spdlog/fmt-header.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/bench/bench.cpp b/bench/bench.cpp -index 8a46837a6..ae47f047c 100644 ---- a/bench/bench.cpp -+++ b/bench/bench.cpp -@@ -15,7 +15,7 @@ - #if defined(SPDLOG_USE_STD_FORMAT) - # include - #elif defined(SPDLOG_FMT_EXTERNAL) --# include -+# include - #else - # include "spdlog/fmt/bundled/format.h" - #endif diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 1471705790d2a4..44fd69854d1ae6 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -2,11 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog REF "v${VERSION}" - SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 + SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d HEAD_REF v1.x - PATCHES - fmt-header.patch # https://github.com/gabime/spdlog/pull/2545 - fmt-10-support.patch # Upstream patch: https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 68704c84c18e8e..401c1f3e20d558 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "spdlog", - "version-semver": "1.11.0", - "port-version": 1, + "version-semver": "1.12.0", "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d64d5b932cc663..fa7798b08e5f47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7709,8 +7709,8 @@ "port-version": 3 }, "spdlog": { - "baseline": "1.11.0", - "port-version": 1 + "baseline": "1.12.0", + "port-version": 0 }, "spectra": { "baseline": "1.0.1", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index c37ac8af31ca7b..f01a029f7e8d4e 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41cf31aa350a44644863d7777489501d240f248c", + "version-semver": "1.12.0", + "port-version": 0 + }, { "git-tree": "67656948712582d93d9096cc08871a3270908d38", "version-semver": "1.11.0", From 56edf67d426afdd387b5d2da52d6219644d3254f Mon Sep 17 00:00:00 2001 From: Nicholas Hayes <0xC0000054@users.noreply.github.com> Date: Mon, 10 Jul 2023 10:55:39 -0600 Subject: [PATCH 485/533] [libheif] Update to version 1.16.2 (#32450) --- ports/libheif/portfile.cmake | 2 +- ports/libheif/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libheif.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 4c6178eefa0998..20241789a63efe 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 d81f841ac63d58f56414bf8d799a12af0c846148d2c245cd0c0cc3133edd0b3e08e5018efbc82b83fbab00209a6e0806133f63283bf7244cc4e9cf37b4fa8110 + SHA512 ef32fced3a66d888caf2202b55bc4c81094045abfd2806216bbf0c359a30663c500ed5e33a9cef316bcfd933498e87753e9af6b3c179e84c370efd62900493c0 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 81a78726b3d14f..82796b95458342 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libheif", - "version": "1.16.1", - "port-version": 1, + "version": "1.16.2", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index fa7798b08e5f47..64d487192191b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4157,8 +4157,8 @@ "port-version": 4 }, "libheif": { - "baseline": "1.16.1", - "port-version": 1 + "baseline": "1.16.2", + "port-version": 0 }, "libhsplasma": { "baseline": "2023-05-08", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 2cf6290b7df65e..7ebd1b7efb46cf 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1874b1dd0f2756a3254c8eec416430b941af7b6e", + "version": "1.16.2", + "port-version": 0 + }, { "git-tree": "4ee9a2b84e8279ba555de6f0f5e3f93b93b98d5d", "version": "1.16.1", From 94c05e713fa12cf3978ee62ca5e5a12331a8b725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Mon, 10 Jul 2023 18:55:55 +0200 Subject: [PATCH 486/533] [benchmark] Update to 1.8.2 (#32449) --- ports/benchmark/portfile.cmake | 4 ++-- ports/benchmark/vcpkg.json | 2 +- versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index c0391f7e1fcbcb..cc17566a7d3ea4 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.8.0 - SHA512 ae8df163ca1319752a03497a259800dc33c71164e7def2feeadcf18d018c64eaf846ea2a562183e3d3cde0af58291de0b091ec6d9c025076f469c403b2ab0d51 + REF v1.8.2 + SHA512 532f2cee66cf527ef4452a060cfdedba6417e5d8f72225d6bf50adf6422d9a769b0f54f48982b438fa9ced975ac47bcc5e62c3c23ce871b5cfdbcf9cc0d2b829 HEAD_REF main ) diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 2cc12d063a787f..db9c8e81d1d620 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.8.0", + "version-semver": "1.8.2", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "license": "Apache-2.0", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index a398f90189caa2..3cf8af5c483f11 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54f61ab31bcb486a12c859c33db17905f397cc0c", + "version-semver": "1.8.2", + "port-version": 0 + }, { "git-tree": "faeb0b56e68483860ab8cc468a6c594ac361167f", "version-semver": "1.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index 64d487192191b4..b948ca6a6b971b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -521,7 +521,7 @@ "port-version": 0 }, "benchmark": { - "baseline": "1.8.0", + "baseline": "1.8.2", "port-version": 0 }, "bento4": { From 66010065fe0e8d89bcfc0b2dd1fd2be83a633166 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Mon, 10 Jul 2023 12:56:11 -0400 Subject: [PATCH 487/533] Updating the necessary files. (#32444) --- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jsonifier.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index a2333855fd75be..6949ce3bb1539d 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 7373bd8d8554f9b76eb80d1c6b906d917ede80d55f5c363c6c26c67b4e659d9e657fb15d2da7d1eaf41fc24ee84fd54b16d8a0bd9bd76aacf899990eee425845 + SHA512 6b7af20a5cfedd98200e537b284d513f8ee964d76c28d8f01cdc40e324f051b3fa48c2d68ddc92c8dd2ed494b807b4dfdaca25430fc4f6bf68b9e9a8fc9a8644 HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 6b38fa36a02144..a7c4118f314f6a 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.3", + "version": "0.9.4", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b948ca6a6b971b..b5bc2bd01f0b7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3517,7 +3517,7 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.3", + "baseline": "0.9.4", "port-version": 0 }, "jsonnet": { diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index c97f64f92de4c8..39cecf72fd786f 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81bce1af7b2990ff2664572b50e320b112044b78", + "version": "0.9.4", + "port-version": 0 + }, { "git-tree": "29c1237004abf2ca9bb395ab8f2d211f7ba563f3", "version": "0.9.3", From 34869a04eb8e289af56029556077f31eec754878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=99=E3=81=91=E3=82=84?= <64895419+sukeya@users.noreply.github.com> Date: Tue, 11 Jul 2023 02:00:31 +0900 Subject: [PATCH 488/533] [Imath] Update Imath to v3.1.9 (#31944) * Update Imath to v3.1.9. * fix version database. --- ports/imath/portfile.cmake | 4 ++-- ports/imath/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imath.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake index e8e38f8be58c20..0c60c9daa5f874 100644 --- a/ports/imath/portfile.cmake +++ b/ports/imath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/Imath - REF v3.1.5 - SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d + REF v3.1.9 + SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564 HEAD_REF master ) diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json index 01ef7a9d6adee1..0973f840591bd2 100644 --- a/ports/imath/vcpkg.json +++ b/ports/imath/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imath", - "version": "3.1.5", + "version": "3.1.9", "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index b5bc2bd01f0b7e..7df385aef41250 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3341,7 +3341,7 @@ "port-version": 0 }, "imath": { - "baseline": "3.1.5", + "baseline": "3.1.9", "port-version": 0 }, "imgui": { diff --git a/versions/i-/imath.json b/versions/i-/imath.json index f1385c4d11764e..ff451ccffac500 100644 --- a/versions/i-/imath.json +++ b/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1853273c56448fff5ec5e2c9133895922df682bd", + "version": "3.1.9", + "port-version": 0 + }, { "git-tree": "e72149f2fce9434300bbdd84562ad7a58aa4ac90", "version": "3.1.5", From 1ec3d05438d4c1edf62a330f65fcfe1d86e791b2 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Mon, 10 Jul 2023 19:52:11 +0200 Subject: [PATCH 489/533] [pybind11] update to v2.10.4 (#32194) * [pybind11] update to v2.10.4, clean-up redundant dependency, add usage --- ports/pybind11/portfile.cmake | 14 +++-------- ports/pybind11/usage | 23 +++++++++++++++++ ports/pybind11/vcpkg.json | 3 +-- ports/shiva/find_python_and_no_copy_dll.patch | 25 +++++++++++++++++++ ports/shiva/no_copy_dll.patch | 13 ---------- ports/shiva/portfile.cmake | 17 ++++++------- ports/shiva/vcpkg.json | 5 +++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 +-- versions/p-/pybind11.json | 5 ++++ versions/s-/shiva.json | 5 ++++ 11 files changed, 77 insertions(+), 39 deletions(-) create mode 100644 ports/pybind11/usage create mode 100644 ports/shiva/find_python_and_no_copy_dll.patch delete mode 100644 ports/shiva/no_copy_dll.patch diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 515669e1c9cbb1..26fe2fbb98d8c4 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 REF "v${VERSION}" - SHA512 3894400f04cd08e2dbb14b3d696339f0364434f1d6f8bb057338ac88157ec7491b2df1e1e46ebd5abccdcd5775c5e9238de6404f0db87f64f5a1802db3a5b18c + SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7 HEAD_REF master ) @@ -10,11 +10,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYBIND11_TEST=OFF - -DPYBIND11_FINDPYTHON=ON - OPTIONS_RELEASE - -DPYTHON_IS_DEBUG=OFF - OPTIONS_DEBUG - -DPYTHON_IS_DEBUG=ON + # Disable all Python searching, Python required only for tests + -DPYBIND11_NOPYTHON=ON ) vcpkg_cmake_install() @@ -23,8 +20,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pybind11/pybind11Tools.cmake" - [=[find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=] - [=[find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})]=]) # CMake's PythonLibs works better with vcpkg - +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pybind11/usage b/ports/pybind11/usage new file mode 100644 index 00000000000000..39f9166e15a75b --- /dev/null +++ b/ports/pybind11/usage @@ -0,0 +1,23 @@ +pybind11 provides CMake targets. There are two modes provided; classic, which is built on the old Python +discovery packages in CMake, or the new FindPython mode, which uses FindPython +from 3.12+ forward (3.15+ _highly_ recommended). + +New FindPython mode: + + find_package(Python COMPONENTS Interpreter Development) + find_package(pybind11 CONFIG) + + # pybind11 method: + pybind11_add_module(MyModule1 src1.cpp) + + # Python method: + Python_add_library(MyModule2 src2.cpp) + target_link_libraries(MyModule2 pybind11::headers) + set_target_properties(MyModule2 PROPERTIES + INTERPROCEDURAL_OPTIMIZATION ON + CXX_VISIBILITY_PRESET ON + VISIBILITY_INLINES_HIDDEN ON + ) + +For more information see here: + https://pybind11.readthedocs.io/en/latest/compiling.html#building-with-cmake \ No newline at end of file diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index 4edd356aad82ab..7c2ed06ea40281 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,12 +1,11 @@ { "name": "pybind11", - "version": "2.10.3", + "version": "2.10.4", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "license": "BSD-3-Clause", "supports": "!(arm & windows)", "dependencies": [ - "python3", { "name": "vcpkg-cmake", "host": true diff --git a/ports/shiva/find_python_and_no_copy_dll.patch b/ports/shiva/find_python_and_no_copy_dll.patch new file mode 100644 index 00000000000000..31f447daa890ef --- /dev/null +++ b/ports/shiva/find_python_and_no_copy_dll.patch @@ -0,0 +1,25 @@ +diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt +index eef14ee..30130ba 100644 +--- a/modules/python/CMakeLists.txt ++++ b/modules/python/CMakeLists.txt +@@ -1,10 +1,10 @@ + include(CMakeSources.cmake) + set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + ++find_package(Python COMPONENTS Interpreter Development) + find_package(pybind11 CONFIG REQUIRED) + +- +-if (WIN32) ++if (FALSE) + ## We need pyton dll + file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll) + +@@ -19,6 +19,6 @@ endif () + + CREATE_MODULE(shiva::pyscripting "${MODULE_SOURCES}" ${MODULE_PATH} "python") + +-target_link_libraries(pyscripting INTERFACE shiva::ecs shiva::input pybind11::embed pybind11::module) ++target_link_libraries(pyscripting INTERFACE shiva::ecs shiva::input pybind11::embed pybind11::module Python::Module) + + AUTO_TARGETS_MODULE_INSTALL(pyscripting) diff --git a/ports/shiva/no_copy_dll.patch b/ports/shiva/no_copy_dll.patch deleted file mode 100644 index add7f22a494d0c..00000000000000 --- a/ports/shiva/no_copy_dll.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt -index eef14ee87..d52a147d8 100644 ---- a/modules/python/CMakeLists.txt -+++ b/modules/python/CMakeLists.txt -@@ -4,7 +4,7 @@ set(MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(pybind11 CONFIG REQUIRED) - - --if (WIN32) -+if (WIN32 AND FALSE) - ## We need pyton dll - file(GLOB PYTHON_DLL ${PYTHON_LIBRARIES}/../*.dll) - diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake index 884a8de108656c..d0367006645c78 100644 --- a/ports/shiva/portfile.cmake +++ b/ports/shiva/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Milerius/shiva - REF 1.0 - SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 - HEAD_REF master - PATCHES no_copy_dll.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO Milerius/shiva + REF ${VERSION} + SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 + HEAD_REF master + PATCHES find_python_and_no_copy_dll.patch ) find_library(PYTHON_RELEASE NAMES python310 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) @@ -23,8 +23,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/shiva") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/shiva") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/shiva/LICENSE" "${CURRENT_PACKAGES_DIR}/share/shiva/copyright") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json index 447297bd066507..65107debfdee91 100644 --- a/ports/shiva/vcpkg.json +++ b/ports/shiva/vcpkg.json @@ -1,9 +1,11 @@ { "name": "shiva", "version": "1.0", - "port-version": 5, + "port-version": 6, "description": "Modern C++ Game Engine", "homepage": "https://github.com/Milerius/shiva", + "license": "MIT", + "supports": "!(static & windows)", "dependencies": [ "boost-dll", "boost-filesystem", @@ -16,6 +18,7 @@ }, "nlohmann-json", "pybind11", + "python3", "sol2", "spdlog", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5b653a921dfb99..b60c182d883ef9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1378,8 +1378,6 @@ septag-sx:x64-uwp=fail sfml:arm-neon-android=fail sfml:arm64-android=fail sfml:x64-android=fail -shiva:x64-windows-static=fail -shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail shiva-sfml:x64-osx=fail shiva-sfml:arm64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index 7df385aef41250..ecf1151f508f65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6545,7 +6545,7 @@ "port-version": 0 }, "pybind11": { - "baseline": "2.10.3", + "baseline": "2.10.4", "port-version": 0 }, "pystring": { @@ -7506,7 +7506,7 @@ }, "shiva": { "baseline": "1.0", - "port-version": 5 + "port-version": 6 }, "shiva-sfml": { "baseline": "1.0", diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index 361969cb3fac77..38d08b94d2d2e8 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed50c1b3263ecefd48d008f522bf966c9e4347d1", + "version": "2.10.4", + "port-version": 0 + }, { "git-tree": "a3b13210bfd5f8dcbab60336dd54f0ed7230c5c3", "version": "2.10.3", diff --git a/versions/s-/shiva.json b/versions/s-/shiva.json index 81d1b1b42cb50a..25094698859e7c 100644 --- a/versions/s-/shiva.json +++ b/versions/s-/shiva.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f99562a0a906db852e4ff3a7caf03ad4c4fbcab", + "version": "1.0", + "port-version": 6 + }, { "git-tree": "821cf61c76079cfd5c7a635dc36e01c0f33c38f5", "version": "1.0", From 64a47e8ede2e72e0242a3ff71f2fd2bf77d2491c Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Mon, 10 Jul 2023 13:29:43 -0700 Subject: [PATCH 490/533] [CI Baseline] Ports passing, remove from fail list (#32441) * Passing in CI remove from faillist * foonathan not passing * organize baseline --- scripts/ci.baseline.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b60c182d883ef9..ea7808fd4619d1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -181,8 +181,6 @@ chartdir:x64-windows=skip chartdir:x64-windows-static-md=skip chartdir:x64-osx=skip chipmunk:arm-neon-android=fail -chipmunk:arm64-android=fail -chipmunk:x64-android=fail # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI # broken on Windows because it does not yet support VS2022 @@ -401,11 +399,11 @@ folly:arm64-android=fail folly:x64-android=fail fontconfig:x64-uwp=fail fontconfig:arm-uwp=fail -foonathan-memory:arm-neon-android=fail foonathan-memory:arm64-android=fail foonathan-memory:arm64-windows=fail foonathan-memory:arm-uwp=fail foonathan-memory:x64-android=fail +foonathan-memory:arm-neon-android=fail foonathan-memory:x64-uwp=fail freeglut:arm-neon-android=fail freeglut:arm-uwp=fail From 6b8459636c7ab9f2ccb638697b2ac990e1fd64b1 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:20:45 -0700 Subject: [PATCH 491/533] [vcpkg baseline][graphviz/think-cell-range/geotrans] Fix download error (#31772) --- ports/geotrans/portfile.cmake | 4 ++-- ports/geotrans/vcpkg.json | 1 + ports/graphviz/portfile.cmake | 6 ++---- ports/graphviz/vcpkg.json | 2 +- ports/think-cell-range/portfile.cmake | 17 ++++++++--------- ports/think-cell-range/vcpkg.json | 6 +++--- scripts/ci.baseline.txt | 9 +++------ versions/baseline.json | 8 ++++---- versions/g-/geotrans.json | 5 +++++ versions/g-/graphviz.json | 5 +++++ versions/t-/think-cell-range.json | 5 +++++ 11 files changed, 39 insertions(+), 29 deletions(-) diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index 8f77ee9095c4fe..1c38a8dabd5839 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -4,8 +4,8 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic") # which we re-build anyway. There is no source only package provided or it would be preferred (and smaller). vcpkg_download_distfile(ARCHIVE URLS "https://earth-info.nga.mil/php/download.php?file=wgs-mastertgz" - FILENAME "geotrans-3.9-master.tgz" - SHA512 b0bd5ca6eb584eebf0adc89eb86ec949f372bb4ea92c559f74f2055b0f121369b3d8de0bcff7b7db9abc57ac5a129d5c283d67f098e4af12d91b41747a76e541 + FILENAME "geotrans-3.9-master-adf1935.tgz" + SHA512 adf19357edc62681a2515e7210a752b0e09214b6ce69024e60150e0780059c08a9ab5a162a0562dbc37127438783a24bcde1adb88b559bc95ff9a5bea0eb8b39 ) vcpkg_extract_source_archive( diff --git a/ports/geotrans/vcpkg.json b/ports/geotrans/vcpkg.json index db4fe1c57093f8..61212b5f03d6ca 100644 --- a/ports/geotrans/vcpkg.json +++ b/ports/geotrans/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geotrans", "version": "3.9", + "port-version": 1, "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.", "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home", "license": null, diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 9998e80ed9e2c5..3a827fde3afde3 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -1,7 +1,5 @@ set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # for plugins -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH @@ -26,7 +24,7 @@ vcpkg_list(SET OPTIONS) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_download_distfile( LTDL_H_PATH - URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/${VCPKG_TARGET_ARCHITECTURE}/include/ltdl.h" + URLS "https://gitlab.com/graphviz/graphviz-windows-dependencies/-/raw/141d3a21be904fa8dc2ae3ed01d36684db07a35d/x64/include/ltdl.h" FILENAME graphviz-ltdl-141d3a21.h SHA512 f2d20e849e35060536265f47014c40eb70e57dacd600a9db112fc465fbfa6a66217b44a8c3dc33039c260a27f09d9034b329b03cc28c32a22ec503fcd17b78cd ) @@ -105,4 +103,4 @@ else() file(COPY "${CURRENT_PACKAGES_DIR}/lib/graphviz" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index 20be7b5de0550c..3d37d87f147068 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphviz", "version-semver": "7.0.0", - "port-version": 1, + "port-version": 2, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", diff --git a/ports/think-cell-range/portfile.cmake b/ports/think-cell-range/portfile.cmake index 2599e517dbc23a..f5e60910dfe2ae 100644 --- a/ports/think-cell-range/portfile.cmake +++ b/ports/think-cell-range/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO think-cell/range - REF 498839d41519d38bb81089f7d0f517026bd042cc - SHA512 1292ba4dd994aab2cb620c24ebd03437a47e426368ed803579dad13a3fa52762cefe42c77c9921d5c4bcbd6592775714191de63097c230e50f9b59b9498005e5 - HEAD_REF master + REPO think-cell/think-cell-library + REF "${VERSION}" + SHA512 dbb391982fc8050a020c9597fa8608abf87f351b84b7060cfadac4670fd4564f34836a8862f42647983f601a21d6d8bbda95429fc6e2788e94a343fbba09ae99 + HEAD_REF main ) -file(INSTALL ${SOURCE_PATH}/range DESTINATION ${CURRENT_PACKAGES_DIR}/include/think-cell FILES_MATCHING PATTERN "*.h") +file(INSTALL "${SOURCE_PATH}/tc/range" DESTINATION "${CURRENT_PACKAGES_DIR}/include/think-cell" FILES_MATCHING PATTERN "*.h") -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/think-cell-range/COPYING ${CURRENT_PACKAGES_DIR}/share/think-cell-range/copyright) -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") +file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY ${SOURCE_PATH}/range/range.example.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/think-cell-range) +file(COPY "${SOURCE_PATH}/range.example.cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/think-cell-range/vcpkg.json b/ports/think-cell-range/vcpkg.json index 3296cf65438623..846fcd857977b2 100644 --- a/ports/think-cell-range/vcpkg.json +++ b/ports/think-cell-range/vcpkg.json @@ -1,9 +1,9 @@ { "name": "think-cell-range", - "version-string": "498839d", - "port-version": 2, + "version": "2023.1", "description": "think-cell's range library", - "homepage": "https://github.com/think-cell/range", + "homepage": "https://github.com/think-cell/think-cell-library", + "license": "BSL-1.0", "dependencies": [ "boost" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ea7808fd4619d1..aa83ce3e14f09c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -452,12 +452,9 @@ gemmlowp:x64-android=fail gherkin-c:arm-neon-android=fail gherkin-c:arm64-android=fail gherkin-c:x64-android=fail - -# Port geotrans source ftp://ftp.nga.mil server -# extremely slow may take several hours to download -geotrans:x64-linux = skip -geotrans:x64-windows = skip -geotrans:x86-windows = skip +geotrans:arm-neon-android=fail +geotrans:arm64-android=fail +geotrans:x64-android=fail getopt:arm-uwp=fail getopt:x64-uwp=fail gflags:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index ecf1151f508f65..bdadbee0c00985 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2790,7 +2790,7 @@ }, "geotrans": { "baseline": "3.9", - "port-version": 0 + "port-version": 1 }, "getdns": { "baseline": "1.7.0", @@ -2986,7 +2986,7 @@ }, "graphviz": { "baseline": "7.0.0", - "port-version": 1 + "port-version": 2 }, "greatest": { "baseline": "1.5.0", @@ -8017,8 +8017,8 @@ "port-version": 9 }, "think-cell-range": { - "baseline": "498839d", - "port-version": 2 + "baseline": "2023.1", + "port-version": 0 }, "thor": { "baseline": "2022-04-16", diff --git a/versions/g-/geotrans.json b/versions/g-/geotrans.json index 8d1633629a0f30..43fe4cc129ad71 100644 --- a/versions/g-/geotrans.json +++ b/versions/g-/geotrans.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b392617570c01a75595f982080630925b27ba3bf", + "version": "3.9", + "port-version": 1 + }, { "git-tree": "2649a6e046a3e72681606d14a091512447aade75", "version": "3.9", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index c1f93f1d7c6ac0..2b6e2a2d0bf5e0 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "793ff2f4883ca15332814044876e57a9b0921c43", + "version-semver": "7.0.0", + "port-version": 2 + }, { "git-tree": "2a730e87b6af42e6fbf3af0fc7e5c4dc6785e9df", "version-semver": "7.0.0", diff --git a/versions/t-/think-cell-range.json b/versions/t-/think-cell-range.json index f3a34c739aebe1..a6644e4f8cc314 100644 --- a/versions/t-/think-cell-range.json +++ b/versions/t-/think-cell-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98fd2e4c5e01f3c8396c5bb35cfbdd81da45f47f", + "version": "2023.1", + "port-version": 0 + }, { "git-tree": "e39d38661e62f2c36eaa0026eabfb21e827e8456", "version-string": "498839d", From 4c21df20b27cd9db280ac1a897fc2909cf383dae Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 11 Jul 2023 02:14:57 +0200 Subject: [PATCH 492/533] [zydis] hardcode static define (#32453) * [zydis] hardcode static usage * v db --- ports/zydis/portfile.cmake | 1 + ports/zydis/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zydis.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake index 27ee6d782a5b0c..f8e48649fc6487 100644 --- a/ports/zydis/portfile.cmake +++ b/ports/zydis/portfile.cmake @@ -27,6 +27,7 @@ vcpkg_copy_tools(TOOL_NAMES ZydisDisasm ZydisInfo AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Zydis/Defines.h" "defined(ZYDIS_STATIC_BUILD)" "1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/zydis/vcpkg.json b/ports/zydis/vcpkg.json index 84dacdc119f79b..e7453bec86ff62 100644 --- a/ports/zydis/vcpkg.json +++ b/ports/zydis/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zydis", "version-semver": "4.0.0", + "port-version": 1, "description": "Fast and lightweight x86/x86-64 disassembler library.", "homepage": "https://zydis.re", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index bdadbee0c00985..ed0652a4c8fb7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9006,7 +9006,7 @@ }, "zydis": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "zyre": { "baseline": "2019-07-07", diff --git a/versions/z-/zydis.json b/versions/z-/zydis.json index ce8b1d994265eb..5098e904e73cc0 100644 --- a/versions/z-/zydis.json +++ b/versions/z-/zydis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "743422a6b31df7e852fdc96cc14fe95a3f8a8136", + "version-semver": "4.0.0", + "port-version": 1 + }, { "git-tree": "3e5b3e4b01d2ff55d68c2f591d0dd523224844c5", "version-semver": "4.0.0", From d25dff35e134645fd248aa5318109d48a4cac8b0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 11 Jul 2023 02:15:28 +0200 Subject: [PATCH 493/533] [asmtk] Fix downstream usage (#32451) * [asmtk] fix static downstream usage * v db --- ports/asmtk/portfile.cmake | 7 +++++++ ports/asmtk/vcpkg.json | 1 + versions/a-/asmtk.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ports/asmtk/portfile.cmake b/ports/asmtk/portfile.cmake index be25e0bcb79bba..4c0f6c95944564 100644 --- a/ports/asmtk/portfile.cmake +++ b/ports/asmtk/portfile.cmake @@ -25,6 +25,13 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asmtk) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/asmtk/globals.h" "!defined(ASMTK_STATIC)" "0") +endif() + +set(cmakefile "${CURRENT_PACKAGES_DIR}/share/asmtk/asmtk-config.cmake") +file(READ "${cmakefile}" contents) +file(WRITE "${cmakefile}" "include(CMakeFindDependencyMacro)\nfind_dependency(asmjit)\n${contents}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/asmtk/vcpkg.json b/ports/asmtk/vcpkg.json index 981d9b9021bd8c..ab7714643e10db 100644 --- a/ports/asmtk/vcpkg.json +++ b/ports/asmtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asmtk", "version-date": "2022-11-06", + "port-version": 1, "description": "Assembler toolkit based on AsmJit ", "homepage": "https://github.com/asmjit/asmtk", "supports": "!arm", diff --git a/versions/a-/asmtk.json b/versions/a-/asmtk.json index 79f8b0b77ca05a..c96f70a0a24505 100644 --- a/versions/a-/asmtk.json +++ b/versions/a-/asmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29f1e796d085204c9552c62adbe7279acfd8f3d9", + "version-date": "2022-11-06", + "port-version": 1 + }, { "git-tree": "9805dcacbdaa6f23d28fac07d973d22c2d00aec5", "version-date": "2022-11-06", diff --git a/versions/baseline.json b/versions/baseline.json index ed0652a4c8fb7b..cb76971e1c1cd1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -250,7 +250,7 @@ }, "asmtk": { "baseline": "2022-11-06", - "port-version": 0 + "port-version": 1 }, "assimp": { "baseline": "5.2.5", From efd6cedc9e02dab6f31ba320887bd1339124d383 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Tue, 11 Jul 2023 02:16:20 +0200 Subject: [PATCH 494/533] [cairo] update license info and add all licenses to copyright file (#32430) --- ports/cairo/portfile.cmake | 2 +- ports/cairo/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index f53211eff5f6c2..36b876318a5bc3 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -87,4 +87,4 @@ endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING-LGPL-2.1" "${SOURCE_PATH}/COPYING-MPL-1.1") diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 5971251b4f53d1..38e6acd4744542 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,10 +1,10 @@ { "name": "cairo", "version": "1.17.8", - "port-version": 2, + "port-version": 3, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", - "license": "MPL-1.1", + "license": "LGPL-2.1-only OR MPL-1.1", "supports": "!xbox", "dependencies": [ "dirent", diff --git a/versions/baseline.json b/versions/baseline.json index cb76971e1c1cd1..2a4bc4632a68f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1366,7 +1366,7 @@ }, "cairo": { "baseline": "1.17.8", - "port-version": 2 + "port-version": 3 }, "cairomm": { "baseline": "1.16.2", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 9f241e3adbfa91..d47321464e5f7d 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8fda1b05b3f6a99f08c23f8ad94ed43d4a69875", + "version": "1.17.8", + "port-version": 3 + }, { "git-tree": "e94aef48f94b5cdac2387269b5f2ad421a684873", "version": "1.17.8", From be82dd7c5002148001ef709f562e7d18a7aab917 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 11 Jul 2023 02:17:37 +0200 Subject: [PATCH 495/533] [sqlite3] Fix option passing (#32404) --- ports/sqlite3/portfile.cmake | 19 +++++++++---------- ports/sqlite3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index b37693c0a77157..85c6ada8f8f331 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -25,15 +25,21 @@ else() set(SQLITE_API "") endif() -vcpkg_check_features(OUT_FEATURE_OPTIONS Unused +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fts5 SQLITE_ENABLE_FTS5 + math SQLITE_ENABLE_MATH_FUNCTIONS + zlib WITH_ZLIB + INVERTED_FEATURES + tool SQLITE3_SKIP_TOOLS +) +vcpkg_check_features(OUT_FEATURE_OPTIONS none # only using the script-mode side-effects FEATURES dbstat SQLITE_ENABLE_DBSTAT_VTAB fts3 SQLITE_ENABLE_FTS3 fts4 SQLITE_ENABLE_FTS4 - fts5 SQLITE_ENABLE_FTS5 memsys3 SQLITE_ENABLE_MEMSYS3 memsys5 SQLITE_ENABLE_MEMSYS5 - math SQLITE_ENABLE_MATH_FUNCTIONS limit SQLITE_ENABLE_UPDATE_DELETE_LIMIT rtree SQLITE_ENABLE_RTREE session SQLITE_ENABLE_SESSION @@ -57,13 +63,6 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH} file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}") configure_file("${CMAKE_CURRENT_LIST_DIR}/sqlite3-vcpkg-config.h.in" "${SOURCE_PATH}/sqlite3-vcpkg-config.h" @ONLY) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - zlib WITH_ZLIB - INVERTED_FEATURES - tool SQLITE3_SKIP_TOOLS -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 1980d3076c35bc..e9a8c802df157f 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlite3", "version": "3.42.0", + "port-version": 1, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index 2a4bc4632a68f0..34d37cc3a68517 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7778,7 +7778,7 @@ }, "sqlite3": { "baseline": "3.42.0", - "port-version": 0 + "port-version": 1 }, "sqlitecpp": { "baseline": "3.3.0", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 3d2bebe1fefd0b..8bb7967f0397d0 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3414b2e79fd240d315ac9fc1165fc376966c8322", + "version": "3.42.0", + "port-version": 1 + }, { "git-tree": "a1b6deae3ce2f17e1384f02e7da3e7fae3a0865d", "version": "3.42.0", From ac68eb6048806f37b1b508c6f27f86c6f54dac4b Mon Sep 17 00:00:00 2001 From: JAEHONG KIM <52454344+ralpioxxcs@users.noreply.github.com> Date: Tue, 11 Jul 2023 09:41:10 +0900 Subject: [PATCH 496/533] [tensorpipe] Fix build failure test features (#32346) * [tensorpipe] Change old target name * [tensorpipe] Update baseline * [tensorpipe] Modify patch file * [tensorpipe] update version * [tensorpipe] add unofficial prefix * [tensorpipe] add unofficial namespace --- ports/tensorpipe/portfile.cmake | 9 +--- ports/tensorpipe/support-find-package.patch | 58 +++++++++++++++++++++ ports/tensorpipe/support-test.patch | 6 +-- ports/tensorpipe/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tensorpipe.json | 5 ++ 6 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 ports/tensorpipe/support-find-package.patch diff --git a/ports/tensorpipe/portfile.cmake b/ports/tensorpipe/portfile.cmake index 81943bf955eadd..290d97d6229f54 100644 --- a/ports/tensorpipe/portfile.cmake +++ b/ports/tensorpipe/portfile.cmake @@ -1,11 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff" - FILENAME tensorpipe-pr-435.patch - SHA512 7bcf604a967da36b8af936f8b8ab87b442834024b0b2cb886811c15e80893be842fbee2667bbbc39886814ec9b2f4ed0c2527de51fdb7dc293b25cce515f5e4b -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/tensorpipe @@ -13,6 +7,7 @@ vcpkg_from_github( SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e PATCHES "${INSTALL_PACKAGE_CONFIG_PATCH}" + support-find-package.patch use-vcpkg.patch support-test.patch ) @@ -45,7 +40,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe" PACKAGE_NAME "Tensorpipe") +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/unofficial-tensorpipe" PACKAGE_NAME "unofficial-tensorpipe") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/tensorpipe/support-find-package.patch b/ports/tensorpipe/support-find-package.patch new file mode 100644 index 00000000000000..85278a26ab9cae --- /dev/null +++ b/ports/tensorpipe/support-find-package.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77df76d..bebb8c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,5 +24,17 @@ include(MiscCheck) + add_subdirectory(tensorpipe) + + install(EXPORT TensorpipeTargets +- DESTINATION share/cmake/Tensorpipe +- FILE TensorpipeTargets.cmake) ++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/unofficial-tensorpipe ++ NAMESPACE unofficial::tensorpipe:: ++ FILE unofficial-tensorpipe-targets.cmake) ++ ++# Create TensorpipeConfig.cmake for find_package(unofficial-tensorpipe CONFIG) ++include(CMakePackageConfigHelpers) ++get_filename_component(CONFIG_FILE_PATH ${CMAKE_CURRENT_BINARY_DIR}/unofficial-tensorpipe-config.cmake ABSOLUTE) ++configure_package_config_file( ++ cmake/unofficial-tensorpipe-config.cmake.in ${CONFIG_FILE_PATH} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/unofficial-tensorpipe) ++ ++# Install the generated config file ++install(FILES ${CONFIG_FILE_PATH} ++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/unofficial-tensorpipe) +diff --git a/cmake/unofficial-tensorpipe-config.cmake.in b/cmake/unofficial-tensorpipe-config.cmake.in +new file mode 100644 +index 000000000..f2ea8ce47 +--- /dev/null ++++ b/cmake/unofficial-tensorpipe-config.cmake.in +@@ -0,0 +1,15 @@ ++@PACKAGE_INIT@ ++include(CMakeFindDependencyMacro) ++ ++find_dependency(libuv REQUIRED) ++ ++get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) ++file(GLOB CONFIG_FILES "${_DIR}/unofficial-tensorpipe-config-*.cmake") ++foreach(f ${CONFIG_FILES}) ++ include(${f}) ++endforeach() ++ ++# import targets ++include("${_DIR}/unofficial-tensorpipe-targets.cmake") ++ ++check_required_components(@PROJECT_NAME@) +diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt +index ce494722f..b722381f8 100644 +--- a/tensorpipe/python/CMakeLists.txt ++++ b/tensorpipe/python/CMakeLists.txt +@@ -14,3 +14,8 @@ endif() + set(PYBIND11_CPP_STANDARD -std=c++14) + pybind11_add_module(pytensorpipe tensorpipe.cc) + target_link_libraries(pytensorpipe PRIVATE tensorpipe) ++ ++install(TARGETS pytensorpipe ++ EXPORT TensorpipeTargets ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/ports/tensorpipe/support-test.patch b/ports/tensorpipe/support-test.patch index 21a94c37bdc20e..107e9166bed905 100644 --- a/ports/tensorpipe/support-test.patch +++ b/ports/tensorpipe/support-test.patch @@ -26,10 +26,10 @@ index 53e8643..09baaa0 100644 - ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) +find_package(GTest CONFIG REQUIRED) + -+if (TARGET uv) -+ set(LIBUV_LIBRARY uv) ++if (TARGET libuv::uv) ++ set(LIBUV_LIBRARY libuv::uv) +else() -+ set(LIBUV_LIBRARY uv_a) ++ set(LIBUV_LIBRARY libuv::uv_a) +endif() list(APPEND TP_TEST_LINK_LIBRARIES diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index 47f5427f6d3476..6e8139793c2fa9 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorpipe", "version-date": "2022-03-16", - "port-version": 4, + "port-version": 5, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 34d37cc3a68517..ba4fd488d4ba5d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7986,7 +7986,7 @@ }, "tensorpipe": { "baseline": "2022-03-16", - "port-version": 4 + "port-version": 5 }, "termcolor": { "baseline": "2.1.0", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index daf61f2055afaa..3485df95dc2018 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a085dcc97de3188e8fa82b123a7f3da7cd8de11", + "version-date": "2022-03-16", + "port-version": 5 + }, { "git-tree": "f470079788d337b13d5a7fb0b4f3663863f3c385", "version-date": "2022-03-16", From 4afcf674b3b6184f02e1cf76d19b8c0252dd3720 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 11 Jul 2023 02:42:15 +0200 Subject: [PATCH 497/533] Remove entries already covered by support expressions (#32226) --- scripts/ci.baseline.txt | 220 ---------------------------------------- 1 file changed, 220 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index aa83ce3e14f09c..cd61eb7ce017f9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -78,9 +78,6 @@ berkeleydb:x64-android=fail binlog:arm-neon-android=fail bitserializer:arm64-osx=fail blitz:x64-android=fail -blitz:x64-uwp=fail -blitz:arm64-windows=fail -blitz:arm-uwp=fail blitz:x64-linux=fail # python2 boinc:arm-neon-android=fail boinc:arm64-android=fail @@ -233,9 +230,6 @@ cmcstl2:x86-windows = skip cnats:arm-neon-android=fail cnats:arm64-android=fail cnats:x64-android=fail -coin:arm64-windows=fail -coin:arm-uwp=fail -coin:x64-uwp=fail coin-or-ipopt:x64-linux=fail concurrencpp:arm-neon-android=fail concurrencpp:arm64-android=fail @@ -246,10 +240,8 @@ constexpr-contracts:arm-neon-android=fail constexpr-contracts:arm64-android=fail constexpr-contracts:x64-android=fail coroutine:arm-neon-android=fail -coroutine:arm-uwp=fail coroutine:arm64-android=fail coroutine:x64-android=fail -coroutine:x64-uwp=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail cpp-ipc:x64-android=fail @@ -265,8 +257,6 @@ cppmicroservices:arm64-windows=fail cppmicroservices:arm-uwp=fail cppmicroservices:x64-android=fail cppmicroservices:x64-uwp=fail -cpp-netlib:arm-uwp=fail -cpp-netlib:x64-uwp=fail # Requires full C++20 support, currently absent from CI for these triplets. cppslippi:arm-neon-android=fail cppslippi:arm64-android=fail @@ -274,13 +264,10 @@ cppslippi:x64-android=fail cppslippi:x64-linux=fail cppslippi:x64-osx=fail cppcoro:x64-linux=fail -cppcoro:arm-uwp=fail -cppcoro:x64-uwp=fail cpptoml:arm-neon-android=fail cpptoml:arm64-android=fail cpptoml:x64-android=fail cpputest:arm-neon-android=fail -crashpad:arm-uwp=fail crashpad:x64-linux=fail cserialport:arm-neon-android=fail cserialport:arm64-android=fail @@ -288,7 +275,6 @@ cserialport:x64-android=fail cubeb:arm-neon-android=fail cubeb:arm64-android=fail cubeb:x64-android=fail -cuda:x64-osx=fail czmq:arm-neon-android=fail czmq:arm64-android=fail czmq:x64-android=fail @@ -301,8 +287,6 @@ dbg-macro:x64-android=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip dbghelp:arm64-windows=skip -dbghelp:x64-linux=fail -dbghelp:x64-osx=fail dbghelp:x64-uwp=skip dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip @@ -321,15 +305,11 @@ dimcli:x64-windows-static=fail directxsdk:x86-windows=skip directxsdk:x64-windows=skip directxsdk:x64-windows-static-md=skip -discord-game-sdk:x64-windows-static=fail -discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail discount:x64-android=fail dlib:arm-uwp=fail dlib:x64-uwp=fail -dmlc:arm-uwp=fail -dmlc:x64-uwp=fail drogon:arm-neon-android=fail drogon:arm64-android=fail drogon:x64-android=fail @@ -455,10 +435,6 @@ gherkin-c:x64-android=fail geotrans:arm-neon-android=fail geotrans:arm64-android=fail geotrans:x64-android=fail -getopt:arm-uwp=fail -getopt:x64-uwp=fail -gflags:arm-uwp=fail -gflags:x64-uwp=fail # Conflicts with libevent gherkin-c:arm64-windows = skip @@ -483,16 +459,6 @@ glfw3:x64-android=fail glfw3:x64-uwp=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail -gmmlib:arm-uwp=fail -gmmlib:arm64-windows=fail -gmmlib:x64-osx=fail -gmmlib:x64-uwp=fail -gmmlib:x64-windows-static-md=fail -gmmlib:x64-windows-static=fail -gmmlib:x64-windows=fail -gmmlib:x86-windows=fail -google-cloud-cpp:arm-uwp=fail -google-cloud-cpp:x64-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail # graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251 @@ -529,16 +495,6 @@ gz-tools2:arm64-android=fail halide:x86-windows=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail -hdf5:arm-uwp=fail -hdf5:x64-uwp=fail -healpix:x86-windows=fail -healpix:x64-windows=fail -healpix:x64-windows-static=fail -healpix:x64-windows-static-md=fail -healpix:x64-uwp=fail -healpix:arm64-windows=fail -healpix:arm-uwp=fail -healpix:x64-osx=fail hexl:x64-android=fail highs:arm-neon-android=fail highs:arm64-android=fail @@ -549,8 +505,6 @@ hwloc:arm-neon-android=fail hwloc:arm64-android=fail hwloc:x64-android=fail hyperscan:x64-android=fail -idevicerestore:x64-linux=fail -idevicerestore:x64-osx=fail ignition-common1:x64-linux=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail @@ -558,10 +512,7 @@ ignition-msgs1:arm64-windows=fail ignition-msgs1:arm-uwp=fail ignition-msgs1:x64-android=fail ignition-msgs1:x64-uwp=fail -ignition-msgs5:arm64-windows=fail -ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-android=fail -ignition-msgs5:x64-uwp=fail ignition-msgs5:x64-osx=skip # Conflicts with libjpeg-turbo, mozjpeg ignition-msgs6:x64-android=fail @@ -585,12 +536,8 @@ infoware:x64-android=fail intelrdfpmathlib:arm-neon-android=fail intelrdfpmathlib:arm64-android=fail intelrdfpmathlib:x64-android=fail -irrlicht:arm64-windows=fail -irrlicht:arm-uwp=fail irrlicht:x64-android=fail -irrlicht:x64-uwp=fail isal:x64-android=fail -ismrmrd:x86-windows=fail jaeger-client-cpp:arm-neon-android=fail jaeger-client-cpp:x64-android=fail jemalloc:arm-neon-android=fail @@ -600,18 +547,13 @@ jemalloc:arm-uwp=fail jemalloc:x64-android=fail jemalloc:x64-uwp=fail jinja2cpplight:arm-neon-android=fail -jinja2cpplight:arm-uwp=fail jinja2cpplight:arm64-android=fail jinja2cpplight:x64-android=fail -jinja2cpplight:x64-uwp=fail json-schema-validator:arm-neon-android=fail json-schema-validator:arm64-android=fail keystone:x64-linux=fail # python2 -kfr:arm64-windows=fail kfr:x64-android=fail kfr:x64-uwp=fail -kfr:arm-uwp=fail -kfr:x64-linux=fail lastools:arm-neon-android=fail lastools:arm64-android=fail lastools:x64-android=fail @@ -622,10 +564,7 @@ lcm:arm64-android=fail lcm:x64-android=fail leptonica:x64-uwp=fail leptonica:arm-uwp=fail -leveldb:arm-uwp=fail -leveldb:x64-uwp=fail libaiff:x64-linux=fail -libarchive:arm-uwp=fail libbson:arm-neon-android=fail libbson:arm64-android=fail libbson:x64-android=fail @@ -648,22 +587,7 @@ libgpg-error:arm64-android=fail libgpg-error:x64-android=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail -libgpod:x64-osx=fail -libevhtp:x86-windows=fail -libevhtp:x64-windows=fail -libevhtp:x64-windows-static=fail -libevhtp:x64-windows-static-md=fail -libevhtp:x64-uwp=fail -libevhtp:arm64-windows=fail -libevhtp:arm-uwp=fail -libexif:arm-uwp=fail -libexif:x64-uwp=fail libfreenect2:arm64-windows=fail -libgit2:arm-uwp=fail -libgit2:x64-uwp=fail -libgo:arm-uwp=fail -libgo:x64-uwp=fail -libgo:arm64-windows=fail libgpod:arm-neon-android=fail libgpod:arm64-android=fail libgpod:x64-android=fail @@ -678,7 +602,6 @@ libhdfs3:arm64-osx=fail libidn2:arm-neon-android=fail libidn2:arm64-android=fail libidn2:x64-android=fail -libirecovery:x64-windows-static-md=fail # 120 min build time for libjxl arm-uwp-rel, reason unknown libjxl:arm-uwp=skip liblemon:arm-uwp=fail @@ -726,26 +649,17 @@ libmikmod:arm-neon-android=fail libmikmod:arm64-android=fail libmikmod:x64-android=fail libmodman:x64-windows-static=fail -libmodplug:arm-uwp=fail -libmodplug:x64-uwp=fail libmpeg2:arm-neon-android=fail -libmpeg2:arm-uwp=fail libmpeg2:arm64-android=fail libmpeg2:x64-android=fail -libmpeg2:x64-linux=fail -libmpeg2:x64-osx=fail -libmpeg2:x64-uwp=fail libmysql:arm-neon-android=fail libmysql:arm64-android=fail libmysql:x64-android=fail -libmysql:x86-windows=fail libmysql:arm64-windows=fail libodb:x64-linux=fail # dynamic exception specifications libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail -libopusenc:arm-uwp=fail -libopusenc:x64-uwp=fail libosip2:arm-neon-android=fail libosip2:arm64-android=fail libosip2:x64-android=fail @@ -787,37 +701,25 @@ libressl:x64-windows-static=skip libressl:x64-windows-static-md=skip libressl:x86-windows=skip libsoundio:arm64-windows=fail -libsoundio:arm-uwp=fail -libsoundio:x64-uwp=fail libspatialite:arm-uwp=fail libspatialite:x64-uwp=fail -libssh:arm-uwp=fail -libssh:x64-uwp=fail libtar:arm-neon-android=fail libtar:arm64-android=fail libtcod:arm-neon-android=fail libtcod:arm64-android=fail libtcod:x64-android=fail libtins:arm-neon-android=fail -libtins:arm-uwp=fail libtins:arm64-android=fail libtins:x64-android=fail -libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm-uwp=fail libusb:arm-neon-android=fail -libusb:arm-uwp=fail libusb:arm64-android=fail libusb:x64-android=fail -libusb:x64-uwp=fail libusb-win32:arm-uwp=fail -libusb-win32:x64-linux=fail -libusb-win32:x64-osx=fail libusb-win32:x64-uwp=fail libuv:arm-uwp=fail libuv:x64-uwp=fail -libvmdk:arm-uwp=fail -libvmdk:x64-uwp=fail #Skip detection to avoid upstream remove older releases libvmdk:x86-windows=skip libvmdk:x64-windows=skip @@ -831,19 +733,10 @@ libvpx:arm-neon-android=fail libwandio:arm-neon-android=fail libwandio:arm64-android=fail libwandio:x64-android=fail -libwandio:x86-windows=fail -libwandio:x64-windows=fail -libwandio:x64-windows-static=fail -libwandio:x64-windows-static-md=fail -libwandio:x64-uwp=fail -libwandio:arm64-windows=fail -libwandio:arm-uwp=fail libxaw:x64-windows-static=skip # clang-cl ICEd libxt:arm64-windows=fail libzen:arm-neon-android=fail -licensepp:arm-uwp=fail -licensepp:x64-uwp=fail linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail @@ -863,16 +756,11 @@ llvm:x64-android=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cpp:x64-linux=fail # dynamic exception specifications -log4cxx:arm-uwp=fail -log4cxx:x64-uwp=fail loguru:arm-neon-android=fail loguru:arm64-android=fail loguru:x64-android=fail -luajit:arm64-windows=fail luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail -luasec:x64-windows-static=fail -lzfse:arm-uwp=fail magnum:arm-neon-android=fail magnum:arm64-android=fail magnum:arm64-windows=skip @@ -920,7 +808,6 @@ microsoft-signalr:x64-windows-static=skip microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 -mlpack:x64-uwp=fail monkeys-audio:arm-neon-android=fail monkeys-audio:arm64-android=fail monkeys-audio:x64-android=fail @@ -977,14 +864,7 @@ mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip msmpi:arm64-windows=fail -msmpi:arm-uwp=fail -msmpi:x64-linux=fail -msmpi:x64-osx=fail -msmpi:x64-uwp=fail -munit:arm-uwp=fail -munit:arm64-windows=fail munit:x64-android=fail -munit:x64-uwp=fail mysql-connector-cpp:arm-neon-android=fail mysql-connector-cpp:arm64-android=fail mysql-connector-cpp:x64-android=fail @@ -998,8 +878,6 @@ nana:x64-uwp=fail nanodbc:arm-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip -nativefiledialog:arm-uwp=fail -nativefiledialog:x64-uwp=fail netcdf-cxx4:x64-windows-static-md=fail ngspice:x64-android=fail ngspice:x64-windows-static=fail @@ -1011,14 +889,6 @@ nng:x64-uwp=fail nrf-ble-driver:arm-neon-android=fail nrf-ble-driver:arm64-android=fail nrf-ble-driver:x64-android=fail -numactl:arm64-windows=fail -numactl:arm-uwp=fail -numactl:x64-osx=fail -numactl:x64-uwp=fail -numactl:x64-windows=fail -numactl:x64-windows-static=fail -numactl:x64-windows-static-md=fail -numactl:x86-windows=fail nvtt:x64-android=fail oatpp-libressl:x64-android=fail ocilib:x64-windows-static-md=fail @@ -1066,13 +936,8 @@ open62541:x64-windows-static-md=fail openblas:arm-neon-android=fail openblas:arm64-android=fail openblas:x64-android=fail -opencc:arm64-windows=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. -opencc:arm-uwp=fail opencc:x64-android=fail -opencc:x64-uwp=fail -opencl:arm-uwp=fail -opencl:x64-uwp=fail opencsg:arm-uwp=fail opencsg:x64-uwp=fail opencv2:arm-neon-android=fail @@ -1096,8 +961,6 @@ opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md = skip opencv3:x86-windows = skip -opendnp3:x64-uwp=fail -opendnp3:arm-uwp=fail openfbx:arm-neon-android=fail openimageio:arm-neon-android=fail openimageio:arm64-android=fail @@ -1128,10 +991,6 @@ openvdb:x64-windows-static=fail openvdb:x64-windows-static-md=fail openvpn3:x64-osx=fail openvpn3:arm64-osx=fail -openvr:arm64-windows=fail -openvr:arm-uwp=fail -openvr:x64-osx=fail -openvr:x64-uwp=fail openvr:x64-windows-static=fail optional-bare:arm64-windows = skip optional-bare:arm-uwp = skip @@ -1145,8 +1004,6 @@ optional-bare:x86-windows = skip optional-lite:arm-neon-android=fail optional-lite:arm64-android=fail optional-lite:x64-android=fail -opusfile:arm-uwp=fail -opusfile:x64-uwp=fail orc:arm-neon-android=fail orc:arm64-android=fail orc:x64-android=fail @@ -1162,19 +1019,14 @@ platform-folders:x64-uwp=fail plib:arm-neon-android=fail plib:arm64-android=fail plib:x64-android=fail -plibsys:arm-uwp=fail -plibsys:x64-uwp=fail plplot:arm64-windows=fail plplot:arm-uwp=fail plplot:x64-uwp=fail -pmdk:arm-uwp=fail -pmdk:arm64-windows=fail pmdk:x64-android=fail pmdk:x64-linux=fail pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail -pmdk:x86-windows=fail polyhook2:x64-android=fail popsift:x64-windows-static-md=fail popsift:x64-linux=fail # segfaults :( @@ -1211,12 +1063,9 @@ qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip # Missing system libraries -qt5-wayland:x64-osx=fail qtwayland:x64-osx=fail qtwayland:arm64-osx=fail # Missing prerequisites for CI success -qt5-webengine:x64-linux=fail -qt5-webengine:x64-osx=fail # Fail due to outdated protoc headers. # D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17): # fatal error C1189: #error: This file was generated by an older version of protoc which is @@ -1258,9 +1107,6 @@ rapidstring:x64-windows=fail rapidstring:x64-windows-static=fail rapidstring:x64-windows-static-md=fail rapidstring:x86-windows=fail -raylib:arm64-windows=fail -raylib:arm-uwp=fail -raylib:x64-uwp=fail # file conflicts with rbdl rbdl-orb:x86-windows=skip rbdl-orb:x64-windows=skip @@ -1274,16 +1120,12 @@ rbdl-orb:x64-osx=skip rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail -readline:arm-uwp=fail -readline:x64-uwp=fail realsense2:arm64-windows=fail realsense2:arm-uwp=fail realsense2:x64-uwp=fail replxx:arm-neon-android=fail -replxx:arm-uwp=fail replxx:arm64-android=fail replxx:x64-android=fail -replxx:x64-uwp=fail rest-rpc:arm-neon-android=fail rest-rpc:arm64-android=fail rest-rpc:x64-android=fail @@ -1315,18 +1157,10 @@ rply:arm64-windows=skip rply:x64-linux=skip rply:x64-osx=skip rply:x64-windows-static-md=skip -rsasynccpp:arm64-windows=fail -rsasynccpp:arm-uwp=fail -rsasynccpp:x64-linux=fail -rsasynccpp:x64-osx=fail rsm-bsa:arm-neon-android=fail rsm-bsa:arm64-android=fail rsm-bsa:x64-android=fail rtlsdr:x64-uwp=fail -rtlsdr:arm64-windows=fail -rtlsdr:arm-uwp=fail -rtlsdr:x64-linux=fail -rtlsdr:x64-osx=fail rttr:arm-neon-android=fail rttr:arm64-android=fail @@ -1350,12 +1184,7 @@ sciter:x86-windows=skip scnlib:arm-uwp=fail scnlib:x64-uwp=fail sdformat10:x64-windows-static-md=fail -sdformat6:arm-uwp=fail -sdformat6:arm64-windows=fail -sdformat6:x64-uwp=fail sdformat6:x64-windows-static-md=fail -sdformat9:arm-uwp=fail -sdformat9:x64-uwp=fail sdformat9:x64-windows-static-md=fail sdl1:arm-neon-android=fail sdl1:arm64-android=fail @@ -1366,10 +1195,7 @@ sentencepiece:arm-neon-android=fail sentencepiece:arm64-android=fail sentencepiece:x64-android=fail sentencepiece:x64-windows-static-md=fail -septag-sx:arm64-windows=fail -septag-sx:arm-uwp=fail septag-sx:x64-android=fail -septag-sx:x64-uwp=fail sfml:arm-neon-android=fail sfml:arm64-android=fail sfml:x64-android=fail @@ -1408,16 +1234,12 @@ sleef:x86-windows=fail sleepy-discord:arm-neon-android=fail sleepy-discord:arm64-android=fail slikenet:arm-neon-android=fail -slikenet:arm-uwp=fail slikenet:arm64-android=fail slikenet:x64-android=fail -slikenet:x64-uwp=fail smpeg2:arm-neon-android=fail smpeg2:arm64-android=fail smpeg2:x64-android=fail smpeg2:x64-linux=fail -sockpp:arm-uwp=fail -sockpp:x64-uwp=fail soem:arm-neon-android=fail soem:arm64-android=fail soem:x64-android=fail @@ -1430,11 +1252,6 @@ soil:arm-neon-android=fail soil:arm64-android=fail soil:x64-android=fail solid3:arm64-android=fail -soqt:arm64-windows=fail -soqt:arm-uwp=fail -soqt:x64-uwp=fail -soundtouch:arm-uwp=fail -soundtouch:x64-uwp=fail spaceland:arm64-android=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail @@ -1447,22 +1264,6 @@ spdk-isal:arm-neon-android=fail spdk-isal:arm64-android=fail spdk-isal:x64-android=fail spdk:x64-linux=fail -spdk-dpdk:arm64-windows=fail -spdk-dpdk:arm-uwp=fail -spdk-dpdk:x64-osx=fail -spdk-dpdk:x64-uwp=fail -spdk-dpdk:x64-windows=fail -spdk-dpdk:x64-windows-static=fail -spdk-dpdk:x64-windows-static-md=fail -spdk-dpdk:x86-windows=fail -spdk-ipsec:arm64-windows=fail -spdk-ipsec:arm-uwp=fail -spdk-ipsec:x64-osx=fail -spdk-ipsec:x64-uwp=fail -spdk-ipsec:x64-windows=fail -spdk-ipsec:x64-windows-static=fail -spdk-ipsec:x64-windows-static-md=fail -spdk-ipsec:x86-windows=fail # Conflict with isal, and "internal" dep of spdk:x64-linux=fail spdk-isal:x64-linux=skip spscqueue:arm-neon-android=fail @@ -1499,8 +1300,6 @@ tcl:arm64-windows=fail tcl:x64-android=fail tcl:x64-uwp=fail teemo:x64-android=fail -telnetpp:arm-uwp=fail -telnetpp:x64-uwp=fail # tensorflow does not support VS2022 tensorflow:x64-android=fail @@ -1520,8 +1319,6 @@ thorvg:arm64-android=fail thorvg:x64-android=fail tidy-html5:arm-uwp=fail tidy-html5:x64-uwp=fail -tinkerforge:arm-uwp=fail -tinkerforge:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail tinycthread:arm-neon-android=fail @@ -1553,7 +1350,6 @@ unittest-cpp:arm64-windows=fail unittest-cpp:arm-uwp=fail unittest-cpp:x64-android=fail unittest-cpp:x64-uwp=fail -usbmuxd:x64-windows-static-md=fail # USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600) usd:arm64-windows=skip usd:arm-uwp=skip @@ -1564,20 +1360,12 @@ usd:x64-windows-static-md=skip usd:x64-linux=skip usd:x64-osx=skip usd:x86-windows=skip -uthenticode:arm-uwp=fail -uthenticode:x64-uwp=fail # the version of v8 we have in the repo doesn't support VS2022 -v8:arm-uwp=fail -v8:arm64-windows=fail v8:x64-android=fail -v8:x64-osx=fail -v8:x64-uwp=fail v8:x64-windows-static-md=fail v8:x64-windows-static=fail v8:x64-windows=fail v8:x86-windows=fail -vectorclass:arm64-windows=fail -vectorclass:arm-uwp=fail vowpal-wabbit:arm-neon-android=fail vowpal-wabbit:arm64-android=fail vowpal-wabbit:x64-android=fail @@ -1587,12 +1375,10 @@ vtk-m:x64-android=fail vulkan:arm-neon-android=fail vulkan:arm64-android=fail vulkan:arm64-windows=fail -vulkan:arm-uwp=fail vulkan:x64-android=fail vulkan:x64-linux=fail vulkan:x64-osx=fail vulkan:arm64-osx=fail -vulkan:x64-uwp=fail vulkan:x64-windows=fail vulkan:x64-windows-static=fail vulkan:x64-windows-static-md=fail @@ -1636,17 +1422,13 @@ wpilib:arm-neon-android=fail wpilib:arm64-android=fail wpilib:arm64-windows=fail wpilib:x64-android=fail -wpilib:x64-osx=fail wpilib:x64-linux=fail wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 x264:arm-neon-android=fail x264:arm64-android=fail x265:arm-neon-android=fail x265:arm64-android=fail -x265:arm64-windows=fail -x265:arm-uwp=fail x265:x64-android=fail -x265:x64-uwp=fail # No xorg-macros available on osx xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail @@ -1656,8 +1438,6 @@ xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail -z3:arm-uwp=fail -z3:x64-uwp=fail zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail From 79a6c094989d1952da01a7bc3abf30198f8da860 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 10 Jul 2023 20:42:39 -0400 Subject: [PATCH 498/533] Remove crash workaround skips from ci.baseline.txt. (#32482) --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cd61eb7ce017f9..a01fea2e7b8a00 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1409,7 +1409,6 @@ winpcap:x64-windows = skip winpcap:x64-windows-static = skip winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip -winsock2:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 wordnet:arm-neon-android=fail wordnet:arm64-android=fail wordnet:x64-android=fail @@ -1423,7 +1422,6 @@ wpilib:arm64-android=fail wpilib:arm64-windows=fail wpilib:x64-android=fail wpilib:x64-linux=fail -wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 x264:arm-neon-android=fail x264:arm64-android=fail x265:arm-neon-android=fail From 7822b3b51671370fc81e035d5f8521f5126d8b1a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 11 Jul 2023 19:33:28 +0200 Subject: [PATCH 499/533] [liblzma] Fix vcpkg windows debug flags (#32348) --- ports/liblzma/portfile.cmake | 2 ++ ports/liblzma/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/liblzma.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 7c8f5aa09c0fbd..fc0ecec4462627 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -28,7 +28,9 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF -DCREATE_XZ_SYMLINKS=OFF -DCREATE_LZMA_SYMLINKS=OFF + -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT= # using flags from (vcpkg) toolchain MAYBE_UNUSED_VARIABLES + CMAKE_MSVC_DEBUG_INFORMATION_FORMAT CREATE_XZ_SYMLINKS CREATE_LZMA_SYMLINKS ) diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index f20ff049892797..c73bfcfa495324 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liblzma", "version": "5.4.3", + "port-version": 1, "description": "Compression library with an API similar to that of zlib.", "homepage": "https://tukaani.org/xz/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index ba4fd488d4ba5d..b1942d02fd65d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4270,7 +4270,7 @@ }, "liblzma": { "baseline": "5.4.3", - "port-version": 0 + "port-version": 1 }, "libmad": { "baseline": "0.15.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index f596c82a064252..0a475ce93723e3 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f97f6a0904a3add9c3273f8ab1993902d75d5ef", + "version": "5.4.3", + "port-version": 1 + }, { "git-tree": "ba357d6805e44b3df1ed4343801f1b61a5d63de0", "version": "5.4.3", From 62c4a7ad6333ae50b31302c48cb3ca5712828b03 Mon Sep 17 00:00:00 2001 From: Tamir Date: Tue, 11 Jul 2023 20:34:27 +0300 Subject: [PATCH 500/533] [RealSense] Update to 2.54.1 (#32389) --- ports/realsense2/fix_config_osx.patch | 12 ------------ ports/realsense2/portfile.cmake | 9 +++++---- ports/realsense2/vcpkg.json | 5 +---- versions/baseline.json | 2 +- versions/r-/realsense2.json | 5 +++++ 5 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 ports/realsense2/fix_config_osx.patch diff --git a/ports/realsense2/fix_config_osx.patch b/ports/realsense2/fix_config_osx.patch deleted file mode 100644 index d96f4bea58b989..00000000000000 --- a/ports/realsense2/fix_config_osx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake -index 3e5929b..57dbe76 100644 ---- a/CMake/unix_config.cmake -+++ b/CMake/unix_config.cmake -@@ -35,7 +35,6 @@ macro(os_set_flags) - - if(APPLE) - set(FORCE_RSUSB_BACKEND ON) -- set(BUILD_WITH_TM2 ON) - endif() - - if(FORCE_RSUSB_BACKEND) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 149cdd6ba60547..61b55e2817bd56 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.53.1 - SHA512 ea975cf919f483dc6669bd3fbce6c301df2ffadbe592972fdec8051de373374a5243565cb87b592f21f017c5ca319634617bacb0c49557136fda3620c59f2101 + REF v2.54.1 + SHA512 9b7146a5f6a4152d95286f679e0f5314ab0b040f67a030e42dfe01ad995af486d3d158d1ac7ef0bbe783a90e067d32e4bb4ba1a524fe75a89be6c7fe9c3a30ed HEAD_REF master PATCHES fix_openni2.patch - fix_config_osx.patch ) file(COPY "${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf" DESTINATION "${SOURCE_PATH}") @@ -14,7 +13,6 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tm2 BUILD_WITH_TM2 tools BUILD_TOOLS ) @@ -50,6 +48,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw") endif() vcpkg_copy_pdbs() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 12975171102d7f..b3d7d5f40849e0 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "realsense2", - "version": "2.53.1", + "version": "2.54.1", "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", @@ -25,9 +25,6 @@ "openni2" ] }, - "tm2": { - "description": "Build Intel® RealSense™ T265 device" - }, "tools": { "description": "Build Intel® RealSense™ tools" } diff --git a/versions/baseline.json b/versions/baseline.json index b1942d02fd65d3..4f27dd430cd7db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7105,7 +7105,7 @@ "port-version": 4 }, "realsense2": { - "baseline": "2.53.1", + "baseline": "2.54.1", "port-version": 0 }, "recast": { diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index dc6ce814093a2c..dcb999dbdd9747 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba09c586ba854502c24f6abf1b3307e964c8ae16", + "version": "2.54.1", + "port-version": 0 + }, { "git-tree": "90cd2f16e28c916f46da66fea9e6de742a26b0c2", "version": "2.53.1", From 505cba2668accafe0ebba3a8f05238dbbc6291ad Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 11 Jul 2023 20:18:41 +0200 Subject: [PATCH 501/533] [libssh2,libgit2,vcpkg-ci-libgit2] Fix, test, cleanup (#32440) --- ports/libgit2/c-standard.diff | 26 +++++++++ ports/libgit2/cli-include-dirs.diff | 12 ++++ ports/libgit2/dependencies.diff | 41 +++++++++++++ ports/libgit2/fix-configcmake.patch | 55 ------------------ ports/libgit2/mingw-winhttp.diff | 13 +++++ ports/libgit2/portfile.cmake | 57 ++++++++++++++----- ports/libgit2/unofficial-config-export.diff | 21 +++++++ ports/libgit2/unofficial-git2-config.cmake | 6 ++ ports/libgit2/unofficial-libgit2-config.cmake | 3 + ports/libgit2/usage | 11 ++++ ports/libgit2/vcpkg.json | 7 ++- ports/libssh2/portfile.cmake | 19 ++++++- ports/libssh2/vcpkg.json | 19 ++++++- scripts/ci.baseline.txt | 3 - .../vcpkg-ci-libgit2/portfile.cmake | 1 + .../test_ports/vcpkg-ci-libgit2/vcpkg.json | 15 +++++ versions/baseline.json | 4 +- versions/l-/libgit2.json | 5 ++ versions/l-/libssh2.json | 5 ++ 19 files changed, 246 insertions(+), 77 deletions(-) create mode 100644 ports/libgit2/c-standard.diff create mode 100644 ports/libgit2/cli-include-dirs.diff create mode 100644 ports/libgit2/dependencies.diff delete mode 100644 ports/libgit2/fix-configcmake.patch create mode 100644 ports/libgit2/mingw-winhttp.diff create mode 100644 ports/libgit2/unofficial-config-export.diff create mode 100644 ports/libgit2/unofficial-git2-config.cmake create mode 100644 ports/libgit2/unofficial-libgit2-config.cmake create mode 100644 ports/libgit2/usage create mode 100644 scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json diff --git a/ports/libgit2/c-standard.diff b/ports/libgit2/c-standard.diff new file mode 100644 index 00000000000000..8775f77243f0bb --- /dev/null +++ b/ports/libgit2/c-standard.diff @@ -0,0 +1,26 @@ +diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt +index c2a97e1..8c5b2ea 100644 +--- a/src/libgit2/CMakeLists.txt ++++ b/src/libgit2/CMakeLists.txt +@@ -2,7 +2,7 @@ + # git library functionality. + + add_library(libgit2 OBJECT) +-set_target_properties(libgit2 PROPERTIES C_STANDARD 90) ++set_target_properties(libgit2 PROPERTIES C_STANDARD 99) + set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF) + + include(PkgBuildConfig) +diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt +index ee35eb9..158fac2 100644 +--- a/src/util/CMakeLists.txt ++++ b/src/util/CMakeLists.txt +@@ -1,7 +1,7 @@ + # util: a shared library for common utility functions for libgit2 projects + + add_library(util OBJECT) +-set_target_properties(util PROPERTIES C_STANDARD 90) ++set_target_properties(util PROPERTIES C_STANDARD 99) + set_target_properties(util PROPERTIES C_EXTENSIONS OFF) + + configure_file(git2_features.h.in git2_features.h) diff --git a/ports/libgit2/cli-include-dirs.diff b/ports/libgit2/cli-include-dirs.diff new file mode 100644 index 00000000000000..e2a779c820f834 --- /dev/null +++ b/ports/libgit2/cli-include-dirs.diff @@ -0,0 +1,12 @@ +diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt +index 84b6c19..df2119c 100644 +--- a/src/cli/CMakeLists.txt ++++ b/src/cli/CMakeLists.txt +@@ -46,6 +46,7 @@ set_target_properties(git2_cli PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME}) + ide_split_sources(git2_cli) + + target_include_directories(git2_cli PRIVATE ${CLI_INCLUDES}) ++target_include_directories(git2_cli SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES}) + + if(MSVC_IDE) + # Precompiled headers diff --git a/ports/libgit2/dependencies.diff b/ports/libgit2/dependencies.diff new file mode 100644 index 00000000000000..1e046208e8cdb4 --- /dev/null +++ b/ports/libgit2/dependencies.diff @@ -0,0 +1,41 @@ +diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake +index 2a3a91b..523fa72 100644 +--- a/cmake/SelectRegex.cmake ++++ b/cmake/SelectRegex.cmake +@@ -17,7 +17,9 @@ if(REGEX_BACKEND STREQUAL "regcomp_l") + add_feature_info(regex ON "using system regcomp_l") + set(GIT_REGEX_REGCOMP_L 1) + elseif(REGEX_BACKEND STREQUAL "pcre2") +- find_package(PCRE2) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(PCRE2 REQUIRED libpcre2-8) ++ set(PCRE2_LIBRARIES "${PCRE2_LINK_LIBRARIES}") + + if(NOT PCRE2_FOUND) + MESSAGE(FATAL_ERROR "PCRE2 support was requested but not found") +@@ -33,6 +35,9 @@ elseif(REGEX_BACKEND STREQUAL "pcre") + add_feature_info(regex ON "using system PCRE") + set(GIT_REGEX_PCRE 1) + ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(PCRE REQUIRED libpcre) ++ set(PCRE_LIBRARIES "${PCRE_LINK_LIBRARIES}") + list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) + list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES}) + list(APPEND LIBGIT2_PC_REQUIRES "libpcre") +diff --git a/cmake/SelectSSH.cmake b/cmake/SelectSSH.cmake +index 23dfc97..f481527 100644 +--- a/cmake/SelectSSH.cmake ++++ b/cmake/SelectSSH.cmake +@@ -1,6 +1,10 @@ + # Optional external dependency: libssh2 + if(USE_SSH) +- find_pkglibraries(LIBSSH2 libssh2) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(LIBSSH2 REQUIRED libssh2) ++ set(LIBSSH2_LIBRARIES "${LIBSSH2_LINK_LIBRARIES}") ++ set(LIBSSH2_LDFLAGS "") ++ list(APPEND LIBGIT2_PC_REQUIRES "libssh2") + if(NOT LIBSSH2_FOUND) + find_package(LibSSH2) + set(LIBSSH2_INCLUDE_DIRS ${LIBSSH2_INCLUDE_DIR}) diff --git a/ports/libgit2/fix-configcmake.patch b/ports/libgit2/fix-configcmake.patch deleted file mode 100644 index 11b02e89ff4e8d..00000000000000 --- a/ports/libgit2/fix-configcmake.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/cmake/SelectRegex.cmake b/cmake/SelectRegex.cmake -index 2a3a91b8c..cbb409350 100644 ---- a/cmake/SelectRegex.cmake -+++ b/cmake/SelectRegex.cmake -@@ -1,5 +1,4 @@ - # Specify regular expression implementation --find_package(PCRE) - - if(REGEX_BACKEND STREQUAL "") - check_symbol_exists(regcomp_l "regex.h;xlocale.h" HAVE_REGCOMP_L) -@@ -33,8 +32,8 @@ elseif(REGEX_BACKEND STREQUAL "pcre") - add_feature_info(regex ON "using system PCRE") - set(GIT_REGEX_PCRE 1) - -- list(APPEND LIBGIT2_SYSTEM_INCLUDES ${PCRE_INCLUDE_DIRS}) -- list(APPEND LIBGIT2_SYSTEM_LIBS ${PCRE_LIBRARIES}) -+ find_package(unofficial-pcre CONFIG REQUIRED) -+ list(APPEND LIBGIT2_SYSTEM_LIBS unofficial::pcre::pcre) - list(APPEND LIBGIT2_PC_REQUIRES "libpcre") - elseif(REGEX_BACKEND STREQUAL "regcomp") - add_feature_info(regex ON "using system regcomp") -diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt -index 876a703e8..8283f9585 100644 ---- a/src/libgit2/CMakeLists.txt -+++ b/src/libgit2/CMakeLists.txt -@@ -110,10 +110,28 @@ FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLU - - # Install - --install(TARGETS libgit2package -+install(TARGETS libgit2package EXPORT unofficial-git2Targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ -+install(EXPORT unofficial-git2Targets -+ NAMESPACE unofficial::git2:: -+ DESTINATION share/unofficial-git2 -+) -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" -+[[include(CMakeFindDependencyMacro) -+if(@USE_BUNDLED_ZLIB@ STREQUAL "OFF") -+ find_dependency(ZLIB) -+endif() -+if(@REGEX_BACKEND@ STREQUAL "pcre") -+ find_dependency(unofficial-pcre CONFIG) -+endif() -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-git2Targets.cmake") -+]]) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake" @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-git2-config.cmake DESTINATION share/unofficial-git2) -+ - install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/ - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}") - install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h diff --git a/ports/libgit2/mingw-winhttp.diff b/ports/libgit2/mingw-winhttp.diff new file mode 100644 index 00000000000000..80f24aeef58b07 --- /dev/null +++ b/ports/libgit2/mingw-winhttp.diff @@ -0,0 +1,13 @@ +diff --git a/cmake/SelectWinHTTP.cmake b/cmake/SelectWinHTTP.cmake +index 96e0bdb..31c3a56 100644 +--- a/cmake/SelectWinHTTP.cmake ++++ b/cmake/SelectWinHTTP.cmake +@@ -3,7 +3,7 @@ if(WIN32 AND USE_WINHTTP) + + # Since MinGW does not come with headers or an import library for winhttp, + # we have to include a private header and generate our own import library +- if(MINGW) ++ if(0) + add_subdirectory("${PROJECT_SOURCE_DIR}/deps/winhttp" "${PROJECT_BINARY_DIR}/deps/winhttp") + list(APPEND LIBGIT2_SYSTEM_LIBS winhttp) + list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/winhttp") diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index f0d056dd79e97f..54e33d1472f540 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -5,10 +5,21 @@ vcpkg_from_github( SHA512 fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5 HEAD_REF maint/v1.6 PATCHES - fix-configcmake.patch + c-standard.diff # for 'inline' in system headers + cli-include-dirs.diff + dependencies.diff + mingw-winhttp.diff + unofficial-config-export.diff +) +file(REMOVE_RECURSE + "${SOURCE_PATH}/cmake/FindPCRE.cmake" + "${SOURCE_PATH}/cmake/FindPCRE2.cmake" + "${SOURCE_PATH}/deps/chromium-zlib" + "${SOURCE_PATH}/deps/http-parser" + "${SOURCE_PATH}/deps/pcre" + "${SOURCE_PATH}/deps/winhttp" + "${SOURCE_PATH}/deps/zlib" ) - -file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindPCRE.cmake") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) @@ -29,10 +40,6 @@ function(set_tls_backend VALUE) set(USE_HTTPS ${VALUE} PARENT_SCOPE) endfunction() -if("openssl" IN_LIST FEATURES) - list(APPEND GIT_OPTIONS "-DGIT_OPENSSL=1") -endif() - foreach(GIT2_FEATURE ${FEATURES}) if(GIT2_FEATURE STREQUAL "pcre") set_regex_backend("pcre") @@ -53,10 +60,13 @@ if(NOT REGEX_BACKEND) message(FATAL_ERROR "Must choose pcre or pcre2 regex backend") endif() +vcpkg_find_acquire_program(PKGCONFIG) + vcpkg_check_features( OUT_FEATURE_OPTIONS GIT2_FEATURES - FEATURES - ssh USE_SSH + FEATURES + ssh USE_SSH + tools BUILD_CLI ) vcpkg_cmake_configure( @@ -67,15 +77,36 @@ vcpkg_cmake_configure( -DUSE_HTTPS=${USE_HTTPS} -DREGEX_BACKEND=${REGEX_BACKEND} -DSTATIC_CRT=${STATIC_CRT} - -DBUILD_CLI=OFF + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON ${GIT2_FEATURES} - ${GIT_OPTIONS} + OPTIONS_DEBUG + -DBUILD_CLI=OFF + MAYBE_UNUSED_VARIABLES + STATIC_CRT ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-git2 CONFIG_PATH share/unofficial-git2) vcpkg_fixup_pkgconfig() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-git2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-git2") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libgit2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libgit2") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libgit2 CONFIG_PATH share/unofficial-libgit2) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES git2 AUTO_CLEAN) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(file_list "${SOURCE_PATH}/COPYING") +if(NOT VCPKG_TARGET_IS_WINDOWS) + file(WRITE "${CURRENT_BUILDTREES_DIR}/Notice for ntlmclient" [[ +Copyright (c) Edward Thomson. All rights reserved. +These source files are part of ntlmclient, distributed under the MIT license. +]]) + list(APPEND file_list "${CURRENT_BUILDTREES_DIR}/Notice for ntlmclient") +endif() +vcpkg_install_copyright(FILE_LIST ${file_list}) diff --git a/ports/libgit2/unofficial-config-export.diff b/ports/libgit2/unofficial-config-export.diff new file mode 100644 index 00000000000000..084c83903755ae --- /dev/null +++ b/ports/libgit2/unofficial-config-export.diff @@ -0,0 +1,21 @@ +diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt +index dcb4279..20acdc8 100644 +--- a/src/libgit2/CMakeLists.txt ++++ b/src/libgit2/CMakeLists.txt +@@ -128,10 +128,16 @@ FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLU + + # Install + ++target_include_directories(libgit2package SYSTEM PUBLIC $) + install(TARGETS libgit2package ++ EXPORT unofficial-libgit2-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(EXPORT unofficial-libgit2-targets ++ NAMESPACE unofficial::libgit2:: ++ DESTINATION share/unofficial-libgit2 ++) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/ + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}") + install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h diff --git a/ports/libgit2/unofficial-git2-config.cmake b/ports/libgit2/unofficial-git2-config.cmake new file mode 100644 index 00000000000000..9f407fcc2adbc5 --- /dev/null +++ b/ports/libgit2/unofficial-git2-config.cmake @@ -0,0 +1,6 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/../unofficial-libgit2/usage" usage) +message(WARNING "find_package(unofficial-git2) is deprecated.\n${usage}") +include(CMakeFindDependencyMacro) +find_dependency(unofficial-libgit2 CONFIG) +add_library(unofficial::git2::libgit2package INTERFACE IMPORTED) +set_target_properties(unofficial::git2::libgit2package PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libgit2::libgit2package) diff --git a/ports/libgit2/unofficial-libgit2-config.cmake b/ports/libgit2/unofficial-libgit2-config.cmake new file mode 100644 index 00000000000000..01ebca678ed6cf --- /dev/null +++ b/ports/libgit2/unofficial-libgit2-config.cmake @@ -0,0 +1,3 @@ +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libgit2-targets.cmake") +add_library(unofficial::libgit2::libgit2 INTERFACE IMPORTED) +set_target_properties(unofficial::libgit2::libgit2 PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libgit2::libgit2package) diff --git a/ports/libgit2/usage b/ports/libgit2/usage new file mode 100644 index 00000000000000..8ed1d2efabe2d3 --- /dev/null +++ b/ports/libgit2/usage @@ -0,0 +1,11 @@ +libgit2 can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2) + target_link_libraries(main PRIVATE PkgConfig::LIBGIT2) + +vcpkg provides proprietary CMake targets: + + find_package(unofficial-libgit2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libgit2::libgit2) + diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 11b59aff5d8014..c179d4d39513d9 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libgit2", "version-semver": "1.6.4", - "description": "Git linkable library", + "port-version": 1, + "description": "A C library implementing the Git core methods with a solid API", "homepage": "https://github.com/libgit2/libgit2", + "license": null, "supports": "!uwp", "dependencies": [ "http-parser", @@ -85,6 +87,9 @@ } ] }, + "tools": { + "description": "Build CLI tools" + }, "winhttp": { "description": "SSL support (WinHTTP)", "supports": "windows & !uwp" diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 65a457c2aada5e..eb463470d26d32 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -8,8 +8,17 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - zlib ENABLE_ZLIB_COMPRESSION + zlib ENABLE_ZLIB_COMPRESSION + INVERTED_FEATURES + zlib CMAKE_DISABLE_FIND_PACKAGE_ZLIB # for use by the cryto backend ) +if("openssl" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DCRYPTO_BACKEND=OpenSSL") +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS "-DCRYPTO_BACKEND=WinCNG") +else() + message(FATAL_ERROR "Port ${PORT} only supports OpenSSL and WinCNG crypto backends.") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND FEATURE_OPTIONS "-DBUILD_STATIC_LIBS:BOOL=OFF") endif() @@ -22,6 +31,8 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} OPTIONS_DEBUG -DENABLE_DEBUG_LOGGING=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) vcpkg_cmake_install() @@ -37,6 +48,12 @@ if (VCPKG_TARGET_IS_WINDOWS) else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0") endif() + if(VCPKG_TARGET_STATIC_LIBRARY_PREFIX STREQUAL "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2") + endif() + endif() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index e30291ccc95d08..26a31cb8c6f305 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libssh2", "version": "1.11.0", + "port-version": 1, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "license": "BSD-3-Clause", "dependencies": [ - "openssl", + { + "name": "libssh2", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows" + }, { "name": "vcpkg-cmake", "host": true @@ -16,11 +24,18 @@ } ], "default-features": [ + "openssl", "zlib" ], "features": { + "openssl": { + "description": "Use the openssl crypto backend", + "dependencies": [ + "openssl" + ] + }, "zlib": { - "description": "Use compressing via zlib", + "description": "Use compression via zlib", "dependencies": [ "zlib" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a01fea2e7b8a00..4b5d22965ec963 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -578,9 +578,6 @@ libcpplocate:x64-android=fail libcrafter:arm-neon-android=fail libcrafter:arm64-android=fail libcrafter:x64-android=fail -libgit2:arm-neon-android=fail -libgit2:arm64-android=fail -libgit2:x64-android=fail libgo:x64-android=fail libgpg-error:arm-neon-android=fail libgpg-error:arm64-android=fail diff --git a/scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake b/scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake new file mode 100644 index 00000000000000..065116c276adcf --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libgit2/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json b/scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json new file mode 100644 index 00000000000000..f4c01aa8ccf62a --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libgit2/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-ci-libgit2", + "version-string": "ci", + "description": "Validates libgit2 with ssh and tools.", + "dependencies": [ + { + "name": "libgit2", + "default-features": false, + "features": [ + "ssh", + "tools" + ] + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4f27dd430cd7db..4f5bd278c7ae61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4106,7 +4106,7 @@ }, "libgit2": { "baseline": "1.6.4", - "port-version": 0 + "port-version": 1 }, "libgme": { "baseline": "0.6.3", @@ -4622,7 +4622,7 @@ }, "libssh2": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index b14ae5fdb29bcb..3f4938ddc19315 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a3e64338633f5a89dca3586094f3f156f5a0a42", + "version-semver": "1.6.4", + "port-version": 1 + }, { "git-tree": "e400f294d284f6a7ff3a19b2454c919873405f08", "version-semver": "1.6.4", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 1c8910c46453ac..46ca7ec35d9e42 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a17fdd9cf1d6c1f7af5967ee961a41c6dcc40788", + "version": "1.11.0", + "port-version": 1 + }, { "git-tree": "e57c6157ce67a01ce0b98152d9ccfd544e32b381", "version": "1.11.0", From cbdd5ce583d8bb3415f90a4a9c3602b6156fd780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 11 Jul 2023 20:19:10 +0200 Subject: [PATCH 502/533] [quill] Update to 3.2.0 (#32478) --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 990ab1e837e763..d7f3ad4b0e5216 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 c38b56c655dff8b7f9218a465256a7c19f2544b46e4a0139cc06c98a6365c9611e40b6a6f2ee47f5eb5019194899806d600d5f72b844cc20377cc35cce0e22bd + SHA512 fa920a0536903a75e08e223f7c3675d16d23e116cb5daf7bb979cbb12305b13642a0f7e52965508f1e3bdd33302af6b2ef499b9571f861c6b44ffa23f3772af1 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 543347f78d53d9..b75c8fc7efe009 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.1.0", + "version": "3.2.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4f5bd278c7ae61..1847d7cf0496bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6985,7 +6985,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.1.0", + "baseline": "3.2.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 552df7fb8cefa1..b5ed27759b6e9b 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6a0bc935a79b82c346bdd0ea001ed7b051ed571", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "115bc3d12264c44fbbe7fbe6469044e7b873aa9a", "version": "3.1.0", From ff39d70a4cf379291564a449396321315858988e Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 11 Jul 2023 20:19:30 +0200 Subject: [PATCH 503/533] nghttp3: update 0.13.0 (#32502) --- ports/nghttp3/portfile.cmake | 2 +- ports/nghttp3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index 33d32af802aae0..ac1229ab3cd247 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 a1ac58a8911a55140c5bff87c19cd152fdf3417d6ca26a26a230f914f5e7e1154304ecae8726d04832d2dbc37ce01666db2e32f31e5e73ab50ef0c2d300e5ff1 + SHA512 542a992f20fd1d19b526429c2bc7cec3d636178dd31c323b658361f928d9b8d1b8c56d18b17c93a645e42b217f623480342ae2b96e1d6f1d9d34e102f73c3337 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index d10ae9dd26c1df..94d14a49b44b92 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.12.0", + "version": "0.13.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1847d7cf0496bc..d812370a97af40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5665,7 +5665,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "0.12.0", + "baseline": "0.13.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index d30a126da417c4..43f03b418ec11f 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bd84b01197cd87cc5ca7cb73d458da9a504caa5", + "version": "0.13.0", + "port-version": 0 + }, { "git-tree": "868b3e41f403af9da33191e05418e37f71a46c30", "version": "0.12.0", From 97d9f68cefd9bd85b3b741e1c204fc0428859dd8 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 11 Jul 2023 20:20:06 +0200 Subject: [PATCH 504/533] ngtcp2: update 0.17.0 (#32501) --- ports/ngtcp2/portfile.cmake | 2 +- ports/ngtcp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ngtcp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index 0b6fd5578fcaec..547130313d16be 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 59fd3b1dacd34d6945acb4b2f4d7e9ea4b62496f4b834d24e4f3d5366a73976c26420baaab87de48cba0fcb64a9c18634ead7b2f839ac4687b4b066f58b938f6 + SHA512 d4457b6fdc32276b45d97ae608f4f5b0dc686ebecdf55ac6d3a4cb6f569899cdb812a075e525f328e6755dca0d5f7320491311d3d3ecb929bf765e9cbd97ed31 HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index cb23175221331f..d195c04d530c8f 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "0.16.0", + "version": "0.17.0", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d812370a97af40..cf8c8fc8f93e29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5673,7 +5673,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "0.16.0", + "baseline": "0.17.0", "port-version": 0 }, "nifly": { diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index 31aaa9b2365848..45687766604bb4 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0d7665d44dfadb8bd4ac73c842d33f54b888802", + "version": "0.17.0", + "port-version": 0 + }, { "git-tree": "5c23d20c06e58c61401f02c07a05bce9cf6a3eb4", "version": "0.16.0", From 4d1e0507a302b620da731ef1a048bb61b5864cbb Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 12 Jul 2023 02:20:55 +0800 Subject: [PATCH 505/533] [angle] Fix gcc13 compilation error (#32499) * fix uint32_t has not been declared * update version --- ports/angle/002-fix-builder-error.patch | 12 ++++++++++++ ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/angle/002-fix-builder-error.patch b/ports/angle/002-fix-builder-error.patch index 8c632d1b095e9c..a6d56ac62f9d09 100644 --- a/ports/angle/002-fix-builder-error.patch +++ b/ports/angle/002-fix-builder-error.patch @@ -26,3 +26,15 @@ index f4bb137f2..86495013b 100644 namespace angle { +diff --git a/include/GLSLANG/ShaderVars.h b/include/GLSLANG/ShaderVars.h +index 94cb93e..5593f66 100644 +--- a/include/GLSLANG/ShaderVars.h ++++ b/include/GLSLANG/ShaderVars.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + namespace sh + { diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index d4b8e411b01724..ba86afdcd0d885 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 4, + "port-version": 5, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index dab9401de84158..27c6eb9c50b9f3 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8849e7cee8eb5754ec1aefba7644bb393863f94", + "version-string": "chromium_5414", + "port-version": 5 + }, { "git-tree": "f5963e0a9c6de152e825e610333e626e8a9df144", "version-string": "chromium_5414", diff --git a/versions/baseline.json b/versions/baseline.json index cf8c8fc8f93e29..909adf36ffab20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 4 + "port-version": 5 }, "annoy": { "baseline": "1.17.2", From 8657e923f44ccee935998409361077b0bb8c0364 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Tue, 11 Jul 2023 20:34:18 +0200 Subject: [PATCH 506/533] [libcroco] add license id and use vcpkg_install_copyright() (#32498) * [libcroco] add license id and use vcpkg_install_copyright() * Update version database --- ports/libcroco/portfile.cmake | 2 +- ports/libcroco/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libcroco.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index b7429589a4aa1c..aa144cc688cd19 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -28,6 +28,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libcroco) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_copy_pdbs() diff --git a/ports/libcroco/vcpkg.json b/ports/libcroco/vcpkg.json index 5a801f47660d35..88b8d2dae0d2e1 100644 --- a/ports/libcroco/vcpkg.json +++ b/ports/libcroco/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libcroco", "version": "0.6.13", - "port-version": 4, + "port-version": 5, "description": "A standalone css2 parsing and manipulation library", + "license": "LGPL-2.0-only", "dependencies": [ "glib", "libxml2", diff --git a/versions/baseline.json b/versions/baseline.json index 909adf36ffab20..9f434f9731c7bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3954,7 +3954,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 4 + "port-version": 5 }, "libcsv": { "baseline": "3.0.3", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 6451fe1ff05966..2a4f465f5a4ff3 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6962c2f97aca37a74b56870cc7ff032605cfba2", + "version": "0.6.13", + "port-version": 5 + }, { "git-tree": "04dc173766f01e3ddad3bcd53c62ed56741ab3a8", "version": "0.6.13", From 4efa61c0ac71d30a4ca05271d0d12d73535ad5e5 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Tue, 11 Jul 2023 20:41:24 +0200 Subject: [PATCH 507/533] [fribidi] add license id and use vcpkg_install_copyright() (#32496) * [fribidi] add license id and use vcpkg_install_copyright() * Update version database --- ports/fribidi/portfile.cmake | 2 +- ports/fribidi/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/f-/fribidi.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index b112c046c32d09..1fc220d3712822 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -53,4 +53,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json index 0b28f86bcf0623..48cebd04e73285 100644 --- a/ports/fribidi/vcpkg.json +++ b/ports/fribidi/vcpkg.json @@ -1,7 +1,9 @@ { "name": "fribidi", "version": "1.0.12", + "port-version": 1, "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", + "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 9f434f9731c7bf..918df79435cfa4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2670,7 +2670,7 @@ }, "fribidi": { "baseline": "1.0.12", - "port-version": 0 + "port-version": 1 }, "frozen": { "baseline": "1.1.1", diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index c164cdf54af529..75e2892abbeca7 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b611119763d80fa18b07cf2e3c99c02069b0ec55", + "version": "1.0.12", + "port-version": 1 + }, { "git-tree": "43f84b32dcc2e675fac20a42c0cf0c7f801c1fbc", "version": "1.0.12", From efca044b75fbf481d6650ce4d3b223d8af94f7a7 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 12 Jul 2023 02:41:53 +0800 Subject: [PATCH 508/533] fix conflict file with libevent (#32471) --- ports/libev/portfile.cmake | 10 +++++----- ports/libev/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libev.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/libev/portfile.cmake b/ports/libev/portfile.cmake index edbe54408d6ab5..a12364e66fe8a6 100644 --- a/ports/libev/portfile.cmake +++ b/ports/libev/portfile.cmake @@ -18,10 +18,10 @@ vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file( - INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright -) +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include.tmp") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libevConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libev/vcpkg.json b/ports/libev/vcpkg.json index 4ea0372e81dd68..73d16f0f11c2bc 100644 --- a/ports/libev/vcpkg.json +++ b/ports/libev/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libev", "version": "4.33", + "port-version": 1, "description": "libev is a high-performance event loop/event model with lots of features.", "homepage": "http://software.schmorp.de/pkg/libev.html", "license": "BSD-2-Clause OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 918df79435cfa4..450a6fc35facd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4030,7 +4030,7 @@ }, "libev": { "baseline": "4.33", - "port-version": 0 + "port-version": 1 }, "libevent": { "baseline": "2.1.12+20230128", diff --git a/versions/l-/libev.json b/versions/l-/libev.json index de71987e96fc87..1c9132ba0cb595 100644 --- a/versions/l-/libev.json +++ b/versions/l-/libev.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfde981a39ab06f99274a246ccbb342b51efe55f", + "version": "4.33", + "port-version": 1 + }, { "git-tree": "8602cc86e0ede2c2f32fb03b1e2bfd0698331bf3", "version": "4.33", From 2ebb70a6e4466ccd80ed5c51aa0b14d0723bd3ba Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:53:14 -0400 Subject: [PATCH 509/533] [DiscordCoreAPI] Updating to v1.50 (#32486) --- ports/discordcoreapi/portfile.cmake | 3 ++- ports/discordcoreapi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index be7f9186bb0dba..44cba25dc79335 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 62fe2e3bc61cfc18c253a5d23faba95c0550e0e60b1bfbd55627afaee7ca441aeb44358a3f52c97255bd0afacb79855839af238caeff28b555f4682dc6cc2674 + SHA512 a073aa37c666083ed62ff036cd5a3419d6d558b952aceec0c8584b0889bc0402625e2318255d2a92949e1954e70f54892157edd2374b7152eadc0bb5ba868b65 + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 999196cb932bc2..f20264a0a7cba7 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "1.40", + "version": "1.50", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 450a6fc35facd0..aa508fe9a1984b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2133,7 +2133,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "1.40", + "baseline": "1.50", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index a911eb4f931d2f..db9119748c030d 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5470dc11ff71563bac3bd6d27b677561051a995f", + "version": "1.50", + "port-version": 0 + }, { "git-tree": "67dcb76ec4a6669264f61e9718533d9fd253a066", "version": "1.40", From 1611e074a1a36b9c42eae9c59b95b988b55cb663 Mon Sep 17 00:00:00 2001 From: Brian Rogers Date: Tue, 11 Jul 2023 11:53:48 -0700 Subject: [PATCH 510/533] [libunifex] Update to v0.3.0 (#32481) Co-authored-by: Brian Rogers --- ports/libunifex/portfile.cmake | 6 +++--- ports/libunifex/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libunifex.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libunifex/portfile.cmake b/ports/libunifex/portfile.cmake index b1c80085878dc0..0bd1a4c29fbf97 100644 --- a/ports/libunifex/portfile.cmake +++ b/ports/libunifex/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookexperimental/libunifex - REF 591ec09e7d51858ad05be979d4034574215f5971 - SHA512 b07ebad2e6fa9a40c73fe2712e65cfe49591857bf784bd901acb7f35549746a36679c969df89321866530fd774bde176aa2d800f3da1462e818eecb8d0822842 - HEAD_REF master + REF "v${VERSION}" + SHA512 91a02d50e45c0458e25bd51c50fb6e98a668298733a3e66e8eb5353b0a5ea78a3656fe83b873e0ea50b26c6a7de572a663160b458c0fb1272ffa8bfd7715d1cc + HEAD_REF main PATCHES fix-compile-error.patch fix-linux-timespec.patch diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json index f7e5de17199724..528fe49618cec4 100644 --- a/ports/libunifex/vcpkg.json +++ b/ports/libunifex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libunifex", - "version-date": "2023-01-25", - "port-version": 2, + "version": "0.3.0", "description": "Unified Executors", "homepage": "https://github.com/facebookexperimental/libunifex", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index aa508fe9a1984b..d45d10bb7f5a03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4709,8 +4709,8 @@ "port-version": 1 }, "libunifex": { - "baseline": "2023-01-25", - "port-version": 2 + "baseline": "0.3.0", + "port-version": 0 }, "libunistring": { "baseline": "1.1", diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json index 4fffaa2729157f..60d0c0ef0e90db 100644 --- a/versions/l-/libunifex.json +++ b/versions/l-/libunifex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c60e3416d322f4e80f25e565190f679c99967931", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "4cc9469cbd38b11cc3966599bcb60c29d4dc34bc", "version-date": "2023-01-25", From 5eb7e5587993b3abe53ba62425d64722e33ded09 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Tue, 11 Jul 2023 20:54:17 +0200 Subject: [PATCH 511/533] [tiff] set correct license id in license field (#32476) * [tiff] set correct license id in license field * Update version database --- ports/tiff/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/t-/tiff.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 00fa2772a64d33..5efdd811634629 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,9 +1,10 @@ { "name": "tiff", "version": "4.5.1", + "port-version": 2, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", - "license": null, + "license": "libtiff", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index d45d10bb7f5a03..0335f833902a54 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8042,7 +8042,7 @@ }, "tiff": { "baseline": "4.5.1", - "port-version": 0 + "port-version": 2 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 2ab9123bbbe275..2548d1d90eb96e 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68f4ecc87b5ddce6c328c0f600a4c8b81d967d4c", + "version": "4.5.1", + "port-version": 2 + }, { "git-tree": "5510d3f8317c71185268d5128e6a7c24b4d66863", "version": "4.5.1", From 501bd6f75ada29bcbc43ab481c501f538bd139c0 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 12 Jul 2023 02:54:40 +0800 Subject: [PATCH 512/533] [cpp-httplib] Update to v0.13.1 (#32474) * [cpp-httplib] Update to v0.13.1 * version --- ports/cpp-httplib/fix-find-brotli.patch | 13 +++++++------ ports/cpp-httplib/portfile.cmake | 2 +- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ports/cpp-httplib/fix-find-brotli.patch b/ports/cpp-httplib/fix-find-brotli.patch index 087e47daee9bbf..4d749360b4c20d 100644 --- a/ports/cpp-httplib/fix-find-brotli.patch +++ b/ports/cpp-httplib/fix-find-brotli.patch @@ -1,7 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3515d77..556fb78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -131,9 +131,9 @@ endif() +@@ -138,9 +138,9 @@ endif() # Adds our cmake folder to the search path for find_package list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") if(HTTPLIB_REQUIRE_BROTLI) @@ -13,7 +14,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt endif() # Just setting this variable here for people building in-tree if(Brotli_FOUND) -@@ -216,9 +216,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} +@@ -223,9 +223,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} # Needed for API from MacOS Security framework "$<$,$,$>:-framework CoreFoundation -framework Security>" # Can't put multiple targets in a single generator expression or it bugs out. @@ -26,13 +27,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt $<$:ZLIB::ZLIB> $<$:OpenSSL::SSL> $<$:OpenSSL::Crypto> -@@ -274,9 +274,6 @@ install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE) - install(FILES +@@ -283,9 +283,6 @@ if(HTTPLIB_INSTALL) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" - # Install it so it can be used later by the httplibConfig.cmake file. - # Put it in the same dir as our config file instead of a global path so we don't potentially stomp on other packages. - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindBrotli.cmake" - DESTINATION ${_TARGET_INSTALL_CMAKEDIR} - ) + DESTINATION ${_TARGET_INSTALL_CMAKEDIR} + ) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 05d31c8cb3a4f6..4a2860a8cb3f70 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib REF "v${VERSION}" - SHA512 3465e5c843ad4087bababadf8fe9f3e6961213301540053bb47f242f958280f43c85b03b8cf6f955a6b91bf9511a81669feeb9989344caf2a1e42ff587b3a460 + SHA512 4a70ebafd0920116a78ea18982606f0bec396e5cdcea9ba583c1da4fd77fa45c5bf30a6ac14eeee9424f3e445a882a560345d731a7113ab4e7dff88f4ef0a436 HEAD_REF master PATCHES fix-find-brotli.patch diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index b8cb1d9e3b35ed..ef375323e52f6c 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.12.3", + "version": "0.13.1", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0335f833902a54..2e8538b86df845 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1757,7 +1757,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.12.3", + "baseline": "0.13.1", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index 6d613ba2355923..d706e5c9cec853 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "795e219c0d92adb47551a8a8a4a1e800d5fe70a9", + "version": "0.13.1", + "port-version": 0 + }, { "git-tree": "570d0fcd52fa9bb8048dfe84df6a31b2473949b5", "version": "0.12.3", From edd88a8448c86394368015c35cd944434b8e418e Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 11 Jul 2023 11:55:18 -0700 Subject: [PATCH 513/533] [redis-plus-plus] Update to 1.3.10 (#32469) --- ports/redis-plus-plus/portfile.cmake | 9 ++++++++- ports/redis-plus-plus/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/redis-plus-plus.json | 5 +++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index 774576376e3230..1b8087660140d0 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus REF "${VERSION}" - SHA512 a9afecc4059155137d524542e7ad699f78e5efc8b1136c1aac093e60fe70dddede3594afe6920f813ba011fb61740bec09b3564c8f8f42118e21fdd5f40f6161 + SHA512 43741da2222a9416cee16f522244ddf243b7a188f08704bb05e66f659213b05189fcef35b7b100b128d301e889765ad3f151889e9b5b9e6510479bec58b04ce0 HEAD_REF master PATCHES fix-conversion.patch @@ -50,6 +50,13 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(PACKAGE_NAME redis++ CONFIG_PATH share/cmake/redis++) +if("async" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/redis++/redis++-config.cmake" +"include(CMakeFindDependencyMacro)" +[[include(CMakeFindDependencyMacro) +find_dependency(libuv CONFIG)]]) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 9830185b8030a8..7545206f4c8b0a 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "redis-plus-plus", - "version-semver": "1.3.9", - "port-version": 1, + "version-semver": "1.3.10", "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2e8538b86df845..c7a54495db959a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7121,8 +7121,8 @@ "port-version": 0 }, "redis-plus-plus": { - "baseline": "1.3.9", - "port-version": 1 + "baseline": "1.3.10", + "port-version": 0 }, "refl-cpp": { "baseline": "0.12.3", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index e85115ec4c7c8d..a94f13a9cf936d 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0304c085aa643a482f93ed391ba61bed356577f9", + "version-semver": "1.3.10", + "port-version": 0 + }, { "git-tree": "8c31ae593f450352915471514d517a772cd5099b", "version-semver": "1.3.9", From 92bad87dfb4e711ac658a9ca33e1183184677020 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 11 Jul 2023 20:57:41 +0200 Subject: [PATCH 514/533] [polyhook2] Fix static linkage for downstream consumers. (#32455) --- ports/polyhook2/fix-dep.patch | 62 ++++++++++++++++++++++++++++++++++ ports/polyhook2/portfile.cmake | 1 + ports/polyhook2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/polyhook2.json | 5 +++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 ports/polyhook2/fix-dep.patch diff --git a/ports/polyhook2/fix-dep.patch b/ports/polyhook2/fix-dep.patch new file mode 100644 index 00000000000000..cd24ccaf100f88 --- /dev/null +++ b/ports/polyhook2/fix-dep.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a91480445..c3d432e0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -211,14 +211,8 @@ endif() + + #DisAsm/Zydis + if (POLYHOOK_USE_EXTERNAL_ZYDIS) +- find_library(ZYDIS_LIBRARY NAMES zydis) +- find_library(ZYCORE_LIBRARY NAMES zycore) +- find_path(ZYDIS_INCLUDE_DIR NAMES zydis/zydis.h) +- find_path(ZYCORE_INCLUDE_DIR NAMES zycore/zycore.h) +- target_link_libraries(${PROJECT_NAME} PUBLIC ${ZYDIS_LIBRARY}) +- target_link_libraries(${PROJECT_NAME} PUBLIC ${ZYCORE_LIBRARY}) +- target_include_directories(${PROJECT_NAME} PUBLIC ${ZYDIS_INCLUDE_DIR}) +- target_include_directories(${PROJECT_NAME} PUBLIC ${ZYCORE_INCLUDE_DIR}) ++ find_package(zydis REQUIRED) ++ target_link_libraries(${PROJECT_NAME} PUBLIC Zydis::Zydis) + else() + target_link_libraries(${PROJECT_NAME} PUBLIC $) + target_include_directories(${PROJECT_NAME} PUBLIC $) +@@ -231,10 +225,8 @@ install(FILES ${PROJECT_SOURCE_DIR}/polyhook2/ZydisDisassembler.hpp DESTINATION + + function(link_asmjit) + if (POLYHOOK_USE_EXTERNAL_ASMJIT) +- find_library(ASMJIT_LIBRARY NAMES asmjit) +- find_path(ASMJIT_INCLUDE_DIR NAMES asmjit/asmjit.h) +- target_link_libraries(${PROJECT_NAME} PRIVATE ${ASMJIT_LIBRARY}) +- target_include_directories(${PROJECT_NAME} PUBLIC ${ASMJIT_INCLUDE_DIR}) ++ find_package(asmjit REQUIRED) ++ target_link_libraries(${PROJECT_NAME} PRIVATE asmjit::asmjit) + else() + target_link_libraries(${PROJECT_NAME} PRIVATE $) + target_include_directories(${PROJECT_NAME} PUBLIC "$") +@@ -238,10 +238,8 @@ if(POLYHOOK_FEATURE_DETOURS) + link_asmjit() + + if (POLYHOOK_USE_EXTERNAL_ASMTK) +- find_library(ASMTK_LIBRARY NAMES asmtk) +- find_path(ASMTK_INCLUDE_DIR NAMES asmtk/asmtk.h) +- target_link_libraries(${PROJECT_NAME} PUBLIC ${ASMTK_LIBRARY}) +- target_include_directories(${PROJECT_NAME} PUBLIC ${ASMTK_INCLUDE_DIR}) ++ find_package(asmtk REQUIRED) ++ target_link_libraries(${PROJECT_NAME} PRIVATE asmjit::asmtk) + else() + target_link_libraries(${PROJECT_NAME} PUBLIC $) + target_include_directories(${PROJECT_NAME} PUBLIC "$") +diff --git a/PolyHook_2-config.cmake.in b/PolyHook_2-config.cmake.in +index 709f8b5d9..3add035e3 100644 +--- a/PolyHook_2-config.cmake.in ++++ b/PolyHook_2-config.cmake.in +@@ -10,5 +10,10 @@ set(POLYHOOK_FEATURE_INLINENTD @POLYHOOK_FEATURE_INLINENTD@) + set(POLYHOOK_FEATURE_PE @POLYHOOK_FEATURE_PE@) + set(POLYHOOK_FEATURE_VIRTUALS @POLYHOOK_FEATURE_VIRTUALS@) + ++include(CMakeFindDependencyMacro) ++find_dependency(Zydis) ++find_dependency(asmjit) ++find_dependency(asmtk) ++ + get_filename_component(POLYHOOK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + include("${POLYHOOK_CMAKE_DIR}/PolyHook_2-targets.cmake") diff --git a/ports/polyhook2/portfile.cmake b/ports/polyhook2/portfile.cmake index 01923d5460b4fc..4a009292890f84 100644 --- a/ports/polyhook2/portfile.cmake +++ b/ports/polyhook2/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF 1ff1d0285fc28bfd206aa0a38ae93022a5ad9be1 SHA512 056b5ce76683e130e053e1f62ccc3fbd060670ac74e0235f100d16bba36707bad5e84d2100fd2cc3a67a7c294eeaf5fb72a213f3d3af099013fe13c92575cc8b HEAD_REF master + PATCHES fix-dep.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json index 5a5ae96c637d31..17898381b95d55 100644 --- a/ports/polyhook2/vcpkg.json +++ b/ports/polyhook2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "polyhook2", "version-date": "2023-05-16", + "port-version": 1, "description": "C++17, x86/x64 Hooking Library v2.0", "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c7a54495db959a..34e5d41e936b34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6410,7 +6410,7 @@ }, "polyhook2": { "baseline": "2023-05-16", - "port-version": 0 + "port-version": 1 }, "polymorphic-value": { "baseline": "1.3.0", diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index 6caad9cf4ccfe3..f24afaca6c1b19 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d6b2480d856d0e6009923d176fb68392e201ac8", + "version-date": "2023-05-16", + "port-version": 1 + }, { "git-tree": "3e46e50c70de16dfea86f4a7a8ceea6d19b3c46b", "version-date": "2023-05-16", From e5f4e66fed7cf9569aff513fd617da1a10c4e63e Mon Sep 17 00:00:00 2001 From: hesmar Date: Tue, 11 Jul 2023 21:22:54 +0200 Subject: [PATCH 515/533] [tesseract] fix unrecognized command line option -mfpu=neon on aarch64 (#32507) --- .../fix-aarch64-mfpu-not-available.patch | 25 +++++++++++++++++++ ports/tesseract/portfile.cmake | 1 + ports/tesseract/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tesseract.json | 5 ++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ports/tesseract/fix-aarch64-mfpu-not-available.patch diff --git a/ports/tesseract/fix-aarch64-mfpu-not-available.patch b/ports/tesseract/fix-aarch64-mfpu-not-available.patch new file mode 100644 index 00000000000000..0c76ebcf4f0d64 --- /dev/null +++ b/ports/tesseract/fix-aarch64-mfpu-not-available.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db4c39d5..276c65f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,7 +257,11 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") + set(HAVE_AVX512F FALSE) + set(HAVE_FMA FALSE) + set(HAVE_SSE4_1 FALSE) ++ + check_cxx_compiler_flag("-mfpu=neon" HAVE_NEON) ++ if(HAVE_NEON) ++ set(NEON_COMPILE_FLAGS "-mfpu=neon") ++ endif(HAVE_NEON) + + else() + +@@ -271,7 +275,6 @@ else() + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86|x86_64|AMD64|amd64|i386|i686") + + if(HAVE_NEON) +- set(NEON_COMPILE_FLAGS "-mfpu=neon") + message(STATUS "LTO build is not supported on arm/RBPi.") + set(ENABLE_LTO FALSE) # enable LTO cause fatal error on arm/RBPi + endif() + \ No newline at end of file diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 213d88aa270aae..a28501777de668 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( PATCHES ${tesseract_patch} fix_static_link_icu.patch + fix-aarch64-mfpu-not-available.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 2aa8674f239d20..4d51f167630340 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tesseract", "version": "5.3.1", + "port-version": 1, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 34e5d41e936b34..12a541ce0118f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7994,7 +7994,7 @@ }, "tesseract": { "baseline": "5.3.1", - "port-version": 0 + "port-version": 1 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 4ec5c7faee86f9..f8477ca0249d9c 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0b39327eee123cac1611afe9d88303822fedbdf", + "version": "5.3.1", + "port-version": 1 + }, { "git-tree": "aeb035e40f678090353d237cc6de1089fb58d89c", "version": "5.3.1", From 854c5cab1a1325fc1d87db3809265c90df26c678 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Tue, 11 Jul 2023 21:35:06 +0200 Subject: [PATCH 516/533] [libuuid] add license id and use vcpkg_install_copyright() (#32504) * [libuuid] add license id and use vcpkg_install_copyright() * Update version database --- ports/libuuid/portfile.cmake | 4 +--- ports/libuuid/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libuuid.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake index e42f64f220e680..74bf515e2e106d 100644 --- a/ports/libuuid/portfile.cmake +++ b/ports/libuuid/portfile.cmake @@ -35,8 +35,6 @@ endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/unofficial-libuuid PACKAGE_NAME unofficial-libuuid) vcpkg_fixup_pkgconfig() -file(INSTALL - "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_copy_pdbs() diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json index d47017dd082839..405adfb81bf864 100644 --- a/ports/libuuid/vcpkg.json +++ b/ports/libuuid/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libuuid", "version": "1.0.3", - "port-version": 13, + "port-version": 14, "description": "Universally unique id library", "homepage": "https://sourceforge.net/projects/libuuid", + "license": "BSD-3-Clause", "supports": "!osx & !windows", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 12a541ce0118f2..91d07bf9532ef4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4734,7 +4734,7 @@ }, "libuuid": { "baseline": "1.0.3", - "port-version": 13 + "port-version": 14 }, "libuv": { "baseline": "1.45.0", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index f9a5b177fe076a..95e9210f42eb84 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09be6774f518692bc418aa03623cc9dbc19e6516", + "version": "1.0.3", + "port-version": 14 + }, { "git-tree": "356948d66a6dd59bd830d26c78d1df673de20ea1", "version": "1.0.3", From a54b77790d1632394bc16621ef83613dd4480320 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Wed, 12 Jul 2023 03:59:39 +0800 Subject: [PATCH 517/533] [vcpkg doc] Update doc link in README_zh_CN.md (#32485) --- README_zh_CN.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README_zh_CN.md b/README_zh_CN.md index b0f5252996789b..18b61cfe55edd5 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -12,7 +12,7 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 * GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg 频道 * Discord: [\#include \](https://www.includecpp.org)， #🌏vcpkg 频道 -* 文档: [Documentation](docs/README.md) +* 文档: [Documentation](https://learn.microsoft.com/vcpkg) # 目录 @@ -241,8 +241,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems 使用此种方式可无需设置 `CMAKE_TOOLCHAIN_FILE` 即可使用 vcpkg，且更容易完成配置工作。 -[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/buildsystems/integration.md +[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools @@ -250,7 +249,6 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems [getting-started:macos-brew]: #installing-gcc-on-macos [getting-started:macos-gcc]: #installing-gcc-on-macos [getting-started:visual-studio]: https://visualstudio.microsoft.com/ -[getting-started:manifest-spec]: docs/specifications/manifests.md # Tab 补全/自动补全 @@ -271,10 +269,10 @@ $ ./vcpkg integrate bash # 或 zsh ## 示例 -请查看 [文档](docs/README.md) 获取具体示例， -其包含 [安装并使用包](docs/examples/installing-and-using-packages.md)， -[使用压缩文件添加包](docs/examples/packaging-zipfiles.md) -和 [从 GitHub 源中添加一个包](docs/examples/packaging-github-repos.md)。 +请查看 [文档](https://learn.microsoft.com/vcpkg) 获取具体示例， +其包含 [安装并使用包](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages)， +[使用压缩文件添加包](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles) +和 [从 GitHub 源中添加一个包](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos)。 我们的文档现在也可以从 [vcpkg.io](https://vcpkg.io/) 在线获取。 我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 创建 issue. From a5fff62846e6e91f43151ed80601a6ecaee50e0b Mon Sep 17 00:00:00 2001 From: Regen Date: Wed, 12 Jul 2023 09:35:08 +0900 Subject: [PATCH 518/533] [angle] Fix typo (#32491) Co-authored-by: Billy Robert O'Neal III --- ports/angle/cmake-buildsystem/CMakeLists.txt | 2 +- ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/angle/cmake-buildsystem/CMakeLists.txt b/ports/angle/cmake-buildsystem/CMakeLists.txt index 09295948ec8efb..110c5a09755d67 100644 --- a/ports/angle/cmake-buildsystem/CMakeLists.txt +++ b/ports/angle/cmake-buildsystem/CMakeLists.txt @@ -398,7 +398,7 @@ if (angle_use_x11) target_sources(ANGLE PRIVATE ${libangle_gpu_info_util_x11_sources}) target_sources(ANGLE PRIVATE "src/gpu_info_util/SystemInfo_x11.cpp") target_compile_definitions(ANGLE PRIVATE ANGLE_USE_X11 GPU_INFO_USE_X11) - target_link_libraries(ANGLE PRIVATE $X11_LIBRARIES} X11::X11 X11::Xi X11::Xext) + target_link_libraries(ANGLE PRIVATE ${X11_LIBRARIES} X11::X11 X11::Xi X11::Xext) endif() # set export names of some targets to match prior vcpkg port buildsystem diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index ba86afdcd0d885..12ac3a4df8cf95 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 5, + "port-version": 6, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 27c6eb9c50b9f3..fe0f1cb5e40472 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28f33feb91072e2df5daa5b7e10846db4a6f3a50", + "version-string": "chromium_5414", + "port-version": 6 + }, { "git-tree": "d8849e7cee8eb5754ec1aefba7644bb393863f94", "version-string": "chromium_5414", diff --git a/versions/baseline.json b/versions/baseline.json index 91d07bf9532ef4..d930800a5c31bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 5 + "port-version": 6 }, "annoy": { "baseline": "1.17.2", From e0e74f5b57be000179a5eba9d20a9e966f70e31c Mon Sep 17 00:00:00 2001 From: Yuri Bogomolov Date: Wed, 12 Jul 2023 04:35:21 +0400 Subject: [PATCH 519/533] [libev] change package name to unofficial-libev (#32472) --- ports/libev/portfile.cmake | 4 ++-- .../{libevConfig.cmake => unofficial-libev-config.cmake} | 0 ports/libev/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libev.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) rename ports/libev/{libevConfig.cmake => unofficial-libev-config.cmake} (100%) diff --git a/ports/libev/portfile.cmake b/ports/libev/portfile.cmake index a12364e66fe8a6..2a44f859c11f24 100644 --- a/ports/libev/portfile.cmake +++ b/ports/libev/portfile.cmake @@ -23,5 +23,5 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") file(RENAME "${CURRENT_PACKAGES_DIR}/include.tmp" "${CURRENT_PACKAGES_DIR}/include/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libevConfig.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libev-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") diff --git a/ports/libev/libevConfig.cmake b/ports/libev/unofficial-libev-config.cmake similarity index 100% rename from ports/libev/libevConfig.cmake rename to ports/libev/unofficial-libev-config.cmake diff --git a/ports/libev/vcpkg.json b/ports/libev/vcpkg.json index 73d16f0f11c2bc..930e6d9fe7c661 100644 --- a/ports/libev/vcpkg.json +++ b/ports/libev/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libev", "version": "4.33", - "port-version": 1, + "port-version": 2, "description": "libev is a high-performance event loop/event model with lots of features.", "homepage": "http://software.schmorp.de/pkg/libev.html", "license": "BSD-2-Clause OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index d930800a5c31bd..db2426988dc4ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4030,7 +4030,7 @@ }, "libev": { "baseline": "4.33", - "port-version": 1 + "port-version": 2 }, "libevent": { "baseline": "2.1.12+20230128", diff --git a/versions/l-/libev.json b/versions/l-/libev.json index 1c9132ba0cb595..2a759b21156c7f 100644 --- a/versions/l-/libev.json +++ b/versions/l-/libev.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1287c21bdb7398762b3906c5daaab7b537bea188", + "version": "4.33", + "port-version": 2 + }, { "git-tree": "cfde981a39ab06f99274a246ccbb342b51efe55f", "version": "4.33", From 63a57560c62187ee487b0d55796b12c020f9ad38 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 11 Jul 2023 20:35:49 -0400 Subject: [PATCH 520/533] [mujoco] use correct https:// schema for hompage url (#32509) --- ports/mujoco/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mujoco.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/mujoco/vcpkg.json b/ports/mujoco/vcpkg.json index 674a758b4588d5..ab0a312e22cd2f 100644 --- a/ports/mujoco/vcpkg.json +++ b/ports/mujoco/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mujoco", "version": "2.3.2", + "port-version": 1, "description": "Multi-Joint dynamics with Contact.", - "homepage": "mujoco.org", + "homepage": "https://mujoco.org", "license": "Apache-2.0", "supports": "!(windows & static)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index db2426988dc4ee..b84255c37822fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5518,7 +5518,7 @@ }, "mujoco": { "baseline": "2.3.2", - "port-version": 0 + "port-version": 1 }, "mujs": { "baseline": "1.3.2", diff --git a/versions/m-/mujoco.json b/versions/m-/mujoco.json index fc68f3fd8b3937..6a226880519427 100644 --- a/versions/m-/mujoco.json +++ b/versions/m-/mujoco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c70b9104b75fe8947ddac6e9450207cadb59cb0b", + "version": "2.3.2", + "port-version": 1 + }, { "git-tree": "086053d3e52e0d7565733cf06db736f2e1617a63", "version": "2.3.2", From 5ac89392d779288ec8073ebba69cf12d3537f6d7 Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Wed, 12 Jul 2023 02:36:33 +0200 Subject: [PATCH 521/533] [dirent] add license id and use vcpkg_install_copyright() (#32495) --- ports/dirent/portfile.cmake | 2 +- ports/dirent/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/d-/dirent.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/dirent/portfile.cmake b/ports/dirent/portfile.cmake index 945f6017af0f1f..e8b57749387d8c 100644 --- a/ports/dirent/portfile.cmake +++ b/ports/dirent/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dirent RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_copy_pdbs() set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/ports/dirent/vcpkg.json b/ports/dirent/vcpkg.json index cba6c1168a5cc9..81e6361e6cc869 100644 --- a/ports/dirent/vcpkg.json +++ b/ports/dirent/vcpkg.json @@ -1,7 +1,8 @@ { "name": "dirent", "version": "1.23.2", - "port-version": 2, + "port-version": 3, "description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.", - "homepage": "https://github.com/tronkko/dirent" + "homepage": "https://github.com/tronkko/dirent", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index b84255c37822fb..1c8b6413b7ae3e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2122,7 +2122,7 @@ }, "dirent": { "baseline": "1.23.2", - "port-version": 2 + "port-version": 3 }, "discord-game-sdk": { "baseline": "3.2.1", diff --git a/versions/d-/dirent.json b/versions/d-/dirent.json index 17eb9996873727..07e9e7d86851e1 100644 --- a/versions/d-/dirent.json +++ b/versions/d-/dirent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6df6238f6f97735c39e2e9b19d90f3895c4a636b", + "version": "1.23.2", + "port-version": 3 + }, { "git-tree": "9d27b241631b1f540dd16824cd8a2df735233733", "version": "1.23.2", From 5d94ad783a6e14c6b3c62a60113bcf0740c6d28a Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 12 Jul 2023 14:52:27 +0800 Subject: [PATCH 522/533] [flann] Fix pop_t is not defined under non-gunc platform. (#32468) --- ports/flann/fix_undefined_pot_t.patch | 13 +++++++++++++ ports/flann/portfile.cmake | 3 ++- ports/flann/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flann.json | 5 +++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 ports/flann/fix_undefined_pot_t.patch diff --git a/ports/flann/fix_undefined_pot_t.patch b/ports/flann/fix_undefined_pot_t.patch new file mode 100644 index 00000000000000..459727e0b926b0 --- /dev/null +++ b/ports/flann/fix_undefined_pot_t.patch @@ -0,0 +1,13 @@ +diff --git a/src/cpp/flann/algorithms/dist.h b/src/cpp/flann/algorithms/dist.h +index 4e6eb73..bbcdda1 100644 +--- a/src/cpp/flann/algorithms/dist.h ++++ b/src/cpp/flann/algorithms/dist.h +@@ -519,7 +519,7 @@ struct HammingPopcnt + #else + HammingLUT lut; + result = lut(reinterpret_cast (a), +- reinterpret_cast (b), size * sizeof(pop_t)); ++ reinterpret_cast (b), size); + #endif + return result; + } diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 78d4d27695c8a9..8eb96a4b5a0f68 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-build-error.patch fix-dependency-hdf5.patch + fix_undefined_pot_t.patch # https://github.com/opencv/opencv/pull/13270/ ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -37,6 +38,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_fixup_pkgconfig() diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json index ed0622359e80c0..c93f374d020fb9 100644 --- a/ports/flann/vcpkg.json +++ b/ports/flann/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 6, + "port-version": 7, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1c8b6413b7ae3e..887341e6d2dcef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2518,7 +2518,7 @@ }, "flann": { "baseline": "2019-04-07", - "port-version": 6 + "port-version": 7 }, "flash-runtime-extensions": { "baseline": "2.4", diff --git a/versions/f-/flann.json b/versions/f-/flann.json index d951e22e012f4f..94e299066fe60b 100644 --- a/versions/f-/flann.json +++ b/versions/f-/flann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "827bba7345ec924adeee28bacb5b0a79f705920d", + "version-date": "2019-04-07", + "port-version": 7 + }, { "git-tree": "300415ad416640a5b4a4f0895a3250b306726181", "version-date": "2019-04-07", From fd8186918c812c9a40206130a32d8636abd58ac0 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 11 Jul 2023 23:53:04 -0700 Subject: [PATCH 523/533] [Azure Storage] Update to July Release (#32516) --- ports/azure-storage-blobs-cpp/portfile.cmake | 7 ++++--- ports/azure-storage-blobs-cpp/vcpkg.json | 2 +- ports/azure-storage-common-cpp/portfile.cmake | 5 +++-- ports/azure-storage-common-cpp/vcpkg.json | 2 +- ports/azure-storage-files-datalake-cpp/portfile.cmake | 5 +++-- ports/azure-storage-files-datalake-cpp/vcpkg.json | 2 +- ports/azure-storage-files-shares-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-shares-cpp/vcpkg.json | 2 +- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 8 ++++---- 13 files changed, 40 insertions(+), 17 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 30adab999d55c4..f8a12fe24582e2 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.7.0 - SHA512 7750035f42c7cc120b294d0449885446d5d06c0393a24d957f1484525967fd609dda0319574e9d95888441d749bbca820fccaf7741ac1321bc071adcfb48f3a9 + REF azure-storage-blobs_12.8.0 + SHA512 2ff085f6e4152cd65cc234ea44773e48577d938a3e733189dbb77d88f0882c00b5c5ae136287b87437a34ce571a54dea6d0a16f178df4f6102363e9371f403f2 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/ + SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-blobs/" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 14a527dfe0d082..0d22be3a81f5fc 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.7.0", + "version-semver": "12.8.0", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 9ef991aeb312ea..e033ad8630db07 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.3.2 - SHA512 e437c12ba1056838a1d68257522f412f709b4bcbd3e58d4f7fc47768f125a61258667e0f4fcb93927522da9ab2a9495c3d8c53d81f01a86feb142a7025b1ee4c + REF azure-storage-common_12.3.3 + SHA512 a9167e5b3d3cfe0585ef201f07cc80fdef6e6147be2a72f217dceca6c006579c341360f35bd7c5c7de6b0c7c122732107cb920baf74e5fef053a99512ee28515 ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-common/" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 24dfb910a93c91..39729d1ecb01e2 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.3.2", + "version-semver": "12.3.3", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index d1f39b7bad4922..efd23c2868f294 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.6.0 - SHA512 29f1f929abdb7a013593679143ad7a90b52af10f630832c15c133c11925c27528d9221c73ad1b53aad59d7017c82347a4d06bfaf96aaa9ae60ea5a23d8355fcc + REF azure-storage-files-datalake_12.7.0 + SHA512 5c0ce675666e64aca05dc64254afaba75af89d3c836aa0168a6f6b92c16b3fc148274a686bc3f6b13670205cf0939cba55fe62be3892ac26bb4edfe46816d114 ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 4ca085dc661f12..71649f223c5f2b 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.6.0", + "version-semver": "12.7.0", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 19be8c992e0b07..2fa51b973034fe 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.5.0 - SHA512 e56a3af0df71f9887248fdf48274345b236a56a7556235d1c3bab61668fee0c1163e86339c080166445c6b66dfbbba1938204592ca6f6a2b232303836317d7f6 + REF azure-storage-files-shares_12.6.0 + SHA512 a739391ee457b593320ae614393d3c602b1787cc9f135a5a20b54c33345b19c24a456c45781f11cb26e5272671f8ded6e00639617861ae396fdaec38417dbe03 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index c42fe1433482a1..0d25e6b8df7b87 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.5.0", + "version-semver": "12.6.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 16064dfbda8fba..29d294da7fc276 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "984b2a3258596a074a6a79be8b0d7c3128137981", + "version-semver": "12.8.0", + "port-version": 0 + }, { "git-tree": "40ca58231897346f0bf37910ae4c431aa8a5f56d", "version-semver": "12.7.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 8c8539dcb5d5f1..51d7376da76720 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b147e96bd4b49d4803cf8a3c4b5359bfe3bec275", + "version-semver": "12.3.3", + "port-version": 0 + }, { "git-tree": "13de7bf9db0ab19424dcbf7413c3bf2aa5798653", "version-semver": "12.3.2", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 90e7f41a82ab9b..1a0e6bb4e3c85b 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca459a11301918aa1296233d473a865032323673", + "version-semver": "12.7.0", + "port-version": 0 + }, { "git-tree": "9c8ba7dabf8011127712dc95628ca1029b0c92c3", "version-semver": "12.6.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 24ca95ae667855..6fdf29b3d2c0ae 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "856f4e474ec45831593123a281fe650ba86387ab", + "version-semver": "12.6.0", + "port-version": 0 + }, { "git-tree": "f264428685ea6f882d9c58a9915c83665d428456", "version-semver": "12.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index 887341e6d2dcef..c8b44f5a3f927b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -445,11 +445,11 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.7.0", + "baseline": "12.8.0", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.3.2", + "baseline": "12.3.3", "port-version": 0 }, "azure-storage-cpp": { @@ -457,11 +457,11 @@ "port-version": 5 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.6.0", + "baseline": "12.7.0", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.5.0", + "baseline": "12.6.0", "port-version": 0 }, "azure-storage-queues-cpp": { From 5269f4f4f6b3970ad21f6956f6bb2322c024910c Mon Sep 17 00:00:00 2001 From: sakiodre <136492105+sakiodre@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:53:52 +0700 Subject: [PATCH 524/533] [lunasvg] Update 2.3.8 (#32510) --- ports/lunasvg/portfile.cmake | 4 ++-- ports/lunasvg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lunasvg.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake index 9b40c58421d863..509d063dfa2711 100644 --- a/ports/lunasvg/portfile.cmake +++ b/ports/lunasvg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sammycage/lunasvg - REF e612abda858b53160041381a23422cd2b4f42fbd #2.3.1 - SHA512 44f5d013d918cb5af90114a12857bdd2c204caff761516ef98b12b08d8b6215e91f6d963c281500c386f287b9d0ecd5b3d986d4c8c33423c0c34d539d744e09d + REF "v${VERSION}" + SHA512 368f76ae3c04fbcb08406d9e7793af37b5e28ab90ffe0978fae8783620a45af3270fcd4e895c553e3e651f0ba07e37355acffd9f0aab1bf9ef822f465de21073 HEAD_REF master PATCHES fix-install.patch diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json index df3d8aaa0769f1..1e55ed9194cc15 100644 --- a/ports/lunasvg/vcpkg.json +++ b/ports/lunasvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lunasvg", - "version": "2.3.1", + "version": "2.3.8", "description": "lunasvg is a standalone SVG rendering library in C++", "homepage": "https://github.com/sammycage/lunasvg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c8b44f5a3f927b..a3951991d6278a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5081,7 +5081,7 @@ "port-version": 1 }, "lunasvg": { - "baseline": "2.3.1", + "baseline": "2.3.8", "port-version": 0 }, "luv": { diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json index fb076139e32d59..ba6d59f64c05ee 100644 --- a/versions/l-/lunasvg.json +++ b/versions/l-/lunasvg.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7", - "version": "2.3.1", + "git-tree": "064296e0fbadcd3113e5ee2a65202614c9125acc", + "version": "2.3.8", "port-version": 0 } ] From 7ff8ea637860e9ab0cde8035ae3176f594026e0a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 13 Jul 2023 03:26:28 +0800 Subject: [PATCH 525/533] update to 8.0.0 (#32489) --- ports/harfbuzz/portfile.cmake | 2 +- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 24ea90ed4e6140..2ee850d57d6811 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 47238586c399ede1095c60b7e065718308c396cab645fd5bd5c75e15357c068ff001b2b6624d44c7f6538b65faf549c0224bdb62131a1cea78418f3f57113c7e + SHA512 bfad0310f0f20a900b02f3f061920e7488d4565292864eb349e71a9597a10b2305fdeb1b19ac1975444d59f7903e5308961e4b84e33c25aa23d6e588536c5c5d HEAD_REF master ) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 45b50dea66f4f2..5962a25680cb1d 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "7.3.0", + "version": "8.0.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index a3951991d6278a..3bcc60ad0769ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3109,7 +3109,7 @@ "port-version": 1 }, "harfbuzz": { - "baseline": "7.3.0", + "baseline": "8.0.0", "port-version": 0 }, "hash-library": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 12ea472ac7c28e..fb47919bf174d0 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f0320d0c3d8f57f1665f30b98bd64ff0181181d", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "7b0e10a3d5e7e49990e7a19f29cdba04571725f4", "version": "7.3.0", From 4d6bafb2cea6ab6a5fd31f7cd2b49983d12f39e8 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 12 Jul 2023 12:30:31 -0700 Subject: [PATCH 526/533] Update passing remove from fail lists 2023-07-10. (#32484) * PASSING, REMOVE FROM FAIL LIST: chipmunk:arm64-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: chipmunk:x64-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt). REGRESSION: fastrtps:arm-neon-android failed with BUILD_FAILED. If expected, add fastrtps:arm-neon-android=fail to /vcpkg/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: fastrtps:arm64-android failed with BUILD_FAILED. If expected, add fastrtps:arm64-android=fail to /vcpkg/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: fastrtps:x64-android failed with BUILD_FAILED. If expected, add fastrtps:x64-android=fail to /vcpkg/scripts/azure-pipelines/../ci.baseline.txt. Previously blocked by: PASSING, REMOVE FROM FAIL LIST: foonathan-memory:arm-neon-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: foonathan-memory:arm64-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: foonathan-memory:x64-android (/vcpkg/scripts/azure-pipelines/../ci.baseline.txt). REGRESSION: cmake-user:x86-windows cascaded, but it is required to pass. (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: hdf5:x86-windows failed with BUILD_FAILED. If expected, add hdf5:x86-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: vcpkg-ci-mathgl:x86-windows cascaded, but it is required to pass. (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: vcpkg-ci-opencv:x86-windows cascaded, but it is required to pass. (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: vcpkg-ci-openimageio:x86-windows cascaded, but it is required to pass. (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: vcpkg-ci-paraview:x86-windows cascaded, but it is required to pass. (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:112 (message): Command failed: "C:/Program Files/PowerShell/7/pwsh.exe" -noprofile -executionpolicy Bypass -nologo -file C:/a/1/s/scripts/buildsystems/msbuild/applocal.ps1 -targetBinary D:/packages/hdf5_x86-windows/tools/hdf5/h5clear-shared.exe -installedDir D:/packages/hdf5_x86-windows/bin -verbose Working Directory: C:/a/1/s Error code: Access violation See logs for more information: D:\buildtrees\hdf5\copy-tool-dependencies-2-out.log D:\buildtrees\hdf5\copy-tool-dependencies-2-err.log Previous CI run passed, so I'm going to hope we got a bad machine or something and move on for now. REGRESSION: openvino:x64-linux failed with BUILD_FAILED. If expected, add openvino:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: openvino:x64-osx failed with BUILD_FAILED. If expected, add openvino:x64-osx=fail to /Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: openvino:x64-windows failed with BUILD_FAILED. If expected, add openvino:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: openvino:x64-windows-static failed with BUILD_FAILED. If expected, add openvino:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: openvino:x64-windows-static-md failed with BUILD_FAILED. If expected, add openvino:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. See discussion in https://github.com/microsoft/vcpkg/pull/32418 / https://github.com/openvinotoolkit/openvino/issues/18465 -- openvino conflicts with oneDNN because the vcpkg copy is not the same as their forked copy. REGRESSION: physx:x64-linux failed with FILE_CONFLICTS. If expected, add physx:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: physx:x64-windows failed with FILE_CONFLICTS. If expected, add physx:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: physx:x64-windows-static failed with FILE_CONFLICTS. If expected, add physx:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: physx:x64-windows-static-md failed with FILE_CONFLICTS. If expected, add physx:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. See discussion in https://github.com/microsoft/vcpkg/pull/32432 -- omniverse-physx-sdk was added 5 days ago and conflicts. REGRESSION: libev:arm-neon-android failed with FILE_CONFLICTS. If expected, add libev:arm-neon-android=fail to /vcpkg/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: libev:x64-android failed with FILE_CONFLICTS. If expected, add libev:x64-android=fail to /vcpkg/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: libev:x64-linux failed with FILE_CONFLICTS. If expected, add libev:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. REGRESSION: libev:x64-osx failed with FILE_CONFLICTS. If expected, add libev:x64-osx=fail to /Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt. Fixed by https://github.com/microsoft/vcpkg/pull/32471 REGRESSION: ryu:x64-linux failed with FILE_CONFLICTS. If expected, add ryu:x64-linux=fail to /agent/_work/1/s/scripts/azure-pipelines/../ci.baseline.txt. error: The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with ryu:x64-linux Installed by bde:x64-linux debug/lib/libryu.a include/ryu/ryu.h lib/libryu.a * Exclude chipmunk:arm-neon-android with a supports expression rather than with ci.baseline.txt as this is explicitly blocked in the sources. --- ports/chipmunk/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 9 ++++----- versions/baseline.json | 2 +- versions/c-/chipmunk.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/chipmunk/vcpkg.json b/ports/chipmunk/vcpkg.json index 808b1eae11048c..01bccc9ebc6663 100644 --- a/ports/chipmunk/vcpkg.json +++ b/ports/chipmunk/vcpkg.json @@ -1,9 +1,10 @@ { "name": "chipmunk", "version": "7.0.3", - "port-version": 5, + "port-version": 6, "description": "A fast and lightweight 2D game physics library.", "homepage": "https://github.com/slembcke/Chipmunk2D", + "supports": "!(arm & !arm64 & android)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4b5d22965ec963..0c15f327d51608 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -177,7 +177,6 @@ chartdir:x86-windows=skip chartdir:x64-windows=skip chartdir:x64-windows-static-md=skip chartdir:x64-osx=skip -chipmunk:arm-neon-android=fail # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI # broken on Windows because it does not yet support VS2022 @@ -342,10 +341,13 @@ evpp:arm-neon-android=fail evpp:arm64-android=fail evpp:x64-android=fail faiss:arm64-windows=fail +fastrtps:arm-neon-android=fail fastrtps:arm-uwp=fail +fastrtps:arm64-android=fail +fastrtps:x64-android=fail fastrtps:x64-uwp=fail -fastrtps:x64-windows-static=fail fastrtps:x64-windows-static-md=fail +fastrtps:x64-windows-static=fail fdk-aac:arm-neon-android=fail fdk-aac:arm64-android=fail fdk-aac:x64-android=fail @@ -379,11 +381,8 @@ folly:arm64-android=fail folly:x64-android=fail fontconfig:x64-uwp=fail fontconfig:arm-uwp=fail -foonathan-memory:arm64-android=fail foonathan-memory:arm64-windows=fail foonathan-memory:arm-uwp=fail -foonathan-memory:x64-android=fail -foonathan-memory:arm-neon-android=fail foonathan-memory:x64-uwp=fail freeglut:arm-neon-android=fail freeglut:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3bcc60ad0769ec..0ab46e7f9312cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1502,7 +1502,7 @@ }, "chipmunk": { "baseline": "7.0.3", - "port-version": 5 + "port-version": 6 }, "chmlib": { "baseline": "0.40", diff --git a/versions/c-/chipmunk.json b/versions/c-/chipmunk.json index 1ca82e7e73343a..c0624b5473c377 100644 --- a/versions/c-/chipmunk.json +++ b/versions/c-/chipmunk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daaeebb368f5c367d7005bb828913f8e158648c1", + "version": "7.0.3", + "port-version": 6 + }, { "git-tree": "949b207c326b9ded582e3360db0375bfbde8e136", "version": "7.0.3", From 81d262e85351d6c8458305d2b7de6466d2507a79 Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Thu, 13 Jul 2023 04:06:59 +0800 Subject: [PATCH 527/533] [nameof] Bump to 0.10.3 (#32523) * [nameof] Bump to 0.10.3 * update version database --- ports/nameof/portfile.cmake | 14 +++++++------- ports/nameof/usage | 4 ++++ ports/nameof/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nameof.json | 5 +++++ 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 ports/nameof/usage diff --git a/ports/nameof/portfile.cmake b/ports/nameof/portfile.cmake index 4b4ba12fce7548..098fbdea5917c8 100644 --- a/ports/nameof/portfile.cmake +++ b/ports/nameof/portfile.cmake @@ -1,13 +1,13 @@ -# header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/nameof - REF v0.10.2 - SHA512 1ec508378d12eb4a65da1bee8011302f65e78bbcab82aae716afc673665af5283a5aae5f1d0de85c7d6f59bb7268e02fc01b171f50de26bb86dc27c3b46097fa + REF "v${VERSION}" + SHA512 2b0bad2a3309202bcd6e361c2f2d4a61b474359a6c2df0a8b9e1a6c9e077bbf0c0d18dc5b603ecb4f82cc1f74656aae51e52ece0f7049ac3f75b593f14542b93 HEAD_REF master ) +set(VCPKG_BUILD_TYPE release) # header-only port + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -20,7 +20,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -# Handle copyright -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nameof/usage b/ports/nameof/usage new file mode 100644 index 00000000000000..db46ed2a033c10 --- /dev/null +++ b/ports/nameof/usage @@ -0,0 +1,4 @@ +nameof provides CMake targets: + + find_package(nameof CONFIG REQUIRED) + target_link_libraries(main PRIVATE nameof::nameof) diff --git a/ports/nameof/vcpkg.json b/ports/nameof/vcpkg.json index 47f997a2dac88b..2192778699c6d2 100644 --- a/ports/nameof/vcpkg.json +++ b/ports/nameof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nameof", - "version": "0.10.2", + "version": "0.10.3", "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.", "homepage": "https://github.com/Neargye/nameof", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0ab46e7f9312cd..3dd8bc3864d41f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5549,7 +5549,7 @@ "port-version": 1 }, "nameof": { - "baseline": "0.10.2", + "baseline": "0.10.3", "port-version": 0 }, "nana": { diff --git a/versions/n-/nameof.json b/versions/n-/nameof.json index 9db7ec0e2c5c8e..125944e2854dac 100644 --- a/versions/n-/nameof.json +++ b/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f82961138b18791ffba3efef021f008c467988fb", + "version": "0.10.3", + "port-version": 0 + }, { "git-tree": "c6e74d9d06b8f8982ecfbad4b07e5215c8ea054b", "version": "0.10.2", From f764ff90b6c90a0964e9aea19b50fc23705ac6ed Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Thu, 13 Jul 2023 04:07:17 +0800 Subject: [PATCH 528/533] [libuv] Bump to 1.46.0 (#32525) --- ports/libuv/portfile.cmake | 2 +- ports/libuv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 2cfc46ae25e027..1de13194eb4c16 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv REF "v${VERSION}" - SHA512 a156dd0ed06bc7c50515f46ef6e5636d870288636f442ce9ec46716e22fdaa664ce49e432f4737c81e9c6013b34ed150e7420ab9fc316ed23281096954359774 + SHA512 e3a7c10ffd909f9b128fb2316e09b8456e87278107178b49368f31ba30e7f62d64e7eba650cc59ef2d7eb178199c7a2c5b5c99b333849200492235116d7aee7a HEAD_REF v1.x PATCHES fix-build-type.patch ) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index cfb3b0fc42a031..412b8261225a6e 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libuv", - "version-semver": "1.45.0", + "version-semver": "1.46.0", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 3dd8bc3864d41f..13d06eaae59585 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4737,7 +4737,7 @@ "port-version": 14 }, "libuv": { - "baseline": "1.45.0", + "baseline": "1.46.0", "port-version": 0 }, "libuvc": { diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 0bc61e3180c472..79edd423215ff2 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cd421b9c0bc8a89bf76892f99c87560cbde8d93", + "version-semver": "1.46.0", + "port-version": 0 + }, { "git-tree": "c99175c380930fd7a51719f7247618cceaa51529", "version-semver": "1.45.0", From 69741f8eb39edad5db498204a2164f6e12ea7a80 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 12 Jul 2023 22:35:46 -0700 Subject: [PATCH 529/533] [geotrans] Passes now on Android. (#32536) https://dev.azure.com/vcpkg/public/_build/results?buildId=91681&view=logs&j=185c373b-2f55-539e-a6cb-ef2677cc0d97&t=bd42ae40-c428-56e6-fb3d-bb973ea0084d Previously was changed from skip to fail in https://github.com/microsoft/vcpkg/commit/6b8459636c7ab9f2ccb638697b2ac990e1fd64b1 --- scripts/ci.baseline.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0c15f327d51608..2f38f42df069d8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -431,10 +431,6 @@ gemmlowp:x64-android=fail gherkin-c:arm-neon-android=fail gherkin-c:arm64-android=fail gherkin-c:x64-android=fail -geotrans:arm-neon-android=fail -geotrans:arm64-android=fail -geotrans:x64-android=fail - # Conflicts with libevent gherkin-c:arm64-windows = skip gherkin-c:arm-uwp = skip From 61e6021b0bdfe5486643e3b2f02230eca42d93ad Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Thu, 13 Jul 2023 07:55:57 +0200 Subject: [PATCH 530/533] [nghttp2]: update to 1.55.0 (#32535) --- ports/nghttp2/portfile.cmake | 2 +- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index a5afb8f3c50df8..cdd009ba81bb7b 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF v${VERSION} - SHA512 0ec50178068276cde624c47a634beda0b96ef1529970fddb20cf7a9b4b30d792827ffe16f16f5b7e210d0b7913be5d25e6c6704f6f7fb9a1b5a85f63aeaba6bc + SHA512 85b2216907f6868ee0a4b013cb4bfbb7cdd9827f26227eac726523f8e0695fc912749664f75aed5e394d36a23d88ff89bcec7e35f58d2bf468990a3b90bf33ae HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index a37baafec8cfac..5e628e135dbe26 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.54.0", + "version": "1.55.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 13d06eaae59585..0a51b5590e8fef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5657,7 +5657,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.54.0", + "baseline": "1.55.0", "port-version": 0 }, "nghttp2-asio": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 839a76e7841450..da95a321c87ba1 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b79d36373533804ca437bc13144b9614c0612f1a", + "version": "1.55.0", + "port-version": 0 + }, { "git-tree": "4bc602a9f1721052cae35a9c91b829df65398f86", "version": "1.54.0", From 285baf2dd93262be8cf177021195acd27f3ae2ed Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Thu, 13 Jul 2023 07:56:50 +0200 Subject: [PATCH 531/533] [xcb-proto] set license id and use vcpkg_install_copyright() (#32531) * [xcb-proto] set license id and use vcpkg_install_copyright() * Update version database --- ports/xcb-proto/portfile.cmake | 2 +- ports/xcb-proto/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/x-/xcb-proto.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake index 8927d2a8d4caf6..e79eb88d833184 100644 --- a/ports/xcb-proto/portfile.cmake +++ b/ports/xcb-proto/portfile.cmake @@ -45,5 +45,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") endif() diff --git a/ports/xcb-proto/vcpkg.json b/ports/xcb-proto/vcpkg.json index 0f285d781eeaf9..a78735d9e210ef 100644 --- a/ports/xcb-proto/vcpkg.json +++ b/ports/xcb-proto/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xcb-proto", "version": "1.14.1", + "port-version": 1, "description": "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions", "homepage": "https://xcb.freedesktop.org/", - "license": null, + "license": "X11-distribute-modifications-variant", "dependencies": [ "bzip2", { diff --git a/versions/baseline.json b/versions/baseline.json index 0a51b5590e8fef..5a6c4704d698a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8778,7 +8778,7 @@ }, "xcb-proto": { "baseline": "1.14.1", - "port-version": 0 + "port-version": 1 }, "xcb-render-util": { "baseline": "0.3.10", diff --git a/versions/x-/xcb-proto.json b/versions/x-/xcb-proto.json index 20e240c6086729..94c00710d45d51 100644 --- a/versions/x-/xcb-proto.json +++ b/versions/x-/xcb-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2eac40d0f3ae01205792344a254ac956e0adcd2", + "version": "1.14.1", + "port-version": 1 + }, { "git-tree": "e5933d2463549d6d3b00a8aa1f0279f2a974ec1c", "version": "1.14.1", From fc5fa5f2e7dd3bb8b0913273f07d3be3793994f2 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 13 Jul 2023 07:57:00 +0200 Subject: [PATCH 532/533] [sentry-native] update to 0.6.5 (#32534) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 6c07cd10ab5e68..3a5c9882e15354 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 81b935a0b909885d842b870d05d96d46ccb85ac4f91456e07a92b85547a96ba8c3ed620bc7034823fd4639d1f3698b5c40fc1ed4a93e1c997ce757dfb7a4d529 + SHA512 fe28ecb66325f6dc81ba0e2f76c99b3f70c2a3e85e33a90eb16262b258e9e83a466c7b6bd2356bc44774d895b18d281c0238670aa2112bf48f0dc7de0eb94788 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 7bca16cc35c12d..2c412d8e4770a5 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.4", + "version": "0.6.5", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 5a6c4704d698a0..45608cd02b74a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7437,7 +7437,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.6.4", + "baseline": "0.6.5", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index c374da31ce92e0..35d48346653bf3 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57e5580a75a4aa261871733eeda97721e557fe58", + "version": "0.6.5", + "port-version": 0 + }, { "git-tree": "fd5779f3ac082cce4ffa01f13b9ed0f9f4f74d73", "version": "0.6.4", From 78784c0b0aa87ae63bce01c2c040ce1b3269ecd1 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:02:06 +0800 Subject: [PATCH 533/533] [baresip-libre] Fix incorrect condition in patch file (#32529) --- ports/baresip-libre/use-c11.patch | 2 +- ports/baresip-libre/vcpkg.json | 2 +- versions/b-/baresip-libre.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/baresip-libre/use-c11.patch b/ports/baresip-libre/use-c11.patch index 6c9547431be4ee..ec03b519c4ce4a 100644 --- a/ports/baresip-libre/use-c11.patch +++ b/ports/baresip-libre/use-c11.patch @@ -6,7 +6,7 @@ index b364219..fd662d4 100644 set(PROJECT_VERSION_FULL ${PROJECT_VERSION}) endif() -+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ++if(WIN32 AND NOT MINGW) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std:c11" ) +endif() + diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index 586d1ea74443e7..a2fc0f19abb909 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "baresip-libre", "version": "3.2.0", - "port-version": 1, + "port-version": 2, "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 687cfb8086d1f9..bdc02a61743a0b 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eba692c2b454a491269fec62a993c0b08b24d34", + "version": "3.2.0", + "port-version": 2 + }, { "git-tree": "c32aafef7c464cd6b860327ea35759e708f96a77", "version": "3.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 45608cd02b74a3..5518f368ba1e37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -490,7 +490,7 @@ }, "baresip-libre": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "basisu": { "baseline": "1.11",