git: 80898b526334 - main - www/firefox: update to 107.0 (rc1)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Nov 2022 20:52:08 UTC
The branch main has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=80898b526334682fb8e63f1a6e7e2c9029bfa19d
commit 80898b526334682fb8e63f1a6e7e2c9029bfa19d
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-11-07 20:51:37 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-11-07 20:51:37 +0000
www/firefox: update to 107.0 (rc1)
Release Notes (soon):
https://www.mozilla.org/en-US/firefox/107.0/releasenotes/
---
www/firefox/Makefile | 4 +-
www/firefox/distinfo | 6 +-
www/firefox/files/patch-libwebrtc-generated | 13885 +++++++++++--------
...patch-python_mozbuild_mozbuild_gn__processor.py | 30 +-
4 files changed, 7769 insertions(+), 6156 deletions(-)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2623d61a6053..bf87649f6ed6 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 106.0.5
+DISTVERSION= 107.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -11,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.83:security/nss \
+ nss>=3.84:security/nss \
icu>=71.1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=4.4.1:print/harfbuzz \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index c9a5939e0d5e..a261f5b893a1 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667588934
-SHA256 (firefox-106.0.5.source.tar.xz) = 9471a7610d0adc350f14c363f1fcd2e15a85f22744f5850604af01aa844bc8a8
-SIZE (firefox-106.0.5.source.tar.xz) = 500379208
+TIMESTAMP = 1667849286
+SHA256 (firefox-107.0.source.tar.xz) = 07a94156c10da66aa7e0bc165b3baf306934c2e199144148845d6d7faa92cf63
+SIZE (firefox-107.0.source.tar.xz) = 502971200
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 925a9eebc060..6025ef6fafc5 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,20 +1,19 @@
-commit 92fd9b62fee80dc5abd172e1d1e15bb7d277b9fe
+commit 798fee7dc5e46be98cf353e90548f560642199ef
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-Date: Sun Oct 9 19:16:04 2022 +0000
+Date: Mon Nov 7 20:21:22 2022 +0000
- Regenerate build config for libwebrtc/Firefox 106
+ Regenerate libwebrtc build config for Firefox 107.0
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 8fbfa680375d..f23f8119fc14 100644
+index 8fbfa680375d..ae63fb378f55 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -30,7 +29,7 @@ index 8fbfa680375d..f23f8119fc14 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -156,9 +155,10 @@ index 8fbfa680375d..f23f8119fc14 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -194,16 +194,15 @@ index 8fbfa680375d..f23f8119fc14 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..a5ae7135d079 100644
+index 06d73f689afb..c5891c7c798d 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -219,7 +218,7 @@ index 06d73f689afb..a5ae7135d079 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -341,9 +340,10 @@ index 06d73f689afb..a5ae7135d079 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -379,16 +379,15 @@ index 06d73f689afb..a5ae7135d079 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 64f93961ccb7..acab459443e2 100644
+index 64f93961ccb7..b9e2837ed52e 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -404,7 +403,7 @@ index 64f93961ccb7..acab459443e2 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -530,9 +529,10 @@ index 64f93961ccb7..acab459443e2 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -568,16 +568,15 @@ index 64f93961ccb7..acab459443e2 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 d71f5541616d..558bb7943024 100644
+index d71f5541616d..a7fe2cda7f26 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -12,11 +12,22 @@ AllowCompilerWarnings()
+@@ -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["USE_X11"] = "1"
DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "0"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -594,7 +593,7 @@ index d71f5541616d..558bb7943024 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -731,9 +730,10 @@ index d71f5541616d..558bb7943024 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -769,16 +769,15 @@ index d71f5541616d..558bb7943024 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 51787695ffb8..438a82e5f08d 100644
+index 51787695ffb8..2e07cdc574e5 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -794,7 +793,7 @@ index 51787695ffb8..438a82e5f08d 100644
FINAL_LIBRARY = "webrtc"
-@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +52,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -924,9 +923,10 @@ index 51787695ffb8..438a82e5f08d 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -962,16 +962,15 @@ index 51787695ffb8..438a82e5f08d 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..89b60b6adcc7 100644
+index c284e7a34fd9..d5f3c49482ac 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -987,7 +986,7 @@ index c284e7a34fd9..89b60b6adcc7 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,153 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1105,9 +1104,10 @@ index c284e7a34fd9..89b60b6adcc7 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -1143,16 +1143,15 @@ index c284e7a34fd9..89b60b6adcc7 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..29b7f946ba87 100644
+index 8b0f06e3f145..2be918cdbead 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1168,7 +1167,7 @@ index 8b0f06e3f145..29b7f946ba87 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1294,9 +1293,10 @@ index 8b0f06e3f145..29b7f946ba87 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -1332,16 +1332,15 @@ index 8b0f06e3f145..29b7f946ba87 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..58234d4610d8 100644
+index e5049191901e..35a84d063d3d 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -12,10 +12,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1357,7 +1356,7 @@ index e5049191901e..58234d4610d8 100644
FINAL_LIBRARY = "webrtc"
-@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1479,9 +1478,10 @@ index e5049191901e..58234d4610d8 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -1517,16 +1517,15 @@ index e5049191901e..58234d4610d8 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 d025ed5250e6..419f847fe20f 100644
+index d025ed5250e6..8ec8ad30d40b 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1542,7 +1541,7 @@ index d025ed5250e6..419f847fe20f 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1672,9 +1671,10 @@ index d025ed5250e6..419f847fe20f 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -1710,16 +1710,15 @@ index d025ed5250e6..419f847fe20f 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 186075c3592b..7797ed797e36 100644
+index 186075c3592b..07db614cbc2b 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1735,7 +1734,7 @@ index 186075c3592b..7797ed797e36 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1865,9 +1864,10 @@ index 186075c3592b..7797ed797e36 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -1903,16 +1903,15 @@ index 186075c3592b..7797ed797e36 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 7c58a9f33356..72833fd6f9aa 100644
+index 7c58a9f33356..8726a7a6063d 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -1928,7 +1927,7 @@ index 7c58a9f33356..72833fd6f9aa 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,165 +55,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,165 +54,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2058,9 +2057,10 @@ index 7c58a9f33356..72833fd6f9aa 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -2096,16 +2096,15 @@ index 7c58a9f33356..72833fd6f9aa 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 2358f3537290..ab88b7abb087 100644
+index 2358f3537290..07a254f760fb 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,25 @@ AllowCompilerWarnings()
+@@ -12,12 +12,24 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2125,7 +2124,7 @@ index 2358f3537290..ab88b7abb087 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,220 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,220 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2279,9 +2278,10 @@ index 2358f3537290..ab88b7abb087 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -2348,16 +2348,15 @@ index 2358f3537290..ab88b7abb087 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 e43ff4a5fe68..09c6d9c245ce 100644
+index e43ff4a5fe68..060bfa387087 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,25 @@ AllowCompilerWarnings()
+@@ -12,12 +12,24 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2377,7 +2376,7 @@ index e43ff4a5fe68..09c6d9c245ce 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,220 +56,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,220 +55,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2531,9 +2530,10 @@ index e43ff4a5fe68..09c6d9c245ce 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
@@ -2600,16 +2600,15 @@ index e43ff4a5fe68..09c6d9c245ce 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 5756aae03b99..904d42838080 100644
+index 5756aae03b99..d8962da6b881 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2625,7 +2624,7 @@ index 5756aae03b99..904d42838080 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2755,9 +2754,10 @@ index 5756aae03b99..904d42838080 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
-
- OS_LIBS += [
@@ -2793,16 +2793,15 @@ index 5756aae03b99..904d42838080 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 3bb22b01e15e..b9faa14f0843 100644
+index 3bb22b01e15e..6c62151f3d29 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,21 @@ AllowCompilerWarnings()
+@@ -12,10 +12,20 @@ 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["USE_X11"] = "1"
+DEFINES["WEBRTC_BSD"] = True
+DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -2818,200 +2817,7 @@ index 3bb22b01e15e..b9faa14f0843 100644
FINAL_LIBRARY = "webrtc"
-@@ -41,165 +52,11 @@ 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_AVX2"] = 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_ENABLE_AVX2"] = True
-- 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_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_AVX2"] = 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["UNICODE"] = True
-- DEFINES["USE_AURA"] = "1"
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-- 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
--
-- OS_LIBS += [
-- "winmm"
-- ]
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["CPU_ARCH"] == "aarch64":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["CPU_ARCH"] == "arm":
--
-- CXXFLAGS += [
-- "-mfpu=neon"
-- ]
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = 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["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
--
-- OS_LIBS += [
-- "android_support",
-- "unwind"
-- ]
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
--
-- OS_LIBS += [
-- "android_support"
-- ]
--
--if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
--
-- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-- DEFINES["_GNU_SOURCE"] = True
--
- 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 a9afcbe28056..3866e0ea8547 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,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["USE_X11"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
-+DEFINES["WEBRTC_ENABLE_AVX2"] = 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["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
-
- FINAL_LIBRARY = "webrtc"
-
-@@ -41,165 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3141,9 +2947,203 @@ index a9afcbe28056..3866e0ea8547 100644
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
+-
+- OS_LIBS += [
+- "android_support",
+- "unwind"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+-
+- OS_LIBS += [
+- "android_support"
+- ]
+-
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
-
+- DEFINES["WEBRTC_ENABLE_AVX2"] = True
+- DEFINES["_GNU_SOURCE"] = True
+-
+ 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 a9afcbe28056..427e38b00c24 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()
+ 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_AVX2"] = 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["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+
+ FINAL_LIBRARY = "webrtc"
+
+@@ -41,165 +51,15 @@ 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_AVX2"] = 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_ENABLE_AVX2"] = True
+- 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_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
+-
*** 27149 LINES SKIPPED ***