From nobody Fri Jan 27 16:12:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P3Mzx49SDz3b6HT; Fri, 27 Jan 2023 16:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P3Mzx2P7Tz3kXc; Fri, 27 Jan 2023 16:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674835965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o7Cu501ftO9koFdYmyJUkpishie3OJ7JMWIGWnjuCfE=; b=xkPjcuWTMu7a2wAV8cgO+zAIwb4NjWVj4TI35FzTuc67hfQJaZI7z7oltpQtWKcb3LkVHh JoAZdx4oMxAz1drdbDJqH6SDDSN7GceI2FltIvsRMdAgnA2Dk/9KzUAVG+gOrc/kJro2q/ LF22JBDUoPAVDco1dkIRb+g0BfecdzQnWPGN2g/8bORqnX0BQL+G9AK5Rk7UOMgBUbW+Tg HfLtilhaFl6f39YCsKtXO8wmI2X5yeNBtVElNIEpbJQGp9KO6uxHGQO9qr+wbzxnX34VAR cdK6mZpxnHiCaylYIvXSLUN4flaYjFPcc181CtlUigzkAqZf5gQcURSQqVTG3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674835965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o7Cu501ftO9koFdYmyJUkpishie3OJ7JMWIGWnjuCfE=; b=xgGxriZNzSv5JWvOGUVtA2rcvGpd/AoF+UPKLtEeRu8p7FGhRSHCvqQlgdIlyx8QKmWBHN e7Vrft4A2POd5fyKq5HVOb70GVGUYYViBE0zWlYNKsZemiZkQTe/vdHMsPwEe8HiUIzGry BjeQdgkH4uYSUgvLNDbcqP2zHQAZ/FNy/cMFwf6Ur4ly9e7St8Uwe39TggsSFwSlGZ83pc hpsim4CPUzszNq40JjVj5jqhaBsIZVo9x05twKuD3YdeW5B51zanj0kxwhI5YDcchMaQ93 jLMzDjSfgsayGOHTON9bV7S2uB5KMgSk8FJLLzQw5BITVyHk4XaAjY4XuOz04g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674835965; a=rsa-sha256; cv=none; b=J/ru+EgHN14LrBGhfGPCAxJDdVYPTPjyJm4STCWgdpWZM8Z7Dj7ofMPfMeNpxrhvkDYzjQ vJ0sM6bE5r/e8bftIG+w+vtNMLCbwah4Dy4Jq8d+IwvGRslB7pIMMlE4njUsLnQQqsVfD/ izVOnh/CfVSAqWlfVBvcxfj7SwBnxR5ugdWajTTXR7RdOHq4o9I2JYjXcrCv7yNhqTbwuE hHGTpJjKDURTyxvQ3N8XBlseBkMeO2UI3i2Z8kmnxfCNqEbLKqvAbb87icXtzOUdeAfo7q pFxjmUnr4kYOtINgVoo7sTsUTFFZS2L+cf9v2TFvSHyQlCtcWGYwdxp++kcqmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P3Mzx0QfDzFqq; Fri, 27 Jan 2023 16:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30RGCjQh058042; Fri, 27 Jan 2023 16:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RGCiJ6058041; Fri, 27 Jan 2023 16:12:44 GMT (envelope-from git) Date: Fri, 27 Jan 2023 16:12:44 GMT Message-Id: <202301271612.30RGCiJ6058041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 9607f49592d4 - main - multimedia/ringrtc: Update to 2.23.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9607f49592d4f4c7bb33efd3e3559521372e1435 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=9607f49592d4f4c7bb33efd3e3559521372e1435 commit 9607f49592d4f4c7bb33efd3e3559521372e1435 Author: Mikael Urankar AuthorDate: 2023-01-27 11:10:47 +0000 Commit: Mikael Urankar CommitDate: 2023-01-27 16:12:29 +0000 multimedia/ringrtc: Update to 2.23.0 Changes: https://github.com/signalapp/ringrtc/releases/tag/v2.23.0 --- multimedia/ringrtc/Makefile | 45 ++++++------ multimedia/ringrtc/distinfo | 82 +++++++++++---------- ...h-src_webrtc_src_build_config_compiler_BUILD.gn | 41 +++++------ ...c_webrtc_src_build_config_compiler_compiler.gni | 6 +- .../patch-src_webrtc_src_build_config_features.gni | 10 +-- ...c_webrtc_src_build_toolchain_gcc__toolchain.gni | 9 ++- ...webrtc_src_rtc__base_physical__socket__server.h | 4 +- .../files/patch-src_webrtc_src_testing_BUILD.gn | 27 ------- ...il-cpp_absl_base_internal_unscaledcycleclock.cc | 14 ---- ...-src_webrtc_src_third__party_libevent_BUILD.gn} | 4 +- multimedia/ringrtc/webrtc_fetch.sh | 84 +++++++++++----------- 11 files changed, 144 insertions(+), 182 deletions(-) diff --git a/multimedia/ringrtc/Makefile b/multimedia/ringrtc/Makefile index 1751104c83a7..e69ca3082597 100644 --- a/multimedia/ringrtc/Makefile +++ b/multimedia/ringrtc/Makefile @@ -1,7 +1,6 @@ PORTNAME= ringrtc DISTVERSIONPREFIX= v -DISTVERSION= 2.22.0 -PORTREVISION= 2 +DISTVERSION= 2.23.0 CATEGORIES= multimedia MASTER_SITES= LOCAL/mikael/ringrtc/:base \ LOCAL/mikael/ringrtc/:boringssl \ @@ -58,22 +57,22 @@ EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} # sh net-im/signal-desktop/get_deps.sh -WEBRTC_REV= 5005b +WEBRTC_REV= 5359 # modify webrtc_fetch.sh, then sh webrtc_fetch.sh -BASE_REV= d714333bb07eb8444f600ea4d2dc56be55730a51 -BORINGSSL_REV= 27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c -BUILD_REV= bb1c23c67d2328cbb89966535bfca2916854bb8e -BUILDTOOLS_REV= c2e4795660817c2776dbabd778b92ed58c074032 -CATAPULT_REV= e9e999a4a88a2963b60bec778f340d3c3d00fa1a -ICU_REV= 1fd0dbea04448c3f73fe5cb7599f9472f0f107f1 -LIBJPEG_TURBO_REV= 22f1a22c99e9dde8cd3c72ead333f425c5a7aa77 +BASE_REV= b054aaefd4d4ec5aad7189c4e97000a06b594163 +BORINGSSL_REV= 1ee71185a2322dc354bee5e5a0abfb1810a27dc6 +BUILD_REV= 1c4f38fd4f534d78b72cefc376a03b3e8b486e7c +BUILDTOOLS_REV= 24fa2da896a027e7202bb8886177cccfe885b67d +CATAPULT_REV= 4793433248183dd073e608f655204d4acfdc7193 +ICU_REV= 20f8ac695af59b6c830def7d4e95bfeb13dd7be5 +LIBJPEG_TURBO_REV= ed683925e4897a84b3bffc5c1414c85b97a129a3 LIBSRTP_REV= 5b7c744eb8310250ccc534f3f86a2015b3887a0a -LIBVPX_REV= bf672f23a5336cb54dbcb2e4417142139f44cc3e -LIBYUV_REV= f4d25308467cbd50c2706a46fa0ddcef939e715a +LIBVPX_REV= 9d6d0624d7943a09cc0be9df1a7402522989ac1a +LIBYUV_REV= 00950840d1c9bcbb3eb6ebc5aac5793e71166c8b NASM_REV= 9215e8e1d0fe474ffd3e16c1a07a0f97089e6224 -TESTING_REV= d2cc6b1f9d361923efea2c822f9e6c346861dc9f -THIRD_PARTY_REV= 5a0acdf2e317019f2c55ad5de72a144e9a758cdf +TESTING_REV= 6f2362298838e8789b09282cf198c8582f9c4555 +THIRD_PARTY_REV= 28a4580f804c4fc4279ecf10100a409811030235 BINARY_ALIAS= python3=${PYTHON_CMD} @@ -102,8 +101,9 @@ MAKE_ARGS= -C out/${BUILDTYPE} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}/src/rust WEBRTCDIR= ${WRKDIR}/${PORTNAME}-${DISTVERSION}/src/webrtc/src -# fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.22.0/src/rust/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile -CARGO_CRATES= aes-0.8.1 \ +# fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.23.0/src/rust/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile +CARGO_CRATES= adler-1.0.2 \ + aes-0.8.1 \ aho-corasick-0.7.19 \ anyhow-1.0.65 \ atty-0.2.14 \ @@ -121,6 +121,7 @@ CARGO_CRATES= aes-0.8.1 \ cipher-0.4.3 \ combine-4.6.6 \ cpufeatures-0.2.5 \ + crc32fast-1.3.2 \ crypto-common-0.1.6 \ ctr-0.9.2 \ curve25519-dalek-3.2.1 \ @@ -130,6 +131,7 @@ CARGO_CRATES= aes-0.8.1 \ env_logger-0.9.1 \ fastrand-1.8.0 \ fixedbitset-0.4.2 \ + flate2-1.0.25 \ form_urlencoded-1.1.0 \ futures-0.3.24 \ futures-channel-0.3.24 \ @@ -163,6 +165,7 @@ CARGO_CRATES= aes-0.8.1 \ libloading-0.6.7 \ log-0.4.17 \ memchr-2.5.0 \ + miniz_oxide-0.6.2 \ multimap-0.8.3 \ neon-0.10.1 \ neon-build-0.10.1 \ @@ -194,10 +197,10 @@ CARGO_CRATES= aes-0.8.1 \ regex-syntax-0.6.27 \ remove_dir_all-0.5.3 \ ring-0.16.20 \ - rustls-0.19.1 \ + rustls-0.20.7 \ ryu-1.0.11 \ same-file-1.0.6 \ - sct-0.6.1 \ + sct-0.7.0 \ semver-0.9.0 \ semver-parser-0.7.0 \ serde-1.0.145 \ @@ -226,7 +229,7 @@ CARGO_CRATES= aes-0.8.1 \ unicode-normalization-0.1.22 \ unicode-xid-0.2.4 \ untrusted-0.7.1 \ - ureq-2.2.0 \ + ureq-2.5.0 \ url-2.3.1 \ version_check-0.9.4 \ walkdir-2.3.2 \ @@ -237,8 +240,8 @@ CARGO_CRATES= aes-0.8.1 \ wasm-bindgen-macro-support-0.2.83 \ wasm-bindgen-shared-0.2.83 \ web-sys-0.3.60 \ - webpki-0.21.4 \ - webpki-roots-0.21.1 \ + webpki-0.22.0 \ + webpki-roots-0.22.6 \ which-4.3.0 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ diff --git a/multimedia/ringrtc/distinfo b/multimedia/ringrtc/distinfo index 4d69228346fc..bb5982cbb627 100644 --- a/multimedia/ringrtc/distinfo +++ b/multimedia/ringrtc/distinfo @@ -1,30 +1,32 @@ -TIMESTAMP = 1670143042 -SHA256 (base-d714333bb07eb8444f600ea4d2dc56be55730a51.tar.gz) = ce15c56dff4027e320dccfe499ce8a55a9a5acb97e83dec778268f926ad28a5c -SIZE (base-d714333bb07eb8444f600ea4d2dc56be55730a51.tar.gz) = 5235397 -SHA256 (boringssl-27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c.tar.gz) = 5d70f015a0e342ef69dcccc8aae9caa56cd3a6841f1434056b92a3e6f7a3fab6 -SIZE (boringssl-27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c.tar.gz) = 31049003 -SHA256 (build-bb1c23c67d2328cbb89966535bfca2916854bb8e.tar.gz) = 20d188961d5345b7547717ad1889fe7106a4490546c647f70d03c681e9f26bc6 -SIZE (build-bb1c23c67d2328cbb89966535bfca2916854bb8e.tar.gz) = 1430221 -SHA256 (buildtools-c2e4795660817c2776dbabd778b92ed58c074032.tar.gz) = cd958b9f334cdaace8a1e4bf1d176179f7178572ecbc8a8a9f77bbc35e005570 -SIZE (buildtools-c2e4795660817c2776dbabd778b92ed58c074032.tar.gz) = 88004 -SHA256 (catapult-e9e999a4a88a2963b60bec778f340d3c3d00fa1a.tar.gz) = c369b1773ad8965f37425eead47ba5cc3bc7250cb1dc0d9705c117196749da1e -SIZE (catapult-e9e999a4a88a2963b60bec778f340d3c3d00fa1a.tar.gz) = 160083621 -SHA256 (icu-1fd0dbea04448c3f73fe5cb7599f9472f0f107f1.tar.gz) = 972edeaee804cd033522ce542629879c10a9aed50f5a188485a576a93332f8a9 -SIZE (icu-1fd0dbea04448c3f73fe5cb7599f9472f0f107f1.tar.gz) = 52919308 +TIMESTAMP = 1674495628 +SHA256 (base-b054aaefd4d4ec5aad7189c4e97000a06b594163.tar.gz) = f488e9590186eff2ec7d3ea144a0bcc8d62cb1edd2445084985aac0825ca7eed +SIZE (base-b054aaefd4d4ec5aad7189c4e97000a06b594163.tar.gz) = 5455794 +SHA256 (boringssl-1ee71185a2322dc354bee5e5a0abfb1810a27dc6.tar.gz) = ad65537bbc8b34e383a32b73c25cf2051c3f437fe63c66ec7188016e649f67b0 +SIZE (boringssl-1ee71185a2322dc354bee5e5a0abfb1810a27dc6.tar.gz) = 31145043 +SHA256 (build-1c4f38fd4f534d78b72cefc376a03b3e8b486e7c.tar.gz) = 607edf3f7f9ea1c65c1cc110e7a30da8768a6e7090534c5f9d3f63f178887082 +SIZE (build-1c4f38fd4f534d78b72cefc376a03b3e8b486e7c.tar.gz) = 1495648 +SHA256 (buildtools-24fa2da896a027e7202bb8886177cccfe885b67d.tar.gz) = 9be6e680e349a85b3c15268bd4c0fd2b4279b77322e4ebc2eb296f2ade25d75a +SIZE (buildtools-24fa2da896a027e7202bb8886177cccfe885b67d.tar.gz) = 89366 +SHA256 (catapult-4793433248183dd073e608f655204d4acfdc7193.tar.gz) = 47beb18fd24c8b577c9ae2b60e1a0a858cbb936223f0567eb56dc429b472c7b3 +SIZE (catapult-4793433248183dd073e608f655204d4acfdc7193.tar.gz) = 158169111 +SHA256 (icu-20f8ac695af59b6c830def7d4e95bfeb13dd7be5.tar.gz) = 5e44bbb9dc9de3c3e98a3bfe1a2fdfd4d874e6f2f41540eb3d19a06c3e63c3eb +SIZE (icu-20f8ac695af59b6c830def7d4e95bfeb13dd7be5.tar.gz) = 50096719 SHA256 (nasm-9215e8e1d0fe474ffd3e16c1a07a0f97089e6224.tar.gz) = d4f382150be6408efecf44e7158e909eb8c1a58bcd16c39a434e6b3b31bf5cf7 SIZE (nasm-9215e8e1d0fe474ffd3e16c1a07a0f97089e6224.tar.gz) = 1550652 -SHA256 (libjpeg_turbo-22f1a22c99e9dde8cd3c72ead333f425c5a7aa77.tar.gz) = 774aadf0ae4827ce77645442f8fba552c0be068c0bec7933fa99f4a490931433 -SIZE (libjpeg_turbo-22f1a22c99e9dde8cd3c72ead333f425c5a7aa77.tar.gz) = 2382951 +SHA256 (libjpeg_turbo-ed683925e4897a84b3bffc5c1414c85b97a129a3.tar.gz) = 2259378560e0dd5157d5a0408b1b612089b747f22fe5448f09965f4687e4203b +SIZE (libjpeg_turbo-ed683925e4897a84b3bffc5c1414c85b97a129a3.tar.gz) = 2379452 SHA256 (libsrtp-5b7c744eb8310250ccc534f3f86a2015b3887a0a.tar.gz) = 727d9475ada02cf1adc336ab22beed08cc3644bf141d97ed8ab3873a1dbac32c SIZE (libsrtp-5b7c744eb8310250ccc534f3f86a2015b3887a0a.tar.gz) = 139073 -SHA256 (libvpx-bf672f23a5336cb54dbcb2e4417142139f44cc3e.tar.gz) = 3efd6839932b542208d3c74c7308c004aeb5d3dd9c878327efc3d86c349376ae -SIZE (libvpx-bf672f23a5336cb54dbcb2e4417142139f44cc3e.tar.gz) = 5485018 -SHA256 (libyuv-f4d25308467cbd50c2706a46fa0ddcef939e715a.tar.gz) = f0900e5ec539a2552de7622c8a1678cd05879878986d35ddf8bc1c7f5b262a3e -SIZE (libyuv-f4d25308467cbd50c2706a46fa0ddcef939e715a.tar.gz) = 549756 -SHA256 (third_party-5a0acdf2e317019f2c55ad5de72a144e9a758cdf.tar.gz) = eaa7bfb531689e2abff7b5d4e884c2bd5936d651a1b59a5929c72e9eef4f217c -SIZE (third_party-5a0acdf2e317019f2c55ad5de72a144e9a758cdf.tar.gz) = 1073823306 -SHA256 (testing-d2cc6b1f9d361923efea2c822f9e6c346861dc9f.tar.gz) = ae070d31fbd026485f2289b7513c10a6320b8edba1e8f0d8c2d1a4c0431f2f1c -SIZE (testing-d2cc6b1f9d361923efea2c822f9e6c346861dc9f.tar.gz) = 4705296 +SHA256 (libvpx-9d6d0624d7943a09cc0be9df1a7402522989ac1a.tar.gz) = 73f07af23bb0b71dc0755b648d41bc5fd9232bcff7f7f0ffb8e8b9a739b63a6d +SIZE (libvpx-9d6d0624d7943a09cc0be9df1a7402522989ac1a.tar.gz) = 5562981 +SHA256 (libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.gz) = 02ebd391ae5ce32fa7b5ac7e825cab0daef22723dac86b9cfa8c0c6bc59f8157 +SIZE (libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.gz) = 564101 +SHA256 (third_party-28a4580f804c4fc4279ecf10100a409811030235.tar.gz) = 2aa4c61f51f9919af91f1a08eb2ac137d29f2f67e7816a3103dcc4774ad4781d +SIZE (third_party-28a4580f804c4fc4279ecf10100a409811030235.tar.gz) = 874913732 +SHA256 (testing-6f2362298838e8789b09282cf198c8582f9c4555.tar.gz) = 7ffce761bd1189dce142640a43ca11963cbee720c55eee5515d213b40178d10d +SIZE (testing-6f2362298838e8789b09282cf198c8582f9c4555.tar.gz) = 2363033 +SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe +SIZE (rust/crates/adler-1.0.2.crate) = 12778 SHA256 (rust/crates/aes-0.8.1.crate) = bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba SIZE (rust/crates/aes-0.8.1.crate) = 123260 SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e @@ -61,6 +63,8 @@ SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7 SIZE (rust/crates/combine-4.6.6.crate) = 132428 SHA256 (rust/crates/cpufeatures-0.2.5.crate) = 28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320 SIZE (rust/crates/cpufeatures-0.2.5.crate) = 11251 +SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d +SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760 SHA256 (rust/crates/ctr-0.9.2.crate) = 0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835 @@ -79,6 +83,8 @@ SHA256 (rust/crates/fastrand-1.8.0.crate) = a7a407cfaa3385c4ae6b23e84623d48c2798 SIZE (rust/crates/fastrand-1.8.0.crate) = 11369 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954 +SHA256 (rust/crates/flate2-1.0.25.crate) = a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841 +SIZE (rust/crates/flate2-1.0.25.crate) = 70210 SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8 SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734 SHA256 (rust/crates/futures-0.3.24.crate) = 7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c @@ -145,6 +151,8 @@ SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b603 SIZE (rust/crates/log-0.4.17.crate) = 38028 SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d SIZE (rust/crates/memchr-2.5.0.crate) = 65812 +SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa +SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536 SHA256 (rust/crates/multimap-0.8.3.crate) = e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a SIZE (rust/crates/multimap-0.8.3.crate) = 13518 SHA256 (rust/crates/neon-0.10.1.crate) = 28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373 @@ -207,14 +215,14 @@ SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df8 SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184 SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc SIZE (rust/crates/ring-0.16.20.crate) = 5082615 -SHA256 (rust/crates/rustls-0.19.1.crate) = 35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7 -SIZE (rust/crates/rustls-0.19.1.crate) = 208143 +SHA256 (rust/crates/rustls-0.20.7.crate) = 539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c +SIZE (rust/crates/rustls-0.20.7.crate) = 268469 SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09 SIZE (rust/crates/ryu-1.0.11.crate) = 47007 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 SIZE (rust/crates/same-file-1.0.6.crate) = 10183 -SHA256 (rust/crates/sct-0.6.1.crate) = b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce -SIZE (rust/crates/sct-0.6.1.crate) = 26825 +SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4 +SIZE (rust/crates/sct-0.7.0.crate) = 27502 SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 SIZE (rust/crates/semver-0.9.0.crate) = 17344 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 @@ -271,8 +279,8 @@ SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf16299313 SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352 SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a SIZE (rust/crates/untrusted-0.7.1.crate) = 7924 -SHA256 (rust/crates/ureq-2.2.0.crate) = 3131cd6cb18488da91da1d10ed31e966f453c06b65bf010d35638456976a3fd7 -SIZE (rust/crates/ureq-2.2.0.crate) = 80014 +SHA256 (rust/crates/ureq-2.5.0.crate) = b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f +SIZE (rust/crates/ureq-2.5.0.crate) = 98026 SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643 SIZE (rust/crates/url-2.3.1.crate) = 72777 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f @@ -293,10 +301,10 @@ SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4def SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194 SHA256 (rust/crates/web-sys-0.3.60.crate) = bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f SIZE (rust/crates/web-sys-0.3.60.crate) = 700485 -SHA256 (rust/crates/webpki-0.21.4.crate) = b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea -SIZE (rust/crates/webpki-0.21.4.crate) = 58505 -SHA256 (rust/crates/webpki-roots-0.21.1.crate) = aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940 -SIZE (rust/crates/webpki-roots-0.21.1.crate) = 223591 +SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd +SIZE (rust/crates/webpki-0.22.0.crate) = 58663 +SHA256 (rust/crates/webpki-roots-0.22.6.crate) = b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87 +SIZE (rust/crates/webpki-roots-0.22.6.crate) = 242386 SHA256 (rust/crates/which-4.3.0.crate) = 1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b SIZE (rust/crates/which-4.3.0.crate) = 9635 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 @@ -313,7 +321,7 @@ SHA256 (rust/crates/zeroize-1.3.0.crate) = 4756f7db3f7b5574938c3eb1c117038b8e07f SIZE (rust/crates/zeroize-1.3.0.crate) = 15913 SHA256 (rust/crates/zeroize_derive-1.3.2.crate) = 3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17 SIZE (rust/crates/zeroize_derive-1.3.2.crate) = 10299 -SHA256 (signalapp-ringrtc-v2.22.0_GH0.tar.gz) = b4f75c2816fb0188b4f9533fc090f98c751d4c4940ae969a45de9f034a3cc8fc -SIZE (signalapp-ringrtc-v2.22.0_GH0.tar.gz) = 607903 -SHA256 (signalapp-webrtc-5005b_GH0.tar.gz) = 143d3aec9a26761ce053412ac2a9916a8a6aa3cc97e58b01a0e8aa949a1b49df -SIZE (signalapp-webrtc-5005b_GH0.tar.gz) = 37506489 +SHA256 (signalapp-ringrtc-v2.23.0_GH0.tar.gz) = a7dcc15b30237cb363b241bd2c87ed2ed61a12828f54ad2c5a91b09cf56c8363 +SIZE (signalapp-ringrtc-v2.23.0_GH0.tar.gz) = 563456 +SHA256 (signalapp-webrtc-5359_GH0.tar.gz) = c8c370a3a0eab12d181f2676eee47be3f84e23e710c7af862c1c2bcc92d7aa72 +SIZE (signalapp-webrtc-5359_GH0.tar.gz) = 39790249 diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_BUILD.gn b/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_BUILD.gn index dc2d466a60da..77339bb432c6 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_BUILD.gn +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ --- ../../src/webrtc/src/build/config/compiler/BUILD.gn.orig 2022-02-16 12:34:12 UTC +++ ../../src/webrtc/src/build/config/compiler/BUILD.gn -@@ -140,7 +140,7 @@ declare_args() { +@@ -134,7 +134,7 @@ declare_args() { # # TODO(crbug.com/1131993): Enabling this when 'is_android' is true breaks # content_shell_test_apk on both ARM and x86. @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -356,7 +356,7 @@ config("compiler") { +@@ -337,7 +337,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ current_os != "zos") { ldflags += [ "-Wl,--fatal-warnings" ] } -@@ -533,7 +533,7 @@ config("compiler") { +@@ -524,7 +524,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -27,16 +27,16 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -930,7 +930,7 @@ config("compiler_cpu_abi") { +@@ -935,7 +935,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia && ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd && + !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1251,7 +1251,7 @@ config("compiler_deterministic") { +@@ -1273,7 +1273,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -45,16 +45,16 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1264,7 +1264,7 @@ config("compiler_deterministic") { - # and -fcoverage-compilation-dir=. +@@ -1287,7 +1287,7 @@ config("compiler_deterministic") { cflags += [ "-ffile-compilation-dir=." ] + swiftflags += [ "-file-compilation-dir=." ] } - if (!is_win) { + if (!is_win && !is_bsd) { # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1302,7 +1302,7 @@ config("clang_revision") { +@@ -1325,7 +1325,7 @@ config("clang_revision") { } config("clang_revision") { @@ -63,16 +63,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1541,7 +1541,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", - ] - -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - # TODO(https://crbug.com/1300731) Clean up and enable. - cflags += [ "-Wno-unqualified-std-cast-call" ] - } -@@ -1854,7 +1854,7 @@ config("thin_archive") { +@@ -1860,7 +1860,7 @@ config("thin_archive") { # archives. # TODO(crbug.com/1221615): Enable on is_apple if use_lld once that no longer # confuses lldb. @@ -81,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2355,7 +2355,7 @@ config("symbols") { +@@ -2367,7 +2367,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if ((!is_nacl || is_clang) && current_os != "zos") { @@ -89,8 +80,8 @@ + cflags += [ "-g0" ] } - if (!is_nacl && is_clang && !is_tsan && !is_asan && -@@ -2394,7 +2394,7 @@ config("symbols") { + if (!is_nacl && is_clang && !is_tsan && !is_asan) { +@@ -2405,7 +2405,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. _enable_gdb_index = @@ -99,7 +90,7 @@ current_os != "zos" && (use_gold || use_lld) && # Disable on non-fission 32-bit Android because it pushes # libcomponents_unittests over the 4gb size limit. -@@ -2413,7 +2413,7 @@ config("symbols") { +@@ -2433,7 +2433,7 @@ config("symbols") { } if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos") { diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_compiler.gni b/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_compiler.gni index e002a799ffb3..f06f258e5d45 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_compiler.gni +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_compiler_compiler.gni @@ -1,11 +1,11 @@ --- ../../src/webrtc/src/build/config/compiler/compiler.gni.orig 2021-11-15 18:52:18 UTC +++ ../../src/webrtc/src/build/config/compiler/compiler.gni -@@ -219,7 +219,7 @@ declare_args() { +@@ -230,7 +230,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. -- use_gold = !use_lld && !(is_chromecast && is_linux && -+ use_gold = !use_lld && !is_bsd && !(is_chromecast && is_linux && +- use_gold = !use_lld && !(is_castos && ++ use_gold = !is_bsd && !use_lld && !(is_castos && (current_cpu == "arm" || current_cpu == "mipsel")) && (((is_linux || is_chromeos_lacros) && (current_cpu == "x64" || current_cpu == "x86" || diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_features.gni b/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_features.gni index b87b4940126d..b17ea6853e19 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_features.gni +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_build_config_features.gni @@ -1,11 +1,11 @@ --- ../../src/webrtc/src/build/config/features.gni.orig 2020-09-19 19:50:44 UTC +++ ../../src/webrtc/src/build/config/features.gni -@@ -26,7 +26,7 @@ declare_args() { - proprietary_codecs = is_chrome_branded || is_chromecast +@@ -31,7 +31,7 @@ declare_args() { + proprietary_codecs = is_chrome_branded || is_castos || is_cast_android # libudev usage. This currently only affects the content layer. -- use_udev = (is_linux || is_chromeos) && !is_chromecast -+ use_udev = (is_linux || is_chromeos) && !is_chromecast && !is_bsd +- use_udev = (is_linux && !is_castos) || is_chromeos ++ use_udev = !is_bsd && ((is_linux && !is_castos) || is_chromeos) - use_dbus = (is_linux || is_chromeos) && !is_chromecast + use_dbus = is_linux || is_chromeos diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_gcc__toolchain.gni b/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_gcc__toolchain.gni index ac1e2e8ca0ef..acc1fdf33546 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_gcc__toolchain.gni +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_build_toolchain_gcc__toolchain.gni @@ -12,11 +12,10 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -780,13 +785,22 @@ template("clang_toolchain") { - # use_gold too. - template("clang_toolchain") { - gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +@@ -796,12 +801,22 @@ template("clang_toolchain") { + prefix = rebase_path(_path, root_build_dir) + } + - cc = "${prefix}/clang" - cxx = "${prefix}/clang++" - ld = cxx diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_physical__socket__server.h b/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_physical__socket__server.h index a6e2186eaa81..495e5c78e1fd 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_physical__socket__server.h +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_physical__socket__server.h @@ -1,9 +1,9 @@ --- ../../src/webrtc/src/rtc_base/physical_socket_server.h.orig 2021-01-28 23:16:17 UTC +++ ../../src/webrtc/src/rtc_base/physical_socket_server.h -@@ -11,7 +11,7 @@ - #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ +@@ -12,7 +12,7 @@ #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ + #include "api/units/time_delta.h" -#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) +#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_testing_BUILD.gn b/multimedia/ringrtc/files/patch-src_webrtc_src_testing_BUILD.gn deleted file mode 100644 index 886b17bbdff3..000000000000 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_testing_BUILD.gn +++ /dev/null @@ -1,27 +0,0 @@ ---- ../../src/webrtc/src/testing/BUILD.gn.orig 2022-02-18 10:35:44 UTC -+++ ../../src/webrtc/src/testing/BUILD.gn -@@ -44,14 +44,14 @@ group("run_perf_test") { - } - } - --python_library("run_isolated_script_test") { -- testonly = true -- pydeps_file = "//testing/scripts/run_isolated_script_test.pydeps" -- data = [ "//.vpython3" ] --} -+#python_library("run_isolated_script_test") { -+# testonly = true -+# pydeps_file = "//testing/scripts/run_isolated_script_test.pydeps" -+# data = [ "//.vpython3" ] -+#} - --python_library("wpt_android_lib") { -- testonly = true -- pydeps_file = "//testing/scripts/run_android_wpt.pydeps" -- data = [ "//.vpython3" ] --} -+#python_library("wpt_android_lib") { -+# testonly = true -+# pydeps_file = "//testing/scripts/run_android_wpt.pydeps" -+# data = [ "//.vpython3" ] -+#} diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_abseil-cpp_absl_base_internal_unscaledcycleclock.cc b/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_abseil-cpp_absl_base_internal_unscaledcycleclock.cc deleted file mode 100644 index fb15995c2be3..000000000000 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_abseil-cpp_absl_base_internal_unscaledcycleclock.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- ../../src/webrtc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc.orig 2020-08-09 20:09:49 UTC -+++ ../../src/webrtc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -@@ -24,8 +24,10 @@ - #ifdef __GLIBC__ - #include - #elif defined(__FreeBSD__) --#include -+#include "absl/base/call_once.h" - #include -+#include -+#include - #endif - #endif - diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_base_third__party_libevent_BUILD.gn b/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_libevent_BUILD.gn similarity index 70% rename from multimedia/ringrtc/files/patch-src_webrtc_src_base_third__party_libevent_BUILD.gn rename to multimedia/ringrtc/files/patch-src_webrtc_src_third__party_libevent_BUILD.gn index dcfcc07ee16c..2e0d95403edc 100644 --- a/multimedia/ringrtc/files/patch-src_webrtc_src_base_third__party_libevent_BUILD.gn +++ b/multimedia/ringrtc/files/patch-src_webrtc_src_third__party_libevent_BUILD.gn @@ -1,5 +1,5 @@ ---- ../../src/webrtc/src/base/third_party/libevent/BUILD.gn.orig 2021-03-15 17:07:00 UTC -+++ ../../src/webrtc/src/base/third_party/libevent/BUILD.gn +--- ../../src/webrtc/src/third_party/libevent/BUILD.gn.orig 2021-03-15 17:07:00 UTC ++++ ../../src/webrtc/src/third_party/libevent/BUILD.gn @@ -43,6 +43,13 @@ static_library("libevent") { "mac/event-config.h", ] diff --git a/multimedia/ringrtc/webrtc_fetch.sh b/multimedia/ringrtc/webrtc_fetch.sh index 14c0558b1b44..5d49d37ff1cb 100644 --- a/multimedia/ringrtc/webrtc_fetch.sh +++ b/multimedia/ringrtc/webrtc_fetch.sh @@ -1,6 +1,6 @@ #!/bin/sh -WEBRTC_REV=5005b +WEBRTC_REV=5359 base_url="https://chromium.googlesource.com/chromium/src/base.git/+archive/" boringssl_url="https://boringssl.googlesource.com/boringssl.git/+archive/" @@ -70,47 +70,49 @@ third_party_hash=$(grep 'third_party@' /tmp/DEPS | awk -F '@' '{print $2}' | sed printf "THIRD_PARTY_REV=\t${third_party_hash}\n" printf "THIRD_PARTY_REV=\t${third_party_hash}\n" | portedit merge -i Makefile -echo "fetch -o base-${base_hash}.tar.gz ${base_url}${base_hash}.tar.gz" -echo "fetch -o boringssl-${boringssl_hash}.tar.gz ${boringssl_url}${boringssl_hash}.tar.gz" -echo "fetch -o build-${build_hash}.tar.gz ${build_url}${build_hash}.tar.gz" -echo "fetch -o buildtools-${buildtools_hash}.tar.gz ${buildtools_url}${buildtools_hash}.tar.gz" -echo "fetch -o catapult-${catapult_hash}.tar.gz ${catapult_url}${catapult_hash}.tar.gz" -echo "fetch -o icu-${icu_hash}.tar.gz ${icu_url}${icu_hash}.tar.gz" -echo "fetch -o libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz ${libjpeg_turbo_url}${libjpeg_turbo_hash}.tar.gz" -echo "fetch -o libsrtp-${libsrtp_hash}.tar.gz ${libsrtp_url}${libsrtp_hash}.tar.gz" -echo "fetch -o libvpx-${libvpx_hash}.tar.gz ${libvpx_url}${libvpx_hash}.tar.gz" -echo "fetch -o libyuv-${libyuv_hash}.tar.gz ${libyuv_url}${libyuv_hash}.tar.gz" -echo "fetch -o nasm-${nasm_hash}.tar.gz ${nasm_url}${nasm_hash}.tar.gz" -echo "fetch -o testing-${testing_hash}.tar.gz ${testing_url}${testing_hash}.tar.gz" -echo "fetch -o third_party-${third_party_hash}.tar.gz ${third_party_url}${third_party_hash}.tar.gz" +mkdir dist_tmp +echo "fetch -o dist_tmp/base-${base_hash}.tar.gz ${base_url}${base_hash}.tar.gz" +echo "fetch -o dist_tmp/boringssl-${boringssl_hash}.tar.gz ${boringssl_url}${boringssl_hash}.tar.gz" +echo "fetch -o dist_tmp/build-${build_hash}.tar.gz ${build_url}${build_hash}.tar.gz" +echo "fetch -o dist_tmp/buildtools-${buildtools_hash}.tar.gz ${buildtools_url}${buildtools_hash}.tar.gz" +echo "fetch -o dist_tmp/catapult-${catapult_hash}.tar.gz ${catapult_url}${catapult_hash}.tar.gz" +echo "fetch -o dist_tmp/icu-${icu_hash}.tar.gz ${icu_url}${icu_hash}.tar.gz" +echo "fetch -o dist_tmp/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz ${libjpeg_turbo_url}${libjpeg_turbo_hash}.tar.gz" +echo "fetch -o dist_tmp/libsrtp-${libsrtp_hash}.tar.gz ${libsrtp_url}${libsrtp_hash}.tar.gz" +echo "fetch -o dist_tmp/libvpx-${libvpx_hash}.tar.gz ${libvpx_url}${libvpx_hash}.tar.gz" +echo "fetch -o dist_tmp/libyuv-${libyuv_hash}.tar.gz ${libyuv_url}${libyuv_hash}.tar.gz" +echo "fetch -o dist_tmp/nasm-${nasm_hash}.tar.gz ${nasm_url}${nasm_hash}.tar.gz" +echo "fetch -o dist_tmp/testing-${testing_hash}.tar.gz ${testing_url}${testing_hash}.tar.gz" +echo "fetch -o dist_tmp/third_party-${third_party_hash}.tar.gz ${third_party_url}${third_party_hash}.tar.gz" mkdir -p base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm testing third_party -tar xf base-${base_hash}.tar.gz -C base -tar xf boringssl-${boringssl_hash}.tar.gz -C boringssl -tar xf build-${build_hash}.tar.gz -C build -tar xf buildtools-${buildtools_hash}.tar.gz -C buildtools -tar xf catapult-${catapult_hash}.tar.gz -C catapult -tar xf icu-${icu_hash}.tar.gz -C icu -tar xf libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz -C libjpeg_turbo -tar xf libsrtp-${libsrtp_hash}.tar.gz -C libsrtp -tar xf libvpx-${libvpx_hash}.tar.gz -C libvpx -tar xf libyuv-${libyuv_hash}.tar.gz -C libyuv -tar xf nasm-${nasm_hash}.tar.gz -C nasm -tar xf testing-${testing_hash}.tar.gz -C testing -tar xf third_party-${third_party_hash}.tar.gz -C third_party - -tar czf /tmp/base-${base_hash}.tar.gz base -tar czf /tmp/boringssl-${boringssl_hash}.tar.gz boringssl -tar czf /tmp/build-${build_hash}.tar.gz build -tar czf /tmp/buildtools-${buildtools_hash}.tar.gz buildtools -tar czf /tmp/catapult-${catapult_hash}.tar.gz catapult -tar czf /tmp/icu-${icu_hash}.tar.gz icu -tar czf /tmp/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz libjpeg_turbo -tar czf /tmp/libsrtp-${libsrtp_hash}.tar.gz libsrtp -tar czf /tmp/libvpx-${libvpx_hash}.tar.gz libvpx -tar czf /tmp/libyuv-${libyuv_hash}.tar.gz libyuv -tar czf /tmp/nasm-${nasm_hash}.tar.gz nasm -tar czf /tmp/testing-${testing_hash}.tar.gz testing -tar czf /tmp/third_party-${third_party_hash}.tar.gz third_party +tar xf dist_tmp/base-${base_hash}.tar.gz -C base +tar xf dist_tmp/boringssl-${boringssl_hash}.tar.gz -C boringssl +tar xf dist_tmp/build-${build_hash}.tar.gz -C build +tar xf dist_tmp/buildtools-${buildtools_hash}.tar.gz -C buildtools +tar xf dist_tmp/catapult-${catapult_hash}.tar.gz -C catapult +tar xf dist_tmp/icu-${icu_hash}.tar.gz -C icu +tar xf dist_tmp/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz -C libjpeg_turbo +tar xf dist_tmp/libsrtp-${libsrtp_hash}.tar.gz -C libsrtp +tar xf dist_tmp/libvpx-${libvpx_hash}.tar.gz -C libvpx +tar xf dist_tmp/libyuv-${libyuv_hash}.tar.gz -C libyuv +tar xf dist_tmp/nasm-${nasm_hash}.tar.gz -C nasm +tar xf dist_tmp/testing-${testing_hash}.tar.gz -C testing +tar xf dist_tmp/third_party-${third_party_hash}.tar.gz -C third_party + +mkdir dist_good +tar czf dist_good/base-${base_hash}.tar.gz base +tar czf dist_good/boringssl-${boringssl_hash}.tar.gz boringssl +tar czf dist_good/build-${build_hash}.tar.gz build +tar czf dist_good/buildtools-${buildtools_hash}.tar.gz buildtools +tar czf dist_good/catapult-${catapult_hash}.tar.gz catapult +tar czf dist_good/icu-${icu_hash}.tar.gz icu +tar czf dist_good/libjpeg_turbo-${libjpeg_turbo_hash}.tar.gz libjpeg_turbo +tar czf dist_good/libsrtp-${libsrtp_hash}.tar.gz libsrtp +tar czf dist_good/libvpx-${libvpx_hash}.tar.gz libvpx +tar czf dist_good/libyuv-${libyuv_hash}.tar.gz libyuv +tar czf dist_good/nasm-${nasm_hash}.tar.gz nasm +tar czf dist_good/testing-${testing_hash}.tar.gz testing +tar czf dist_good/third_party-${third_party_hash}.tar.gz third_party rm -rf base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm testing third_party