From nobody Mon Dec 11 21:56:32 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SpwYr5Ydfz548Vm; Mon, 11 Dec 2023 21:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SpwYr577Fz4sR8; Mon, 11 Dec 2023 21:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702331792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPrb5hxTlN0/eboPJ801uY+8CRDROCfxxSEbIAdhE4g=; b=DfSR9R5K7Cn0Zzky1DgY1JQfO+MxVlsabxPFHCPUJ4lCqUzYHyxpEqvLBiMK5zytlqxY7Q a5VvIwfHtz2ZJ04zFTxL61Xx4b/zQD8pU7Obok3/1i/t1+DuXhTQb2QgYrWDej0Bvr9Z8Y wSryX3fpdBUW53XGud/aw06OmJbYRl3TQOa4qLwiwJ56qylX6P3vJlkMzlllbFeXYb10+/ UFq/7qowrLmtDqWGwAcshVY1xl6sEaGW3kntQgy6FiQKEmiSgDsTVFC8mrrxbXRDlsu/0l ZpqXLoNkF+Wbwwzy0NOi/SeO+Xbk5Ch1oc91uhCDCbpja6oQbqeT1yVYHXCr1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702331792; a=rsa-sha256; cv=none; b=dGjjDADRtHcWWF88LFa5kTDx9dSARtuQYdH7SF7qO2vhXW2ctV4u0ILeQvtjZf9sPMa52H E8f7NmG+JN5u/7LJFnRIhTcgwNmEICxKcuc2Weg9RPe8uET9EBI3gyCys9u39bG1iZ8f0H +uTM0FYPGWY1ALlYtIL6m1fDn0hzEt/ND/PmVyuKTYVkxO+zt7uH8KX3tRs6xuhwNr6tOF aI2evoZv+1ByFy0+ebjP6CUmt2A/bt3wcDaLe4zyv6ccNOQaAO2DiQys+cdgQnpLnYNNx+ 97BUD0xtumxGN+utvbS5+bllwR22SEdsLcCIqsslkg0GSsKJaHik2u7a34nEkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702331792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPrb5hxTlN0/eboPJ801uY+8CRDROCfxxSEbIAdhE4g=; b=KLvpzpm/fOsCEoWGaEik1qDPgdm/TT6BE9aTpk2G6p+46BGsNiiEUszV/C0kf275JTQuNw v4fKvHGukKNzXCXMvp7cX2MDEtZevRhzSJiRBhcF2uKUvD6lGD6qwIdMcPOGxfZwIFREZi T2V+rtWT/rDMZ+r+GXepWNVU+hpnU8aPh6CCo/F1R3s2e8IavpXLcHIdRkGg4lM3u+krnJ PNRa89RsCDy1tKzXnA0MBkxJUAhe53NnZBTc7/ZCCosRd4h2060HY12cf3xb2pl29Gva0j T+TB6qgsKwMFJT4GwT4RVkyBMNJaBXpme+ms+U2rx5D00PJ0aTv3Jhe88VOoTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SpwYr47k0znmk; Mon, 11 Dec 2023 21:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BBLuWv3042002; Mon, 11 Dec 2023 21:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BBLuWx7041999; Mon, 11 Dec 2023 21:56:32 GMT (envelope-from git) Date: Mon, 11 Dec 2023 21:56:32 GMT Message-Id: <202312112156.3BBLuWx7041999@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: bef6139c5d13 - 2023Q4 - www/firefox: update to 121.0 (rc1) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: bef6139c5d133a8e833a4d94d9259d0707d88c4e Auto-Submitted: auto-generated The branch 2023Q4 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=bef6139c5d133a8e833a4d94d9259d0707d88c4e commit bef6139c5d133a8e833a4d94d9259d0707d88c4e Author: Christoph Moench-Tegeder AuthorDate: 2023-12-11 21:52:51 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-12-11 21:56:22 +0000 www/firefox: update to 121.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/121.0/releasenotes/ (cherry picked from commit ef972b65fdfbd22b16860c285681e1ff5b97fb6a) --- www/firefox/Makefile | 2 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-libwebrtc-generated | 1398 +++++++++++++++++++-------- 3 files changed, 976 insertions(+), 430 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index da5c6dae44bd..9f5c1a96dea4 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -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.94:security/nss \ + nss>=3.95:security/nss \ icu>=73.1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=8.2.2:print/harfbuzz \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index c063848b2846..9aa8f1cbe6e4 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701289915 -SHA256 (firefox-120.0.1.source.tar.xz) = 76e7bb2a144880158444d8e9014f4d080d219bd150c3db405b27e4c7e3959ae2 -SIZE (firefox-120.0.1.source.tar.xz) = 529206136 +TIMESTAMP = 1702328424 +SHA256 (firefox-121.0.source.tar.xz) = edc7a5159d23ff2a23e22bf5abe22231658cee2902b93b5889ee73958aa06aa4 +SIZE (firefox-121.0.source.tar.xz) = 530302784 diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 83168c8ae9e3..63b7d364b811 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit 7f6be72c2d5b9ddb298305edbc5bb9fc1e7a4475 +commit c9b787241510e3d357366a6a6c9c83c29880080e Author: Christoph Moench-Tegeder - regenerate FreeBSD libwebrtc patch for Firefox 120 + regenerate FreeBSD libwebrtc patch for Firefox 121 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 cf60c534b8df..e6a2d969a1fd 100644 @@ -846,7 +846,7 @@ index 2c211f384b72..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 9248b91c2d92..ce2f85ba66dc 100644 +index bbe919aa5953..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() @@ -870,7 +870,7 @@ index 9248b91c2d92..ce2f85ba66dc 100644 FINAL_LIBRARY = "webrtc" -@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -957,6 +957,9 @@ index 9248b91c2d92..ce2f85ba66dc 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -1252,7 +1255,7 @@ index cb3495a89e19..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 0ef13b0f4588..2df8ddd20ca2 100644 +index 520104b4592d..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() @@ -1276,7 +1279,7 @@ index 0ef13b0f4588..2df8ddd20ca2 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1363,6 +1366,9 @@ index 0ef13b0f4588..2df8ddd20ca2 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -1390,7 +1396,7 @@ index 0ef13b0f4588..2df8ddd20ca2 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -1644,7 +1650,7 @@ index 81070090281f..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 ff00330a684c..9f1caaa8645d 100644 +index 026c95751931..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() @@ -1668,7 +1674,7 @@ index ff00330a684c..9f1caaa8645d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1755,6 +1761,9 @@ index ff00330a684c..9f1caaa8645d 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -1860,7 +1869,7 @@ index ff00330a684c..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 ee8f51ccb440..57de72563f2e 100644 +index 512385612ee0..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() @@ -1884,7 +1893,7 @@ index ee8f51ccb440..57de72563f2e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1971,6 +1980,9 @@ index ee8f51ccb440..57de72563f2e 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -2076,7 +2088,7 @@ index ee8f51ccb440..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 e9984fe360ce..0a34d8fdda8a 100644 +index b003a5c2383c..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() @@ -2100,7 +2112,7 @@ index e9984fe360ce..0a34d8fdda8a 100644 FINAL_LIBRARY = "webrtc" -@@ -46,184 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,187 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2187,6 +2199,9 @@ index e9984fe360ce..0a34d8fdda8a 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -2742,7 +2757,7 @@ index bb012a151a7c..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 2a3e692b812d..588ec3b5b33b 100644 +index 1367c36ea990..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() @@ -2766,7 +2781,7 @@ index 2a3e692b812d..588ec3b5b33b 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2853,6 +2868,9 @@ index 2a3e692b812d..588ec3b5b33b 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -2958,7 +2976,7 @@ index 2a3e692b812d..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 7f89c91164f6..20d76c5496fa 100644 +index b4808ded9c8b..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() @@ -2982,7 +3000,7 @@ index 7f89c91164f6..20d76c5496fa 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3069,6 +3087,9 @@ index 7f89c91164f6..20d76c5496fa 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -3174,7 +3195,7 @@ index 7f89c91164f6..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 9dd0927ed536..f738a9569a45 100644 +index 8714874223a8..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() @@ -3198,7 +3219,7 @@ index 9dd0927ed536..f738a9569a45 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3285,6 +3306,9 @@ index 9dd0927ed536..f738a9569a45 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -3390,7 +3414,7 @@ index 9dd0927ed536..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 4ecf66bd1968..2cc917d90aab 100644 +index 5ebbe0ea5f5f..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() @@ -3414,7 +3438,7 @@ index 4ecf66bd1968..2cc917d90aab 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3501,6 +3525,9 @@ index 4ecf66bd1968..2cc917d90aab 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -3528,7 +3555,7 @@ index 4ecf66bd1968..2cc917d90aab 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -3588,7 +3615,7 @@ index 4ecf66bd1968..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 36bd517e0079..8f13941e25c3 100644 +index 933120c6927d..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() @@ -3612,7 +3639,7 @@ index 36bd517e0079..8f13941e25c3 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3699,6 +3726,9 @@ index 36bd517e0079..8f13941e25c3 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -4440,7 +4470,7 @@ index 97953a5df078..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 21c64c783062..fce4fdca7298 100644 +index c343cfdb5f63..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() @@ -4464,7 +4494,7 @@ index 21c64c783062..fce4fdca7298 100644 FINAL_LIBRARY = "webrtc" -@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4551,6 +4581,9 @@ index 21c64c783062..fce4fdca7298 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -4656,7 +4689,7 @@ index 21c64c783062..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 9b1098290596..0c7b461dd94a 100644 +index f2fee9346445..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() @@ -4680,7 +4713,7 @@ index 9b1098290596..0c7b461dd94a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4767,6 +4800,9 @@ index 9b1098290596..0c7b461dd94a 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -4794,7 +4830,7 @@ index 9b1098290596..0c7b461dd94a 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -5077,7 +5113,7 @@ index 24625fb77d03..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 2c2a46ea430d..27167f6f4829 100644 +index f4310e7a28e1..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() @@ -5101,7 +5137,7 @@ index 2c2a46ea430d..27167f6f4829 100644 FINAL_LIBRARY = "webrtc" -@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -5188,6 +5224,9 @@ index 2c2a46ea430d..27167f6f4829 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -7122,7 +7161,7 @@ index 252c6e021d12..c6ad466bcf88 100644 Library("options_gn") diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build -index 8f7d88432678..0e340edaa9b8 100644 +index 57be6208e57f..0e340edaa9b8 100644 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -7146,7 +7185,7 @@ index 8f7d88432678..0e340edaa9b8 100644 FINAL_LIBRARY = "webrtc" -@@ -39,104 +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" @@ -7164,6 +7203,10 @@ index 8f7d88432678..0e340edaa9b8 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -7252,7 +7295,7 @@ index 8f7d88432678..0e340edaa9b8 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -146,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -7312,7 +7355,7 @@ index 8f7d88432678..0e340edaa9b8 100644 - Library("fec_controller_api_gn") diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build -index e105574d498d..bb3da46c855c 100644 +index a7b53adc457b..bb3da46c855c 100644 --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -7336,7 +7379,7 @@ index e105574d498d..bb3da46c855c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7423,6 +7466,9 @@ index e105574d498d..bb3da46c855c 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -8877,7 +8923,7 @@ index 289b08052239..2565408ce87a 100644 - 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 0f053a0e9732..7aea55ea197a 100644 +index e7255c805bee..7aea55ea197a 100644 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -8901,7 +8947,7 @@ index 0f053a0e9732..7aea55ea197a 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -8988,6 +9034,9 @@ index 0f053a0e9732..7aea55ea197a 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -10720,7 +10769,7 @@ index f69b13a731a3..b048864ad448 100644 - Library("refcountedbase_gn") diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build -index aaa86c696fa6..fcf285f401fc 100644 +index 45cad74d51aa..fcf285f401fc 100644 --- third_party/libwebrtc/api/rtc_error_gn/moz.build +++ third_party/libwebrtc/api/rtc_error_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -10744,7 +10793,7 @@ index aaa86c696fa6..fcf285f401fc 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10831,6 +10880,9 @@ index aaa86c696fa6..fcf285f401fc 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -10936,7 +10988,7 @@ index aaa86c696fa6..fcf285f401fc 100644 Library("rtc_error_gn") diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -index 180dfb1ff4b4..68470ecf6df4 100644 +index 6d14d068a7fe..68470ecf6df4 100644 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -10960,7 +11012,7 @@ index 180dfb1ff4b4..68470ecf6df4 100644 FINAL_LIBRARY = "webrtc" -@@ -44,184 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11047,6 +11099,9 @@ index 180dfb1ff4b4..68470ecf6df4 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -11152,7 +11207,7 @@ index 180dfb1ff4b4..68470ecf6df4 100644 Library("rtc_event_log_gn") diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build -index 1641b4594ef6..b5647f419f7c 100644 +index ba0c4f55aa8c..b5647f419f7c 100644 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -11176,7 +11231,7 @@ index 1641b4594ef6..b5647f419f7c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11263,6 +11318,9 @@ index 1641b4594ef6..b5647f419f7c 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -11368,7 +11426,7 @@ index 1641b4594ef6..b5647f419f7c 100644 Library("rtp_headers_gn") diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -index d331490f9baf..df1cf58c7083 100644 +index d4d79fc4042d..df1cf58c7083 100644 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -11392,7 +11450,7 @@ index d331490f9baf..df1cf58c7083 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11479,6 +11537,9 @@ index d331490f9baf..df1cf58c7083 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -11986,7 +12047,7 @@ index ac0c98a19350..5f6e81fb3f4e 100644 - Library("rtp_sender_interface_gn") diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build -index 7e18b2e7cc9d..f274d0055498 100644 +index b5ea7bc20fc2..f274d0055498 100644 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build +++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -12010,7 +12071,7 @@ index 7e18b2e7cc9d..f274d0055498 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12097,6 +12158,9 @@ index 7e18b2e7cc9d..f274d0055498 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -13602,7 +13666,7 @@ index d09913813a7e..39a9ebc0842e 100644 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 5bd7a14d5ed6..cbeb41795c2d 100644 +index d1d364a13ea1..cbeb41795c2d 100644 --- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build +++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -13626,7 +13690,7 @@ index 5bd7a14d5ed6..cbeb41795c2d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13713,6 +13777,9 @@ index 5bd7a14d5ed6..cbeb41795c2d 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -13740,7 +13807,7 @@ index 5bd7a14d5ed6..cbeb41795c2d 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -13800,7 +13867,7 @@ index 5bd7a14d5ed6..cbeb41795c2d 100644 - 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 38a5c45915e9..e4486979adcc 100644 +index 16ae3e2f0daa..e4486979adcc 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,11 +12,20 @@ AllowCompilerWarnings() @@ -13824,7 +13891,7 @@ index 38a5c45915e9..e4486979adcc 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13911,6 +13978,9 @@ index 38a5c45915e9..e4486979adcc 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -14240,7 +14310,7 @@ index d88a604315bf..dee377f35156 100644 Library("goog_cc_gn") diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build -index 2a3988f5695d..f03b20773145 100644 +index 61b68b20c239..f03b20773145 100644 --- third_party/libwebrtc/api/transport/network_control_gn/moz.build +++ third_party/libwebrtc/api/transport/network_control_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -14264,7 +14334,7 @@ index 2a3988f5695d..f03b20773145 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14351,6 +14421,9 @@ index 2a3988f5695d..f03b20773145 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -14668,7 +14741,7 @@ index a662091d3eef..8c55ec075d15 100644 Library("dependency_descriptor_gn") diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build -index 324f779cb8f0..7862f9ee7c3d 100644 +index 4a3e5f409700..7862f9ee7c3d 100644 --- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build +++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -14692,7 +14765,7 @@ index 324f779cb8f0..7862f9ee7c3d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -14779,6 +14852,9 @@ index 324f779cb8f0..7862f9ee7c3d 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -14806,7 +14882,7 @@ index 324f779cb8f0..7862f9ee7c3d 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -15056,7 +15132,7 @@ index 6bf7ef309680..39d0ef9756e1 100644 - Library("stun_types_gn") diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build -index 77a120da7d27..98964899137c 100644 +index 3c85fd9c0082..98964899137c 100644 --- third_party/libwebrtc/api/transport_api_gn/moz.build +++ third_party/libwebrtc/api/transport_api_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -15080,7 +15156,7 @@ index 77a120da7d27..98964899137c 100644 FINAL_LIBRARY = "webrtc" -@@ -43,176 +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" @@ -15098,6 +15174,10 @@ index 77a120da7d27..98964899137c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -16771,7 +16851,7 @@ index 5d024d30e9f2..d43142211cf9 100644 Library("encoded_frame_gn") diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build -index c1c76b29d8a4..4c046aa480ac 100644 +index 53a06a6a7840..4c046aa480ac 100644 --- third_party/libwebrtc/api/video/encoded_image_gn/moz.build +++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -16795,7 +16875,7 @@ index c1c76b29d8a4..4c046aa480ac 100644 FINAL_LIBRARY = "webrtc" -@@ -43,184 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16882,6 +16962,9 @@ index c1c76b29d8a4..4c046aa480ac 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -17211,7 +17294,7 @@ index 6f8d8b947437..ea11fb826b9e 100644 Library("frame_buffer_gn") diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build -index d6cbcd817ba6..63707a6269b2 100644 +index f9e5bdd1122b..63707a6269b2 100644 --- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build +++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -17235,7 +17318,7 @@ index d6cbcd817ba6..63707a6269b2 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -17322,6 +17405,9 @@ index d6cbcd817ba6..63707a6269b2 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -17349,7 +17435,7 @@ index d6cbcd817ba6..63707a6269b2 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -18213,7 +18299,7 @@ index 6ebe9921df53..b2366c6af2a0 100644 Library("video_bitrate_allocation_gn") diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build -index 1712dffdc683..8eb8884fe45b 100644 +index b995b23a983b..8eb8884fe45b 100644 --- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build +++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -18237,7 +18323,7 @@ index 1712dffdc683..8eb8884fe45b 100644 FINAL_LIBRARY = "webrtc" -@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,115 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18324,6 +18410,9 @@ index 1712dffdc683..8eb8884fe45b 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -18351,7 +18440,7 @@ index 1712dffdc683..8eb8884fe45b 100644 if CONFIG["CPU_ARCH"] == "x86": -@@ -154,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -157,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -18813,7 +18902,7 @@ index b8327ec933cb..b7f4cc420178 100644 - Library("video_codec_constants_gn") diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build -index 7d21dfb24a71..c7700a5bcd92 100644 +index d9157e5e796b..c7700a5bcd92 100644 --- third_party/libwebrtc/api/video/video_frame_gn/moz.build +++ third_party/libwebrtc/api/video/video_frame_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -18837,7 +18926,7 @@ index 7d21dfb24a71..c7700a5bcd92 100644 FINAL_LIBRARY = "webrtc" -@@ -54,184 +63,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -54,187 +63,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -18924,6 +19013,9 @@ index 7d21dfb24a71..c7700a5bcd92 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -19029,7 +19121,7 @@ index 7d21dfb24a71..c7700a5bcd92 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 01eabd0d3249..735fd52d03b8 100644 +index e1c033c43c29..735fd52d03b8 100644 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build @@ -12,11 +12,20 @@ AllowCompilerWarnings() @@ -19053,7 +19145,7 @@ index 01eabd0d3249..735fd52d03b8 100644 FINAL_LIBRARY = "webrtc" *** 2796 LINES SKIPPED ***