diff --git a/ports/buck-yeh-bux/fix-build-error-with-fmt11.patch b/ports/buck-yeh-bux/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..fad7e85039a8cf --- /dev/null +++ b/ports/buck-yeh-bux/fix-build-error-with-fmt11.patch @@ -0,0 +1,12 @@ +diff --git a/include/bux/FA.h b/include/bux/FA.h +index 907ed95..f8439b8 100644 +--- a/include/bux/FA.h ++++ b/include/bux/FA.h +@@ -9,6 +9,7 @@ + #include // std::map<> + #include // std::set<> + #include // std::vector<> ++#include + + namespace bux { + diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index d6096af8884668..34037df3d6df62 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 7b58e67d0744ead50fb5a826118d1026dc85b6bd880a2d3f30a9d355fc20f48697057eec139ad3960a65cebfbd0e30b99bee42b71bd23058c815a50b6df10c5c HEAD_REF main + PATCHES + fix-build-error-with-fmt11.patch ) vcpkg_cmake_configure( diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 249e2da1aa0a32..c4f02e7d16fcb1 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,7 +1,7 @@ { "name": "buck-yeh-bux", "version": "1.6.8", - "port-version": 1, + "port-version": 2, "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "license": "MIT", diff --git a/ports/fizz/fix-build-error-with-fmt11.patch b/ports/fizz/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..4dead667d02474 --- /dev/null +++ b/ports/fizz/fix-build-error-with-fmt11.patch @@ -0,0 +1,13 @@ +diff --git a/fizz/record/Types.h b/fizz/record/Types.h +index 2cb449a..f1a370b 100644 +--- a/fizz/record/Types.h ++++ b/fizz/record/Types.h +@@ -454,7 +454,7 @@ struct hash { + + template <> + struct fmt::formatter : formatter { +- auto format(fizz::ExtensionType t, format_context& ctx) { ++ auto format(fizz::ExtensionType t, format_context& ctx) const { + return formatter::format(folly::to_underlying(t), ctx); + } + }; diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 1460bf2dcf47a7..3c5549cf6fe74b 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF main PATCHES fix-build.patch + fix-build-error-with-fmt11.patch ) # Prefer installed config files diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 49b7d01188d3af..f9878e51df752f 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fizz", "version-string": "2024.07.29.00", + "port-version": 1, "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/fmt/fix-visibility.patch b/ports/fmt/fix-visibility.patch deleted file mode 100644 index f4c808fac5a146..00000000000000 --- a/ports/fmt/fix-visibility.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/fmt/core.h b/include/fmt/core.h -index b51c1406..bb139509 100644 ---- a/include/fmt/core.h -+++ b/include/fmt/core.h -@@ -2306,6 +2306,7 @@ enum class state { start, align, sign, hash, zero, width, precision, locale }; - - // Parses standard format specifiers. - template -+FMT_VISIBILITY("hidden") // Suppress an ld warning on macOS (#3769). - FMT_CONSTEXPR FMT_INLINE auto parse_format_specs( - const Char* begin, const Char* end, dynamic_format_specs& specs, - basic_format_parse_context& ctx, type arg_type) -> const Char* { diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index cdc14879513166..75c8a9b929a10f 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 27df90c681ec37e55625062a79e3b83589b6d7e94eff37a3b412bb8c1473f757a8adb727603acc9185c3490628269216843b7d7bd5a3cb37f0029da5d1495ffa + SHA512 47ff6d289dcc22681eea6da465b0348172921e7cafff8fd57a1540d3232cc6b53250a4625c954ee0944c87963b17680ecbc3ea123e43c2c822efe0dc6fa6cef3 HEAD_REF master PATCHES - fix-visibility.patch fix-write-batch.patch ) @@ -23,7 +22,7 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h" "defined(FMT_SHARED)" "1" ) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index d0806b79b28c16..cfe60e61b2aed3 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "10.2.1", - "port-version": 2, + "version": "11.0.2", "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/ports/folly/fix-fmt11-cmake.patch b/ports/folly/fix-fmt11-cmake.patch new file mode 100644 index 00000000000000..03cca93643ad07 --- /dev/null +++ b/ports/folly/fix-fmt11-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake +index 0e93175..1637d9f 100644 +--- a/CMake/GenPkgConfig.cmake ++++ b/CMake/GenPkgConfig.cmake +@@ -93,7 +93,7 @@ function(gen_pkgconfig_vars) + # Set the output variables + string(REPLACE ";" " " cflags "${cflags}") + string(REPLACE ";" " " private_libs "${private_libs}") +- ++ string(REPLACE "<$:/utf-8>" "/utf-8" cflags "${cflags}") + # Since CMake 3.18 FindThreads may include a generator expression requiring + # a target, which gets propagated to us through INTERFACE_COMPILE_OPTIONS. + # Before CMake 3.19 there's no way to solve this in a general way, so we diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 3716cf42e55598..000196c0ac8540 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -5,6 +5,12 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") +vcpkg_download_distfile(FMT11_RANGE_PATCH + URLS https://github.com/facebook/folly/commit/21e8dcd464ee46b2144a1e4d4c0e452355ae15f0.patch?full_index=1 + FILENAME fmt11-range.patch + SHA512 6a3afe361cd24b4f62b3aba625dfbbfb767c91f27fa45ed4604adc5ec3d574e571ece13eeda0d9d47b8a37166fc31b1ed7f58f120a35d35977085a08172de105 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly @@ -17,6 +23,8 @@ vcpkg_from_github( fix-deps.patch disable-uninitialized-resize-on-new-stl.patch fix-unistd-include.patch + fix-fmt11-cmake.patch + ${FMT11_RANGE_PATCH} ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index a41bc0888677df..c769e46a543c66 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,7 @@ { "name": "folly", "version-string": "2024.07.29.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/ports/libtorch/fix-build-error-with-fmt11.patch b/ports/libtorch/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..352126248145d6 --- /dev/null +++ b/ports/libtorch/fix-build-error-with-fmt11.patch @@ -0,0 +1,36 @@ +diff --git a/torch/csrc/distributed/c10d/socket.cpp b/torch/csrc/distributed/c10d/socket.cpp +index 51ea05fa..3c3fbb39 100644 +--- a/torch/csrc/distributed/c10d/socket.cpp ++++ b/torch/csrc/distributed/c10d/socket.cpp +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + #include + #include +diff --git a/torch/csrc/profiler/standalone/execution_trace_observer.cpp b/torch/csrc/profiler/standalone/execution_trace_observer.cpp +index 93d9e2d1..ea241a8b 100644 +--- a/torch/csrc/profiler/standalone/execution_trace_observer.cpp ++++ b/torch/csrc/profiler/standalone/execution_trace_observer.cpp +@@ -10,6 +10,7 @@ + #endif // _WIN32 + + #include ++#include + #include + #include + #include +diff --git a/torch/csrc/profiler/util.cpp b/torch/csrc/profiler/util.cpp +index 180555f9..1358c9ab 100644 +--- a/torch/csrc/profiler/util.cpp ++++ b/torch/csrc/profiler/util.cpp +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #ifdef USE_KINETO + #include diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index edf4be4918e97d..3fafa005b4f45e 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -37,6 +37,7 @@ vcpkg_from_github( fix-calculate-minloglevel.patch force-cuda-include.patch fix-aten-cutlass.patch + fix-build-error-with-fmt11.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index 0ca92ccded53ba..15a55c170f0a8f 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "2.1.2", - "port-version": 4, + "port-version": 5, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/ports/saucer/fix-build-error-with-fmt11.patch b/ports/saucer/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..502b3971650a0e --- /dev/null +++ b/ports/saucer/fix-build-error-with-fmt11.patch @@ -0,0 +1,12 @@ +diff --git a/include/saucer/serializers/glaze/glaze.inl b/include/saucer/serializers/glaze/glaze.inl +index c0e1395..d704ed9 100644 +--- a/include/saucer/serializers/glaze/glaze.inl ++++ b/include/saucer/serializers/glaze/glaze.inl +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + + #include diff --git a/ports/saucer/portfile.cmake b/ports/saucer/portfile.cmake index 9416e5ee9b4943..f167a9b366f84d 100644 --- a/ports/saucer/portfile.cmake +++ b/ports/saucer/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF dev PATCHES fix_findpkg.patch + fix-build-error-with-fmt11.patch ) vcpkg_cmake_configure( diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json index fa7d4cffdf4dd9..f20e4e62b11ffd 100644 --- a/ports/saucer/vcpkg.json +++ b/ports/saucer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "saucer", "version": "2.3.0", + "port-version": 1, "description": "Next-gen desktop apps with web-frontend in C++", "homepage": "https://saucer.github.io/", "license": "MIT", diff --git a/ports/seacas/fix-build-error-with-fmt11.patch b/ports/seacas/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..470626c20426b3 --- /dev/null +++ b/ports/seacas/fix-build-error-with-fmt11.patch @@ -0,0 +1,108 @@ +diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C +index fa2719a..0a7cfff 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + + #if !defined(NO_ZOLTAN_SUPPORT) +diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +index ef20a45..faa7943 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.C +@@ -11,6 +11,7 @@ + #include + #include // for nullptr + #include ++#include + #include // for _Rb_tree_iterator, etc + #include // for basic_ostream, etc + #include +diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C +index 488d28a..0a1e5e2 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + #include // for size_t + #include +diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C +index 241ff80..d234b8b 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C +index 6888e17..f53c5e5 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.C +@@ -8,6 +8,7 @@ + #include + #include // for size_t + #include ++#include + #include // for string + #include // for vector + +diff --git a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h +index c486d69..b67a5c6 100644 +--- a/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h ++++ b/packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.h +@@ -9,6 +9,7 @@ + #include "iohb_export.h" + + #include ++#include + #include + #include + #include +diff --git a/packages/seacas/libraries/ioss/src/main/io_info.C b/packages/seacas/libraries/ioss/src/main/io_info.C +index 53a162b..bcadb55 100644 +--- a/packages/seacas/libraries/ioss/src/main/io_info.C ++++ b/packages/seacas/libraries/ioss/src/main/io_info.C +@@ -11,6 +11,7 @@ + #define FMT_DEPRECATED_OSTREAM + #include + #include ++#include + #if defined(SEACAS_HAVE_CGNS) + #include + #endif +diff --git a/packages/seacas/libraries/ioss/src/main/io_modify.C b/packages/seacas/libraries/ioss/src/main/io_modify.C +index 50a217d..c01191b 100644 +--- a/packages/seacas/libraries/ioss/src/main/io_modify.C ++++ b/packages/seacas/libraries/ioss/src/main/io_modify.C +@@ -58,6 +58,7 @@ + #include + #include + #include ++#include + + #if defined(SEACAS_HAVE_EXODUS) + #include +diff --git a/packages/seacas/libraries/ioss/src/main/sphgen.C b/packages/seacas/libraries/ioss/src/main/sphgen.C +index f633d55..24c2e2f 100644 +--- a/packages/seacas/libraries/ioss/src/main/sphgen.C ++++ b/packages/seacas/libraries/ioss/src/main/sphgen.C +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index dd78fb15714326..81bae2abbc1f9b 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-mpi.patch fix-headers.patch fix-fmt-10.patch + fix-build-error-with-fmt11.patch ) file(REMOVE "${SOURCE_PATH}/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake") diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 3f4792cfefb255..29e95ca10f14fd 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 6, + "port-version": 7, "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/shogun/fix-build-error-with-fmt11.patch b/ports/shogun/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..2cf7e09807c10d --- /dev/null +++ b/ports/shogun/fix-build-error-with-fmt11.patch @@ -0,0 +1,24 @@ +diff --git a/src/shogun/labels/BinaryLabelEncoder.h b/src/shogun/labels/BinaryLabelEncoder.h +index 5bcd57e..69ed63e 100644 +--- a/src/shogun/labels/BinaryLabelEncoder.h ++++ b/src/shogun/labels/BinaryLabelEncoder.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + namespace shogun + { + /** @brief Implements a reversible mapping from +diff --git a/src/shogun/labels/MulticlassLabelsEncoder.h b/src/shogun/labels/MulticlassLabelsEncoder.h +index 41e9855..04151e4 100644 +--- a/src/shogun/labels/MulticlassLabelsEncoder.h ++++ b/src/shogun/labels/MulticlassLabelsEncoder.h +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + namespace shogun + { diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake index 9fff2511aaa13e..52cdca2fa4b2c3 100644 --- a/ports/shogun/portfile.cmake +++ b/ports/shogun/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fmt.patch syntax.patch remove-bitsery.patch + fix-build-error-with-fmt11.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/shogun/vcpkg.json b/ports/shogun/vcpkg.json index be26036d6f857b..7dfd5dfed82a05 100644 --- a/ports/shogun/vcpkg.json +++ b/ports/shogun/vcpkg.json @@ -1,6 +1,7 @@ { "name": "shogun", "version-date": "2023-12-19", + "port-version": 1, "description": "Unified and efficient Machine Learning", "homepage": "https://github.com/shogun-toolbox/shogun", "dependencies": [ diff --git a/ports/vowpal-wabbit/fix-build-error-with-fmt11.patch b/ports/vowpal-wabbit/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..8d62d2ddfa9dc5 --- /dev/null +++ b/ports/vowpal-wabbit/fix-build-error-with-fmt11.patch @@ -0,0 +1,89 @@ +diff --git a/vowpalwabbit/config/src/cli_help_formatter.cc b/vowpalwabbit/config/src/cli_help_formatter.cc +index 8cc6dfe..10b9823 100644 +--- a/vowpalwabbit/config/src/cli_help_formatter.cc ++++ b/vowpalwabbit/config/src/cli_help_formatter.cc +@@ -8,6 +8,7 @@ + #include "vw/config/options.h" + + #include ++#include + + #include + #include +diff --git a/vowpalwabbit/config/src/options_cli.cc b/vowpalwabbit/config/src/options_cli.cc +index cec7c03..ea31810 100644 +--- a/vowpalwabbit/config/src/options_cli.cc ++++ b/vowpalwabbit/config/src/options_cli.cc +@@ -10,6 +10,7 @@ + #include "vw/config/option.h" + + #include ++#include + + #include + #include +diff --git a/vowpalwabbit/core/include/vw/core/automl_impl.h b/vowpalwabbit/core/include/vw/core/automl_impl.h +index 4a44666..0d1b35d 100644 +--- a/vowpalwabbit/core/include/vw/core/automl_impl.h ++++ b/vowpalwabbit/core/include/vw/core/automl_impl.h +@@ -334,7 +334,7 @@ template <> + class formatter : public formatter + { + public: +- auto format(VW::reductions::automl::automl_state c, format_context& ctx) -> decltype(ctx.out()) ++ auto format(VW::reductions::automl::automl_state c, format_context& ctx) const -> decltype(ctx.out()) + { + return formatter::format(std::string{VW::to_string(c)}, ctx); + } +@@ -344,7 +344,7 @@ template <> + class formatter : public formatter + { + public: +- auto format(VW::reductions::automl::config_state c, format_context& ctx) -> decltype(ctx.out()) ++ auto format(VW::reductions::automl::config_state c, format_context& ctx) const -> decltype(ctx.out()) + { + return formatter::format(std::string{VW::to_string(c)}, ctx); + } +@@ -354,7 +354,7 @@ template <> + class formatter : public formatter + { + public: +- auto format(VW::reductions::automl::config_type c, format_context& ctx) -> decltype(ctx.out()) ++ auto format(VW::reductions::automl::config_type c, format_context& ctx) const -> decltype(ctx.out()) + { + return formatter::format(std::string{VW::to_string(c)}, ctx); + } +diff --git a/vowpalwabbit/core/include/vw/core/ccb_label.h b/vowpalwabbit/core/include/vw/core/ccb_label.h +index 2e7e985..b0050dd 100644 +--- a/vowpalwabbit/core/include/vw/core/ccb_label.h ++++ b/vowpalwabbit/core/include/vw/core/ccb_label.h +@@ -14,6 +14,7 @@ + #include "vw/core/v_array.h" + + #include ++#include + + #include + #include +@@ -81,7 +82,7 @@ template <> + class formatter : public formatter + { + public: +- auto format(VW::ccb_example_type c, format_context& ctx) -> decltype(ctx.out()) ++ auto format(VW::ccb_example_type c, format_context& ctx) const -> decltype(ctx.out()) + { + return formatter::format(std::string{VW::to_string(c)}, ctx); + } +diff --git a/vowpalwabbit/core/include/vw/core/slates_label.h b/vowpalwabbit/core/include/vw/core/slates_label.h +index 0cd089c..d226893 100644 +--- a/vowpalwabbit/core/include/vw/core/slates_label.h ++++ b/vowpalwabbit/core/include/vw/core/slates_label.h +@@ -81,7 +81,7 @@ template <> + class formatter : public formatter + { + public: +- auto format(VW::slates::example_type c, format_context& ctx) -> decltype(ctx.out()) ++ auto format(VW::slates::example_type c, format_context& ctx) const -> decltype(ctx.out()) + { + return formatter::format(std::string{VW::to_string(c)}, ctx); + } diff --git a/ports/vowpal-wabbit/portfile.cmake b/ports/vowpal-wabbit/portfile.cmake index 734a33c6f247a1..21ec2fd89fe67f 100644 --- a/ports/vowpal-wabbit/portfile.cmake +++ b/ports/vowpal-wabbit/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF "${VERSION}" SHA512 37c4401e5304c20a7a4c2ffa6102bfa82085c4bbc787c796da295e789996f09472ac4b3e732b0a44016eab6579c2648085b1e67b1df2658257d52f7e46a1b683 HEAD_REF master - PATCHES cmake_remove_bin_targets.patch + PATCHES + cmake_remove_bin_targets.patch + fix-build-error-with-fmt11.patch ) vcpkg_cmake_configure( diff --git a/ports/vowpal-wabbit/vcpkg.json b/ports/vowpal-wabbit/vcpkg.json index 9f4dfacdc313af..6e2e21eda1c9a7 100644 --- a/ports/vowpal-wabbit/vcpkg.json +++ b/ports/vowpal-wabbit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vowpal-wabbit", "version": "9.8.0", - "port-version": 2, + "port-version": 3, "description": "Reduction based online learning framework with a focus on contextual bandits and reinforcement learning.", "homepage": "https://github.com/vowpalwabbit/vowpal_wabbit", "license": "BSD-3-Clause", diff --git a/ports/wasmedge/fix-build-error-with-fmt11.patch b/ports/wasmedge/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..3c584d1954d240 --- /dev/null +++ b/ports/wasmedge/fix-build-error-with-fmt11.patch @@ -0,0 +1,13 @@ +diff --git a/lib/common/errinfo.cpp b/lib/common/errinfo.cpp +index 69aa666..b7b0857 100644 +--- a/lib/common/errinfo.cpp ++++ b/lib/common/errinfo.cpp +@@ -5,6 +5,8 @@ + #include "common/errcode.h" + #include "common/hexstr.h" + ++#include ++ + using namespace std::literals; + + fmt::format_context::iterator diff --git a/ports/wasmedge/portfile.cmake b/ports/wasmedge/portfile.cmake index e3381439ab3da2..fec240caa03cab 100644 --- a/ports/wasmedge/portfile.cmake +++ b/ports/wasmedge/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF "${VERSION}" SHA512 fcd6b804876a5899ec8c21aa349b7ec3e8e0b87537e93d237cb14da2ecb162410ae9ad39212c5ab01e4408191768b806d84e55934616de094a696bf6f02fe1de HEAD_REF master + PATCHES fix-build-error-with-fmt11.patch ) set(WASMEDGE_CMAKE_OPTIONS "") diff --git a/ports/wasmedge/vcpkg.json b/ports/wasmedge/vcpkg.json index 47a2e255d9a331..5bdb72d75600a0 100644 --- a/ports/wasmedge/vcpkg.json +++ b/ports/wasmedge/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wasmedge", "version": "0.13.5", - "port-version": 1, + "port-version": 2, "description": "WasmEdge is a high-performance WebAssembly runtime for edge computing.", "homepage": "https://WasmEdge.org", "license": "Apache-2.0", diff --git a/ports/wpilib/fix-build-error-with-fmt11.patch b/ports/wpilib/fix-build-error-with-fmt11.patch new file mode 100644 index 00000000000000..c33eff5d70bb89 --- /dev/null +++ b/ports/wpilib/fix-build-error-with-fmt11.patch @@ -0,0 +1,36 @@ +diff --git a/ntcore/src/dev/native/cpp/main.cpp b/ntcore/src/dev/native/cpp/main.cpp +index 6e43fdb..ad93644 100644 +--- a/ntcore/src/dev/native/cpp/main.cpp ++++ b/ntcore/src/dev/native/cpp/main.cpp +@@ -13,6 +13,7 @@ + #include + + #include ++#include + #include + #include + +diff --git a/wpiutil/examples/printlog/printlog.cpp b/wpiutil/examples/printlog/printlog.cpp +index cb89934..4fe4817 100644 +--- a/wpiutil/examples/printlog/printlog.cpp ++++ b/wpiutil/examples/printlog/printlog.cpp +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "wpi/DataLogReader.h" + #include "wpi/DenseMap.h" +diff --git a/wpiutil/src/main/native/include/wpi/Logger.h b/wpiutil/src/main/native/include/wpi/Logger.h +index 01a02fd..bd524a9 100644 +--- a/wpiutil/src/main/native/include/wpi/Logger.h ++++ b/wpiutil/src/main/native/include/wpi/Logger.h +@@ -9,6 +9,7 @@ + #include + + #include ++#include + + namespace wpi { + diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 1d22e6e0400abb..fed6884be711c8 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( windows-install-location.patch missing-find_dependency.patch fix-usage.patch + fix-build-error-with-fmt11.patch ) if("allwpilib" IN_LIST FEATURES) diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json index 48d3edf194ef4a..9d54f08ff0d45f 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wpilib", "version-date": "2023-08-24", + "port-version": 1, "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/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index f453941d18f711..a2d5cde2d49f6f 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "856dddcbc547f4351ff1382b163f7c1d4f5de495", + "version": "1.6.8", + "port-version": 2 + }, { "git-tree": "29028471ac882b35474e5f29767c8d1e92e31a6f", "version": "1.6.8", diff --git a/versions/baseline.json b/versions/baseline.json index bf11267fa53bd1..6fc0613b371b41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1398,7 +1398,7 @@ }, "buck-yeh-bux": { "baseline": "1.6.8", - "port-version": 1 + "port-version": 2 }, "buck-yeh-bux-mariadb-client": { "baseline": "1.0.3", @@ -2734,7 +2734,7 @@ }, "fizz": { "baseline": "2024.07.29.00", - "port-version": 0 + "port-version": 1 }, "flagpp": { "baseline": "2.1", @@ -2813,12 +2813,12 @@ "port-version": 2 }, "fmt": { - "baseline": "10.2.1", - "port-version": 2 + "baseline": "11.0.2", + "port-version": 0 }, "folly": { "baseline": "2024.07.29.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", @@ -5130,7 +5130,7 @@ }, "libtorch": { "baseline": "2.1.2", - "port-version": 4 + "port-version": 5 }, "libtorrent": { "baseline": "2.0.10", @@ -7990,7 +7990,7 @@ }, "saucer": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "sbp": { "baseline": "3.4.10", @@ -8102,7 +8102,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 6 + "port-version": 7 }, "seal": { "baseline": "4.1.1", @@ -8202,7 +8202,7 @@ }, "shogun": { "baseline": "2023-12-19", - "port-version": 0 + "port-version": 1 }, "si": { "baseline": "2.5.1", @@ -9326,7 +9326,7 @@ }, "vowpal-wabbit": { "baseline": "9.8.0", - "port-version": 2 + "port-version": 3 }, "vs-yasm": { "baseline": "0.5.0", @@ -9414,7 +9414,7 @@ }, "wasmedge": { "baseline": "0.13.5", - "port-version": 1 + "port-version": 2 }, "wavelib": { "baseline": "2021-11-26", @@ -9526,7 +9526,7 @@ }, "wpilib": { "baseline": "2023-08-24", - "port-version": 0 + "port-version": 1 }, "wren": { "baseline": "0.4.0", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index d6ddf75d03f5a3..9fc6ae13371cf1 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9b5cc90801fcb2ef5ac271ef1f09348b1ee9536", + "version-string": "2024.07.29.00", + "port-version": 1 + }, { "git-tree": "7a1f82b0ff072b3576c6d07fa49d320819495ebb", "version-string": "2024.07.29.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 2de065cbaa5b08..1b9437e1417438 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01091f7b48f4960e6e0a8763dbb3e7aee3e6e834", + "version-string": "2024.07.29.00", + "port-version": 1 + }, { "git-tree": "fad13c6c795653b7165a4f1cdefbe11c1270803d", "version-string": "2024.07.29.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index e1b4d605448839..6d88b7d7acce2b 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fe4dea09fc09a30e6ece9ac19edb7ad6a49601", + "version": "11.0.2", + "port-version": 0 + }, { "git-tree": "f6f4efa01a5e9ac627f0c6687af8b6b317fbbe42", "version": "10.2.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 5f6340706c5735..47afd19998be62 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "145b025ac9e58f82128d1594a9a1d320c0e8f759", + "version-string": "2024.07.29.00", + "port-version": 1 + }, { "git-tree": "4ae71f31a0f70250d2cd0f9374d0b30d328ba48f", "version-string": "2024.07.29.00", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index ac60ce2afc3906..275dfeab7d269a 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d1fe8207d6f9680a243fe20ed6a222f1174d708", + "version": "2.1.2", + "port-version": 5 + }, { "git-tree": "669a1f2317ab243ad046d2a48b96ed72e82976d8", "version": "2.1.2", diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json index f83856fcdb7e8c..9792e3063872c4 100644 --- a/versions/s-/saucer.json +++ b/versions/s-/saucer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab050dd2d11b33fbb575dcd4a48fffe0daf099d8", + "version": "2.3.0", + "port-version": 1 + }, { "git-tree": "65f56fc183c1735f4c6c239f660b5dfc35ba3281", "version": "2.3.0", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index a0a68f42b94088..22abaa2b33a163 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "405532a89129aa97af0759ecf8e4da3ee4d8a543", + "version-date": "2022-11-22", + "port-version": 7 + }, { "git-tree": "bebbef6d1a82c6848bbb8d619a5e379f9b29b3f9", "version-date": "2022-11-22", diff --git a/versions/s-/shogun.json b/versions/s-/shogun.json index 9808405efb5662..beb939f4686c9a 100644 --- a/versions/s-/shogun.json +++ b/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b3a907b0e5ba4e83f761e7bce13e081b2b8c330", + "version-date": "2023-12-19", + "port-version": 1 + }, { "git-tree": "005b5791f492c914205e14ecf3985f1f9da7a707", "version-date": "2023-12-19", diff --git a/versions/v-/vowpal-wabbit.json b/versions/v-/vowpal-wabbit.json index bdc107fd3af5e1..c8a7df92c7f160 100644 --- a/versions/v-/vowpal-wabbit.json +++ b/versions/v-/vowpal-wabbit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ffdf8c2be56925eb70832739a411c935d8f8796", + "version": "9.8.0", + "port-version": 3 + }, { "git-tree": "67f9b52b83a34f59c3dd20cff11d2c968149bbfc", "version": "9.8.0", diff --git a/versions/w-/wasmedge.json b/versions/w-/wasmedge.json index bdbc7427693cfb..405bba78f027d4 100644 --- a/versions/w-/wasmedge.json +++ b/versions/w-/wasmedge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2284d35f16fb7ae212ac442dfb0a98d2dc709981", + "version": "0.13.5", + "port-version": 2 + }, { "git-tree": "45086bbec78c8152a37b5c487e103a4fd838b17a", "version": "0.13.5", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index 9cd67fb72424b6..ebaaa231346ada 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fcd17f46e3a3690ef340ba7da121efac75e28cc", + "version-date": "2023-08-24", + "port-version": 1 + }, { "git-tree": "7da141104a256a768fa72c6b3f98104904ebe45e", "version-date": "2023-08-24",