diff --git a/min-cairo/libpng b/min-cairo/libpng index cd0ea2a7f..c22ef3b2e 160000 --- a/min-cairo/libpng +++ b/min-cairo/libpng @@ -1 +1 @@ -Subproject commit cd0ea2a7f53b603d3d9b5b891c779c430047b39a +Subproject commit c22ef3b2e342bdfe3140b7e94879996d0e18c95b diff --git a/min-icu4c/icu b/min-icu4c/icu index 80fb309c8..39dfee39b 160000 --- a/min-icu4c/icu +++ b/min-icu4c/icu @@ -1 +1 @@ -Subproject commit 80fb309c8a5f865767ef72f85ea1bf70c29e2b39 +Subproject commit 39dfee39b88a09fcafb33992a5495c4117490644 diff --git a/min-krypton/vpn-libraries b/min-krypton/vpn-libraries index 48bc145fb..59c659095 160000 --- a/min-krypton/vpn-libraries +++ b/min-krypton/vpn-libraries @@ -1 +1 @@ -Subproject commit 48bc145fb4f9d94b904d5c8aafe7642b3b7e9afb +Subproject commit 59c659095b7e64b6e5f8f3455ab88e4be7be46f3 diff --git a/min-pcre2/pcre2 b/min-pcre2/pcre2 index 0746b3d52..52c088479 160000 --- a/min-pcre2/pcre2 +++ b/min-pcre2/pcre2 @@ -1 +1 @@ -Subproject commit 0746b3d523c9a799aa62ae9e03188b23664f48b0 +Subproject commit 52c08847921a324c804cabf2814549f50bce1265 diff --git a/min-webrtc/abseil-cpp b/min-webrtc/abseil-cpp index 78099461a..f8fa267ec 160000 --- a/min-webrtc/abseil-cpp +++ b/min-webrtc/abseil-cpp @@ -1 +1 @@ -Subproject commit 78099461ac99ee8e7e515046c802d569a4642bd2 +Subproject commit f8fa267ec230b8577507b3798ac234999b72f348 diff --git a/min-webrtc/openssl b/min-webrtc/openssl index 129058165..830bf8e1e 160000 --- a/min-webrtc/openssl +++ b/min-webrtc/openssl @@ -1 +1 @@ -Subproject commit 129058165d195e43a0ad10111b0c2e29bdf65980 +Subproject commit 830bf8e1e4749ad65c51b6a1d0d769ae689404ba diff --git a/min-webrtc/target.mk b/min-webrtc/target.mk index b094544e0..4b2c9223a 100644 --- a/min-webrtc/target.mk +++ b/min-webrtc/target.mk @@ -27,6 +27,7 @@ webrtc += $(filter-out \ webrtc += $(wildcard $(pwd)/webrtc/api/crypto/*.cc) webrtc += $(wildcard $(pwd)/webrtc/api/transport/*.cc) webrtc += $(wildcard $(pwd)/webrtc/api/transport/media/*.cc) +webrtc += $(wildcard $(pwd)/webrtc/api/transport/rtp/*.cc) webrtc += $(wildcard $(pwd)/webrtc/api/units/*.cc) webrtc += $(pwd)/webrtc/api/field_trials_registry.cc @@ -65,6 +66,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/generic_frame_descriptor/generic_frame_info.cc + webrtc += $(pwd)/webrtc/common_video/h264/h264_common.cc webrtc += $(pwd)/webrtc/common_video/h264/pps_parser.cc webrtc += $(pwd)/webrtc/common_video/h264/sps_parser.cc @@ -103,7 +106,10 @@ webrtc += $(wildcard $(pwd)/webrtc/modules/utility/source/*.cc) webrtc += $(pwd)/webrtc/modules/utility/maybe_worker_thread.cc webrtc += $(pwd)/webrtc/modules/video_coding/chain_diff_calculator.cc +webrtc += $(pwd)/webrtc/modules/video_coding/encoded_frame.cc webrtc += $(pwd)/webrtc/modules/video_coding/frame_dependencies_calculator.cc +# XXX: why is this in the include folder?! +webrtc += $(pwd)/webrtc/modules/video_coding/include/video_codec_interface.cc webrtc += $(filter-out \ %/reassembly_streams.cc \ diff --git a/min-webrtc/webrtc b/min-webrtc/webrtc index 4df20baff..b459deaf3 160000 --- a/min-webrtc/webrtc +++ b/min-webrtc/webrtc @@ -1 +1 @@ -Subproject commit 4df20baff171e66e0de5604d20ac8fbc162a7083 +Subproject commit b459deaf380fb95ad0275dbe9e92cb7a8b4b99e5 diff --git a/min-wireshark/extra/path_config.h b/min-wireshark/extra/path_config.h new file mode 100644 index 000000000..b544ad4ba --- /dev/null +++ b/min-wireshark/extra/path_config.h @@ -0,0 +1,2 @@ +#define INSTALL_PREFIX "/" +#define DOC_DIR "." diff --git a/min-wireshark/extra/vcs_version.h b/min-wireshark/extra/vcs_version.h new file mode 100644 index 000000000..e69de29bb diff --git a/min-wireshark/wireshark b/min-wireshark/wireshark index 3c9662b1d..84f963dfa 160000 --- a/min-wireshark/wireshark +++ b/min-wireshark/wireshark @@ -1 +1 @@ -Subproject commit 3c9662b1d27889574c4177c468b9d85dbcef54dc +Subproject commit 84f963dfa2300a83bc7b6cfe17ca105b3b3604fd diff --git a/min-zlib/googletest b/min-zlib/googletest index 934542165..0570e2d93 160000 --- a/min-zlib/googletest +++ b/min-zlib/googletest @@ -1 +1 @@ -Subproject commit 934542165899c786cb5d8a710529c37184730183 +Subproject commit 0570e2d930a185bbc375be70d9ad96836b955a4f diff --git a/min-zlib/libz b/min-zlib/libz index fa5dc4750..2d44c51ad 160000 --- a/min-zlib/libz +++ b/min-zlib/libz @@ -1 +1 @@ -Subproject commit fa5dc4750029333c2486efa38eec7d13890108ed +Subproject commit 2d44c51ada6d325b85b53427b02dabf44648bca4 diff --git a/modules b/modules index 508f1a158..daa678c47 100755 --- a/modules +++ b/modules @@ -21,6 +21,8 @@ head[env/libcxxabi]=origin/release_90 head[app-shared/flutter]=3.7.1 head[app-shared/engine]=$(cat app-shared/flutter/bin/internal/engine.version) +# pcre2 is stuck due to https://github.com/PCRE2Project/pcre2/issues/205 + # url is stuck due to https://forums.developer.apple.com/thread/120977 :/ # (I tried to use a local copy of libcxx on Apple, but crashed on iOS 14) head[p2p/url]=7c822cb9873b1422e09be5131f30e9d83d487096 diff --git a/p2p/c-ares b/p2p/c-ares index 0e7a5dee0..bb8f5bb0a 160000 --- a/p2p/c-ares +++ b/p2p/c-ares @@ -1 +1 @@ -Subproject commit 0e7a5dee0fbb04080750cf6eabbe89d8bae87faa +Subproject commit bb8f5bb0a80e207c06e1aa9da97a4de1a6873a13 diff --git a/p2p/ctre b/p2p/ctre index 1ca2fa83e..c095ae765 160000 --- a/p2p/ctre +++ b/p2p/ctre @@ -1 +1 @@ -Subproject commit 1ca2fa83ec60e0905da5516875d3a64610022459 +Subproject commit c095ae765eff0cb002258c8334a66b286ca0bea8 diff --git a/p2p/curl b/p2p/curl index 9749a379e..1695fcf57 160000 --- a/p2p/curl +++ b/p2p/curl @@ -1 +1 @@ -Subproject commit 9749a379e01d0cf314a3fb7be831d1bb4af6846d +Subproject commit 1695fcf57d53230adc6c8cbe20a283690019db02 diff --git a/p2p/eEVM b/p2p/eEVM index 88446a793..118a9355d 160000 --- a/p2p/eEVM +++ b/p2p/eEVM @@ -1 +1 @@ -Subproject commit 88446a793aa0bb561a216b6df2b51d89d9049328 +Subproject commit 118a9355d023748318a318bc07fc79063f015a94 diff --git a/p2p/intx b/p2p/intx index 1e964dacd..f3b775faa 160000 --- a/p2p/intx +++ b/p2p/intx @@ -1 +1 @@ -Subproject commit 1e964dacdb58a9db2d266fb0c257016013a61f7d +Subproject commit f3b775faa76e64ee76e0c8c4fde4bf7386845402 diff --git a/p2p/lz4 b/p2p/lz4 index 266359f7a..ecf92d089 160000 --- a/p2p/lz4 +++ b/p2p/lz4 @@ -1 +1 @@ -Subproject commit 266359f7a6b8b057153d6bf054d23c48d4372fcf +Subproject commit ecf92d0897587c0f641df9db83c910fd236cb18a diff --git a/p2p/openvpn3 b/p2p/openvpn3 index e4b1afe14..c6deee627 160000 --- a/p2p/openvpn3 +++ b/p2p/openvpn3 @@ -1 +1 @@ -Subproject commit e4b1afe1482a02e766144357d9761f6ba54d0320 +Subproject commit c6deee62707493e60e044396614da16164931ee9 diff --git a/p2p/pugixml b/p2p/pugixml index 95683943b..c2c61a590 160000 --- a/p2p/pugixml +++ b/p2p/pugixml @@ -1 +1 @@ -Subproject commit 95683943bba726729079886d0967112a60fa71aa +Subproject commit c2c61a590508922964a425c603c7016329b14655 diff --git a/p2p/secp256k1 b/p2p/secp256k1 index cbe41ac13..1cca7c174 160000 --- a/p2p/secp256k1 +++ b/p2p/secp256k1 @@ -1 +1 @@ -Subproject commit cbe41ac138bc0773d60ab1942b7ad6fc5eccfc19 +Subproject commit 1cca7c1744b7e54793e7f472e8fa6b209cc6fd70 diff --git a/p2p/snappy b/p2p/snappy index 984b191f0..30326e5b8 160000 --- a/p2p/snappy +++ b/p2p/snappy @@ -1 +1 @@ -Subproject commit 984b191f0fefdeb17050b42a90b7625999c13b8d +Subproject commit 30326e5b8cae9b5f2ea640d74beb2562ced44219 diff --git a/p2p/source/android.cpp b/p2p/source/android.cpp new file mode 100644 index 000000000..7675f280d --- /dev/null +++ b/p2p/source/android.cpp @@ -0,0 +1,39 @@ +/* Orchid - WebRTC P2P VPN Market (on Ethereum) + * Copyright (C) 2017-2020 The Orchid Authors +*/ + +/* GNU Affero General Public License, Version 3 {{{ */ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . +**/ +/* }}} */ + + +#ifdef __ANDROID__ + +// some rust projects depend indirectly on the nix crate +// and rust object files have leaky translation units :( +// so linking the archive tries to pull in these symbols + +#include "error.hpp" + +extern "C" int getgrgid_r(gid_t gid, struct group *grp, char *buffer, size_t bufsize, struct group **result) { + orc_insist(false); +} + +extern "C" int getgrnam_r(const char *name, struct group *grp, char *buffer, size_t bufsize, struct group **result) { + orc_insist(false); +} + +#endif diff --git a/p2p/trezor-common b/p2p/trezor-common index 5fa47f4f7..8f46f1517 160000 --- a/p2p/trezor-common +++ b/p2p/trezor-common @@ -1 +1 @@ -Subproject commit 5fa47f4f7c4555226ea9a3526088f3b499869315 +Subproject commit 8f46f1517fd93fc9cc136a672bab5a6b7e7a62c1 diff --git a/vpn-shared/libevent b/vpn-shared/libevent index 0b79a0024..f9134df7d 160000 --- a/vpn-shared/libevent +++ b/vpn-shared/libevent @@ -1 +1 @@ -Subproject commit 0b79a0024fcc53a322bf63f6e2301173de7dc9de +Subproject commit f9134df7d07a9214d00cb0d18d7fd820fa7eb781 diff --git a/vpn-shared/libssh b/vpn-shared/libssh index c52f40bcb..96aee531f 160000 --- a/vpn-shared/libssh +++ b/vpn-shared/libssh @@ -1 +1 @@ -Subproject commit c52f40bcb2cf958c613b5f7516eb5d7c42099d7d +Subproject commit 96aee531ff0e06854d94c118f8dd7c80fe562b2a diff --git a/vpn-shared/tor b/vpn-shared/tor index 1e6d839ce..a9c7cd6b2 160000 --- a/vpn-shared/tor +++ b/vpn-shared/tor @@ -1 +1 @@ -Subproject commit 1e6d839ce9fbd7dfc656bd13a67bd0908863b674 +Subproject commit a9c7cd6b2c08eed9bfd6dd3daa64a89083fd0b08