git: f20af2792af5 - main - multimedia/ringrtc: Update to 2.37.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 10 Feb 2024 10:03:45 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f20af2792af5c3f4b64c4b1328e32d84e4cc22aa
commit f20af2792af5c3f4b64c4b1328e32d84e4cc22aa
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-02-10 10:01:37 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-02-10 10:03:40 +0000
multimedia/ringrtc: Update to 2.37.0
---
multimedia/ringrtc/Makefile | 26 ++---
multimedia/ringrtc/Makefile.crates | 2 +-
multimedia/ringrtc/distinfo | 58 +++++------
multimedia/ringrtc/files/patch-abseil | 111 ---------------------
...h-src_webrtc_src_build_config_compiler_BUILD.gn | 48 ++++-----
..._src_build_linux_unbundle_replace__gn__files.py | 6 +-
multimedia/ringrtc/update.txt | 2 +-
multimedia/ringrtc/webrtc_fetch.sh | 16 ++-
8 files changed, 82 insertions(+), 187 deletions(-)
diff --git a/multimedia/ringrtc/Makefile b/multimedia/ringrtc/Makefile
index 32c40fc6be97..1e92d061396a 100644
--- a/multimedia/ringrtc/Makefile
+++ b/multimedia/ringrtc/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ringrtc
DISTVERSIONPREFIX= v
-DISTVERSION= 2.36.0
+DISTVERSION= 2.37.0
CATEGORIES= multimedia
MASTER_SITES= LOCAL/mikael/ringrtc/:base \
LOCAL/mikael/ringrtc/:boringssl \
@@ -55,23 +55,23 @@ GH_TUPLE= signalapp:ringrtc:${DISTVERSIONPREFIX}${DISTVERSION} \
signalapp:webrtc:${WEBRTC_REV}:webrtc
# sh net-im/signal-desktop/get_deps.sh
-WEBRTC_REV= 5993d
+WEBRTC_REV= 6099a
# modify webrtc_fetch.sh, then sh webrtc_fetch.sh
-BASE_REV= 609cafa975c8a29d3b2f686c9a42530a556835fe
-BORINGSSL_REV= b8e012e1ff736cc794273af4a7db521e6b18bcd5
-BUILD_REV= 115a7079919c25462a7fd8c1d22900378bbc6585
-BUILDTOOLS_REV= b2043d4f435131d0a1bdd5342c17753ef9236572
-CATAPULT_REV= b8c4f2d99ac66fe47cb8cceec0dd1a1da5d1b51e
-ICU_REV= 985b9a6f70e13f3db741fed121e4dcc3046ad494
-LIBJPEG_TURBO_REV= 30bdb85e302ecfc52593636b2f44af438e05e784
+BASE_REV= 1546e3adb67bb711ca2fd39c3913cb56bd889748
+BORINGSSL_REV= c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3
+BUILD_REV= a21fc6065131d0442e8a54c3ca2638e393b69438
+BUILDTOOLS_REV= 6f834e2039daedfc68a2749c217922b26d5e8497
+CATAPULT_REV= 47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4
+ICU_REV= a622de35ac311c5ad390a7af80724634e5dc61ed
+LIBJPEG_TURBO_REV= 9b894306ec3b28cea46e84c32b56773a98c483da
LIBSRTP_REV= 5b7c744eb8310250ccc534f3f86a2015b3887a0a
-LIBVPX_REV= 38a707faef72eeff89d669c553e7bfe9e08dba8f
+LIBVPX_REV= 424723dc025ce451dab9568239a46b18d0919b4d
LIBYUV_REV= 04821d1e7d60845525e8db55c7bcd41ef5be9406
NASM_REV= 7fc833e889d1afda72c06220e5bed8fb43b2e5ce
-TESTING_REV= ff8dee88bc0b49f8337cee6e82151c245a63b98c
-THIRD_PARTY_REV= ee6367daea550c5845a6079cec5fd6555f39144f
-OPUS_REV= 74d8597f47aa680c9f9e21ab0b99c8c0632fe27d
+TESTING_REV= 46366a7e4d08bf9fceeb3c1c3b5eab8a6a5024b5
+THIRD_PARTY_REV= 64d9ec3158b4629163f88b779a53e16f1cc24f81
+OPUS_REV= 593419e833acab4d15b4901fe156177fb7315468
BINARY_ALIAS= vpython3=${PYTHON_CMD}
diff --git a/multimedia/ringrtc/Makefile.crates b/multimedia/ringrtc/Makefile.crates
index 468d01bc5df6..a303d3f9cc0f 100644
--- a/multimedia/ringrtc/Makefile.crates
+++ b/multimedia/ringrtc/Makefile.crates
@@ -100,7 +100,7 @@ CARGO_CRATES= addr2line-0.21.0 \
getrandom-0.2.11 \
ghash-0.5.0 \
gimli-0.28.1 \
- h2-0.3.22 \
+ h2-0.3.24 \
hashbrown-0.12.3 \
hashbrown-0.14.3 \
heck-0.4.1 \
diff --git a/multimedia/ringrtc/distinfo b/multimedia/ringrtc/distinfo
index 2b7f55d396c2..df237dd4b9a3 100644
--- a/multimedia/ringrtc/distinfo
+++ b/multimedia/ringrtc/distinfo
@@ -1,32 +1,32 @@
-TIMESTAMP = 1706897271
-SHA256 (base-609cafa975c8a29d3b2f686c9a42530a556835fe.tar.gz) = dad36cd0ba7c9b7b5cbc34451bd7dc58bf5ca6e8909f52999a4d5504276b2ce8
-SIZE (base-609cafa975c8a29d3b2f686c9a42530a556835fe.tar.gz) = 5750287
-SHA256 (boringssl-b8e012e1ff736cc794273af4a7db521e6b18bcd5.tar.gz) = 5c1f59a02f2877e4c72183052f665adb930b61a7a1bd10992554449c8db49297
-SIZE (boringssl-b8e012e1ff736cc794273af4a7db521e6b18bcd5.tar.gz) = 35313402
-SHA256 (build-115a7079919c25462a7fd8c1d22900378bbc6585.tar.gz) = 4c6013771141d5977fe369431e09e08b1a426b7eb1ce96b0d847b9387702c35c
-SIZE (build-115a7079919c25462a7fd8c1d22900378bbc6585.tar.gz) = 1522311
-SHA256 (buildtools-b2043d4f435131d0a1bdd5342c17753ef9236572.tar.gz) = f78124fd0e184c64326e83b03bec0b89b3b74fd2c49e091d2af29b66c7de50a6
-SIZE (buildtools-b2043d4f435131d0a1bdd5342c17753ef9236572.tar.gz) = 91251
-SHA256 (catapult-b8c4f2d99ac66fe47cb8cceec0dd1a1da5d1b51e.tar.gz) = 929ca2144bec76f7f9414127f418b5bc2da34ea79044c98c13e6763c4fd05761
-SIZE (catapult-b8c4f2d99ac66fe47cb8cceec0dd1a1da5d1b51e.tar.gz) = 165922100
-SHA256 (icu-985b9a6f70e13f3db741fed121e4dcc3046ad494.tar.gz) = f8e794f9835f1995a3e7e6abd4e4045db3559ba35133df95ece15b0dd4b9eb3a
-SIZE (icu-985b9a6f70e13f3db741fed121e4dcc3046ad494.tar.gz) = 52288915
+TIMESTAMP = 1707496211
+SHA256 (base-1546e3adb67bb711ca2fd39c3913cb56bd889748.tar.gz) = 60693e8298f7d662db8d7104e605cfe4943843e1a67c8bd4875b62fd23d6203e
+SIZE (base-1546e3adb67bb711ca2fd39c3913cb56bd889748.tar.gz) = 5867201
+SHA256 (boringssl-c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3.tar.gz) = 480e9674f377a1c15d7e7d97c659f4b68b40bf84dec1d5dcf38b661cd31bf317
+SIZE (boringssl-c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3.tar.gz) = 35768305
+SHA256 (build-a21fc6065131d0442e8a54c3ca2638e393b69438.tar.gz) = be36012239b900815aed4d6fd86deae164290d69317b1c825fc60ad9b1ab4fab
+SIZE (build-a21fc6065131d0442e8a54c3ca2638e393b69438.tar.gz) = 1545717
+SHA256 (buildtools-6f834e2039daedfc68a2749c217922b26d5e8497.tar.gz) = 52f72c06377950b7aaa18ad2e84a56ced3b4dc84825b46ff64ab16be39b4d808
+SIZE (buildtools-6f834e2039daedfc68a2749c217922b26d5e8497.tar.gz) = 91464
+SHA256 (catapult-47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4.tar.gz) = a7853ae4061c613e46c385a7d46578f3a6b7e302f5bc1f1d179dafe3c6969a55
+SIZE (catapult-47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4.tar.gz) = 165925524
+SHA256 (icu-a622de35ac311c5ad390a7af80724634e5dc61ed.tar.gz) = bcb6c1fc9e8d88123ac6210ee84846d3eadfca163756bcf7bd11ea30769613d3
+SIZE (icu-a622de35ac311c5ad390a7af80724634e5dc61ed.tar.gz) = 52300593
SHA256 (nasm-7fc833e889d1afda72c06220e5bed8fb43b2e5ce.tar.gz) = 97913794896e8570532760a9318144367e8eeac9cbdfb9247071cc24e69fa97e
SIZE (nasm-7fc833e889d1afda72c06220e5bed8fb43b2e5ce.tar.gz) = 1547976
-SHA256 (libjpeg_turbo-30bdb85e302ecfc52593636b2f44af438e05e784.tar.gz) = 5321657fd5732fdbe7c8272bcf80e73f895ce23d65a228882b27b676cf1a2ec9
-SIZE (libjpeg_turbo-30bdb85e302ecfc52593636b2f44af438e05e784.tar.gz) = 2378270
+SHA256 (libjpeg_turbo-9b894306ec3b28cea46e84c32b56773a98c483da.tar.gz) = 62598a235f4d09b74e8ed3a262c148c0a95cfd5c0c59df92449d1be145c98af0
+SIZE (libjpeg_turbo-9b894306ec3b28cea46e84c32b56773a98c483da.tar.gz) = 2376833
SHA256 (libsrtp-5b7c744eb8310250ccc534f3f86a2015b3887a0a.tar.gz) = 9bd3de42693cf0d9481da168dff6a83a2151f764c5f192cab36e109d65d86943
SIZE (libsrtp-5b7c744eb8310250ccc534f3f86a2015b3887a0a.tar.gz) = 142033
-SHA256 (libvpx-38a707faef72eeff89d669c553e7bfe9e08dba8f.tar.gz) = dff37e442b50f75f99198741c144d5c25bb3c85f912c005bdf55b7159108bcb6
-SIZE (libvpx-38a707faef72eeff89d669c553e7bfe9e08dba8f.tar.gz) = 5663313
+SHA256 (libvpx-424723dc025ce451dab9568239a46b18d0919b4d.tar.gz) = 4f0bc1cef519303c0a8f0c1f63505464cb9db43c2608f4f90bf65c9f4d65448e
+SIZE (libvpx-424723dc025ce451dab9568239a46b18d0919b4d.tar.gz) = 5661092
SHA256 (libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.gz) = 41d50ba3db95cdf9350651deec3aa9ddfc71cbf7608c9d53bf3420ba2cfdf375
SIZE (libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.gz) = 564067
-SHA256 (third_party-ee6367daea550c5845a6079cec5fd6555f39144f.tar.gz) = 50bde35bddadf93a7d97887eabf8a2b49e28e31b90427a6fb714b5ce3d7e928e
-SIZE (third_party-ee6367daea550c5845a6079cec5fd6555f39144f.tar.gz) = 797806279
-SHA256 (testing-ff8dee88bc0b49f8337cee6e82151c245a63b98c.tar.gz) = a7999e0a2966f850c2955053446254972f41ec11e84b335a75f08814095fd0fc
-SIZE (testing-ff8dee88bc0b49f8337cee6e82151c245a63b98c.tar.gz) = 2393395
-SHA256 (opus-74d8597f47aa680c9f9e21ab0b99c8c0632fe27d.tar.gz) = e24151614f1bc3c62e7f0f95fdb7ff159045d3c0ffdbc2af4e9c4ab0c1596f52
-SIZE (opus-74d8597f47aa680c9f9e21ab0b99c8c0632fe27d.tar.gz) = 874165
+SHA256 (third_party-64d9ec3158b4629163f88b779a53e16f1cc24f81.tar.gz) = 34f95bc5819e8200d847341a97a24511cb350aa311da70b5c8f88b80255a1163
+SIZE (third_party-64d9ec3158b4629163f88b779a53e16f1cc24f81.tar.gz) = 795272024
+SHA256 (testing-46366a7e4d08bf9fceeb3c1c3b5eab8a6a5024b5.tar.gz) = dcbc402da0f79f355f6aa88f7498c5c6da1422a774ef37d875c5a2858c275a49
+SIZE (testing-46366a7e4d08bf9fceeb3c1c3b5eab8a6a5024b5.tar.gz) = 2397577
+SHA256 (opus-593419e833acab4d15b4901fe156177fb7315468.tar.gz) = cf62fdbf33205e3d15e1bee829a2cb275e82fb6944826d2afb7666623470b816
+SIZE (opus-593419e833acab4d15b4901fe156177fb7315468.tar.gz) = 869636
SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -229,8 +229,8 @@ SHA256 (rust/crates/ghash-0.5.0.crate) = d930750de5717d2dd0b8c0d42c076c0e884c81a
SIZE (rust/crates/ghash-0.5.0.crate) = 9244
SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
SIZE (rust/crates/gimli-0.28.1.crate) = 270497
-SHA256 (rust/crates/h2-0.3.22.crate) = 4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178
-SIZE (rust/crates/h2-0.3.22.crate) = 166413
+SHA256 (rust/crates/h2-0.3.24.crate) = bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9
+SIZE (rust/crates/h2-0.3.24.crate) = 167814
SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
@@ -693,7 +693,7 @@ SHA256 (signalapp-libsignal-v0.37.0_GH0.tar.gz) = 7943a8ed8f6f75cae63d9de9200649
SIZE (signalapp-libsignal-v0.37.0_GH0.tar.gz) = 1067773
SHA256 (signalapp-curve25519-dalek-signal-curve25519-4.1.1_GH0.tar.gz) = f129765413794896efd19667acda3645b9cd17b01181700fd781df68b584ec3d
SIZE (signalapp-curve25519-dalek-signal-curve25519-4.1.1_GH0.tar.gz) = 801981
-SHA256 (signalapp-ringrtc-v2.36.0_GH0.tar.gz) = 1d461317db98af9134512840a525eff5a0944bf4f8562110b4f85fa3800cc52d
-SIZE (signalapp-ringrtc-v2.36.0_GH0.tar.gz) = 805016
-SHA256 (signalapp-webrtc-5993d_GH0.tar.gz) = 436afbd179e772fce9a42e5fbaf5572f4540370f162c15f9e9b7a87832e2b244
-SIZE (signalapp-webrtc-5993d_GH0.tar.gz) = 39714128
+SHA256 (signalapp-ringrtc-v2.37.0_GH0.tar.gz) = 40719ab15a344292b0e6836eac9beaba477858ebbf60181e658a576a0266aee6
+SIZE (signalapp-ringrtc-v2.37.0_GH0.tar.gz) = 805128
+SHA256 (signalapp-webrtc-6099a_GH0.tar.gz) = 1be93fb62e398436630aef0912f4ef41de23a56891f489f748d81ca7a8348523
+SIZE (signalapp-webrtc-6099a_GH0.tar.gz) = 39746744
diff --git a/multimedia/ringrtc/files/patch-abseil b/multimedia/ringrtc/files/patch-abseil
deleted file mode 100644
index acb2cc758d4f..000000000000
--- a/multimedia/ringrtc/files/patch-abseil
+++ /dev/null
@@ -1,111 +0,0 @@
-From b9707b7d7845f9710ae6d5906827b833fdcc2754 Mon Sep 17 00:00:00 2001
-From: Derek Mauro <dmauro@google.com>
-Date: Wed, 6 Sep 2023 13:30:04 -0700
-Subject: [PATCH] Use native methods to implement absl::base_internal::GetPID()
- on FreeBSD, NetBSD, and OpenBSD
-
-https://man.freebsd.org/cgi/man.cgi?query=pthread_getthreadid_np
-https://man.netbsd.org/_lwp_self.2
-https://man.openbsd.org/getthrid.2
-
-This fixes a build break caused by
-https://github.com/abseil/abseil-cpp/commit/88cc63ef739d83277b492e881be72e9069fcb1fe
-
-Fixes #1518
-
-PiperOrigin-RevId: 563200172
-Change-Id: Ifd1b65c84e3631075248bc2e01b8f047dc72d201
----
- absl/base/internal/sysinfo.cc | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc
-index 8bcc4fafaf9..5b427fa5e98 100644
---- src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-+++ src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-@@ -34,6 +34,14 @@
- #include <sys/sysctl.h>
- #endif
-
-+#ifdef __FreeBSD__
-+#include <pthread_np.h>
-+#endif
-+
-+#ifdef __NetBSD__
-+#include <lwp.h>
-+#endif
-+
- #if defined(__myriad2__)
- #include <rtems.h>
- #endif
-@@ -421,7 +429,7 @@ pid_t GetTID() {
- return tid;
- }
-
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
-
- pid_t GetTID() {
- uint64_t tid;
-@@ -432,6 +440,14 @@ pid_t GetTID() {
- return static_cast<pid_t>(tid);
- }
-
-+#elif defined(__OpenBSD__)
-+
-+pid_t GetTID() { return getthrid(); }
-+
-+#elif defined(__NetBSD__)
-+
-+pid_t GetTID() { return static_cast<pid_t>(_lwp_self()); }
-+
- #elif defined(__native_client__)
-
- pid_t GetTID() {
-
-
-
-
-From b020fe646186aa624e607a23baca445ba8cd199e Mon Sep 17 00:00:00 2001
-From: Derek Mauro <dmauro@google.com>
-Date: Thu, 7 Sep 2023 08:02:09 -0700
-Subject: [PATCH] Fix GetTID() on FreeBSD
-
-https://github.com/abseil/abseil-cpp/issues/1518#issuecomment-1709098904
-pointed out that the previous untested fix doesn't work because
-pthread_getthreadid_np() has a different signature on Darwin.
-
-Follow up to https://github.com/abseil/abseil-cpp/commit/b9707b7d7845f9710ae6d5906827b833fdcc2754
-
-Fixes #1518
-
-PiperOrigin-RevId: 563432451
-Change-Id: Id0a9212e9c4413fa520a42934efaed2a06ca5dbc
----
- absl/base/internal/sysinfo.cc | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc
-index 5b427fa5e98..79eaba3e51c 100644
---- src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-+++ src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-@@ -429,7 +429,7 @@ pid_t GetTID() {
- return tid;
- }
-
--#elif defined(__APPLE__) || defined(__FreeBSD__)
-+#elif defined(__APPLE__)
-
- pid_t GetTID() {
- uint64_t tid;
-@@ -440,6 +440,10 @@ pid_t GetTID() {
- return static_cast<pid_t>(tid);
- }
-
-+#elif defined(__FreeBSD__)
-+
-+pid_t GetTID() { return static_cast<pid_t>(pthread_getthreadid_np()); }
-+
- #elif defined(__OpenBSD__)
-
- pid_t GetTID() { return getthrid(); }
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 37e998dd5808..e75f344b6317 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,15 @@
--- src/webrtc/src/build/config/compiler/BUILD.gn.orig 2022-02-16 12:34:12 UTC
+++ src/webrtc/src/build/config/compiler/BUILD.gn
-@@ -237,13 +237,16 @@ config("no_unresolved_symbols") {
+@@ -202,7 +202,7 @@ declare_args() {
+ # This greatly reduces the size of debug builds, at the cost of
+ # debugging information which is required by some specialized
+ # debugging tools.
+- simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
++ simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd
+ }
+
+ declare_args() {
+@@ -266,13 +266,16 @@ config("no_unresolved_symbols") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@@ -18,7 +27,7 @@
}
# compiler ---------------------------------------------------------------------
-@@ -467,6 +470,10 @@ config("compiler") {
+@@ -518,6 +521,10 @@ config("compiler") {
}
}
@@ -29,7 +38,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
-@@ -542,7 +549,7 @@ config("compiler") {
+@@ -593,7 +600,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -38,16 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
-@@ -826,7 +833,7 @@ config("compiler") {
- # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
- # lldb doesn't have the needed changes yet.
- # TODO(crbug.com/1379070): Remove if the upstream default ever changes.
-- if (is_clang && !is_nacl && !is_win && !is_apple) {
-+ if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) {
- cflags_cc += [ "-gsimple-template-names" ]
- }
-
-@@ -1009,7 +1016,7 @@ config("compiler_cpu_abi") {
+@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -56,7 +56,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1024,7 +1031,7 @@ config("compiler_cpu_abi") {
+@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -65,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1359,7 +1366,7 @@ config("compiler_deterministic") {
+@@ -1523,7 +1530,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.
@@ -74,7 +74,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1411,7 +1418,7 @@ config("clang_revision") {
+@@ -1575,7 +1582,7 @@ config("clang_revision") {
}
config("clang_revision") {
@@ -83,7 +83,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
-@@ -1649,7 +1656,7 @@ config("default_warnings") {
+@@ -1860,7 +1867,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -92,8 +92,8 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
-@@ -1779,7 +1786,7 @@ config("chromium_code") {
- }
+@@ -2017,7 +2024,7 @@ config("chromium_code") {
+ ]
# Thread safety analysis is broken under nacl: https://crbug.com/982423.
- if (!is_nacl || is_nacl_saigo) {
@@ -101,7 +101,7 @@
cflags += [
# Thread safety analysis. See base/thread_annotations.h and
# https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
-@@ -1831,7 +1838,7 @@ config("no_chromium_code") {
+@@ -2066,7 +2073,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -110,7 +110,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2339,7 +2346,7 @@ config("afdo") {
+@@ -2595,7 +2602,7 @@ config("afdo") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@@ -119,8 +119,8 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2358,7 +2365,7 @@ config("afdo") {
- }
+@@ -2622,7 +2629,7 @@ config("afdo") {
+ cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
- } else if (auto_profile_path != "" && is_a_target_toolchain) {
@@ -128,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2513,7 +2520,8 @@ config("symbols") {
+@@ -2786,7 +2793,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
diff --git a/multimedia/ringrtc/files/patch-src_webrtc_src_build_linux_unbundle_replace__gn__files.py b/multimedia/ringrtc/files/patch-src_webrtc_src_build_linux_unbundle_replace__gn__files.py
index 853bc711f24a..64f971e383a2 100644
--- a/multimedia/ringrtc/files/patch-src_webrtc_src_build_linux_unbundle_replace__gn__files.py
+++ b/multimedia/ringrtc/files/patch-src_webrtc_src_build_linux_unbundle_replace__gn__files.py
@@ -1,10 +1,10 @@
--- src/webrtc/src/build/linux/unbundle/replace_gn_files.py.orig 2021-11-15 18:52:18 UTC
+++ src/webrtc/src/build/linux/unbundle/replace_gn_files.py
-@@ -54,6 +54,7 @@ REPLACEMENTS = {
+@@ -56,6 +56,7 @@ REPLACEMENTS = {
'libevent': 'third_party/libevent/BUILD.gn',
'libjpeg': 'third_party/libjpeg.gni',
'libpng': 'third_party/libpng/BUILD.gn',
+ 'libusb': 'third_party/libusb/BUILD.gn',
+ 'libsecret' : 'third_party/libsecret/BUILD.gn',
+ 'libusb': 'third_party/libusb/BUILD.gn',
'libvpx': 'third_party/libvpx/BUILD.gn',
- 'libwebp': 'third_party/libwebp/BUILD.gn',
- 'libxml': 'third_party/libxml/BUILD.gn',
diff --git a/multimedia/ringrtc/update.txt b/multimedia/ringrtc/update.txt
index 2eca722591f7..ac083e0e0b68 100644
--- a/multimedia/ringrtc/update.txt
+++ b/multimedia/ringrtc/update.txt
@@ -2,4 +2,4 @@ To update this port:
Bump DISTVERSION
eventually bump WEBRTC_REV (sh net-im/signal-desktop/get_deps.sh)
eventually update *_REV (sh multimedia/ringrtc/webrtc_fetch.sh)
-eventually update CARGO_CRATES (fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.34.1/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile.crates)
+eventually update CARGO_CRATES (fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.37.0/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile.crates)
diff --git a/multimedia/ringrtc/webrtc_fetch.sh b/multimedia/ringrtc/webrtc_fetch.sh
index 070a6aee2ecb..928b20a43f99 100644
--- a/multimedia/ringrtc/webrtc_fetch.sh
+++ b/multimedia/ringrtc/webrtc_fetch.sh
@@ -1,6 +1,7 @@
#!/bin/sh
-WEBRTC_REV=5993d
+WEBRTC_REV=6099a
+# XXX also change fetch opus
base_url="https://chromium.googlesource.com/chromium/src/base.git/+archive/"
boringssl_url="https://boringssl.googlesource.com/boringssl.git/+archive/"
@@ -62,6 +63,10 @@ nasm_hash=$(grep 'nasm.git@' /tmp/DEPS | awk -F '@' '{print $2}' | sed -e "s#',#
printf "NASM_REV=\t${nasm_hash}\n"
printf "NASM_REV=\t${nasm_hash}\n" | portedit merge -i Makefile
+opus_hash=$(grep 'opus.git@' /tmp/DEPS | awk -F '@' '{print $2}' | sed -e "s#',##" -e "s#'##")
+printf "OPUS_REV=\t${boringssl_hash}\n"
+printf "OPUS_REV=\t${boringssl_hash}\n" | portedit merge -i Makefile
+
testing_hash=$(grep 'testing@' /tmp/DEPS | awk -F '@' '{print $2}' | sed -e "s#',##" -e "s#'##")
printf "TESTING_REV=\t${testing_hash}\n"
printf "TESTING_REV=\t${testing_hash}\n" | portedit merge -i Makefile
@@ -70,8 +75,6 @@ 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
-#exit
-
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"
@@ -84,10 +87,11 @@ echo "fetch -o dist_tmp/libsrtp-${libsrtp_hash}.tar.gz ${libsrtp_url}${libsrtp_h
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/opus-${opus_hash}.tar.gz https://codeload.github.com/signalapp/opus/tar.gz/webrtc-6099?dummy=/"
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
+mkdir -p base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm opus testing 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
@@ -99,6 +103,7 @@ 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/opus-${opus_hash}.tar.gz -C opus --strip-components 1
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
@@ -114,7 +119,8 @@ 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/opus-${opus_hash}.tar.gz opus
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
+rm -rf base boringssl build buildtools catapult icu libjpeg_turbo libsrtp libvpx libyuv nasm opus testing third_party