git: 8c0b93b0f6b9 - 2025Q3 - www/firefox: update to 141.0 (rc1)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 14 Jul 2025 21:27:45 UTC
The branch 2025Q3 has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8c0b93b0f6b9c2da0f09c307b4023ab6bcbaa756
commit 8c0b93b0f6b9c2da0f09c307b4023ab6bcbaa756
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2025-07-14 21:24:02 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2025-07-14 21:26:53 +0000
www/firefox: update to 141.0 (rc1)
Release Notes (soon):
https://www.mozilla.org/en-US/firefox/141.0/releasenotes/
(cherry picked from commit 5c60310083d8a7efbe868bb5bd96eae7d06de6c1)
---
www/firefox/Makefile | 2 +-
www/firefox/distinfo | 6 +-
www/firefox/files/patch-libwebrtc-generated | 2740 ++++++++++----------
..._desktop__capture_linux_wayland__egl__dmabuf.cc | 10 +-
4 files changed, 1308 insertions(+), 1450 deletions(-)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 87450ec60b60..5fc5360bfe42 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 140.0.4
+DISTVERSION= 141.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 6dcb7ce7336e..edff255f89a5 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751909777
-SHA256 (firefox-140.0.4.source.tar.xz) = 4027beb34f43ce4da8c0053a1d740ec6a2e766dc8b700216316aa7adcc59e377
-SIZE (firefox-140.0.4.source.tar.xz) = 642671864
+TIMESTAMP = 1752526346
+SHA256 (firefox-141.0.source.tar.xz) = a3060c0bba9cc15902e7155fef60bb0c8bd6711fb19ab2ae8349450bfa4d1948
+SIZE (firefox-141.0.source.tar.xz) = 640136564
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index eb715bc55fbe..2b22311dac6a 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,7 +1,7 @@
-commit f65492631f8fa8714d72d09ba3fa5edf3b08bac3
+commit 8998c489b3e437f880147f0e2c516be1d731b082
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
- regenerate FreeBSD libwebrtc patch for gecko 140
+ regenerate FreeBSD libwebrtc patch for gecko 141
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 a29aef4b45e5..c193c4232adf 100644
@@ -1833,7 +1833,7 @@ index d650f934bf12..28f47d4bb60c 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 4013ba0e53e8..d6bf78db5064 100644
+index 69937649a37e..d6bf78db5064 100644
--- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -1857,7 +1857,7 @@ index 4013ba0e53e8..d6bf78db5064 100644
FINAL_LIBRARY = "xul"
-@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1903,6 +1903,10 @@ index 4013ba0e53e8..d6bf78db5064 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -1942,6 +1946,13 @@ index 4013ba0e53e8..d6bf78db5064 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
@@ -2474,7 +2485,7 @@ index 9720fc943734..43ee9e3a60aa 100644
Library("builtin_audio_processing_builder_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index f554fd6f8241..b068f7739302 100644
+index 1b9e728c732e..b068f7739302 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -2498,7 +2509,7 @@ index f554fd6f8241..b068f7739302 100644
FINAL_LIBRARY = "xul"
-@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2544,6 +2555,10 @@ index f554fd6f8241..b068f7739302 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -2583,6 +2598,13 @@ index f554fd6f8241..b068f7739302 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
@@ -2612,7 +2634,7 @@ index f554fd6f8241..b068f7739302 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2665,7 +2687,7 @@ index f554fd6f8241..b068f7739302 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 cc8409b4ab86..ae6f50e873d1 100644
+index 17f8ad132988..ae6f50e873d1 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -2689,7 +2711,7 @@ index cc8409b4ab86..ae6f50e873d1 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2735,6 +2757,10 @@ index cc8409b4ab86..ae6f50e873d1 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -2883,7 +2909,7 @@ index cc8409b4ab86..ae6f50e873d1 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 4c7addbccf20..87731b62a8fd 100644
+index 2ce54890f795..87731b62a8fd 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -2907,7 +2933,7 @@ index 4c7addbccf20..87731b62a8fd 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2953,6 +2979,10 @@ index 4c7addbccf20..87731b62a8fd 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -3101,7 +3131,7 @@ index 4c7addbccf20..87731b62a8fd 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 0cd4e6611370..e1bdc203eda4 100644
+index fa169cd9554f..e1bdc203eda4 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -3125,7 +3155,7 @@ index 0cd4e6611370..e1bdc203eda4 100644
FINAL_LIBRARY = "xul"
-@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3171,6 +3201,10 @@ index 0cd4e6611370..e1bdc203eda4 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -3765,7 +3799,7 @@ index e37b27978fb1..1532babfe849 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 edebd9ce86d9..05322dea51b6 100644
+index ff8f963180db..05322dea51b6 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -3789,7 +3823,7 @@ index edebd9ce86d9..05322dea51b6 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3835,6 +3869,10 @@ index edebd9ce86d9..05322dea51b6 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -3983,7 +4021,7 @@ index edebd9ce86d9..05322dea51b6 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 40dbaf52b249..7863dd9e6633 100644
+index b25dbdcd7ff2..7863dd9e6633 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -4007,7 +4045,7 @@ index 40dbaf52b249..7863dd9e6633 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4053,6 +4091,10 @@ index 40dbaf52b249..7863dd9e6633 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -4201,7 +4243,7 @@ index 40dbaf52b249..7863dd9e6633 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 376963441f83..94f0257efd1e 100644
+index 8db666948a82..94f0257efd1e 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -4225,7 +4267,7 @@ index 376963441f83..94f0257efd1e 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4271,6 +4313,10 @@ index 376963441f83..94f0257efd1e 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -4419,7 +4465,7 @@ index 376963441f83..94f0257efd1e 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 982fb48b055c..fabe33115004 100644
+index 57f61d6c5158..fabe33115004 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -4443,7 +4489,7 @@ index 982fb48b055c..fabe33115004 100644
FINAL_LIBRARY = "xul"
-@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4489,204 +4535,212 @@ index 982fb48b055c..fabe33115004 100644
- 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_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
--
- OS_LIBS += [
-- "crypt32",
-- "iphlpapi",
-- "secur32",
-- "winmm"
-- ]
-+ DEFINES["_DEBUG"] = True
-
- if CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
--if CONFIG["TARGET_CPU"] == "loongarch64":
--
-- DEFINES["_GNU_SOURCE"] = 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":
-
-@@ -162,50 +69,8 @@ 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":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
- DEFINES["USE_X11"] = "1"
-
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
--
-- OS_LIBS += [
-- "unwind"
-- ]
--
--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["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
-- DEFINES["_GNU_SOURCE"] = True
--
- 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 b8593150d582..4d357bd55c31 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
-@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
- 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_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,186 +53,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_LINUX"] = True
-- DEFINES["WEBRTC_POSIX"] = True
-- DEFINES["_GNU_SOURCE"] = True
-- DEFINES["__STDC_CONSTANT_MACROS"] = True
-- DEFINES["__STDC_FORMAT_MACROS"] = True
--
-- OS_LIBS += [
-- "log"
+- "rt"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+- DEFINES["USE_GLIB"] = "1"
+- DEFINES["USE_OZONE"] = "1"
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_BSD"] = 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
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
++ DEFINES["_DEBUG"] = True
+
+ if CONFIG["TARGET_CPU"] == "aarch64":
+
+ DEFINES["WEBRTC_ARCH_ARM64"] = True
+ DEFINES["WEBRTC_HAS_NEON"] = True
+
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+- DEFINES["WEBRTC_ARCH_ARM"] = True
+- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+- DEFINES["WEBRTC_HAS_NEON"] = True
+-
+-if CONFIG["TARGET_CPU"] == "loongarch64":
+-
+- DEFINES["_GNU_SOURCE"] = 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":
+
+@@ -166,50 +69,8 @@ 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":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+
+ DEFINES["USE_X11"] = "1"
+
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+- OS_LIBS += [
+- "unwind"
+- ]
+-
+-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["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+- DEFINES["_GNU_SOURCE"] = True
+-
+ 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 4b5ec790299c..4d357bd55c31 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
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
+ 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_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,190 +53,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_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_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
+-
+- OS_LIBS += [
+- "rt"
- ]
-
--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_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"
@@ -4835,7 +4889,7 @@ index b8593150d582..4d357bd55c31 100644
Library("audio_encoder_g722_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 bf3eeaa88803..de644f4d586e 100644
+index f584cbcef92e..de644f4d586e 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -4859,7 +4913,7 @@ index bf3eeaa88803..de644f4d586e 100644
FINAL_LIBRARY = "xul"
-@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4905,6 +4959,10 @@ index bf3eeaa88803..de644f4d586e 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -5053,7 +5111,7 @@ index bf3eeaa88803..de644f4d586e 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 7c069bac99c3..e1b09fbd1410 100644
+index e33383e9661f..e1b09fbd1410 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -5077,7 +5135,7 @@ index 7c069bac99c3..e1b09fbd1410 100644
FINAL_LIBRARY = "xul"
-@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5123,6 +5181,10 @@ index 7c069bac99c3..e1b09fbd1410 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -5198,7 +5260,7 @@ index 7c069bac99c3..e1b09fbd1410 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5473,7 +5535,7 @@ index d7116c1b25af..d2fdc6c52b17 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 44bd92989657..2e9b48f8a1ca 100644
+index 336291788c67..2e9b48f8a1ca 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
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -5497,7 +5559,7 @@ index 44bd92989657..2e9b48f8a1ca 100644
FINAL_LIBRARY = "xul"
-@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5543,6 +5605,10 @@ index 44bd92989657..2e9b48f8a1ca 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -7747,7 +7813,7 @@ index 0996db596135..a32dc41fe41f 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 0b458299cbb0..fc391b227ad3 100644
+index cdd4eda497c2..fc391b227ad3 100644
--- third_party/libwebrtc/api/environment/environment_gn/moz.build
+++ third_party/libwebrtc/api/environment/environment_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7771,7 +7837,7 @@ index 0b458299cbb0..fc391b227ad3 100644
FINAL_LIBRARY = "xul"
-@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7789,6 +7855,10 @@ index 0b458299cbb0..fc391b227ad3 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -7813,6 +7883,10 @@ index 0b458299cbb0..fc391b227ad3 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -7852,6 +7926,13 @@ index 0b458299cbb0..fc391b227ad3 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
@@ -7881,7 +7962,7 @@ index 0b458299cbb0..fc391b227ad3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7934,7 +8015,7 @@ index 0b458299cbb0..fc391b227ad3 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 8256e9ef6578..71085b8a0208 100644
+index 8bda4043be6b..71085b8a0208 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -7958,7 +8039,7 @@ index 8256e9ef6578..71085b8a0208 100644
FINAL_LIBRARY = "xul"
-@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8004,6 +8085,10 @@ index 8256e9ef6578..71085b8a0208 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "rt"
+- ]
+-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["USE_GLIB"] = "1"
@@ -8043,6 +8128,13 @@ index 8256e9ef6578..71085b8a0208 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
@@ -8072,7 +8164,7 @@ index 8256e9ef6578..71085b8a0208 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8530,7 +8622,7 @@ index a6f7605626bc..f28ccdfa0f3d 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 83b184870ac0..a6ca7af93bd2 100644
+index 416a862b2e3b..a6ca7af93bd2 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -8554,7 +8646,7 @@ index 83b184870ac0..a6ca7af93bd2 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8600,6 +8692,10 @@ index 83b184870ac0..a6ca7af93bd2 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
*** 3394 LINES SKIPPED ***