git: e37d26b25326 - main - www/firefox: update to 113.0 (rc1)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 02 May 2023 10:27:01 UTC
The branch main has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e37d26b2532619073153f20be14e21fa3bec40e8
commit e37d26b2532619073153f20be14e21fa3bec40e8
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2023-05-02 10:26:17 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2023-05-02 10:26:17 +0000
www/firefox: update to 113.0 (rc1)
Release Notes (soon):
https://www.mozilla.org/en-US/firefox/113.0/releasenotes/
---
www/firefox/Makefile | 3 +-
www/firefox/distinfo | 6 +-
www/firefox/files/patch-bug1824066 | 37 -
www/firefox/files/patch-libwebrtc-generated | 6573 +++++++++++++++++----------
4 files changed, 4092 insertions(+), 2527 deletions(-)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2291342d1264..3baad0d270cd 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,6 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 112.0.2
-PORTREVISION= 1
+DISTVERSION= 113.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 1a0c012c2c19..6c08ec8fabe5 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682357747
-SHA256 (firefox-112.0.2.source.tar.xz) = e6a4819a3b82b1ca6c45296e50e6c9ab653306eeb540e50ba8683e339565992e
-SIZE (firefox-112.0.2.source.tar.xz) = 504773576
+TIMESTAMP = 1683013584
+SHA256 (firefox-113.0.source.tar.xz) = b5ea8f115a9fbf8373667d90465a6733c201d8247cc8154023d4589ca1f0b5bd
+SIZE (firefox-113.0.source.tar.xz) = 495848944
diff --git a/www/firefox/files/patch-bug1824066 b/www/firefox/files/patch-bug1824066
deleted file mode 100644
index cce34e9eb196..000000000000
--- a/www/firefox/files/patch-bug1824066
+++ /dev/null
@@ -1,37 +0,0 @@
-commit c017c06d61545a86338a1cbc73967803c5a2a6bc
-Author: John M. Schanck <jschanck@mozilla.com>
-Date: Thu Mar 23 12:13:44 2023 -0700
-
- Apply pr234 patch to transports/freebsd
-
-diff --git third_party/rust/authenticator/src/transport/freebsd/device.rs third_party/rust/authenticator/src/transport/freebsd/device.rs
-index 8f4de54..3a83be2 100644
---- third_party/rust/authenticator/src/transport/freebsd/device.rs
-+++ third_party/rust/authenticator/src/transport/freebsd/device.rs
-@@ -41,7 +41,9 @@ impl Device {
- buf[6] = 0;
- buf[7] = 1; // one byte
-
-- self.write_all(&buf)?;
-+ if self.write(&buf)? != buf.len() {
-+ return Err(io_err("write ping failed"));
-+ }
-
- // Wait for response
- let mut pfd: libc::pollfd = unsafe { mem::zeroed() };
-@@ -56,8 +58,13 @@ impl Device {
- continue;
- }
-
-- // Read response
-- self.read_exact(&mut buf)?;
-+ // Read response. When reports come in they are all
-+ // exactly the same size, with no report id byte because
-+ // there is only one report.
-+ let n = self.read(&mut buf[1..])?;
-+ if n != buf.len() - 1 {
-+ return Err(io_err("read pong failed"));
-+ }
-
- return Ok(());
- }
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 4027904e444e..28c936432100 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,13 +1,13 @@
-commit d838b64e015cf57136f26fa6bf56647753501016
+commit a8961f42815b94179d9df11555ecdb18fab86a91
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
- regenerate FreeBSD libwebrtc patch for Firefox 112
+ regenerate FreeBSD libwebrtc patch for Firefox 113
diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-index a6f71dc2fd6d..ebf03d2e58ef 100644
+index c3f52293bf1b..46d0a26b3591 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -20,6 +20,7 @@ index a6f71dc2fd6d..ebf03d2e58ef 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -28,7 +29,7 @@ index a6f71dc2fd6d..ebf03d2e58ef 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,169 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -203,10 +204,10 @@ index a6f71dc2fd6d..ebf03d2e58ef 100644
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index 786830328170..3cf98fead5cc 100644
+index 042ba7513206..3e728ca6633b 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -219,6 +220,7 @@ index 786830328170..3cf98fead5cc 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -227,7 +229,7 @@ index 786830328170..3cf98fead5cc 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -388,10 +390,10 @@ index 786830328170..3cf98fead5cc 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index 06d00e524946..f78f3f6dc146 100644
+index 6fc3d10926a4..252fa06b1535 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -404,6 +406,7 @@ index 06d00e524946..f78f3f6dc146 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -412,7 +415,7 @@ index 06d00e524946..f78f3f6dc146 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,169 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,169 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -587,10 +590,10 @@ index 06d00e524946..f78f3f6dc146 100644
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index a01c28a0335f..b9e3e0147e0c 100644
+index 58e55583224d..8bac3177733c 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+@@ -12,12 +12,22 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -604,6 +607,7 @@ index a01c28a0335f..b9e3e0147e0c 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -612,7 +616,7 @@ index a01c28a0335f..b9e3e0147e0c 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -798,10 +802,10 @@ index a01c28a0335f..b9e3e0147e0c 100644
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index cfe6c32be69f..b504253531d1 100644
+index b18ab1742317..0b947d545951 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -814,6 +818,7 @@ index cfe6c32be69f..b504253531d1 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -822,7 +827,7 @@ index cfe6c32be69f..b504253531d1 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1001,10 +1006,10 @@ index cfe6c32be69f..b504253531d1 100644
Library("audio_frame_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index 364e4050adca..9c9958635596 100644
+index 762d6a326ac6..817832d1cad6 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1017,6 +1022,7 @@ index 364e4050adca..9c9958635596 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1025,7 +1031,7 @@ index 364e4050adca..9c9958635596 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1182,10 +1188,10 @@ index 364e4050adca..9c9958635596 100644
-
Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index f97d29722a62..0698e8bca389 100644
+index 6588e466fb4a..124632ba2c0c 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1198,6 +1204,7 @@ index f97d29722a62..0698e8bca389 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1206,7 +1213,7 @@ index f97d29722a62..0698e8bca389 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,161 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1371,10 +1378,10 @@ index f97d29722a62..0698e8bca389 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index b59aa622176e..31860d843683 100644
+index 3ad317dc5332..e483c9fd7863 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1387,6 +1394,7 @@ index b59aa622176e..31860d843683 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1395,7 +1403,7 @@ index b59aa622176e..31860d843683 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1556,10 +1564,10 @@ index b59aa622176e..31860d843683 100644
-
Library("echo_control_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 02803d34938b..163611a96529 100644
+index ae3e9dc306df..9c21c61611bf 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1572,6 +1580,7 @@ index 02803d34938b..163611a96529 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1580,7 +1589,7 @@ index 02803d34938b..163611a96529 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1759,10 +1768,10 @@ index 02803d34938b..163611a96529 100644
Library("audio_decoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 69ca41b49442..4be558192e66 100644
+index ac5fff31eb11..d7d24678af7d 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1775,6 +1784,7 @@ index 69ca41b49442..4be558192e66 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1783,7 +1793,7 @@ index 69ca41b49442..4be558192e66 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1962,10 +1972,10 @@ index 69ca41b49442..4be558192e66 100644
Library("audio_encoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index f7adf8f1dfbe..c44aaf96d795 100644
+index 3981b81f8a31..7061eeab5dce 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -1978,6 +1988,7 @@ index f7adf8f1dfbe..c44aaf96d795 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -1986,7 +1997,7 @@ index f7adf8f1dfbe..c44aaf96d795 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,173 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,173 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2165,10 +2176,10 @@ index f7adf8f1dfbe..c44aaf96d795 100644
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 791b16d94d2e..8635fe5558fe 100644
+index d5e4bb813c5d..d3fdba7c9fa8 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -12,12 +12,24 @@ AllowCompilerWarnings()
+@@ -12,13 +12,25 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2181,6 +2192,7 @@ index 791b16d94d2e..8635fe5558fe 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
@@ -2193,7 +2205,7 @@ index 791b16d94d2e..8635fe5558fe 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,228 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,228 +57,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2427,10 +2439,10 @@ index 791b16d94d2e..8635fe5558fe 100644
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index 7b6d15cdfc0c..5763214e8745 100644
+index a2c0e3eb322b..41e003f77539 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -12,12 +12,24 @@ AllowCompilerWarnings()
+@@ -12,13 +12,25 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2443,6 +2455,7 @@ index 7b6d15cdfc0c..5763214e8745 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
@@ -2455,7 +2468,7 @@ index 7b6d15cdfc0c..5763214e8745 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,228 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,228 +57,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2689,10 +2702,10 @@ index 7b6d15cdfc0c..5763214e8745 100644
Library("builtin_audio_encoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index aa598bdfc240..dbe7cd4539d5 100644
+index 5d92885b476f..9fc3485fe34d 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2705,6 +2718,7 @@ index aa598bdfc240..dbe7cd4539d5 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -2713,7 +2727,7 @@ index aa598bdfc240..dbe7cd4539d5 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2892,10 +2906,10 @@ index aa598bdfc240..dbe7cd4539d5 100644
Library("audio_decoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index b6f1eccd5ea2..895634e854f5 100644
+index 0fb19214d8be..5985b293f06a 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -2908,6 +2922,7 @@ index b6f1eccd5ea2..895634e854f5 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -2916,7 +2931,7 @@ index b6f1eccd5ea2..895634e854f5 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3095,10 +3110,10 @@ index b6f1eccd5ea2..895634e854f5 100644
Library("audio_encoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index acb5f503b9fc..9e5e84c4ac02 100644
+index 676fff1cf94d..25e3731ea347 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3111,6 +3126,7 @@ index acb5f503b9fc..9e5e84c4ac02 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -3119,7 +3135,7 @@ index acb5f503b9fc..9e5e84c4ac02 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3298,10 +3314,10 @@ index acb5f503b9fc..9e5e84c4ac02 100644
Library("audio_decoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 073bd3e1e662..9f1f7a87b746 100644
+index 8d3f39ab6f2d..ae3673d7d83f 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3314,6 +3330,7 @@ index 073bd3e1e662..9f1f7a87b746 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -3322,7 +3339,7 @@ index 073bd3e1e662..9f1f7a87b746 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,161 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3487,10 +3504,10 @@ index 073bd3e1e662..9f1f7a87b746 100644
-
Library("audio_encoder_g722_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index 1fd7bb995a3e..dfd010766aa1 100644
+index 708747b4cb59..2a6a1468d617 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3503,6 +3520,7 @@ index 1fd7bb995a3e..dfd010766aa1 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -3511,7 +3529,7 @@ index 1fd7bb995a3e..dfd010766aa1 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3690,10 +3708,10 @@ index 1fd7bb995a3e..dfd010766aa1 100644
Library("audio_encoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index 5723e03e8602..afef52727f1c 100644
+index 0508df8c128c..bf80183f964e 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3706,6 +3724,7 @@ index 5723e03e8602..afef52727f1c 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -3714,7 +3733,7 @@ index 5723e03e8602..afef52727f1c 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,180 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3900,10 +3919,10 @@ index 5723e03e8602..afef52727f1c 100644
Library("audio_decoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-index 40443414c840..6e0a6b748386 100644
+index 1b867299ad3f..d4ec1250c7b9 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -3916,6 +3935,7 @@ index 40443414c840..6e0a6b748386 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -3924,7 +3944,7 @@ index 40443414c840..6e0a6b748386 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4081,10 +4101,10 @@ index 40443414c840..6e0a6b748386 100644
-
Library("audio_encoder_ilbc_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-index 930dd938889a..46ba53c9063b 100644
+index 86916311191d..e21fd153a761 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4097,6 +4117,7 @@ index 930dd938889a..46ba53c9063b 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4105,7 +4126,7 @@ index 930dd938889a..46ba53c9063b 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,180 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4292,10 +4313,10 @@ index 930dd938889a..46ba53c9063b 100644
Library("audio_encoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
deleted file mode 100644
-index 6580e1f599b2..000000000000
+index 7b4fc60b35e7..000000000000
--- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
+++ /dev/null
-@@ -1,93 +0,0 @@
+@@ -1,94 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -4324,6 +4345,7 @@ index 6580e1f599b2..000000000000
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-DEFINES["_GNU_SOURCE"] = True
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -4390,10 +4412,10 @@ index 6580e1f599b2..000000000000
-
-Library("audio_decoder_isac_fix_gn")
diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
-index c21933e10e5b..256f6292b7ce 100644
+index 09b0eb1ab0d1..de596c7fc12d 100644
--- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4406,6 +4428,7 @@ index c21933e10e5b..256f6292b7ce 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4414,7 +4437,7 @@ index c21933e10e5b..256f6292b7ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,159 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,159 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4579,10 +4602,10 @@ index c21933e10e5b..256f6292b7ce 100644
Library("audio_decoder_isac_float_gn")
diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
-index e96e54f45097..280545fc8134 100644
+index e5ec655bdb46..a8c71ccceb2f 100644
--- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
-@@ -12,10 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,23 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4595,6 +4618,7 @@ index e96e54f45097..280545fc8134 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -4605,7 +4629,7 @@ index e96e54f45097..280545fc8134 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,216 +50,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,216 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4826,10 +4850,10 @@ index e96e54f45097..280545fc8134 100644
Library("audio_decoder_isac_gn")
diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
deleted file mode 100644
-index 9bb1ec62e60e..000000000000
+index 4c917d45692c..000000000000
--- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
+++ /dev/null
-@@ -1,93 +0,0 @@
+@@ -1,94 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -4858,6 +4882,7 @@ index 9bb1ec62e60e..000000000000
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_POSIX"] = True
+-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-DEFINES["_GNU_SOURCE"] = True
-DEFINES["__STDC_CONSTANT_MACROS"] = True
-DEFINES["__STDC_FORMAT_MACROS"] = True
@@ -4924,10 +4949,10 @@ index 9bb1ec62e60e..000000000000
-
-Library("audio_encoder_isac_fix_gn")
diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
-index 9a64a79c40dd..afe2f475fd25 100644
+index 4084e894dba6..e2894f82aabb 100644
--- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -4940,6 +4965,7 @@ index 9a64a79c40dd..afe2f475fd25 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -4948,7 +4974,7 @@ index 9a64a79c40dd..afe2f475fd25 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,159 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,159 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5113,10 +5139,10 @@ index 9a64a79c40dd..afe2f475fd25 100644
Library("audio_encoder_isac_float_gn")
diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
-index fb45423c93a3..15199c708a16 100644
+index dc7555b1c92f..46dd4ec6f404 100644
--- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
-@@ -12,10 +12,22 @@ AllowCompilerWarnings()
+@@ -12,11 +12,23 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5129,6 +5155,7 @@ index fb45423c93a3..15199c708a16 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
@@ -5139,7 +5166,7 @@ index fb45423c93a3..15199c708a16 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,216 +50,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,216 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5359,10 +5386,10 @@ index fb45423c93a3..15199c708a16 100644
-
Library("audio_encoder_isac_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index 622d02e43eab..96cfc33b41c6 100644
+index 28c8a12f99b6..a594e676a6b6 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5375,6 +5402,7 @@ index 622d02e43eab..96cfc33b41c6 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -5383,7 +5411,7 @@ index 622d02e43eab..96cfc33b41c6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5562,10 +5590,10 @@ index 622d02e43eab..96cfc33b41c6 100644
Library("audio_decoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 10b96d1778ba..635edefde84c 100644
+index 996d829e29b4..508ce91d431b 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5578,6 +5606,7 @@ index 10b96d1778ba..635edefde84c 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -5586,7 +5615,7 @@ index 10b96d1778ba..635edefde84c 100644
FINAL_LIBRARY = "webrtc"
-@@ -38,161 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5751,10 +5780,10 @@ index 10b96d1778ba..635edefde84c 100644
-
Library("audio_decoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index bda49a2e1995..f85956c14c96 100644
+index c6bf3b3966c5..34d6a5a32c25 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
@@ -5767,6 +5796,7 @@ index bda49a2e1995..f85956c14c96 100644
DEFINES["WEBRTC_MOZILLA_BUILD"] = True
DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
+DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
+DEFINES["_FILE_OFFSET_BITS"] = "64"
+DEFINES["_LARGEFILE64_SOURCE"] = True
+DEFINES["_LARGEFILE_SOURCE"] = True
@@ -5775,7 +5805,7 @@ index bda49a2e1995..f85956c14c96 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5961,10 +5991,10 @@ index bda49a2e1995..f85956c14c96 100644
Library("audio_decoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index e52716911a1c..5898d8909f94 100644
+index 7b574fb08d6d..cb6ef27502ca 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-@@ -12,10 +12,20 @@ AllowCompilerWarnings()
*** 16967 LINES SKIPPED ***