git: d076c78e68c1 - main - www/firefox: update to 109.0 (rc1)

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Mon, 09 Jan 2023 21:15:56 UTC
The branch main has been updated by cmt:

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

commit d076c78e68c17b877b67d3e0b65c4b9b1a663781
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2023-01-09 21:15:22 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2023-01-09 21:15:22 +0000

    www/firefox: update to 109.0 (rc1)
    
    Release Notes (soon):
      https://www.mozilla.org/en-US/firefox/109.0/releasenotes/
---
 www/firefox/Makefile                        |     8 +-
 www/firefox/distinfo                        |     6 +-
 www/firefox/files/patch-bug847568           |    10 +-
 www/firefox/files/patch-libwebrtc-generated | 13568 ++++++++++++++------------
 4 files changed, 7273 insertions(+), 6319 deletions(-)

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index b3c481db551b..4b61bbe2dbdc 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,5 @@
 PORTNAME=	firefox
-DISTVERSION=	108.0.2
-PORTREVISION=	1
-# DISTVERSIONSUFFIX=	b9
+DISTVERSION=	109.0
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -13,12 +11,12 @@ 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.85:security/nss \
+		nss>=3.86:security/nss \
 		icu>=71.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=5.3.1:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
-		png>=1.6.37:graphics/png \
+		png>=1.6.39:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.12.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index adda894e7d9d..0e4cc3517d27 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672880783
-SHA256 (firefox-108.0.2.source.tar.xz) = 42e6d6b27ad0694a4fc9dd736888ad36c99eb2dbcce96e134584805d644ca300
-SIZE (firefox-108.0.2.source.tar.xz) = 509638740
+TIMESTAMP = 1673297409
+SHA256 (firefox-109.0.source.tar.xz) = 892237fdead5da1ee15e98d383f5cd0cf0cfa5590ee5156f63c486abacc42291
+SIZE (firefox-109.0.source.tar.xz) = 499318384
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 3161dbb88d08..2b3c5e14e99e 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -97,13 +97,9 @@ index b91d9c1..a97e6eb 100755
  echo If gfx/graphite2/src/files.mk has changed, please make corresponding
 diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla
 index 3180257..4587a3b 100644
---- gfx/harfbuzz/README-mozilla
-+++ gfx/harfbuzz/README-mozilla
-@@ -21,3 +21,8 @@ from within the gfx/harfbuzz directory.
- 
- If the collection of source files changes, manual updates to moz.build may be
- needed as we don't use the upstream makefiles.
-+
+--- /dev/null
++++ gfx/harfbuzz/README-mozilla.fbsd
+@@ -0,0 +1,4 @@
 +The in-tree copy may be omitted during build by --with-system-harfbuzz.
 +Make sure to keep pkg-config version check within toolkit/moz.configure in sync
 +with checkout version or increment latest tag by one if it's not based
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 5458f3d2df6e..a37c7b46294d 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,8 +1,7 @@
-commit 3dd423be3774ef9e3e9e9a8f0252a378520918fd
+commit b3770d8e7f0d6fc220353356066c4c1021f37bde
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-Date:   Sun Dec 4 21:38:16 2022 +0000
 
-    regenerate libwebrtc patch for Firefox 108
+    regenerate FreeBSD libwebrtc patch for Firefox 109
 
 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..ae63fb378f55 100644
@@ -8583,6 +8582,187 @@ 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
+@@ -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"
+ 
+@@ -37,153 +47,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
+-
+-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
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["CPU_ARCH"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["CPU_ARCH"] == "arm":
+-
+-    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":
++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("make_ref_counted_gn")
 diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 index 841bc83b09cd..d367856e783e 100644
 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
@@ -12188,10 +12368,10 @@ index edd79b3ce1a9..4c338c4a44c9 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("simulated_network_api_gn")
-diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index caf50afe35c1..fbf2388bdbfe 100644
---- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
+index c3887b4f2edd..f911e6bcc323 100644
+--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
++++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -12376,11 +12556,11 @@ index caf50afe35c1..fbf2388bdbfe 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("task_queue_gn")
-diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index 9ebe97971a49..42be461044e1 100644
---- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+ Library("pending_task_safety_flag_gn")
+diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+index caf50afe35c1..fbf2388bdbfe 100644
+--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
++++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -12402,7 +12582,7 @@ index 9ebe97971a49..42be461044e1 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12421,6 +12601,10 @@ index 9ebe97971a49..42be461044e1 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12561,11 +12745,11 @@ index 9ebe97971a49..42be461044e1 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("bitrate_settings_gn")
-diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index 74133ed40fef..51fd54da9869 100644
---- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+ Library("task_queue_gn")
+diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+index 9ebe97971a49..42be461044e1 100644
+--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
++++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -12587,7 +12771,7 @@ index 74133ed40fef..51fd54da9869 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12606,10 +12790,6 @@ index 74133ed40fef..51fd54da9869 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12675,10 +12855,6 @@ index 74133ed40fef..51fd54da9869 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -12688,6 +12864,10 @@ index 74133ed40fef..51fd54da9869 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -12750,11 +12930,11 @@ index 74133ed40fef..51fd54da9869 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("datagram_transport_interface_gn")
-diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index 700b5a83f026..0ec2d0d307f7 100644
---- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+ Library("bitrate_settings_gn")
+diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+index 74133ed40fef..51fd54da9869 100644
+--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
++++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -12776,7 +12956,7 @@ index 700b5a83f026..0ec2d0d307f7 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12877,10 +13057,6 @@ index 700b5a83f026..0ec2d0d307f7 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -12943,11 +13119,11 @@ index 700b5a83f026..0ec2d0d307f7 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("field_trial_based_config_gn")
-diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 15ad8475cee5..c998590d30dc 100644
---- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+ Library("datagram_transport_interface_gn")
+diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+index 700b5a83f026..0ec2d0d307f7 100644
+--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
++++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -12969,7 +13145,7 @@ index 15ad8475cee5..c998590d30dc 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12989,7 +13165,6 @@ index 15ad8475cee5..c998590d30dc 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -13018,11 +13193,6 @@ index 15ad8475cee5..c998590d30dc 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -13065,9 +13235,208 @@ index 15ad8475cee5..c998590d30dc 100644
 -    DEFINES["__STD_C"] = True
 -
 -    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
+-        "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":
++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("field_trial_based_config_gn")
+diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+index 15ad8475cee5..c998590d30dc 100644
+--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
++++ third_party/libwebrtc/api/transport/goog_cc_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,174 +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 += [
+-        "GLESv2",
+-        "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
+-
+-    OS_LIBS += [
+-        "dl",
+-        "rt"
+-    ]
+-
+-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 += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
 -        "winmm"
 -    ]
 +    DEFINES["_DEBUG"] = True
@@ -17147,7 +17516,7 @@ index 0eef21be59c9..18c24c05b243 100644
 -
  Library("video_frame_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index ebe06a2cc5b2..fecceee6a855 100644
+index 9c539a9e235d..8472c95023d5 100644
 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -17171,7 +17540,7 @@ index ebe06a2cc5b2..fecceee6a855 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,174 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,174 +57,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19081,7 +19450,7 @@ index 005c7222357d..cdc30aa176db 100644
 -
  Library("rtc_software_fallback_wrappers_gn")
 diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index 3b8aee86312b..574d68c4f54e 100644
+index 3a93583c1626..6aed057ed10b 100644
 --- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -19105,7 +19474,7 @@ index 3b8aee86312b..574d68c4f54e 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19124,6 +19493,10 @@ index 3b8aee86312b..574d68c4f54e 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19198,6 +19571,10 @@ index 3b8aee86312b..574d68c4f54e 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -19262,7 +19639,7 @@ index 3b8aee86312b..574d68c4f54e 100644
 -
  Library("scalability_mode_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index 071f18ce405a..716778253e78 100644
+index 3a056cb30770..511508ae346e 100644
 --- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
@@ -19286,7 +19663,7 @@ index 071f18ce405a..716778253e78 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -50,165 +60,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,165 +62,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19454,10 +19831,10 @@ index 071f18ce405a..716778253e78 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("video_codecs_api_gn")
-diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 7be7d67bee33..621ce78b9680 100644
---- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-+++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
+index 660d73625a3f..64f7fb530ab0 100644
+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -19479,7 +19856,7 @@ index 7be7d67bee33..621ce78b9680 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -41,174 +51,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19499,7 +19876,6 @@ index 7be7d67bee33..621ce78b9680 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -19528,11 +19904,6 @@ index 7be7d67bee33..621ce78b9680 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "dl",
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -19575,9 +19946,6 @@ index 7be7d67bee33..621ce78b9680 100644
 -    DEFINES["__STD_C"] = True
 -
 -    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
 -        "winmm"
 -    ]
 +    DEFINES["_DEBUG"] = True
@@ -19589,10 +19957,6 @@ index 7be7d67bee33..621ce78b9680 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -19655,11 +20019,11 @@ index 7be7d67bee33..621ce78b9680 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("vp8_temporal_layers_factory_gn")
-diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index c588b3ce0e8f..ded6e4680a88 100644
---- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+ Library("video_encoder_factory_template_gn")
+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
+index 5c1538f12c71..d56482c79d48 100644
+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -19681,7 +20045,7 @@ index c588b3ce0e8f..ded6e4680a88 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19700,6 +20064,11 @@ index c588b3ce0e8f..ded6e4680a88 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "GLESv2",
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19725,6 +20094,11 @@ index c588b3ce0e8f..ded6e4680a88 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "dl",
+-        "rt"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -19765,6 +20139,13 @@ index c588b3ce0e8f..ded6e4680a88 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -19836,11 +20217,11 @@ index c588b3ce0e8f..ded6e4680a88 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("video_track_source_constraints_gn")
-diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index 333c77706b0d..7b9c37cd58af 100644
---- third_party/libwebrtc/audio/audio_gn/moz.build
-+++ third_party/libwebrtc/audio/audio_gn/moz.build
+ Library("video_encoder_factory_template_libvpx_vp8_adapter_gn")
+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
+index 4535eb0ef68d..fae75a782896 100644
+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -19862,7 +20243,7 @@ index 333c77706b0d..7b9c37cd58af 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -54,174 +64,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19972,10 +20353,6 @@ index 333c77706b0d..7b9c37cd58af 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -20038,11 +20415,11 @@ index 333c77706b0d..7b9c37cd58af 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("audio_gn")
-diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index ef559b9bc6ee..cbfaaadb7d89 100644
---- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+ Library("video_encoder_factory_template_libvpx_vp9_adapter_gn")
+diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
+index 710652e8bc49..eabb80269a3c 100644
+--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
 @@ -12,10 +12,20 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -20064,7 +20441,7 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -43,172 +53,15 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,170 +47,15 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20084,6 +20461,7 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "GLESv2",
 -        "log"
 -    ]
 -
@@ -20113,6 +20491,7 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
+-        "dl",
 -        "rt"
 -    ]
 -
@@ -20172,10 +20551,6 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
  
 -if CONFIG["CPU_ARCH"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -20238,11 +20613,11 @@ index ef559b9bc6ee..cbfaaadb7d89 100644
 -    DEFINES["WEBRTC_ENABLE_AVX2"] = True
*** 20354 LINES SKIPPED ***