diff --git a/ports/fbthrift/0002-fix-dependency.patch b/ports/fbthrift/fix-deps.patch similarity index 78% rename from ports/fbthrift/0002-fix-dependency.patch rename to ports/fbthrift/fix-deps.patch index 6740a2a41427bd..14b6107358b4ef 100644 --- a/ports/fbthrift/0002-fix-dependency.patch +++ b/ports/fbthrift/fix-deps.patch @@ -1,16 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5eea37c..145e5b6 100644 +index c6b2b2a810..787a83bb1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,23 +96,25 @@ endif () +@@ -105,24 +105,26 @@ endif () # Find required dependencies for thrift/lib if (THRIFT_LIB_ONLY OR build_all) - find_package(Gflags REQUIRED) +- find_package(Glog REQUIRED) + find_package(gflags CONFIG REQUIRED) + set(LIBGFLAGS_LIBRARY gflags::gflags) - find_package(glog CONFIG REQUIRED) - set (GLOG_LIBRARIES glog::glog) ++ find_package(glog CONFIG REQUIRED) ++ set(GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) @@ -22,6 +23,7 @@ index 5eea37c..145e5b6 100644 + elseif(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) + endif() + find_package(Xxhash REQUIRED) find_package(mvfst CONFIG REQUIRED) # https://cmake.org/cmake/help/v3.9/module/FindThreads.html set(THREADS_PREFER_PTHREAD_FLAG ON) @@ -31,14 +33,15 @@ index 5eea37c..145e5b6 100644 - ${GLOG_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} - ${ZSTD_INCLUDE_DIRS} +- ${Xxhash_INCLUDE_DIR} ) add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0") if (THRIFT_LIB_ONLY) diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in -index 1d38221..ab96215 100644 +index 057015258c..f0c6692246 100644 --- a/thrift/cmake/FBThriftConfig.cmake.in +++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -28,8 +28,15 @@ else() +@@ -29,8 +29,15 @@ else() set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") endif() @@ -46,12 +49,12 @@ index 1d38221..ab96215 100644 -find_package(mvfst CONFIG REQUIRED) +find_dependency(ZLIB) +find_dependency(mvfst CONFIG) -+find_dependency(fizz CONFIG ) -+find_dependency(fmt CONFIG ) -+find_dependency(folly CONFIG ) ++find_dependency(fizz CONFIG) ++find_dependency(fmt CONFIG) ++find_dependency(folly CONFIG) +find_dependency(gflags CONFIG) -+find_dependency(glog CONFIG ) -+find_dependency(wangle CONFIG ) ++find_dependency(glog CONFIG) ++find_dependency(wangle CONFIG) +find_dependency(zstd CONFIG) if (NOT TARGET FBThrift::thriftcpp2) diff --git a/ports/fbthrift/fix-glog.patch b/ports/fbthrift/fix-glog.patch deleted file mode 100644 index 362e1d1eed09a2..00000000000000 --- a/ports/fbthrift/fix-glog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7d9a1e7..d2b69ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -97,7 +97,8 @@ endif () - # Find required dependencies for thrift/lib - 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(wangle CONFIG REQUIRED) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 42d0af7f7bd2f1..3dcf217e70c1ed 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 b1a880a922e5823ec6c87d1540651978d895a2d0389158865011198ca80034342f39f7b2c1a104745ccb1cb3cb8d355cb0afb5b08c38fb8187a285ea37071f26 + SHA512 5018dd3e062489633c6e6fdef867656bc8ae6717dd74808a29ce5066fd5d0d69d3038a1a0326ed4df2139590dce6b99381cdaaecae0af5ef37d26a5903be1e7e HEAD_REF main - PATCHES - fix-glog.patch - 0002-fix-dependency.patch + PATCHES + fix-deps.patch ) file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake") @@ -34,6 +33,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/async/metadata/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test" @@ -42,6 +42,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/detail/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/tool" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/demo" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 0930517bbbdc6d..8a9dc45da71198 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", @@ -28,6 +28,7 @@ "host": true }, "wangle", + "xxhash", "zlib", "zstd" ] diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index f4d58365334f43..e9101b811a673b 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 e20ecda20f0a4dce306cddfbdcf990212067aa4d3df551ee9d0b4a9a17f0509aba0c38bc9945ba2ba039a60f51a9cd5ea3e6fe6f97ba7d1c80e76238301bd283 + SHA512 5c18e5f66df1fd87a656212a2c4ffa2fd314f82318911e67831e979b2ea2695eec5ef5f61cebeaef954f55c904a5410d49a04cbea6549ba6ee8804db441efcc2 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index faa8361765d58c..a3058d461e25c3 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.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 82911402083731..23293e9024dbe4 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 cb8feb35e51072555b910613e87f079acd1f97892df0e6f3888bd9a8a336ca6183d552bfb4e16cfafbf8f5a7ec3f2a85dda686c74528e23e4bc821b2f67bfa77 + SHA512 d402a2ebdff0c56e23e020823a040ef409b5c7834f598a75248126ca554f622806154d7aabc11ae65c9c2f16907a8a3589ad50e833c359714c4c5b1525cd1ba5 HEAD_REF main PATCHES disable-non-underscore-posix-names.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index ccc71c028086eb..3d81a790bbb3d6 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.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-cmake.patch b/ports/mvfst/fix-cmake.patch deleted file mode 100644 index 4828d189b3c7a0..00000000000000 --- a/ports/mvfst/fix-cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/quic/api/CMakeLists.txt b/quic/api/CMakeLists.txt -index 5522347c5..a0a34761e 100644 ---- a/quic/api/CMakeLists.txt -+++ b/quic/api/CMakeLists.txt -@@ -47,6 +47,7 @@ add_library( - QuicPacketScheduler.cpp - QuicStreamAsyncTransport.cpp - QuicTransportBase.cpp -+ QuicTransportBaseLite.cpp - QuicTransportFunctions.cpp - ) - - -diff --git a/quic/state/CMakeLists.txt b/quic/state/CMakeLists.txt -index 0916546fe..14297bb30 100644 ---- a/quic/state/CMakeLists.txt -+++ b/quic/state/CMakeLists.txt -@@ -55,6 +55,7 @@ add_library( - mvfst_state_ack_handler - AckEvent.cpp - AckHandlers.cpp -+ AckedPacketIterator.cpp - ) - - set_property(TARGET mvfst_state_ack_handler PROPERTY VERSION ${PACKAGE_VERSION}) diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index e9b6374bc77d05..91709b01770296 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 8ec9e7daf1c259f31e90eaa32cfa29d377e279f93c2072528447455f4f8ea897ab17f2759222a2ea9a73fdafe96b7d8223cf1efbadad2e8ea180b23832090aa7 + SHA512 54ab3eeee94bbe5721ca79d365a44d91ad491bd7a3026bcd2c7f603281350a0226d5192879d9d24fb518e6ce97415c2c572835ac0283873e5731056eff2e360a HEAD_REF main - PATCHES fix-cmake.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index b3257e9b170ee7..95c1477fbf8470 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebook/mvfst", "license": "MIT", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index f33be86c1f99d0..fc8ef501281cd5 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 929a4010277bdf7ac7950e1f37b946328ef3da59dafa283db3841236833bde4cb2b734545e7bad8fd104bf4d083f3b50dc4a07d6e07a9fcdde78eda24e20b458 + SHA512 72b71ec08a40a7c037feee9d33a4b1cecaf44fc24d7b3896bd75ef920576d8413051e7fa0b7d5d4470c516850739127f269439af875d982a8d0420d06e2764c1 HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index e76852e54e2b3d..f5b0fed4d2de36 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.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 5036dc4156027e..b66719e2ca2ecb 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 cb64738645c5af63bd4a06112d3ddcee557ca426127f569fc360183fc5893c88049a9ac60212f6187f283f02911e48ef718fb1b5ba41b665ab2bdc312aeb4356 + SHA512 b84419d7035b4599959cc7be9a9253a386ecab7e78c1d9d620afcb537ac178c1172a8f5465cf8769f45ed083d2aa9ba4324c08775fcc83c5ee017b1abec6b3dc HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 47fc0ee65ac483..43adf8b6356a62 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.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 9ecd0e0140ab89..6707a0ffdb2ba0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2713,7 +2713,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "fcl": { @@ -2761,7 +2761,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "flagpp": { @@ -2845,7 +2845,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "font-chef": { @@ -6153,7 +6153,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "mygui": { @@ -7189,7 +7189,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "psimd": { @@ -9501,7 +9501,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index daa8f1f2731b4a..422d29cfb6e7c4 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e93b8851f4d130c0516f0d3f7ea7cd11645c5ea2", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "bc4c75751db768dfccfdf9dc0cd45b5f38e3ab18", "version-string": "2024.10.07.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 25305e8994440c..3cacba9a2b8d3b 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a980fe04f8d156378c1e0cfe32427c1271a8798a", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "0f9b145acd04fdea428cd27b7fca22d37b2f1e80", "version-string": "2024.10.07.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 730de528282725..d001122260cb52 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cd7435de58f63add1ed638ac479505fbbc3a26d", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "c1728c51eda0e3195c97dfdb580113f5a29d267c", "version-string": "2024.10.07.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index cd56cba4695055..e59b04be916015 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d08f8641593a028f20af63bfe7cacfe0ac10dfa", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "884696ea9ad9078cb5235e9bae639fc789ce7a1c", "version-string": "2024.10.07.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index a807e3b642f8fc..75872c8a078f6a 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "119f91bb8ac023671e37d0e47c5fed7c961b0ff2", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "bf5f1d578553c2ec1665a45b4e34bcf3229c3e6f", "version-string": "2024.10.07.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 0a0f2b51371968..b4acedeaa29cb2 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd0245e857537422c82545bc8f1f2c1a51fb1f42", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "dce0e6d225710b3ecd5811bb83d804ea740281c0", "version-string": "2024.10.07.00",