From bdf073a835ebea07e1d039cd9cff4f650014e4ce Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 8 Nov 2022 08:14:23 +0800 Subject: [PATCH] [folly] update to (#27580) * [folly] update to * update version * update fizz to the latest version * update version * update mvfst to the latest version * update version * Apply review suggesstion * update version Co-authored-by: Billy Robert O'Neal III --- ports/fizz/portfile.cmake | 12 ++++++------ ports/fizz/vcpkg.json | 4 ++-- ports/folly/portfile.cmake | 6 +++--- ports/folly/vcpkg.json | 3 +-- ports/mvfst/portfile.cmake | 12 ++++++------ ports/mvfst/vcpkg.json | 3 ++- versions/baseline.json | 10 +++++----- versions/f-/fizz.json | 5 +++++ versions/f-/folly.json | 5 +++++ versions/m-/mvfst.json | 5 +++++ 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 1fe719a785..31aea2d7ce 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 v2022.03.21.00 - SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e + REF 47948342be43ddb951e12a53770278be52d479e7 #v2022.10.31.00 + SHA512 b91fbbe008bbd6ee5e865a585cd51f1a1b69360eba32231f0b585b836e5591ee4cc9ffe1d747a82267f21736056fc97932b35212016e614928c13de7c5a64f55 HEAD_REF master PATCHES 0001-fix-libsodium.patch @@ -13,10 +13,10 @@ vcpkg_from_github( # Prefer installed config files file(REMOVE - ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake - ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake - ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake - ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake + "${SOURCE_PATH}/fizz/cmake/FindGMock.cmake" + "${SOURCE_PATH}/fizz/cmake/FindGflags.cmake" + "${SOURCE_PATH}/fizz/cmake/FindGlog.cmake" + "${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake" ) vcpkg_cmake_configure( diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 84d086bf1b..a87e01bd62 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,9 +1,9 @@ { "name": "fizz", - "version-string": "2022.03.21.00", - "port-version": 1, + "version-string": "2022.10.31.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", + "license": "BSD-3-Clause", "dependencies": [ "double-conversion", "fmt", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index b991a44736..221315e31c 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,15 +8,15 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF 46c03de426e26f4c5a92df37ab233c586fbe369a #v2022.08.15.00 - SHA512 6798878d6892ed79d954fb5754ee102ea04868bce4be9be5dc7c6d6c7ddcbc5573719fe09470d89c385d9e487a75d1a9abc70c29c67698b957fc68b97a8bea32 + REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00 + SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770 HEAD_REF main PATCHES reorder-glog-gflags.patch disable-non-underscore-posix-names.patch boost-1.70.patch fix-windows-minmax.patch - fix-deps.patch + fix-deps.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 1fdc06cfbf..19bd8cd7a2 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2022.08.15.00", - "port-version": 1, + "version-string": "2022.10.31.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/portfile.cmake b/ports/mvfst/portfile.cmake index 79dbbeba3d..8766d87c6f 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/mvfst - REF 7c52380a5c445fe478096d7ca10e92797747ae87 - SHA512 5ccebec9652e7a481b599b20a07b0d6585d300cdde3e6b62985c5ce448c0890d537bced6c9dbd77009f89c16311c56fde1f2131064ff5cc3fcb34bf69cb11f06 + REF 28857570ac808c5493312144dc5af92d6f0a7381 #2022-11-03 + SHA512 3e413e8906ac83f48936871f24d06980bdeff8b7a659326498549afaa53321c047bcd843a7ed971bfed7ddb51e086a28c1ac5fb0f91aabd0a078dda6a75fe488 HEAD_REF main ) @@ -15,10 +15,10 @@ vcpkg_cmake_configure( # Prefer installed config files file(REMOVE - ${SOURCE_PATH}/fizz/cmake/FindGMock.cmake - ${SOURCE_PATH}/fizz/cmake/FindGflags.cmake - ${SOURCE_PATH}/fizz/cmake/FindGlog.cmake - ${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake + "${SOURCE_PATH}/fizz/cmake/FindGMock.cmake" + "${SOURCE_PATH}/fizz/cmake/FindGflags.cmake" + "${SOURCE_PATH}/fizz/cmake/FindGlog.cmake" + "${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake" ) vcpkg_cmake_install() diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 4e3df9f61e..4082b77518 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mvfst", - "version-date": "2022-03-27", + "version-date": "2022-11-03", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 3a1586ab10..eea23dc534 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2317,8 +2317,8 @@ "port-version": 0 }, "fizz": { - "baseline": "2022.03.21.00", - "port-version": 1 + "baseline": "2022.10.31.00", + "port-version": 0 }, "flann": { "baseline": "2019-04-07", @@ -2381,8 +2381,8 @@ "port-version": 0 }, "folly": { - "baseline": "2022.08.15.00", - "port-version": 1 + "baseline": "2022.10.31.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -5033,7 +5033,7 @@ "port-version": 5 }, "mvfst": { - "baseline": "2022-03-27", + "baseline": "2022-11-03", "port-version": 0 }, "mygui": { diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 77febcf198..3f1788bbee 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa78418cc3a270fb236d03b946e1658feabd19dc", + "version-string": "2022.10.31.00", + "port-version": 0 + }, { "git-tree": "3a4e5784b588827080b88e75299923149b842c4d", "version-string": "2022.03.21.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 62a39de726..d310b3a15e 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1557f1102d3f63802e9a13ab16302e4097c81a7", + "version-string": "2022.10.31.00", + "port-version": 0 + }, { "git-tree": "968cb6f9f5300306d010ffabc297339c40ade808", "version-string": "2022.08.15.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 54b8bdcd4c..4b7412e2af 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6187a6048afe0846ffb243d00981f0da0666aa38", + "version-date": "2022-11-03", + "port-version": 0 + }, { "git-tree": "b054de2d05773c286f25528132a496dd075d3914", "version-date": "2022-03-27",