git: 88399891b06b - 2023Q4 - www/firefox: update to 119.0 (rc1)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Oct 2023 10:35:50 UTC
The branch 2023Q4 has been updated by cmt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=88399891b06bd739dedb4511296a635aa76ff81d
commit 88399891b06bd739dedb4511296a635aa76ff81d
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2023-10-17 10:32:12 +0000
Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2023-10-17 10:35:37 +0000
www/firefox: update to 119.0 (rc1)
Release Notes (soon):
https://www.mozilla.org/en-US/firefox/119.0/releasenotes/
(cherry picked from commit 64a6c939ed296f374df8492a6d3d2633154b7b14)
---
Mk/bsd.gecko.mk | 2 +-
www/firefox/Makefile | 8 +-
www/firefox/distinfo | 6 +-
www/firefox/files/patch-libwebrtc-generated | 2484 ++++++++++++++++-----------
4 files changed, 1469 insertions(+), 1031 deletions(-)
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 11c2a20b9d4c..bfa46b242b0f 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -80,7 +80,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD}
BUNDLE_LIBS= yes
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
- rust-cbindgen>=0.24.3:devel/rust-cbindgen \
+ rust-cbindgen>=0.26.0:devel/rust-cbindgen \
${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 06d9fbab6bf1..79ce284cf7bd 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,9 +1,9 @@
PORTNAME= firefox
-DISTVERSION= 118.0.2
+DISTVERSION= 119.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build2/source
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX}
MAINTAINER= gecko@FreeBSD.org
@@ -11,10 +11,10 @@ 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.93:security/nss \
+ nss>=3.94:security/nss \
icu>=73.1:devel/icu \
libevent>=2.1.8:devel/libevent \
- harfbuzz>=8.0.1:print/harfbuzz \
+ harfbuzz>=8.2.1:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
png>=1.6.39:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 3669d9e833fa..8a4da9c201f1 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696885278
-SHA256 (firefox-118.0.2.source.tar.xz) = 89626520f2f0f782f37c074b94690e0f08dcf416be2b992f4aad68df5d727b21
-SIZE (firefox-118.0.2.source.tar.xz) = 520864692
+TIMESTAMP = 1697527283
+SHA256 (firefox-119.0.source.tar.xz) = 6c84c48171da7edbec3f30b637814feb179ae85c3f7f29ba9c00dacbda517d6a
+SIZE (firefox-119.0.source.tar.xz) = 521569780
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index 933db150f486..065a36e2db1f 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,10 +1,10 @@
-commit 8a1cb79aa0534bfcac637a960b66a1b2689cba76
+commit fdfe9894a5854967e2c8ffb6759ca2e59b9fe6c6
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
- regenerate FreeBSD libwebrtc patch for Firefox 118
+ regenerate FreeBSD libwebrtc patch for Firefox 119
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 aa958f70420c..e6a2d969a1fd 100644
+index cf60c534b8df..e6a2d969a1fd 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -28,7 +28,7 @@ index aa958f70420c..e6a2d969a1fd 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93,6 +93,7 @@ index aa958f70420c..e6a2d969a1fd 100644
- 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
@@ -215,7 +216,7 @@ index aa958f70420c..e6a2d969a1fd 100644
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index e453cb8585d0..552c7e77985a 100644
+index d8f3d9bc8f6f..552c7e77985a 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -239,7 +240,7 @@ index e453cb8585d0..552c7e77985a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -304,6 +305,7 @@ index e453cb8585d0..552c7e77985a 100644
- 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
@@ -348,7 +350,7 @@ index e453cb8585d0..552c7e77985a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -408,7 +410,7 @@ index e453cb8585d0..552c7e77985a 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index c2d256488d9b..1b3eb3a6acb6 100644
+index d79aa2f0200c..1b3eb3a6acb6 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -432,7 +434,7 @@ index c2d256488d9b..1b3eb3a6acb6 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -497,6 +499,7 @@ index c2d256488d9b..1b3eb3a6acb6 100644
- 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
@@ -619,7 +622,7 @@ index c2d256488d9b..1b3eb3a6acb6 100644
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 9a644d357f67..f9c2d536b5d3 100644
+index 2c211f384b72..f9c2d536b5d3 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -644,7 +647,7 @@ index 9a644d357f67..f9c2d536b5d3 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -713,6 +716,7 @@ index 9a644d357f67..f9c2d536b5d3 100644
- 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
@@ -842,7 +846,7 @@ index 9a644d357f67..f9c2d536b5d3 100644
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index 6fac266c7368..ce2f85ba66dc 100644
+index 9248b91c2d92..ce2f85ba66dc 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -866,7 +870,7 @@ index 6fac266c7368..ce2f85ba66dc 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -931,6 +935,7 @@ index 6fac266c7368..ce2f85ba66dc 100644
- 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
@@ -1057,7 +1062,7 @@ index 6fac266c7368..ce2f85ba66dc 100644
Library("audio_frame_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index 1732aa7d0c9a..a6098a248028 100644
+index cb3495a89e19..a6098a248028 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1081,7 +1086,7 @@ index 1732aa7d0c9a..a6098a248028 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1142,6 +1147,7 @@ index 1732aa7d0c9a..a6098a248028 100644
- 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
@@ -1186,7 +1192,7 @@ index 1732aa7d0c9a..a6098a248028 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1246,7 +1252,7 @@ index 1732aa7d0c9a..a6098a248028 100644
-
Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 4eac2aa4b4f4..2df8ddd20ca2 100644
+index 0ef13b0f4588..2df8ddd20ca2 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1270,7 +1276,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1335,6 +1341,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
- 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
@@ -1383,7 +1390,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1443,7 +1450,7 @@ index 4eac2aa4b4f4..2df8ddd20ca2 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 2e128f80386d..6e4054510c88 100644
+index 81070090281f..6e4054510c88 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1467,7 +1474,7 @@ index 2e128f80386d..6e4054510c88 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1532,6 +1539,7 @@ index 2e128f80386d..6e4054510c88 100644
- 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
@@ -1576,7 +1584,7 @@ index 2e128f80386d..6e4054510c88 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1636,7 +1644,7 @@ index 2e128f80386d..6e4054510c88 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 87335c298d63..9f1caaa8645d 100644
+index ff00330a684c..9f1caaa8645d 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1660,7 +1668,7 @@ index 87335c298d63..9f1caaa8645d 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1725,6 +1733,7 @@ index 87335c298d63..9f1caaa8645d 100644
- 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
@@ -1851,7 +1860,7 @@ index 87335c298d63..9f1caaa8645d 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 49e0d546f1ce..57de72563f2e 100644
+index ee8f51ccb440..57de72563f2e 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -1875,7 +1884,7 @@ index 49e0d546f1ce..57de72563f2e 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1940,6 +1949,7 @@ index 49e0d546f1ce..57de72563f2e 100644
- 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
@@ -2066,7 +2076,7 @@ index 49e0d546f1ce..57de72563f2e 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 846946073ee1..0a34d8fdda8a 100644
+index e9984fe360ce..0a34d8fdda8a 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -2090,7 +2100,7 @@ index 846946073ee1..0a34d8fdda8a 100644
FINAL_LIBRARY = "webrtc"
-@@ -46,183 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,184 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2155,6 +2165,7 @@ index 846946073ee1..0a34d8fdda8a 100644
- 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
@@ -2281,7 +2292,7 @@ index 846946073ee1..0a34d8fdda8a 100644
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 366307ea13d7..7ea300e23f2a 100644
+index c0f6570d24b9..7ea300e23f2a 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
@@ -12,13 +12,22 @@ AllowCompilerWarnings()
@@ -2307,7 +2318,7 @@ index 366307ea13d7..7ea300e23f2a 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2376,6 +2387,7 @@ index 366307ea13d7..7ea300e23f2a 100644
- 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
@@ -2505,7 +2517,7 @@ index 366307ea13d7..7ea300e23f2a 100644
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index db0e3fbe00d5..0818f76d7b90 100644
+index bb012a151a7c..0818f76d7b90 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
@@ -12,13 +12,22 @@ AllowCompilerWarnings()
@@ -2531,7 +2543,7 @@ index db0e3fbe00d5..0818f76d7b90 100644
FINAL_LIBRARY = "webrtc"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2600,6 +2612,7 @@ index db0e3fbe00d5..0818f76d7b90 100644
- 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
@@ -2729,7 +2742,7 @@ index db0e3fbe00d5..0818f76d7b90 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 4782d01dd10f..588ec3b5b33b 100644
+index 2a3e692b812d..588ec3b5b33b 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -2753,7 +2766,7 @@ index 4782d01dd10f..588ec3b5b33b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2818,6 +2831,7 @@ index 4782d01dd10f..588ec3b5b33b 100644
- 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
@@ -2944,7 +2958,7 @@ index 4782d01dd10f..588ec3b5b33b 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 c972978c13ef..20d76c5496fa 100644
+index 7f89c91164f6..20d76c5496fa 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -2968,7 +2982,7 @@ index c972978c13ef..20d76c5496fa 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3033,6 +3047,7 @@ index c972978c13ef..20d76c5496fa 100644
- 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
@@ -3159,7 +3174,7 @@ index c972978c13ef..20d76c5496fa 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 77003c77a9dd..f738a9569a45 100644
+index 9dd0927ed536..f738a9569a45 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3183,7 +3198,7 @@ index 77003c77a9dd..f738a9569a45 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3248,6 +3263,7 @@ index 77003c77a9dd..f738a9569a45 100644
- 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
@@ -3374,7 +3390,7 @@ index 77003c77a9dd..f738a9569a45 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 41e1e248c525..2cc917d90aab 100644
+index 4ecf66bd1968..2cc917d90aab 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3398,7 +3414,7 @@ index 41e1e248c525..2cc917d90aab 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3463,6 +3479,7 @@ index 41e1e248c525..2cc917d90aab 100644
- 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
@@ -3511,7 +3528,7 @@ index 41e1e248c525..2cc917d90aab 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -3571,7 +3588,7 @@ index 41e1e248c525..2cc917d90aab 100644
-
Library("audio_encoder_g722_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index c3beba6cdb78..8f13941e25c3 100644
+index 36bd517e0079..8f13941e25c3 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3595,7 +3612,7 @@ index c3beba6cdb78..8f13941e25c3 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,183 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3660,6 +3677,7 @@ index c3beba6cdb78..8f13941e25c3 100644
- 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
@@ -3786,7 +3804,7 @@ index c3beba6cdb78..8f13941e25c3 100644
Library("audio_encoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index 53e9d1a4a7ef..ada577bf55ee 100644
+index f02bb1035f05..ada577bf55ee 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -3810,7 +3828,7 @@ index 53e9d1a4a7ef..ada577bf55ee 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3879,6 +3897,7 @@ index 53e9d1a4a7ef..ada577bf55ee 100644
- 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
@@ -4008,7 +4027,7 @@ index 53e9d1a4a7ef..ada577bf55ee 100644
Library("audio_decoder_ilbc_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-index 75737b8f19b0..008599051c34 100644
+index 28a357256253..008599051c34 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4032,7 +4051,7 @@ index 75737b8f19b0..008599051c34 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4093,6 +4112,7 @@ index 75737b8f19b0..008599051c34 100644
- 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
@@ -4137,7 +4157,7 @@ index 75737b8f19b0..008599051c34 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4197,7 +4217,7 @@ index 75737b8f19b0..008599051c34 100644
-
Library("audio_encoder_ilbc_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-index bddfe4219301..5d2f4376ee92 100644
+index 97953a5df078..5d2f4376ee92 100644
--- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4221,7 +4241,7 @@ index bddfe4219301..5d2f4376ee92 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4290,6 +4310,7 @@ index bddfe4219301..5d2f4376ee92 100644
- 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
@@ -4419,7 +4440,7 @@ index bddfe4219301..5d2f4376ee92 100644
Library("audio_encoder_ilbc_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 2b2bc6d9a7b7..fce4fdca7298 100644
+index 21c64c783062..fce4fdca7298 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4443,7 +4464,7 @@ index 2b2bc6d9a7b7..fce4fdca7298 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4508,6 +4529,7 @@ index 2b2bc6d9a7b7..fce4fdca7298 100644
- 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
@@ -4634,7 +4656,7 @@ index 2b2bc6d9a7b7..fce4fdca7298 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 e2c470d5ee58..0c7b461dd94a 100644
+index 9b1098290596..0c7b461dd94a 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4658,7 +4680,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,111 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4723,6 +4745,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
- 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
@@ -4771,7 +4794,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -153,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4831,7 +4854,7 @@ index e2c470d5ee58..0c7b461dd94a 100644
-
Library("audio_decoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index 58e6355a5568..c40633ff9ee4 100644
+index 24625fb77d03..c40633ff9ee4 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -4855,7 +4878,7 @@ index 58e6355a5568..c40633ff9ee4 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4924,6 +4947,7 @@ index 58e6355a5568..c40633ff9ee4 100644
- 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
@@ -5053,7 +5077,7 @@ index 58e6355a5568..c40633ff9ee4 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 91afd0a4e40a..27167f6f4829 100644
+index 2c2a46ea430d..27167f6f4829 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5077,7 +5101,7 @@ index 91afd0a4e40a..27167f6f4829 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5142,6 +5166,7 @@ index 91afd0a4e40a..27167f6f4829 100644
- 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
@@ -5268,7 +5293,7 @@ index 91afd0a4e40a..27167f6f4829 100644
Library("audio_encoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index 06732b48f469..0ccb94d1f9fb 100644
+index 5346ca5b1a16..0ccb94d1f9fb 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
@@ -12,12 +12,21 @@ AllowCompilerWarnings()
@@ -5293,7 +5318,7 @@ index 06732b48f469..0ccb94d1f9fb 100644
FINAL_LIBRARY = "webrtc"
-@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,176 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5354,6 +5379,7 @@ index 06732b48f469..0ccb94d1f9fb 100644
- 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
@@ -5476,7 +5502,7 @@ index 06732b48f469..0ccb94d1f9fb 100644
Library("audio_encoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index ab84d3f7559f..e4bcd225837a 100644
+index 09647c7b4de8..e4bcd225837a 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5500,7 +5526,7 @@ index ab84d3f7559f..e4bcd225837a 100644
FINAL_LIBRARY = "webrtc"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5569,6 +5595,7 @@ index ab84d3f7559f..e4bcd225837a 100644
- 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
@@ -5698,7 +5725,7 @@ index ab84d3f7559f..e4bcd225837a 100644
Library("audio_encoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index 1b19c42e986c..8d416085b79b 100644
+index 9e2bb7030b2b..8d416085b79b 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5722,7 +5749,7 @@ index 1b19c42e986c..8d416085b79b 100644
FINAL_LIBRARY = "webrtc"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5787,6 +5814,7 @@ index 1b19c42e986c..8d416085b79b 100644
- 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
@@ -5909,7 +5937,7 @@ index 1b19c42e986c..8d416085b79b 100644
Library("audio_options_api_gn")
diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index a694eff03b3f..953d60cc35a0 100644
+index 28e30f3e79d7..953d60cc35a0 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -5933,7 +5961,7 @@ index a694eff03b3f..953d60cc35a0 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,107 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5998,6 +6026,7 @@ index a694eff03b3f..953d60cc35a0 100644
- 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
@@ -6042,7 +6071,7 @@ index a694eff03b3f..953d60cc35a0 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -149,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6102,7 +6131,7 @@ index a694eff03b3f..953d60cc35a0 100644
-
Library("bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index e446d8228025..8b21859a8adb 100644
+index 2094b105a2db..8b21859a8adb 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6126,7 +6155,7 @@ index e446d8228025..8b21859a8adb 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,103 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,104 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6187,6 +6216,7 @@ index e446d8228025..8b21859a8adb 100644
- 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
@@ -6231,7 +6261,7 @@ index e446d8228025..8b21859a8adb 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -145,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6291,7 +6321,7 @@ index e446d8228025..8b21859a8adb 100644
-
Library("call_api_gn")
diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index b0f2bbbf3545..e51b0bd98f1a 100644
+index f676975bfa32..e51b0bd98f1a 100644
--- third_party/libwebrtc/api/callfactory_api_gn/moz.build
+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
@@ -12,11 +12,20 @@ AllowCompilerWarnings()
@@ -6315,7 +6345,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
FINAL_LIBRARY = "webrtc"
-@@ -39,118 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6384,6 +6414,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
- 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
@@ -6435,7 +6466,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
if CONFIG["CPU_ARCH"] == "x86":
-@@ -160,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
+@@ -161,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6495,7 +6526,7 @@ index b0f2bbbf3545..e51b0bd98f1a 100644
-
Library("callfactory_api_gn")
diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 1ce4cdd00a59..16ee32317d2a 100644
*** 11746 LINES SKIPPED ***