git: 71c72996de55 - main - www/firefox: update to 112.0 (rc1)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Apr 2023 20:48:25 UTC
The branch main has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=71c72996de55f6ec75b1fc1f3d10cdb5bd937f62
commit 71c72996de55f6ec75b1fc1f3d10cdb5bd937f62
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2023-04-03 20:47:55 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2023-04-03 20:47:55 +0000
www/firefox: update to 112.0 (rc1)
Release Notes (soon):
https://www.mozilla.org/en-US/firefox/112.0/releasenotes/
---
www/firefox/Makefile | 11 +-
www/firefox/distinfo | 6 +-
www/firefox/files/patch-bug1659612 | 22 +-
www/firefox/files/patch-libwebrtc-generated | 32566 ++++++++++++--------------
4 files changed, 14400 insertions(+), 18205 deletions(-)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 0fe303d40352..4f56f9234160 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,10 +1,9 @@
PORTNAME= firefox
-DISTVERSION= 111.0.1
-PORTREVISION= 2
+DISTVERSION= 112.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,14 +11,14 @@ 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.88:security/nss \
+ nss>=3.89:security/nss \
icu>=72.1:devel/icu \
libevent>=2.1.8:devel/libevent \
- harfbuzz>=6.0.0:print/harfbuzz \
+ harfbuzz>=7.1.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
png>=1.6.39:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
- libvpx>=1.12.0:multimedia/libvpx \
+ libvpx>=1.13.0:multimedia/libvpx \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
v4l_compat>0:multimedia/v4l_compat \
autoconf2.13:devel/autoconf2.13 \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index e6e3cf3e2ac9..a5c0e1e91e34 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679420747
-SHA256 (firefox-111.0.1.source.tar.xz) = 84a4f3aba62df6e0451cdd28f8f1e59840d77c4062311947b0e59325c2ebdce8
-SIZE (firefox-111.0.1.source.tar.xz) = 496209640
+TIMESTAMP = 1680553089
+SHA256 (firefox-112.0.source.tar.xz) = 2ada818a5ce5b8fd99b935589ed361913cd04f677ae3576c89ac0b43a877b5e4
+SIZE (firefox-112.0.source.tar.xz) = 499177808
diff --git a/www/firefox/files/patch-bug1659612 b/www/firefox/files/patch-bug1659612
index dce125b883d2..a7aea97734a0 100644
--- a/www/firefox/files/patch-bug1659612
+++ b/www/firefox/files/patch-bug1659612
@@ -20,16 +20,22 @@ media/libcubeb/src/cubeb_alsa.c:1168:3: note: include the header <stdlib.h> or e
^
2 errors generated.
---- media/libcubeb/src/cubeb_alsa.c.orig 2021-08-31 14:26:24.530548000 +0200
-+++ media/libcubeb/src/cubeb_alsa.c 2021-08-31 14:26:43.081470000 +0200
-@@ -5,9 +5,7 @@
+--- media/libcubeb/src/cubeb_alsa.c.orig 2023-03-29 20:51:00.139281000 +0200
++++ media/libcubeb/src/cubeb_alsa.c 2023-03-29 20:51:46.219013000 +0200
+@@ -5,12 +5,16 @@
* accompanying file LICENSE for details.
*/
#undef NDEBUG
--#define _DEFAULT_SOURCE
--#define _BSD_SOURCE
--#define _XOPEN_SOURCE 500
-+#define _GNU_SOURCE 1
++#if defined(__FreeBSD__)
++#define _GNU_SOURCE
++#else
+ #define _DEFAULT_SOURCE
+ #define _BSD_SOURCE
+ #if defined(__NetBSD__)
+ #define _NETBSD_SOURCE /* timersub() */
+ #endif
+ #define _XOPEN_SOURCE 500
++#endif
#include "cubeb-internal.h"
#include "cubeb/cubeb.h"
- #include <alsa/asoundlib.h>
+ #include "cubeb_tracing.h"
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index b3180fb5ac6b..4027904e444e 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,10 +1,10 @@
-commit 14e939dae32f05703a4695064fedf00370e09ca0
+commit d838b64e015cf57136f26fa6bf56647753501016
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
- regenerate FreeBSD libwebrtc patch for Firefox 111
+ regenerate FreeBSD libwebrtc patch for Firefox 112
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 85e236f6f9b8..444bc70b7858 100644
+index a6f71dc2fd6d..ebf03d2e58ef 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()
@@ -28,7 +28,7 @@ index 85e236f6f9b8..444bc70b7858 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,169 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -203,7 +203,7 @@ index 85e236f6f9b8..444bc70b7858 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 06d73f689afb..c5891c7c798d 100644
+index 786830328170..3cf98fead5cc 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -227,7 +227,7 @@ index 06d73f689afb..c5891c7c798d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -388,7 +388,7 @@ index 06d73f689afb..c5891c7c798d 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 ac1dc8fbc4c7..4f97d9412ced 100644
+index 06d00e524946..f78f3f6dc146 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()
@@ -412,7 +412,7 @@ index ac1dc8fbc4c7..4f97d9412ced 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,169 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -587,7 +587,7 @@ index ac1dc8fbc4c7..4f97d9412ced 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 a56dc7457a62..7e6ed72139b6 100644
+index a01c28a0335f..b9e3e0147e0c 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()
@@ -612,7 +612,7 @@ index a56dc7457a62..7e6ed72139b6 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"
@@ -798,7 +798,7 @@ index a56dc7457a62..7e6ed72139b6 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 ab90d0efe1c3..13731a75d898 100644
+index cfe6c32be69f..b504253531d1 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()
@@ -822,7 +822,7 @@ index ab90d0efe1c3..13731a75d898 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"
@@ -1001,7 +1001,7 @@ index ab90d0efe1c3..13731a75d898 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 c284e7a34fd9..d5f3c49482ac 100644
+index 364e4050adca..9c9958635596 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()
@@ -1025,7 +1025,7 @@ index c284e7a34fd9..d5f3c49482ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1182,7 +1182,7 @@ index c284e7a34fd9..d5f3c49482ac 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 8b0f06e3f145..2be918cdbead 100644
+index f97d29722a62..0698e8bca389 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()
@@ -1206,7 +1206,7 @@ index 8b0f06e3f145..2be918cdbead 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,161 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1371,7 +1371,7 @@ index 8b0f06e3f145..2be918cdbead 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 e5049191901e..35a84d063d3d 100644
+index b59aa622176e..31860d843683 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()
@@ -1395,7 +1395,7 @@ index e5049191901e..35a84d063d3d 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1556,7 +1556,7 @@ index e5049191901e..35a84d063d3d 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 847ec7170c2d..88239c6bf5d9 100644
+index 02803d34938b..163611a96529 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()
@@ -1580,7 +1580,7 @@ index 847ec7170c2d..88239c6bf5d9 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1759,7 +1759,7 @@ index 847ec7170c2d..88239c6bf5d9 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 284bee100aba..a89b9e1d77ac 100644
+index 69ca41b49442..4be558192e66 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()
@@ -1783,7 +1783,7 @@ index 284bee100aba..a89b9e1d77ac 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1962,7 +1962,7 @@ index 284bee100aba..a89b9e1d77ac 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 083670fe3e13..c59a2cb042c2 100644
+index f7adf8f1dfbe..c44aaf96d795 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()
@@ -1986,7 +1986,7 @@ index 083670fe3e13..c59a2cb042c2 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,173 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2165,7 +2165,7 @@ index 083670fe3e13..c59a2cb042c2 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 68529faf9f7b..2607c1e67622 100644
+index 791b16d94d2e..8635fe5558fe 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()
@@ -2193,7 +2193,7 @@ index 68529faf9f7b..2607c1e67622 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,228 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,228 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2427,7 +2427,7 @@ index 68529faf9f7b..2607c1e67622 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 78d127c4705c..244b262ce017 100644
+index 7b6d15cdfc0c..5763214e8745 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()
@@ -2455,7 +2455,7 @@ index 78d127c4705c..244b262ce017 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,228 +55,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,228 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2689,7 +2689,7 @@ index 78d127c4705c..244b262ce017 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 ed36a5d51bdb..0ba91bc9d8b7 100644
+index aa598bdfc240..dbe7cd4539d5 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()
@@ -2713,7 +2713,7 @@ index ed36a5d51bdb..0ba91bc9d8b7 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2892,7 +2892,7 @@ index ed36a5d51bdb..0ba91bc9d8b7 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 df9d0a4d6c27..90c08de8b7ab 100644
+index b6f1eccd5ea2..895634e854f5 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()
@@ -2916,7 +2916,7 @@ index df9d0a4d6c27..90c08de8b7ab 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3095,7 +3095,7 @@ index df9d0a4d6c27..90c08de8b7ab 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 11734d7437e2..708a3fdd390f 100644
+index acb5f503b9fc..9e5e84c4ac02 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()
@@ -3119,7 +3119,7 @@ index 11734d7437e2..708a3fdd390f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3298,7 +3298,7 @@ index 11734d7437e2..708a3fdd390f 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 3e710cfd51dc..9d46d596bd05 100644
+index 073bd3e1e662..9f1f7a87b746 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()
@@ -3322,7 +3322,7 @@ index 3e710cfd51dc..9d46d596bd05 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,161 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3341,6 +3341,10 @@ index 3e710cfd51dc..9d46d596bd05 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3406,6 +3410,10 @@ index 3e710cfd51dc..9d46d596bd05 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -3479,7 +3487,7 @@ index 3e710cfd51dc..9d46d596bd05 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 8d3441442969..5b7cb1f3d897 100644
+index 1fd7bb995a3e..dfd010766aa1 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()
@@ -3503,7 +3511,7 @@ index 8d3441442969..5b7cb1f3d897 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,173 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,173 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3682,7 +3690,7 @@ index 8d3441442969..5b7cb1f3d897 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 9c9dc1fef2c6..cc69459ff586 100644
+index 5723e03e8602..afef52727f1c 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()
@@ -3706,7 +3714,7 @@ index 9c9dc1fef2c6..cc69459ff586 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,180 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,180 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3892,7 +3900,7 @@ index 9c9dc1fef2c6..cc69459ff586 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 4cf820803941..3ef29f916d87 100644
+index 40443414c840..6e0a6b748386 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()
@@ -3916,7 +3924,7 @@ index 4cf820803941..3ef29f916d87 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4073,7 +4081,7 @@ index 4cf820803941..3ef29f916d87 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 b05f5142c93d..01cc1674c14e 100644
+index 930dd938889a..46ba53c9063b 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()
@@ -4097,7 +4105,7 @@ index b05f5142c93d..01cc1674c14e 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,180 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,180 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4284,10 +4292,10 @@ index b05f5142c93d..01cc1674c14e 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 ae427db481e0..000000000000
+index 6580e1f599b2..000000000000
--- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
+++ /dev/null
-@@ -1,92 +0,0 @@
+@@ -1,93 +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/.
@@ -4325,6 +4333,7 @@ index ae427db481e0..000000000000
-
-LOCAL_INCLUDES += [
- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
- "/ipc/chromium/src",
- "/third_party/libwebrtc/",
- "/third_party/libwebrtc/third_party/abseil-cpp/",
@@ -4381,7 +4390,7 @@ index ae427db481e0..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 e3ef68e23570..a1e8097db94a 100644
+index c21933e10e5b..256f6292b7ce 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()
@@ -4405,7 +4414,7 @@ index e3ef68e23570..a1e8097db94a 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,159 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,159 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4570,7 +4579,7 @@ index e3ef68e23570..a1e8097db94a 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 cdff79e2c7d3..7e72a8ededa9 100644
+index e96e54f45097..280545fc8134 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()
@@ -4596,7 +4605,7 @@ index cdff79e2c7d3..7e72a8ededa9 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,216 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,216 +50,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4817,10 +4826,10 @@ index cdff79e2c7d3..7e72a8ededa9 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 acf5e3b6b2bd..000000000000
+index 9bb1ec62e60e..000000000000
--- third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
+++ /dev/null
-@@ -1,92 +0,0 @@
+@@ -1,93 +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 +4867,7 @@ index acf5e3b6b2bd..000000000000
-
-LOCAL_INCLUDES += [
- "!/ipc/ipdl/_ipdlheaders",
+- "!/third_party/libwebrtc/gen",
- "/ipc/chromium/src",
- "/third_party/libwebrtc/",
- "/third_party/libwebrtc/third_party/abseil-cpp/",
@@ -4914,7 +4924,7 @@ index acf5e3b6b2bd..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 00eb124b66a6..134d32df0e76 100644
+index 9a64a79c40dd..afe2f475fd25 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()
@@ -4938,7 +4948,7 @@ index 00eb124b66a6..134d32df0e76 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,159 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,159 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5103,7 +5113,7 @@ index 00eb124b66a6..134d32df0e76 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 85ed834881df..ec111c935c6a 100644
+index fb45423c93a3..15199c708a16 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()
@@ -5129,7 +5139,7 @@ index 85ed834881df..ec111c935c6a 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,216 +49,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,216 +50,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5349,7 +5359,7 @@ index 85ed834881df..ec111c935c6a 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 2bc9881db6a2..7c20cedc34c5 100644
+index 622d02e43eab..96cfc33b41c6 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()
@@ -5373,7 +5383,7 @@ index 2bc9881db6a2..7c20cedc34c5 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"
@@ -5552,7 +5562,7 @@ index 2bc9881db6a2..7c20cedc34c5 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 3359d9b0b85d..7d82c70e035e 100644
+index 10b96d1778ba..635edefde84c 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()
@@ -5576,7 +5586,7 @@ index 3359d9b0b85d..7d82c70e035e 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,161 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5595,6 +5605,10 @@ index 3359d9b0b85d..7d82c70e035e 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5660,6 +5674,10 @@ index 3359d9b0b85d..7d82c70e035e 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["CPU_ARCH"] == "aarch64":
@@ -5733,7 +5751,7 @@ index 3359d9b0b85d..7d82c70e035e 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 bdc96c2a26aa..19d5ce9a9a15 100644
+index bda49a2e1995..f85956c14c96 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()
@@ -5757,7 +5775,7 @@ index bdc96c2a26aa..19d5ce9a9a15 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"
@@ -5943,7 +5961,7 @@ index bdc96c2a26aa..19d5ce9a9a15 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 6bae0209af41..b47e3d6d35b5 100644
+index e52716911a1c..5898d8909f94 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()
@@ -5967,7 +5985,7 @@ index 6bae0209af41..b47e3d6d35b5 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"
@@ -6146,7 +6164,7 @@ index 6bae0209af41..b47e3d6d35b5 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 7c9c7f4af957..ef4c20575db0 100644
+index c2f28655abe9..f069d8709fd8 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,11 +12,21 @@ AllowCompilerWarnings()
@@ -6171,7 +6189,7 @@ index 7c9c7f4af957..ef4c20575db0 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,165 +56,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,165 +57,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6342,7 +6360,7 @@ index 7c9c7f4af957..ef4c20575db0 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 59e7a5af1c09..26d4e632df80 100644
+index 922abe89082f..ad68197840a9 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,10 +12,20 @@ AllowCompilerWarnings()
@@ -6366,7 +6384,7 @@ index 59e7a5af1c09..26d4e632df80 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"
@@ -6552,7 +6570,7 @@ index 59e7a5af1c09..26d4e632df80 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 af73a694f51f..7d317d5c3eb0 100644
+index 30c38b05d20c..82b0cb1ca134 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -6576,7 +6594,7 @@ index af73a694f51f..7d317d5c3eb0 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,169 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,169 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6751,7 +6769,7 @@ index af73a694f51f..7d317d5c3eb0 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 7154df99fcc0..6bfa9af65ffd 100644
+index f2816081b04b..5c347cf76308 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -6775,7 +6793,7 @@ index 7154df99fcc0..6bfa9af65ffd 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6936,7 +6954,7 @@ index 7154df99fcc0..6bfa9af65ffd 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 425aeeafa82c..62ea77045905 100644
+index 03ab38db1bb3..2b0b98b68569 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -6960,7 +6978,7 @@ index 425aeeafa82c..62ea77045905 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7117,7 +7135,7 @@ index 425aeeafa82c..62ea77045905 100644
-
Library("call_api_gn")
diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index 44caaf90094f..4fb736b419fc 100644
+index 7c3c3f8c57b0..b974c0624eb6 100644
--- third_party/libwebrtc/api/callfactory_api_gn/moz.build
+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -7141,7 +7159,7 @@ index 44caaf90094f..4fb736b419fc 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,170 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7315,7 +7333,7 @@ index 44caaf90094f..4fb736b419fc 100644
-
Library("callfactory_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 6b98ea51a638..d48614ca4acf 100644
+index 1202b94d5b0f..5cd0b886b125 100644
--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -7339,7 +7357,7 @@ index 6b98ea51a638..d48614ca4acf 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7500,7 +7518,7 @@ index 6b98ea51a638..d48614ca4acf 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 bb577371367e..3fbc6a37c593 100644
+index 1499258aeb09..4d113eee3667 100644
--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -7524,7 +7542,7 @@ index bb577371367e..3fbc6a37c593 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7685,7 +7703,7 @@ index bb577371367e..3fbc6a37c593 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 af911bf40841..b3928ae0d4ed 100644
+index 59a7a0ae74cf..a8e972660b67 100644
--- third_party/libwebrtc/api/crypto/options_gn/moz.build
+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -7709,7 +7727,7 @@ index af911bf40841..b3928ae0d4ed 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,182 +51,21 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,182 +52,21 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7897,7 +7915,7 @@ index af911bf40841..b3928ae0d4ed 100644
Library("options_gn")
diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index ea29beb6b0c7..855dbcea1112 100644
+index 7bbee761ed26..0dd9c7beb139 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -7921,7 +7939,7 @@ index ea29beb6b0c7..855dbcea1112 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8078,7 +8096,7 @@ index ea29beb6b0c7..855dbcea1112 100644
-
Library("fec_controller_api_gn")
diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index 813d5856192a..486b6a2fe58a 100644
+index 7c3a05951f44..0255dbdc1323 100644
--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -8102,7 +8120,7 @@ index 813d5856192a..486b6a2fe58a 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8259,7 +8277,7 @@ index 813d5856192a..486b6a2fe58a 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 a89762beef0c..eb60f39f5d55 100644
+index 20746d1925cf..1550d4f11bbd 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -8283,7 +8301,7 @@ index a89762beef0c..eb60f39f5d55 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,170 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8457,7 +8475,7 @@ index a89762beef0c..eb60f39f5d55 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 c262278451c8..ed26b77d1acd 100644
+index 3c0ed063cc47..4bd60cc0fb35 100644
--- third_party/libwebrtc/api/function_view_gn/moz.build
+++ third_party/libwebrtc/api/function_view_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -8481,7 +8499,7 @@ index c262278451c8..ed26b77d1acd 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,157 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8642,7 +8660,7 @@ index c262278451c8..ed26b77d1acd 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 24c1fe3c203d..e9b919471baa 100644
+index b34dcdb7481c..ce967df5e4f4 100644
--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -8666,7 +8684,7 @@ index 24c1fe3c203d..e9b919471baa 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -38,153 +48,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8822,10 +8840,10 @@ index 24c1fe3c203d..e9b919471baa 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("jingle_logging_api_gn")
-diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index 2fafcbf37fb0..091db6cf5490 100644
---- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+index 1723e5349490..d6c7b496a271 100644
+--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
++++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
@@ -12,10 +12,20 @@ AllowCompilerWarnings()
DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -8847,7 +8865,7 @@ index 2fafcbf37fb0..091db6cf5490 100644
*** 47855 LINES SKIPPED ***