git: a9b8c9aa3c62 - main - www/firefox: update to 106.0 (rc1)

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Mon, 10 Oct 2022 17:49:29 UTC
The branch main has been updated by cmt:

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

commit a9b8c9aa3c62310a4b4abaff423ed661b52ac0bb
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2022-10-10 17:48:52 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2022-10-10 17:48:52 +0000

    www/firefox: update to 106.0 (rc1)
    
    Release Notes (soon):
      https://www.mozilla.org/en-US/firefox/106.0/releasenotes/
---
 www/firefox/Makefile                               |     8 +-
 www/firefox/distinfo                               |     6 +-
 www/firefox/files/patch-bug1559213                 |    39 +-
 www/firefox/files/patch-libwebrtc-generated        | 40463 +++++++++++++------
 www/firefox/files/patch-pipewire_init              |    68 +-
 ...rd__party_libwebrtc_build_config_BUILDCONFIG.gn |    31 +-
 6 files changed, 29040 insertions(+), 11575 deletions(-)

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index bc911522ff5d..617045a1df17 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	firefox
-DISTVERSION=	105.0.3
+DISTVERSION=	106.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.82:security/nss \
+		nss>=3.83:security/nss \
 		icu>=71.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=4.4.1:print/harfbuzz \
@@ -64,10 +64,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
-pre-configure:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
-	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
-
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index e596f29e80ab..8c1eff4b3dd1 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665168135
-SHA256 (firefox-105.0.3.source.tar.xz) = f2fa1e03aecdd4dca0bcda94fd228d3a9ef3635862a2c140f8982d32ae7761e7
-SIZE (firefox-105.0.3.source.tar.xz) = 484942048
+TIMESTAMP = 1665418749
+SHA256 (firefox-106.0.source.tar.xz) = 1546ebfd9d5a814f17479ed626519ed69aa3c89c22c7fb1fe5c84e4d7e5d7e18
+SIZE (firefox-106.0.source.tar.xz) = 500449804
diff --git a/www/firefox/files/patch-bug1559213 b/www/firefox/files/patch-bug1559213
index 09b4dcc58e83..49bbb0fb05ff 100644
--- a/www/firefox/files/patch-bug1559213
+++ b/www/firefox/files/patch-bug1559213
@@ -63,26 +63,27 @@ index 8509aec..eb6f129 100644
      EXPORTS += [
 diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
 index 0069865..e806fc8 100644
---- media/ffvpx/libavcodec/moz.build
+--- media/ffvpx/libavcodec/moz.build.orig
 +++ media/ffvpx/libavcodec/moz.build
-@@ -112,9 +112,15 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
-             'vaapi_vp8.c',
-             'vaapi_vp9.c',
-         ]
-+        if CONFIG["MOZ_SYSTEM_AV1"]:
-+          CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
-+          OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
-+        else:
-+          USE_LIBS += [
-+            'dav1d',
-+            'media_libdav1d_asm',
-+          ]
-         USE_LIBS += [
--          'dav1d',
--          'media_libdav1d_asm',
-           'mozva'
-         ]
- 
+@@ -108,10 +108,14 @@
+         'vp9prob.c',
+         'vp9recon.c'
+     ]
+-    USE_LIBS += [
+-        'dav1d',
+-        'media_libdav1d_asm',
+-    ]
++    if CONFIG["MOZ_SYSTEM_AV1"]:
++      CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
++      OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
++    else:
++      USE_LIBS += [
++          'dav1d',
++          'media_libdav1d_asm',
++      ]
+     if CONFIG['MOZ_WAYLAND']:
+         LOCAL_INCLUDES += ['/media/mozva']
+         SOURCES += [
 diff --git toolkit/moz.configure toolkit/moz.configure
 index 0069865..e806fc8 100644
 --- toolkit/moz.configure
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index d7f0fdecd9c8..925a9eebc060 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,14 +1,22 @@
+commit 92fd9b62fee80dc5abd172e1d1e15bb7d277b9fe
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+Date:   Sun Oct 9 19:16:04 2022 +0000
+
+    Regenerate build config for libwebrtc/Firefox 106
+
 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 445f027e82b0..c286ec3735a7 100644
+index 8fbfa680375d..f23f8119fc14 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
- 
+@@ -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
@@ -22,7 +30,7 @@ index 445f027e82b0..c286ec3735a7 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30,10 +38,11 @@ index 445f027e82b0..c286ec3735a7 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -46,6 +55,7 @@ index 445f027e82b0..c286ec3735a7 100644
 -
 -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
@@ -71,8 +81,10 @@ index 445f027e82b0..c286ec3735a7 100644
 -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
@@ -88,6 +100,7 @@ index 445f027e82b0..c286ec3735a7 100644
 -    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
@@ -105,10 +118,6 @@ index 445f027e82b0..c286ec3735a7 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -159,47 +168,44 @@ index 445f027e82b0..c286ec3735a7 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    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":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
+-    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("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 0ae35513c8c6..efaa7dd2f99c 100644
+index 06d73f689afb..a5ae7135d079 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
 +++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
- 
+@@ -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
@@ -213,7 +219,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -221,10 +227,11 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -237,6 +244,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
 -
 -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
@@ -262,8 +270,10 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
 -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
@@ -279,6 +289,7 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
 -    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
@@ -348,32 +359,38 @@ index 0ae35513c8c6..efaa7dd2f99c 100644
 -
 -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("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 fd8b99d9255f..682ad0f9d8bd 100644
+index 64f93961ccb7..acab459443e2 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
- 
+@@ -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
@@ -387,7 +404,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -40,164 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,161 +52,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -395,10 +412,11 @@ index fd8b99d9255f..682ad0f9d8bd 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -411,6 +429,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644
 -
 -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
@@ -436,8 +455,10 @@ index fd8b99d9255f..682ad0f9d8bd 100644
 -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
@@ -453,6 +474,7 @@ index fd8b99d9255f..682ad0f9d8bd 100644
 -    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
@@ -470,10 +492,6 @@ index fd8b99d9255f..682ad0f9d8bd 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["CPU_ARCH"] == "aarch64":
@@ -524,48 +542,45 @@ index fd8b99d9255f..682ad0f9d8bd 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    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":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
+-    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("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 c60ef9015b87..1558ddeca767 100644
+index d71f5541616d..558bb7943024 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -11,11 +11,20 @@ AllowCompilerWarnings()
- 
+@@ -12,11 +12,22 @@ 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
  DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
  DEFINES["WEBRTC_LIBRARY_IMPL"] = True
  DEFINES["WEBRTC_MOZILLA_BUILD"] = True
@@ -579,7 +594,7 @@ index c60ef9015b87..1558ddeca767 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -41,171 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,172 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -587,10 +602,11 @@ index c60ef9015b87..1558ddeca767 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -603,6 +619,7 @@ index c60ef9015b87..1558ddeca767 100644
 -
 -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
@@ -632,8 +649,10 @@ index c60ef9015b87..1558ddeca767 100644
 -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
@@ -649,6 +668,7 @@ index c60ef9015b87..1558ddeca767 100644
 -    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
@@ -722,48 +742,45 @@ index c60ef9015b87..1558ddeca767 100644
 -    ]
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
-+if CONFIG["CPU_ARCH"] == "x86":
- 
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
+-
 -    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":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
+-    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("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 ca213acc75c3..0c230f0ca1ee 100644
+index 51787695ffb8..438a82e5f08d 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
- 
+@@ -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
@@ -777,7 +794,7 @@ index ca213acc75c3..0c230f0ca1ee 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -41,164 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,165 +53,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -785,10 +802,11 @@ index ca213acc75c3..0c230f0ca1ee 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -801,6 +819,7 @@ index ca213acc75c3..0c230f0ca1ee 100644
 -
 -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
@@ -826,8 +845,10 @@ index ca213acc75c3..0c230f0ca1ee 100644
 -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
@@ -843,6 +864,7 @@ index ca213acc75c3..0c230f0ca1ee 100644
 -    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
@@ -914,47 +936,225 @@ index ca213acc75c3..0c230f0ca1ee 100644
 -
 -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 -
--    CXXFLAGS += [
--        "-msse2"
--    ]
--
 -    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":
-+if CONFIG["CPU_ARCH"] == "x86":
+-
+-    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_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
+--- 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()
+ 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
  
-     CXXFLAGS += [
-         "-msse2"
-     ]
+ FINAL_LIBRARY = "webrtc"
+ 
+@@ -37,153 +48,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
+-
+-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":
+-
+-    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_frame_api_gn")
+ 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 5da87da932c5..33ed59929936 100644
+index 8b0f06e3f145..29b7f946ba87 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
- 
+@@ -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
@@ -968,7 +1168,7 @@ index 5da87da932c5..33ed59929936 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -36,152 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,161 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -976,10 +1176,11 @@ index 5da87da932c5..33ed59929936 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -992,6 +1193,7 @@ index 5da87da932c5..33ed59929936 100644
 -
 -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
@@ -1017,8 +1219,10 @@ index 5da87da932c5..33ed59929936 100644
 -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
@@ -1034,6 +1238,7 @@ index 5da87da932c5..33ed59929936 100644
 -    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
@@ -1107,32 +1312,38 @@ index 5da87da932c5..33ed59929936 100644
 -
 -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_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 a5b0fc942700..32745274dc86 100644
+index e5049191901e..58234d4610d8 100644
 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -11,10 +11,19 @@ AllowCompilerWarnings()
- 
+@@ -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
@@ -1146,7 +1357,7 @@ index a5b0fc942700..32745274dc86 100644
  
  FINAL_LIBRARY = "webrtc"
  
-@@ -36,148 +45,11 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -37,157 +48,11 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1154,10 +1365,11 @@ index a5b0fc942700..32745274dc86 100644
 -if CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-    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
@@ -1170,6 +1382,7 @@ index a5b0fc942700..32745274dc86 100644
 -
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
*** 68289 LINES SKIPPED ***