git: e5025b5100e9 - main - www/firefox: update to 133.0 (rc1)

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Mon, 18 Nov 2024 22:54:56 UTC
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e5025b5100e9f8abbaf0cbe5663fd2d360a3baf2

commit e5025b5100e9f8abbaf0cbe5663fd2d360a3baf2
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2024-11-18 22:53:33 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2024-11-18 22:54:44 +0000

    www/firefox: update to 133.0 (rc1)
    
    Release Notes (soon):
      https://www.mozilla.org/en-US/firefox/133.0/releasenotes/
---
 www/firefox/Makefile                               |     7 +-
 www/firefox/distinfo                               |     6 +-
 .../files/patch-ipc_glue_SharedMemory__posix.cpp   |    21 +
 www/firefox/files/patch-libwebrtc-generated        | 10178 +++++--------------
 ...rd__party_libwebrtc_build_config_BUILDCONFIG.gn |    73 +-
 5 files changed, 2879 insertions(+), 7406 deletions(-)

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e208bad595cb..958ac31ec20c 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	firefox
-DISTVERSION=	132.0.2
-PORTREVISION=	1
+DISTVERSION=	133.0
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -12,7 +11,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.105:security/nss \
+		nss>=3.106:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=10.0.1:print/harfbuzz \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index ff9272346135..5f51136c52be 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731329893
-SHA256 (firefox-132.0.2.source.tar.xz) = 329e1764f4b4e13f11dcf1fd7b3c6d8f80e512e8b7ed5bf65fbe44749c2610e9
-SIZE (firefox-132.0.2.source.tar.xz) = 570535648
+TIMESTAMP = 1731969400
+SHA256 (firefox-133.0.source.tar.xz) = 0360b4bf3dbfa6d03d33f6944817ca9cafaaee2693f5b551c36a6da186aef747
+SIZE (firefox-133.0.source.tar.xz) = 586803844
diff --git a/www/firefox/files/patch-ipc_glue_SharedMemory__posix.cpp b/www/firefox/files/patch-ipc_glue_SharedMemory__posix.cpp
new file mode 100644
index 000000000000..767b663ee5ef
--- /dev/null
+++ b/www/firefox/files/patch-ipc_glue_SharedMemory__posix.cpp
@@ -0,0 +1,21 @@
+commit bdd68dbe8130dcddde28581939ac50542f0b07ad
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    FreeBSD does not have MAP_NORESERVE
+
+diff --git ipc/glue/SharedMemory_posix.cpp ipc/glue/SharedMemory_posix.cpp
+index 73aaff1246c2..5ba7624f584d 100644
+--- ipc/glue/SharedMemory_posix.cpp
++++ ipc/glue/SharedMemory_posix.cpp
+@@ -62,7 +62,11 @@ SharedMemory::Handle SharedMemory::CloneHandle(const Handle& aHandle) {
+ 
+ void* SharedMemory::FindFreeAddressSpace(size_t size) {
+   void* memory = mmap(nullptr, size, PROT_NONE,
++#ifdef __FreeBSD__
++                      MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
++#else
+                       MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE, -1, 0);
++#endif
+   if (memory == MAP_FAILED) {
+     return nullptr;
+   }
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 5e2aedd23554..9de1795cf13d 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,10 +1,10 @@
-commit 92b3c1de6620a3031f08835ef1d374b60fb46a2c
+commit e54d742b072c32d3289d1a99c6c2d71aecf7a3ea
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
-    regenerate FreeBSD libwebrtc patch for Firefox 132
+    regenerate FreeBSD libwebrtc patch for Firefox 133
 
 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 2dbd5881583e..332ca04819ee 100644
+index a80e5f32ade2..d5a2be24fcbe 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -215,7 +215,7 @@ index 2dbd5881583e..332ca04819ee 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 df2c86715cac..6c4e403f6dc1 100644
+index 25221b2af745..dfc948eba91e 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
 +++ third_party/libwebrtc/api/array_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -406,7 +406,7 @@ index df2c86715cac..6c4e403f6dc1 100644
 -
  Library("array_view_gn")
 diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index 4d678a1de7c9..e163a7c1f440 100644
+index bf95db7b24ed..d4e55fe55732 100644
 --- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -605,7 +605,7 @@ index 4d678a1de7c9..e163a7c1f440 100644
 -
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index cbd6f2e6f0d5..3bfa575693b2 100644
+index 2c964a4fd025..f6f8fff6e3bc 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -816,7 +816,7 @@ index cbd6f2e6f0d5..3bfa575693b2 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 746585483f96..33ea9b79d47b 100644
+index e02b226aca7f..744e4c8aa0de 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -1039,7 +1039,7 @@ index 746585483f96..33ea9b79d47b 100644
  
  Library("aec3_factory_gn")
 diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-index 9609692094c1..f0da29e5d200 100644
+index 0fc7d750796a..9f6439e12a20 100644
 --- third_party/libwebrtc/api/audio/audio_device_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1230,7 +1230,7 @@ index 9609692094c1..f0da29e5d200 100644
 -
  Library("audio_device_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 e2561db08f06..59da7761dd35 100644
+index c0e06e7a7865..ca8fc7db5049 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1448,7 +1448,7 @@ index e2561db08f06..59da7761dd35 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 7dd1c4b91100..960b60c3311c 100644
+index bc6ea25161c1..d586a04ef2ba 100644
 --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1635,7 +1635,7 @@ index 7dd1c4b91100..960b60c3311c 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 36d43783a3e7..fd0111ba0ffd 100644
+index cedd56ac791e..7d5115f48657 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1833,7 +1833,7 @@ index 36d43783a3e7..fd0111ba0ffd 100644
 -
  Library("audio_mixer_api_gn")
 diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-index 7226d2a92a40..c60a400c218b 100644
+index 10ae1f65fa9c..e4ababb74a87 100644
 --- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2044,7 +2044,7 @@ index 7226d2a92a40..c60a400c218b 100644
  
  Library("audio_processing_gn")
 diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-index d7629659d6ba..cb69c23840a0 100644
+index 061ff48b8485..3ee36df68faa 100644
 --- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2251,7 +2251,7 @@ index d7629659d6ba..cb69c23840a0 100644
  
  Library("audio_processing_statistics_gn")
 diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 06f43e765114..6c06b87bcfe3 100644
+index f1cfe20bed12..a373bec2722f 100644
 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2442,7 +2442,7 @@ index 06f43e765114..6c06b87bcfe3 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 5811f4d9321b..0f11017e2f6c 100644
+index ff6ba51fed82..7c35bd52175d 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -2660,7 +2660,7 @@ index 5811f4d9321b..0f11017e2f6c 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 f4fb06ef3f09..90113fd85d92 100644
+index 50f39677700f..2716e3c6cda0 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -2878,7 +2878,7 @@ index f4fb06ef3f09..90113fd85d92 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 faed7e9b0f61..84835da8965c 100644
+index 66899306c2b9..7016bab07db9 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -3096,7 +3096,7 @@ index faed7e9b0f61..84835da8965c 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 5de9c2960769..a0d91297b550 100644
+index 235eb30debda..56c2a57b2191 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,13 +12,23 @@ AllowCompilerWarnings()
@@ -3320,7 +3320,7 @@ index 5de9c2960769..a0d91297b550 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 5ff7dfd0ffd4..334acbe7d342 100644
+index d6edc362eb2f..853f9ffd51f5 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,13 +12,23 @@ AllowCompilerWarnings()
@@ -3544,7 +3544,7 @@ index 5ff7dfd0ffd4..334acbe7d342 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 e1c8fa6a08bc..7799b83b91bb 100644
+index cd6f3fcf496e..47a87bc850e2 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -3762,7 +3762,7 @@ index e1c8fa6a08bc..7799b83b91bb 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 39513d15b310..aff5480ad0b3 100644
+index 88ab3c83b6d4..0374f235d934 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -3980,7 +3980,7 @@ index 39513d15b310..aff5480ad0b3 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 cf9228dcab3c..7eb3130288e3 100644
+index 033fdb4bb6e2..ce0b3b836f08 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -4198,7 +4198,7 @@ index cf9228dcab3c..7eb3130288e3 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 3b1a814ac7b2..048ddee2cbdb 100644
+index ecb9b406a256..9057ccf0945f 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -4396,7 +4396,7 @@ index 3b1a814ac7b2..048ddee2cbdb 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 57bdfeaf74c0..f04086fa4375 100644
+index cd28eb346570..12e0041653f5 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -4614,7 +4614,7 @@ index 57bdfeaf74c0..f04086fa4375 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 ae2d4f5dc9b4..8d5eb0cadc34 100644
+index e259a3b72e60..94a1aa4045ad 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -4836,7 +4836,7 @@ index ae2d4f5dc9b4..8d5eb0cadc34 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 2ec1c97ea240..ee5d451c740d 100644
+index cfa532092195..fe0de702eccb 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -5023,7 +5023,7 @@ index 2ec1c97ea240..ee5d451c740d 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 ff9d947abb85..cdb5435b0bf3 100644
+index 87b566eb9c63..1213d0c86e02 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -5245,7 +5245,7 @@ index ff9d947abb85..cdb5435b0bf3 100644
  
  Library("audio_encoder_ilbc_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 06926f2550c6..3bb8979209c8 100644
+index 728c782d1ad9..0d6256e50300 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -5463,7 +5463,7 @@ index 06926f2550c6..3bb8979209c8 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 a40417692306..11dc887d7856 100644
+index c27e08d89ca7..09419763690d 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -5661,7 +5661,7 @@ index a40417692306..11dc887d7856 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 a52b290d08bc..191d27589e54 100644
+index d6fe84b97bcc..6c61258e2290 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -5883,7 +5883,7 @@ index a52b290d08bc..191d27589e54 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 1847aa9f2334..b1a86854c6cd 100644
+index 15d75c1a6da3..1961637772fd 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -6101,7 +6101,7 @@ index 1847aa9f2334..b1a86854c6cd 100644
  
  Library("audio_encoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index b4ed20ad8589..220221aeeed4 100644
+index f0b9b2ddb3fe..c9b0fbf804e7 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -6309,7 +6309,7 @@ index b4ed20ad8589..220221aeeed4 100644
  
  Library("audio_encoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index dc73c7abc386..b76dd0fcc777 100644
+index e2fb4d316a84..5b65a29e09f3 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6531,7 +6531,7 @@ index dc73c7abc386..b76dd0fcc777 100644
  
  Library("audio_encoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index 974d1dbdf2c7..90ca4ab68ba8 100644
+index 9cddf47802bc..77615a363884 100644
 --- third_party/libwebrtc/api/audio_options_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6742,7 +6742,7 @@ index 974d1dbdf2c7..90ca4ab68ba8 100644
  
  Library("audio_options_api_gn")
 diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index 500eff54bbfd..a1f84da5a485 100644
+index a5170774bd1c..4fa8cc90205e 100644
 --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6933,7 +6933,7 @@ index 500eff54bbfd..a1f84da5a485 100644
 -
  Library("bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 372f0888fbba..86c73a9fd726 100644
+index 439d2b44318b..bef49364775e 100644
 --- third_party/libwebrtc/api/call_api_gn/moz.build
 +++ third_party/libwebrtc/api/call_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7120,7 +7120,7 @@ index 372f0888fbba..86c73a9fd726 100644
 -
  Library("call_api_gn")
 diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 2a9b6d96dd75..c032ee4fe916 100644
+index 8c4ad8dd1ec2..fd90602736ac 100644
 --- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7311,7 +7311,7 @@ index 2a9b6d96dd75..c032ee4fe916 100644
 -
  Library("frame_decryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index f1716e6b6267..7d3b6bae0048 100644
+index b3d5fc80f2dc..494bb25a7ab9 100644
 --- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7502,7 +7502,7 @@ index f1716e6b6267..7d3b6bae0048 100644
 -
  Library("frame_encryptor_interface_gn")
 diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index a9e9b0cd9473..5726c9c835be 100644
+index 5ce60513e9dd..02635946fe38 100644
 --- third_party/libwebrtc/api/crypto/options_gn/moz.build
 +++ third_party/libwebrtc/api/crypto/options_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7713,7 +7713,7 @@ index a9e9b0cd9473..5726c9c835be 100644
  
  Library("options_gn")
 diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-index 9388642ab5e6..2a4db566b430 100644
+index dfb310b07831..30fb8a32856a 100644
 --- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
 +++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7935,7 +7935,7 @@ index 9388642ab5e6..2a4db566b430 100644
  
  Library("environment_factory_gn")
 diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
-index 5b7b361ac342..b18f7c018485 100644
+index 484b89746fa8..065021521a62 100644
 --- third_party/libwebrtc/api/environment/environment_gn/moz.build
 +++ third_party/libwebrtc/api/environment/environment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8122,7 +8122,7 @@ index 5b7b361ac342..b18f7c018485 100644
 -
  Library("environment_gn")
 diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 653eae8f233f..383f2f1c9661 100644
+index e8caeb29b0b5..eb72c1303105 100644
 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8313,7 +8313,7 @@ index 653eae8f233f..383f2f1c9661 100644
 -
  Library("fec_controller_api_gn")
 diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index 76e121ec9f5e..544a531d83f1 100644
+index ee276a6abe37..f43eabe0f14f 100644
 --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8531,7 +8531,7 @@ index 76e121ec9f5e..544a531d83f1 100644
  
  Library("field_trials_registry_gn")
 diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index a6ac64bf50c6..541f2359270f 100644
+index 9dcf0f1332d4..adc359f7cb28 100644
 --- third_party/libwebrtc/api/field_trials_view_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8718,7 +8718,7 @@ index a6ac64bf50c6..541f2359270f 100644
 -
  Library("field_trials_view_gn")
 diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index b79f531f5def..36790a9abbbb 100644
+index b47d843d106d..e178baaec5de 100644
 --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8936,7 +8936,7 @@ index b79f531f5def..36790a9abbbb 100644
  
  Library("frame_transformer_interface_gn")
 diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index feea8c2c0ba6..7c48aab74157 100644
+index 6eccd0a4fd32..7971643aae1a 100644
 --- third_party/libwebrtc/api/function_view_gn/moz.build
 +++ third_party/libwebrtc/api/function_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9127,7 +9127,7 @@ index feea8c2c0ba6..7c48aab74157 100644
 -
  Library("function_view_gn")
 diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index 6729abedf9bd..314418594b0e 100644
+index 14951db5b9f2..56c1e1592ebb 100644
 --- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9314,7 +9314,7 @@ index 6729abedf9bd..314418594b0e 100644
 -
  Library("jingle_logging_api_gn")
 diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index f815d7da4e62..d8c0189951f6 100644
+index d75066b59596..270c9ba77c25 100644
 --- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9501,7 +9501,7 @@ index f815d7da4e62..d8c0189951f6 100644
 -
  Library("jingle_peerconnection_api_gn")
 diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index 706b1d5026cc..673b106c6cea 100644
+index 87a58928611c..3f82d7befe43 100644
 --- third_party/libwebrtc/api/location_gn/moz.build
 +++ third_party/libwebrtc/api/location_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9688,7 +9688,7 @@ index 706b1d5026cc..673b106c6cea 100644
 -
  Library("location_gn")
 diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index 6bedaf55cd03..6f4e516cb13f 100644
+index 7f956665eda9..26c6bb690f73 100644
 --- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 +++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9875,7 +9875,7 @@ index 6bedaf55cd03..6f4e516cb13f 100644
 -
  Library("make_ref_counted_gn")
 diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index 8cc4995908e8..4d4d0bbcdb02 100644
+index fea8af2692d4..fa6313b4b8c4 100644
 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10093,7 +10093,7 @@ index 8cc4995908e8..4d4d0bbcdb02 100644
  
  Library("media_stream_interface_gn")
 diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index 5ffa4ac6c78f..6eaccfb29fc6 100644
+index 57a1e2ca464e..5974015ddef6 100644
 --- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 +++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10284,7 +10284,7 @@ index 5ffa4ac6c78f..6eaccfb29fc6 100644
 -
  Library("metronome_gn")
 diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index 0486a791d10f..254ccec7ed2e 100644
+index 10d65f922ebe..d27ef50a9725 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10506,7 +10506,7 @@ index 0486a791d10f..254ccec7ed2e 100644
  
  Library("default_neteq_controller_factory_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index ec0207e6b81a..217b5be2076d 100644
+index a4512f3c1f31..1adeffe9858a 100644
 --- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10531,7 +10531,7 @@ index ec0207e6b81a..217b5be2076d 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10579,10 +10579,6 @@ index ec0207e6b81a..217b5be2076d 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -10728,7 +10724,7 @@ index ec0207e6b81a..217b5be2076d 100644
  
  Library("neteq_api_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index 830a41cbcb2f..04fd38417177 100644
+index 8ca00de79987..1ef35aa77b22 100644
 --- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10753,7 +10749,7 @@ index 830a41cbcb2f..04fd38417177 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10801,10 +10797,6 @@ index 830a41cbcb2f..04fd38417177 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -10877,7 +10869,7 @@ index 830a41cbcb2f..04fd38417177 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -10930,7 +10922,7 @@ index 830a41cbcb2f..04fd38417177 100644
 -
  Library("neteq_controller_api_gn")
 diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index 4f4101599f07..3129a92d497c 100644
+index 97f27314b014..537d954a8d2a 100644
 --- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11141,7 +11133,7 @@ index 4f4101599f07..3129a92d497c 100644
  
  Library("tick_timer_gn")
 diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 84ec63723306..ff25666ad5f9 100644
+index 27f989b8b230..b62ef76e23e2 100644
 --- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 +++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11328,7 +11320,7 @@ index 84ec63723306..ff25666ad5f9 100644
 -
  Library("network_state_predictor_api_gn")
 diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index e90b551e4d69..d402c9d495af 100644
+index f412b0d8fba4..2cef91d8eb1a 100644
 --- third_party/libwebrtc/api/priority_gn/moz.build
 +++ third_party/libwebrtc/api/priority_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11353,7 +11345,7 @@ index e90b551e4d69..d402c9d495af 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11372,6 +11364,10 @@ index e90b551e4d69..d402c9d495af 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -11462,7 +11458,7 @@ index e90b551e4d69..d402c9d495af 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -11515,7 +11511,7 @@ index e90b551e4d69..d402c9d495af 100644
 -
  Library("priority_gn")
 diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
-index b5ded03ae3a4..2a36041b5e46 100644
+index 98c49cbfca5e..4bdb29aad6a8 100644
 --- third_party/libwebrtc/api/ref_count_gn/moz.build
 +++ third_party/libwebrtc/api/ref_count_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11702,7 +11698,7 @@ index b5ded03ae3a4..2a36041b5e46 100644
 -
  Library("ref_count_gn")
 diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 42e693bf022a..e2d783b7b812 100644
+index 7f6d1e6cf3a1..cfef69c83fc3 100644
 --- third_party/libwebrtc/api/refcountedbase_gn/moz.build
 +++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11889,7 +11885,7 @@ index 42e693bf022a..e2d783b7b812 100644
 -
  Library("refcountedbase_gn")
 diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 1ff7960b4dd0..47846b31a453 100644
+index fd4c614cf3ad..e1f3176d41bf 100644
 --- third_party/libwebrtc/api/rtc_error_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_error_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12107,7 +12103,7 @@ index 1ff7960b4dd0..47846b31a453 100644
  
  Library("rtc_error_gn")
 diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index e478cf3e4c3c..8a92a62b9562 100644
+index 2f1418300a0c..f617051daad9 100644
 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12325,7 +12321,7 @@ index e478cf3e4c3c..8a92a62b9562 100644
  
  Library("rtc_event_log_gn")
 diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index 5b5cac9bf046..8691523b8dfc 100644
+index 033677891b16..a684eca109e1 100644
 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12543,7 +12539,7 @@ index 5b5cac9bf046..8691523b8dfc 100644
  
  Library("rtp_headers_gn")
 diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index 7bd7a37fb361..67fffb26c146 100644
+index c75ba8f4c4db..9b2ce7b59fef 100644
 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12760,221 +12756,10 @@ index 7bd7a37fb361..67fffb26c146 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("rtp_packet_info_gn")
-diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index ada3bfe3a22b..dd1ba2bc5bd3 100644
---- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
-+DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- 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
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "xul"
- 
-@@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    OS_LIBS += [
--        "log"
--    ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_NSS_CERTS"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_X11"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-     DEFINES["WEBRTC_ARCH_ARM64"] = True
-     DEFINES["WEBRTC_HAS_NEON"] = True
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_X11"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
--
--    OS_LIBS += [
--        "unwind"
--    ]
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--    CXXFLAGS += [
--        "-msse2"
--    ]
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
- Library("rtp_parameters_gn")
-diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index 5b41bb13cbbe..2ae22cf178d8 100644
---- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+diff --git third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
+index 69412fc87e29..37c9f2066f28 100644
+--- third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
++++ third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -13157,11 +12942,11 @@ index 5b41bb13cbbe..2ae22cf178d8 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("rtp_sender_interface_gn")
-diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index 89f5c0fcc118..ba3ef53ada72 100644
---- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-+++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
+ Library("rtp_packet_sender_gn")
+diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+index b92b2259d02d..d69843293695 100644
+--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
++++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -13184,7 +12969,7 @@ index 89f5c0fcc118..ba3ef53ada72 100644
  
  FINAL_LIBRARY = "xul"
  
-@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13272,13 +13057,6 @@ index 89f5c0fcc118..ba3ef53ada72 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
*** 15088 LINES SKIPPED ***