From 66e6d9ec49a2e888e8f415c1c8a6608a641143dc Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 12 Nov 2024 09:00:57 +0000 Subject: [PATCH] Upgrade most dependencies to their latest version. --- .gitmodules | 6 ++++++ env/autogen.sh | 2 +- env/mingw-w64 | 2 +- env/output.mk | 7 ++----- lib-protocol/SPCDNS | 2 +- lib-protocol/c-ares | 2 +- lib-protocol/curl | 2 +- lib-protocol/lwip | 2 +- lib-protocol/lz4 | 2 +- lib-protocol/pugixml | 2 +- lib-protocol/snappy | 2 +- lib-shared/abseil-cpp | 2 +- lib-shared/abseil.mk | 2 +- lib-shared/asio.mk | 3 +++ lib-shared/boost | 2 +- lib-shared/ctre | 2 +- lib-shared/intx | 2 +- lib-shared/jsoncpp | 2 +- lib-shared/range-v3 | 2 +- lib-shared/secp256k1 | 2 +- lib-shared/sqlite | 2 +- min-boringssl/boringssl | 2 +- min-boringssl/target.mk | 2 +- min-glib/libiconv | 2 +- min-http3/nghttp3 | 1 + min-http3/ngtcp2 | 1 + min-icu4c/icu | 2 +- min-jinja2cpp/Jinja2Cpp | 2 +- min-jinja2cpp/expected-lite | 2 +- min-jinja2cpp/rapidjson | 2 +- min-jinja2cpp/target.mk | 3 +++ min-krypton/vpn-libraries | 2 +- min-pcre2/pcre2 | 2 +- min-v8/FP16 | 2 +- min-v8/jinja2 | 2 +- min-v8/markupsafe | 2 +- min-webrtc/crc32c | 2 +- min-webrtc/libsrtp | 2 +- min-webrtc/target.mk | 4 ++++ min-webrtc/webrtc | 2 +- min-zlib/libz | 2 +- srv-worker/workerd | 2 +- tst-explore/leveldb | 2 +- vpn-shared/libevent | 2 +- vpn-shared/libssh | 2 +- vpn-shared/tor | 2 +- 46 files changed, 59 insertions(+), 44 deletions(-) create mode 160000 min-http3/nghttp3 create mode 160000 min-http3/ngtcp2 diff --git a/.gitmodules b/.gitmodules index 69291fbd1..31f89bcd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -250,3 +250,9 @@ [submodule "rapidjson"] path = min-jinja2cpp/rapidjson url = https://github.com/Tencent/rapidjson.git +[submodule "ngtcp2"] + path = min-http3/ngtcp2 + url = https://github.com/ngtcp2/ngtcp2.git +[submodule "nghttp3"] + path = min-http3/nghttp3 + url = https://github.com/ngtcp2/nghttp3.git diff --git a/env/autogen.sh b/env/autogen.sh index 571bf0802..04d95c26d 100755 --- a/env/autogen.sh +++ b/env/autogen.sh @@ -9,7 +9,7 @@ unset MAKEFLAGS unset MFLAGS if [[ -e ./autogen.sh ]]; then - NOCONFIGURE=1 ./autogen.sh "$@" + NOCONFIGURE=1 CC=clang ./autogen.sh "$@" else autoreconf -i fi diff --git a/env/mingw-w64 b/env/mingw-w64 index c3e587c06..a0f68282b 160000 --- a/env/mingw-w64 +++ b/env/mingw-w64 @@ -1 +1 @@ -Subproject commit c3e587c067a00a561899d49d3e63a659e38802ec +Subproject commit a0f68282b1fb5d2490e2fef052306ed9542e9962 diff --git a/env/output.mk b/env/output.mk index 3f5717221..4f914f4c7 100644 --- a/env/output.mk +++ b/env/output.mk @@ -77,9 +77,6 @@ $(output)/%.c++.o: $$(specific) $$(folder).c++ $$(code) @echo [CC] $(target)/$(arch) $< $(call compile,cxx,c++,-std=c++20) -# XXX: -std=c++2b is currently blocked on an incompatibility with libwebrtc -# https://issues.webrtc.org/issues/339074792 - $(output)/%.cpp.o: $$(specific) $$(folder).cpp $$(code) $(specific) @mkdir -p $(dir $@) @@ -87,11 +84,11 @@ ifeq ($(filter notidy,$(debug)),) @if [[ $< =~ $(filter) && ! $< =~ .*/(base58|lwip|monitor)\.cpp ]]; then \ echo [CT] $(target)/$(arch) $<; \ $(tidy) $< --quiet --warnings-as-errors='*' --header-filter='$(filter)' --config='{Checks: "$(checks)", CheckOptions: [$(foreach v,$(filter checks/%,$(.VARIABLES)),{key: "$(patsubst checks/%,%,$(v))", value: $($(v))}$(comma) )]}' -- \ - $(wordlist 2,$(words $(cxx)),$(cxx)) $(more/$(arch)) -std=c++20 -Wconversion -Wno-sign-conversion $(flags) $(xflags); \ + $(wordlist 2,$(words $(cxx)),$(cxx)) $(more/$(arch)) -std=c++2b -Wconversion -Wno-sign-conversion $(flags) $(xflags); \ fi endif @echo [CC] $(target)/$(arch) $< - $(call compile,cxx,c++,-std=c++20) + $(call compile,cxx,c++,-std=c++2b) $(output)/%.rc.o: $$(specific) $$(folder).rc $$(code) $(specific) diff --git a/lib-protocol/SPCDNS b/lib-protocol/SPCDNS index 443697f51..d291537e1 160000 --- a/lib-protocol/SPCDNS +++ b/lib-protocol/SPCDNS @@ -1 +1 @@ -Subproject commit 443697f5186f92ef78517a95be8dcd8fa4af536c +Subproject commit d291537e1f66b4a7ede069b949a8db0f94c59246 diff --git a/lib-protocol/c-ares b/lib-protocol/c-ares index 85fe3d5a7..67abe5c57 160000 --- a/lib-protocol/c-ares +++ b/lib-protocol/c-ares @@ -1 +1 @@ -Subproject commit 85fe3d5a738bb0ee100662223b713c61ac6ffbbb +Subproject commit 67abe5c5737fffad25ef7eec477e67dc610119ef diff --git a/lib-protocol/curl b/lib-protocol/curl index 76dba7902..b723f6a44 160000 --- a/lib-protocol/curl +++ b/lib-protocol/curl @@ -1 +1 @@ -Subproject commit 76dba79028c7bbe045acae583b46ded643921ad4 +Subproject commit b723f6a445b4d5757db915fe9946158e4158def4 diff --git a/lib-protocol/lwip b/lib-protocol/lwip index 86c9f7999..73fcf7279 160000 --- a/lib-protocol/lwip +++ b/lib-protocol/lwip @@ -1 +1 @@ -Subproject commit 86c9f7999150199374d7697fd2eed62dcd9b1afa +Subproject commit 73fcf72792a926a4e0ac8b656b29bff70552d927 diff --git a/lib-protocol/lz4 b/lib-protocol/lz4 index 5e6774161..7887022e5 160000 --- a/lib-protocol/lz4 +++ b/lib-protocol/lz4 @@ -1 +1 @@ -Subproject commit 5e677416164c9f1102ba6bd708698a20d32ff6a3 +Subproject commit 7887022e5d1de41f1cf53bb12a646d13d6e278d4 diff --git a/lib-protocol/pugixml b/lib-protocol/pugixml index f1d8c51ec..f1f532acf 160000 --- a/lib-protocol/pugixml +++ b/lib-protocol/pugixml @@ -1 +1 @@ -Subproject commit f1d8c51ec8e05b571d7f420ce5cb1a6708c5e0ed +Subproject commit f1f532acfcd94426d4811bed4a2880657739004e diff --git a/lib-protocol/snappy b/lib-protocol/snappy index 52820ea9c..32ded457c 160000 --- a/lib-protocol/snappy +++ b/lib-protocol/snappy @@ -1 +1 @@ -Subproject commit 52820ea9c6cb0af6ebe4920f806dbfbb0de9eaab +Subproject commit 32ded457c0b1fe78ceb8397632c416568d6714a0 diff --git a/lib-shared/abseil-cpp b/lib-shared/abseil-cpp index cbfe51b2c..27a0c7308 160000 --- a/lib-shared/abseil-cpp +++ b/lib-shared/abseil-cpp @@ -1 +1 @@ -Subproject commit cbfe51b2c01da330ff292b145de91346a5950163 +Subproject commit 27a0c7308f04e4560fabe5a7beca837e8f3f2c5b diff --git a/lib-shared/abseil.mk b/lib-shared/abseil.mk index 07146725a..b0688d80b 100644 --- a/lib-shared/abseil.mk +++ b/lib-shared/abseil.mk @@ -24,6 +24,6 @@ source += $(filter-out \ %_test_common.cc \ %_testing.cc \ %/absl/hash/internal/print_hash_of.cc \ -,$(foreach sub,base container crc debugging hash numeric profiling types strings synchronization time,$(wildcard $(pwd)/abseil-cpp/absl/$(sub)/*.cc $(pwd)/abseil-cpp/absl/$(sub)/internal/*.cc)) $(wildcard $(pwd)/abseil-cpp/absl/time/internal/cctz/src/*.cc)) +,$(foreach sub,base container crc debugging hash numeric profiling types strings synchronization time,$(wildcard $(pwd)/abseil-cpp/absl/$(sub)/*.cc $(pwd)/abseil-cpp/absl/$(sub)/internal/*.cc)) $(wildcard $(pwd)/abseil-cpp/absl/strings/internal/str_format/*.cc) $(wildcard $(pwd)/abseil-cpp/absl/time/internal/cctz/src/*.cc)) cflags += -I$(pwd)/abseil-cpp diff --git a/lib-shared/asio.mk b/lib-shared/asio.mk index f2a1cffb3..ac7b29593 100644 --- a/lib-shared/asio.mk +++ b/lib-shared/asio.mk @@ -101,6 +101,9 @@ cflags += -DBOOST_ASIO_DISABLE_CONNECTEX cflags += -DBOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF cflags += -DBOOST_NO_CXX20_HDR_CONCEPTS +# XXX: https://github.com/ned14/outcome/pull/308 +cflags += -DBOOST_OUTCOME_DISABLE_INLINE_GDB_PRETTY_PRINTERS + ifneq ($(filter ios mac,$(target)),) # newer Xcode unconditionally defines _LIBCPP_HAS_ALIGNED_ALLOC but it requires MacOS 10.15+ / iOS 13.0+ cflags += -DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC diff --git a/lib-shared/boost b/lib-shared/boost index ab7968a0b..65c1319bb 160000 --- a/lib-shared/boost +++ b/lib-shared/boost @@ -1 +1 @@ -Subproject commit ab7968a0bbcf574a7859240d1d8443f58ed6f6cf +Subproject commit 65c1319bb92fe7a9a4abd588eff5818d9c2bccf9 diff --git a/lib-shared/ctre b/lib-shared/ctre index 02b4165c0..626313dd1 160000 --- a/lib-shared/ctre +++ b/lib-shared/ctre @@ -1 +1 @@ -Subproject commit 02b4165c024cad597335f9b742ed0186ca7ee212 +Subproject commit 626313dd1563e6f3a02e35427052d808df636cd8 diff --git a/lib-shared/intx b/lib-shared/intx index e0732242e..b071d8106 160000 --- a/lib-shared/intx +++ b/lib-shared/intx @@ -1 +1 @@ -Subproject commit e0732242e36b3bb08cc8cc23445b2bee7c28b9d0 +Subproject commit b071d81066ded14eed1cbf6709330bb8102182f6 diff --git a/lib-shared/jsoncpp b/lib-shared/jsoncpp index 69098a18b..bd25fc5ea 160000 --- a/lib-shared/jsoncpp +++ b/lib-shared/jsoncpp @@ -1 +1 @@ -Subproject commit 69098a18b9af0c47549d9a271c054d13ca92b006 +Subproject commit bd25fc5ea0e14d19e1451632205c8b99ec0b1c09 diff --git a/lib-shared/range-v3 b/lib-shared/range-v3 index 53c40dd62..7e6f34b1e 160000 --- a/lib-shared/range-v3 +++ b/lib-shared/range-v3 @@ -1 +1 @@ -Subproject commit 53c40dd628450c977ee1558285ff43e0613fa7a9 +Subproject commit 7e6f34b1e820fb8321346888ef0558a0ec842b8e diff --git a/lib-shared/secp256k1 b/lib-shared/secp256k1 index 06bff6dec..8deef00b3 160000 --- a/lib-shared/secp256k1 +++ b/lib-shared/secp256k1 @@ -1 +1 @@ -Subproject commit 06bff6dec8d038f7b4112664a9b882293ebc5178 +Subproject commit 8deef00b33ca81202aca80fe0bcd9730f084fbd2 diff --git a/lib-shared/sqlite b/lib-shared/sqlite index 29439b082..2717564bf 160000 --- a/lib-shared/sqlite +++ b/lib-shared/sqlite @@ -1 +1 @@ -Subproject commit 29439b0828063aefe69b0cc4e2fa2b6d6b3d067f +Subproject commit 2717564bfc74860abe14db86dbfebad9ad8c6cfe diff --git a/min-boringssl/boringssl b/min-boringssl/boringssl index 8ae84b558..76968bb3d 160000 --- a/min-boringssl/boringssl +++ b/min-boringssl/boringssl @@ -1 +1 @@ -Subproject commit 8ae84b558b3d3af50a323c7e3800998764e77375 +Subproject commit 76968bb3d53982560bcf08bcd0ba3e1865fe15cd diff --git a/min-boringssl/target.mk b/min-boringssl/target.mk index 7efd06ddc..12aa47e73 100644 --- a/min-boringssl/target.mk +++ b/min-boringssl/target.mk @@ -18,4 +18,4 @@ # }}} -cflags += -I$(pwd)/boringssl/src/include +cflags += -I$(pwd)/boringssl/include diff --git a/min-glib/libiconv b/min-glib/libiconv index 17a9a0721..e5ef17920 160000 --- a/min-glib/libiconv +++ b/min-glib/libiconv @@ -1 +1 @@ -Subproject commit 17a9a0721831bc747cd2ed6d15a111ed4c7dbcb0 +Subproject commit e5ef1792008f7f8db80bf017f118d5ba65899ae4 diff --git a/min-http3/nghttp3 b/min-http3/nghttp3 new file mode 160000 index 000000000..8828bfd67 --- /dev/null +++ b/min-http3/nghttp3 @@ -0,0 +1 @@ +Subproject commit 8828bfd673f1eedcbde4130e6c950c2a988bf529 diff --git a/min-http3/ngtcp2 b/min-http3/ngtcp2 new file mode 160000 index 000000000..14b980930 --- /dev/null +++ b/min-http3/ngtcp2 @@ -0,0 +1 @@ +Subproject commit 14b9809301c25ed6d361cc4da8c14863bab5a37d diff --git a/min-icu4c/icu b/min-icu4c/icu index e6ac2a292..44ea9278b 160000 --- a/min-icu4c/icu +++ b/min-icu4c/icu @@ -1 +1 @@ -Subproject commit e6ac2a292fac59032eb3ba11847a43bd5837c30c +Subproject commit 44ea9278b97768ee8c5df9d247f9afd43be1ed52 diff --git a/min-jinja2cpp/Jinja2Cpp b/min-jinja2cpp/Jinja2Cpp index e97a54e51..86dfb939b 160000 --- a/min-jinja2cpp/Jinja2Cpp +++ b/min-jinja2cpp/Jinja2Cpp @@ -1 +1 @@ -Subproject commit e97a54e51336938470eacb4ce261bde903e22e54 +Subproject commit 86dfb939b5c2beb7fabddae2df386be4e7fb9507 diff --git a/min-jinja2cpp/expected-lite b/min-jinja2cpp/expected-lite index f339d2f73..5b5caad7c 160000 --- a/min-jinja2cpp/expected-lite +++ b/min-jinja2cpp/expected-lite @@ -1 +1 @@ -Subproject commit f339d2f73730f8fee4412f5e4938717866ecef48 +Subproject commit 5b5caad7cd57d5ba3ca796bf1521b131d73ca405 diff --git a/min-jinja2cpp/rapidjson b/min-jinja2cpp/rapidjson index ab1842a2d..858451e5b 160000 --- a/min-jinja2cpp/rapidjson +++ b/min-jinja2cpp/rapidjson @@ -1 +1 @@ -Subproject commit ab1842a2dae061284c0a62dca1cc6d5e7e37e346 +Subproject commit 858451e5b7d1c56cf8f6d58f88cf958351837e53 diff --git a/min-jinja2cpp/target.mk b/min-jinja2cpp/target.mk index 8a2355a40..70d976467 100644 --- a/min-jinja2cpp/target.mk +++ b/min-jinja2cpp/target.mk @@ -20,5 +20,8 @@ cflags += -I$(pwd)/Jinja2Cpp/include cflags += -DJINJA2CPP_WITH_JSON_BINDINGS_BOOST +# XXX: jinja2cpp relies on nonstd::expected_lite::expected::get_unexpected +cflags += -Dnsel_CONFIG_SELECT_EXPECTED=nsel_EXPECTED_NONSTD + source += $(wildcard $(pwd)/Jinja2Cpp/src/*.cpp) source += $(pwd)/Jinja2Cpp/src/binding/boost_json_serializer.cpp diff --git a/min-krypton/vpn-libraries b/min-krypton/vpn-libraries index f1572e77c..e9b8100a5 160000 --- a/min-krypton/vpn-libraries +++ b/min-krypton/vpn-libraries @@ -1 +1 @@ -Subproject commit f1572e77c6ead1412eb145599086a49f2bec3f70 +Subproject commit e9b8100a55985b68fddf85372f6c414c52c5a2d2 diff --git a/min-pcre2/pcre2 b/min-pcre2/pcre2 index 5634d0b6b..82ebebfd0 160000 --- a/min-pcre2/pcre2 +++ b/min-pcre2/pcre2 @@ -1 +1 @@ -Subproject commit 5634d0b6b56793f5215d8d348aedffb510c51cc6 +Subproject commit 82ebebfd0dad4f84c4d8ac5a9dd267add1272315 diff --git a/min-v8/FP16 b/min-v8/FP16 index 95163a75c..98b0a46bc 160000 --- a/min-v8/FP16 +++ b/min-v8/FP16 @@ -1 +1 @@ -Subproject commit 95163a75c51bc8dc29f72d0d7419ec50132984ff +Subproject commit 98b0a46bce017382a6351a19577ec43a715b6835 diff --git a/min-v8/jinja2 b/min-v8/jinja2 index c9c77525e..2f6f2ff5e 160000 --- a/min-v8/jinja2 +++ b/min-v8/jinja2 @@ -1 +1 @@ -Subproject commit c9c77525ea20c871a1d4658f8d312b51266d4bad +Subproject commit 2f6f2ff5e4c1d727377f5e1b9e1903d871f41e74 diff --git a/min-v8/markupsafe b/min-v8/markupsafe index e582d7f0e..6638e9b0a 160000 --- a/min-v8/markupsafe +++ b/min-v8/markupsafe @@ -1 +1 @@ -Subproject commit e582d7f0edb9d67499b0f5abd6ae5550e91da7f2 +Subproject commit 6638e9b0a79afc2ff7edd9e84b518fe7d5d5fea9 diff --git a/min-webrtc/crc32c b/min-webrtc/crc32c index 21fc8ef30..1c51f87c9 160000 --- a/min-webrtc/crc32c +++ b/min-webrtc/crc32c @@ -1 +1 @@ -Subproject commit 21fc8ef30415a635e7351ffa0e5d5367943d4a94 +Subproject commit 1c51f87c9ad8157b4461e2216b9272f13fd0be3b diff --git a/min-webrtc/libsrtp b/min-webrtc/libsrtp index 7a7e64c8b..a52756acb 160000 --- a/min-webrtc/libsrtp +++ b/min-webrtc/libsrtp @@ -1 +1 @@ -Subproject commit 7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a +Subproject commit a52756acb1c5e133089c798736dd171567df11f5 diff --git a/min-webrtc/target.mk b/min-webrtc/target.mk index 0b1f9fd27..208da970c 100644 --- a/min-webrtc/target.mk +++ b/min-webrtc/target.mk @@ -42,6 +42,7 @@ webrtc += $(pwd)/webrtc/api/audio/audio_processing_statistics.cc webrtc += $(pwd)/webrtc/api/audio_codecs/audio_codec_pair_id.cc webrtc += $(pwd)/webrtc/api/audio_codecs/audio_encoder.cc +webrtc += $(pwd)/webrtc/api/audio_codecs/audio_format.cc webrtc += $(pwd)/webrtc/api/call/transport.cc webrtc += $(pwd)/webrtc/api/environment/environment_factory.cc @@ -69,6 +70,7 @@ webrtc += $(pwd)/webrtc/api/video_codecs/video_codec.cc webrtc += $(pwd)/webrtc/api/video_codecs/vp9_profile.cc webrtc += $(pwd)/webrtc/call/call_config.cc +webrtc += $(pwd)/webrtc/call/payload_type_picker.cc webrtc += $(pwd)/webrtc/call/rtp_bitrate_configurator.cc webrtc += $(pwd)/webrtc/call/rtp_config.cc webrtc += $(pwd)/webrtc/call/rtp_demuxer.cc @@ -76,6 +78,8 @@ webrtc += $(pwd)/webrtc/call/rtp_payload_params.cc webrtc += $(pwd)/webrtc/call/rtp_transport_controller_send.cc webrtc += $(pwd)/webrtc/call/rtp_video_sender.cc +webrtc += $(pwd)/webrtc/common_video/corruption_detection_converters.cc + webrtc += $(pwd)/webrtc/common_video/generic_frame_descriptor/generic_frame_info.cc webrtc += $(pwd)/webrtc/common_video/h264/h264_common.cc diff --git a/min-webrtc/webrtc b/min-webrtc/webrtc index b84097e13..849549d40 160000 --- a/min-webrtc/webrtc +++ b/min-webrtc/webrtc @@ -1 +1 @@ -Subproject commit b84097e13973a726d5099e9a211f3c9d52b6fa43 +Subproject commit 849549d40304890255f6033d13c2646e3bfb6ebb diff --git a/min-zlib/libz b/min-zlib/libz index 4f653ff1a..c7678ba8a 160000 --- a/min-zlib/libz +++ b/min-zlib/libz @@ -1 +1 @@ -Subproject commit 4f653ff1af93e9256c59a2c524795cd84c39c698 +Subproject commit c7678ba8af4577e45023b35ae96b6b71efa0acf7 diff --git a/srv-worker/workerd b/srv-worker/workerd index 9bfce124c..d77b0fa08 160000 --- a/srv-worker/workerd +++ b/srv-worker/workerd @@ -1 +1 @@ -Subproject commit 9bfce124ca0019832d27e2ff256ba09563caa9ce +Subproject commit d77b0fa083318952e6f6d556040e7a1d5eeb9b84 diff --git a/tst-explore/leveldb b/tst-explore/leveldb index 068d5ee1a..23e35d792 160000 --- a/tst-explore/leveldb +++ b/tst-explore/leveldb @@ -1 +1 @@ -Subproject commit 068d5ee1a3ac40dabd00d211d5013af44be55bea +Subproject commit 23e35d792b9154f922b8b575b12596a4d8664c65 diff --git a/vpn-shared/libevent b/vpn-shared/libevent index fc9bfd210..78eb30597 160000 --- a/vpn-shared/libevent +++ b/vpn-shared/libevent @@ -1 +1 @@ -Subproject commit fc9bfd210d289d1565cf03e3d9d2e85f50f5b144 +Subproject commit 78eb305975ed68d8bc159e46e6164afff1a74747 diff --git a/vpn-shared/libssh b/vpn-shared/libssh index a5f082db8..861590192 160000 --- a/vpn-shared/libssh +++ b/vpn-shared/libssh @@ -1 +1 @@ -Subproject commit a5f082db831f57e9390578331eee20f8928c4edf +Subproject commit 861590192fed3627e80605be080f79aa2678a005 diff --git a/vpn-shared/tor b/vpn-shared/tor index 7a5d94bcf..9b03f0288 160000 --- a/vpn-shared/tor +++ b/vpn-shared/tor @@ -1 +1 @@ -Subproject commit 7a5d94bcf842299534b667433424ac7a1133d371 +Subproject commit 9b03f0288a15ed70333a2c576b85a89c6e27ca2a