From nobody Tue Jun 27 21:13:42 2023 X-Original-To: dev-commits-ports-main@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 4QrHWV5P2lz4knmJ; Tue, 27 Jun 2023 21:13:42 +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 4QrHWV5726z4kv8; Tue, 27 Jun 2023 21:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687900422; 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=EfSEoCnHlqNo0IMmdh2dMfKuLCQhbo1yHcYkLAXThWA=; b=osIoLTTzSKoFR2jW2Cv09rWMBgBjOt6Ed/nB1+nDdbndf6uluLcvYWsD0ks3lm84LnZbWl JgXpF/XOYHDyLTaJ0K4nrBiRCNvnE+Olf6n0YdONqHV4/mvzghNVrDbQmXpzlrQ8C5KNVp QzpPneywIAUoSBvJKD+RLiupFQ5DYHJNGT9Gg3xw+K695IUkISNdYBLaDDDCTUbExCA8lr RmuAeTFT5xNZMXJVp5uxpAnkm1tvPt7lse26PdelirrjObveRezAxmhjJtQp8SRcAY8/OS 7TyPEnkqONmpkoSvC9St/rziGJ7Ksva5zY+Ote05R9Z+OfIAi0XryaHRbACI1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687900422; 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=EfSEoCnHlqNo0IMmdh2dMfKuLCQhbo1yHcYkLAXThWA=; b=M6N6MbyacnoicnmKulewH2SLjpwhZVF88mkm6WBgeB82ilBtZvTEABtOXLdwuWt1hF5Dui MNpN8mItNrpt9rGdvD6EzCLOfFmya+cq7y3MY7uSz6+IAukZbRqjnqR5SQ7je3G9XrqHb7 bo7/pHg+toIvVnebR2BBb8zJSRm4qJVT0g7hcb8eE0IR7TgUwXhVxkoOprEvVB3LUzaZ/G sCYMnilPKOagCJcsOFiGoXlQcd/oh6SHIy0XAFNyr8gF7kbVuxZy05hGCRRIFf8JSyaxZq Nnm2+W00ds1k3E7ebTN3BsZb/d4PMOfqsELkMqcfv7CIPeKOhfh1GvE5GZdCLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687900422; a=rsa-sha256; cv=none; b=bAaX1iYo40pvxnIMDUQ1rsTTG12mF/+SAuWn8TG64EljN269TNJmmRiF01oMAHU3jFCLKI hFP9TnwXUPG3d/Z+quTlK8766Z2nQqC67sBnCos99oX/XIa4DATgHQnnlPQwGSAHk4Ks32 WzDqRFEhg5wHHp+5I2/7KTTCQyLwQoNHr9lGooa4rZv4KbeR1Nr1UyffwqT/vu0+8BMMlZ UCFaEmp6BzKJTi92g5fufB0BSJ/3yBdHWBkyAj7+oz5zGUtRNqKhlDECH0c7WUmIPemeNt VCD0t2ZiJHjYZJoEEb40Rclt7nnKq3pYxhAN741ac4v1fUzRgeWg02xJ9l5lPQ== 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 4QrHWV4CQ4z176w; Tue, 27 Jun 2023 21:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35RLDgG7014944; Tue, 27 Jun 2023 21:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RLDgrw014943; Tue, 27 Jun 2023 21:13:42 GMT (envelope-from git) Date: Tue, 27 Jun 2023 21:13:42 GMT Message-Id: <202306272113.35RLDgrw014943@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: cc72a4893237 - main - www/firefox: update to 115.0 (rc1) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: cc72a4893237befed7f631554f489f72f7f130fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc72a4893237befed7f631554f489f72f7f130fb commit cc72a4893237befed7f631554f489f72f7f130fb Author: Christoph Moench-Tegeder AuthorDate: 2023-06-27 21:13:04 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-06-27 21:13:04 +0000 www/firefox: update to 115.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/115.0/releasenotes/ --- Mk/bsd.gecko.mk | 13 +- www/firefox/Makefile | 8 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-addon-search | 20 +- www/firefox/files/patch-bug1640982 | 17 - www/firefox/files/patch-libwebrtc-generated | 7721 ++++++++++++++++----------- 6 files changed, 4547 insertions(+), 3238 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 2a8e6aea82e4..0f514f9cc3f2 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -60,12 +60,17 @@ MOZILLA?= ${PORTNAME} MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} -USES+= compiler:c++17-lang cpe gl gmake gnome iconv localbase perl5 pkgconfig \ - python:build desktop-file-utils +USES+= compiler:c++17-lang cpe gl gmake gnome iconv localbase pkgconfig \ + python,build desktop-file-utils +.if ${MOZILLA_VER:R:R} < 115 +USES+= perl5 +.endif CPE_VENDOR?=mozilla USE_GL= gl USE_GNOME= cairo gdkpixbuf2 gtk30 +.if ${MOZILLA_VER:R:R} < 115 USE_PERL5= build +.endif USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xt xtst HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes @@ -82,9 +87,11 @@ LIB_DEPENDS+= libdrm.so:graphics/libdrm RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim MOZ_EXPORT+= ${CONFIGURE_ENV} \ - PERL="${PERL}" \ PYTHON3="${PYTHON_CMD}" \ RUSTFLAGS="${RUSTFLAGS}" +.if ${MOZILLA_VER:R:R} < 115 +MOZ_EXPORT+= PERL="${PERL}" +.endif MOZ_OPTIONS+= --prefix="${PREFIX}" MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}" diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ff90a0c93fe4..698377e6ebcf 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,5 +1,5 @@ PORTNAME= firefox -DISTVERSION= 114.0.2 +DISTVERSION= 115.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ @@ -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.89:security/nss \ - icu>=72.1:devel/icu \ + nss>=3.90:security/nss \ + icu>=73.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=7.1.0:print/harfbuzz \ + harfbuzz>=7.3.0: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 7b8ce39bc772..846496e7f797 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687175824 -SHA256 (firefox-114.0.2.source.tar.xz) = aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe -SIZE (firefox-114.0.2.source.tar.xz) = 505974216 +TIMESTAMP = 1687898233 +SHA256 (firefox-115.0.source.tar.xz) = ba2e725edda4186f4dbd66553145d8f129ef0bdd4919e995c88e69178c60ac3a +SIZE (firefox-115.0.source.tar.xz) = 509003572 diff --git a/www/firefox/files/patch-addon-search b/www/firefox/files/patch-addon-search index f9d788fbad73..b6dbf7924b43 100644 --- a/www/firefox/files/patch-addon-search +++ b/www/firefox/files/patch-addon-search @@ -2,7 +2,7 @@ https://github.com/mozilla/addons/issues/708 https://github.com/mozilla/addons-frontend/issues/4610 diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js -index af08811..77a3b18 100644 +index 621900f90fc1..401ef9074bd0 100644 --- browser/app/profile/firefox.js +++ browser/app/profile/firefox.js @@ -38,7 +38,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true); @@ -14,7 +14,7 @@ index af08811..77a3b18 100644 pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); -@@ -193,8 +193,8 @@ pref("app.update.langpack.enabled", true); +@@ -204,8 +204,8 @@ pref("app.update.langpack.enabled", true); // .. etc .. // pref("extensions.update.enabled", true); @@ -25,24 +25,24 @@ index af08811..77a3b18 100644 pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day -diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm -index 661c902..a41b32f 100644 ---- toolkit/mozapps/extensions/internal/AddonRepository.jsm -+++ toolkit/mozapps/extensions/internal/AddonRepository.jsm -@@ -592,7 +592,7 @@ var AddonRepository = { +diff --git toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs +index f906f244b658..7bb2eb6697c6 100644 +--- toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs ++++ toolkit/mozapps/extensions/internal/AddonRepository.sys.mjs +@@ -596,7 +596,7 @@ export var AddonRepository = { addon.version = String(aEntry.current_version.version); if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { - if (file.platform == "all" || file.platform == lazy.PLATFORM) { + if (file.platform == "all" || file.platform == "linux" || file.platform == lazy.PLATFORM) { if (file.url) { - addon.sourceURI = NetUtil.newURI(file.url); + addon.sourceURI = lazy.NetUtil.newURI(file.url); } diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm -index f8c99c7..c6ba8a1 100644 +index 03186dad43a4..4053fc6f2702 100644 --- toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm -@@ -520,7 +520,7 @@ class AddonInternal { +@@ -634,7 +634,7 @@ class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { diff --git a/www/firefox/files/patch-bug1640982 b/www/firefox/files/patch-bug1640982 deleted file mode 100644 index 5ad0fbad6c72..000000000000 --- a/www/firefox/files/patch-bug1640982 +++ /dev/null @@ -1,17 +0,0 @@ -Unbreak build with Rust 1.45.0 - -error: options `-C embed-bitcode=no` and `-C lto` are incompatible - -diff --git config/makefiles/rust.mk config/makefiles/rust.mk -index 75570d3..94ec33f 100644 ---- config/makefiles/rust.mk -+++ config/makefiles/rust.mk -@@ -97,7 +97,7 @@ ifndef rustflags_sancov - # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. - ifndef MOZ_CODE_COVERAGE - ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto -+cargo_rustc_flags += - endif - # We need -Cembed-bitcode=yes for all crates when using -Clto. - RUSTFLAGS += -Cembed-bitcode=yes diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 0de66b1b0116..2f46714ce495 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit 2eafa75dbec1817680f1074cb7baa45d6734c8d9 +commit ddd5c82284f974ce7fc5857e2a3061a83ed45094 Author: Christoph Moench-Tegeder - regenerate FreeBSD libwebrtc patch for Firefox 114 + regenerate FreeBSD libwebrtc patch for Firefox 115 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 c3f52293bf1b..46d0a26b3591 100644 @@ -5997,7 +5997,7 @@ index fb54663aa230..88d540626600 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 fd28a9f043eb..af94caebd288 100644 +index ff1e226a47bb..af94caebd288 100644 --- third_party/libwebrtc/api/callfactory_api_gn/moz.build +++ third_party/libwebrtc/api/callfactory_api_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -6022,7 +6022,7 @@ index fd28a9f043eb..af94caebd288 100644 FINAL_LIBRARY = "webrtc" -@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6042,7 +6042,6 @@ index fd28a9f043eb..af94caebd288 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -6072,7 +6071,6 @@ index fd28a9f043eb..af94caebd288 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - @@ -6568,7 +6566,7 @@ index b4b02bc0fd68..bb7875318eb2 100644 - Library("frame_encryptor_interface_gn") diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build -index c3fc7472b755..8847d0f5eae0 100644 +index e4b496ffcab2..8847d0f5eae0 100644 --- third_party/libwebrtc/api/crypto/options_gn/moz.build +++ third_party/libwebrtc/api/crypto/options_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -6593,7 +6591,7 @@ index c3fc7472b755..8847d0f5eae0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,165 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -6612,11 +6610,6 @@ index c3fc7472b755..8847d0f5eae0 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -6642,11 +6635,6 @@ index c3fc7472b755..8847d0f5eae0 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -6687,13 +6675,6 @@ index c3fc7472b755..8847d0f5eae0 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -6743,11 +6724,12 @@ index c3fc7472b755..8847d0f5eae0 100644 - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": -- -- CXXFLAGS += [ -- "-msse2" -- ] -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - OS_LIBS += [ - "android_support" - ] @@ -6756,25 +6738,24 @@ index c3fc7472b755..8847d0f5eae0 100644 - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + -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" - ] - +- +- CXXFLAGS += [ +- "-msse2" +- ] +- - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" @@ -7345,7 +7326,7 @@ index 2546c5d6c76d..ddb7e9e6a62d 100644 - Library("field_trials_view_gn") diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build -index 3c39211ab5e2..2f54084a65d9 100644 +index 7aa531c02248..2f54084a65d9 100644 --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -7370,7 +7351,7 @@ index 3c39211ab5e2..2f54084a65d9 100644 FINAL_LIBRARY = "webrtc" -@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,168 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -7390,7 +7371,6 @@ index 3c39211ab5e2..2f54084a65d9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -7420,7 +7400,6 @@ index 3c39211ab5e2..2f54084a65d9 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - @@ -9666,10 +9645,10 @@ index a7da1f7e3bb0..422517f8411b 100644 - DEFINES["_GNU_SOURCE"] = True - Library("network_state_predictor_api_gn") -diff --git third_party/libwebrtc/api/numerics/numerics_gn/moz.build third_party/libwebrtc/api/numerics/numerics_gn/moz.build -index 58aeb51a22f7..6bbc27e50970 100644 ---- third_party/libwebrtc/api/numerics/numerics_gn/moz.build -+++ third_party/libwebrtc/api/numerics/numerics_gn/moz.build +diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build +index 191c836d8508..44ae2b5bf6ea 100644 +--- third_party/libwebrtc/api/priority_gn/moz.build ++++ third_party/libwebrtc/api/priority_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -9692,7 +9671,7 @@ index 58aeb51a22f7..6bbc27e50970 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -9711,10 +9690,6 @@ index 58aeb51a22f7..6bbc27e50970 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -9780,10 +9755,6 @@ index 58aeb51a22f7..6bbc27e50970 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -9793,10 +9764,6 @@ index 58aeb51a22f7..6bbc27e50970 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -9822,9 +9789,10 @@ index 58aeb51a22f7..6bbc27e50970 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -9834,10 +9802,6 @@ index 58aeb51a22f7..6bbc27e50970 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -9853,27 +9817,20 @@ index 58aeb51a22f7..6bbc27e50970 100644 - 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+ DEFINES["USE_X11"] = "1" - - Library("numerics_gn") -diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build -index 191c836d8508..44ae2b5bf6ea 100644 ---- third_party/libwebrtc/api/priority_gn/moz.build -+++ third_party/libwebrtc/api/priority_gn/moz.build +- + Library("priority_gn") +diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build +index 50d1dc895081..e6ea3a8d349d 100644 +--- third_party/libwebrtc/api/refcountedbase_gn/moz.build ++++ third_party/libwebrtc/api/refcountedbase_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -10051,11 +10008,11 @@ index 191c836d8508..44ae2b5bf6ea 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("priority_gn") -diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build -index 50d1dc895081..e6ea3a8d349d 100644 ---- third_party/libwebrtc/api/refcountedbase_gn/moz.build -+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build + Library("refcountedbase_gn") +diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build +index 5beae090b99a..9147a790d33e 100644 +--- third_party/libwebrtc/api/rtc_error_gn/moz.build ++++ third_party/libwebrtc/api/rtc_error_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -10078,7 +10035,7 @@ index 50d1dc895081..e6ea3a8d349d 100644 FINAL_LIBRARY = "webrtc" -@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10097,6 +10054,10 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -10162,6 +10123,10 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -10171,6 +10136,10 @@ index 50d1dc895081..e6ea3a8d349d 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -10196,10 +10165,9 @@ index 50d1dc895081..e6ea3a8d349d 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - - DEFINES["USE_X11"] = "1" - +- +- DEFINES["USE_X11"] = "1" +- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -10209,6 +10177,10 @@ index 50d1dc895081..e6ea3a8d349d 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - +- CXXFLAGS += [ +- "-msse2" +- ] +- - OS_LIBS += [ - "android_support" - ] @@ -10224,20 +10196,27 @@ index 50d1dc895081..e6ea3a8d349d 100644 - 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -- - Library("refcountedbase_gn") -diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build -index 5beae090b99a..9147a790d33e 100644 ---- third_party/libwebrtc/api/rtc_error_gn/moz.build -+++ third_party/libwebrtc/api/rtc_error_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + 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 bda287e729a7..ba95c9db6fa9 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,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -10260,7 +10239,7 @@ index 5beae090b99a..9147a790d33e 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10437,11 +10416,11 @@ index 5beae090b99a..9147a790d33e 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - 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 bda287e729a7..ba95c9db6fa9 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 + 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 ee29948e6455..c7fdc41cbd06 100644 +--- third_party/libwebrtc/api/rtp_headers_gn/moz.build ++++ third_party/libwebrtc/api/rtp_headers_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -10464,7 +10443,7 @@ index bda287e729a7..ba95c9db6fa9 100644 FINAL_LIBRARY = "webrtc" -@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10641,11 +10620,11 @@ index bda287e729a7..ba95c9db6fa9 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - 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 ee29948e6455..c7fdc41cbd06 100644 ---- third_party/libwebrtc/api/rtp_headers_gn/moz.build -+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build + 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 b2eb8ef5a7ff..40dceac38a1f 100644 +--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build ++++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -10845,11 +10824,11 @@ index ee29948e6455..c7fdc41cbd06 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - 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 b2eb8ef5a7ff..40dceac38a1f 100644 ---- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build -+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build + Library("rtp_packet_info_gn") +diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build +index 3c367bed3bb9..dd7145a56759 100644 +--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build ++++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -10872,7 +10851,7 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 FINAL_LIBRARY = "webrtc" -@@ -43,173 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,169 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -10960,10 +10939,6 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -11049,11 +11024,11 @@ index b2eb8ef5a7ff..40dceac38a1f 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("rtp_packet_info_gn") -diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build -index 3c367bed3bb9..dd7145a56759 100644 ---- third_party/libwebrtc/api/rtp_parameters_gn/moz.build -+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build + Library("rtp_parameters_gn") +diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build +index 54c091ac7bed..43683534aba1 100644 +--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build ++++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -11076,7 +11051,7 @@ index 3c367bed3bb9..dd7145a56759 100644 FINAL_LIBRARY = "webrtc" -@@ -44,169 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,153 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -11095,10 +11070,6 @@ index 3c367bed3bb9..dd7145a56759 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -11173,10 +11144,6 @@ index 3c367bed3bb9..dd7145a56759 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -11202,9 +11169,10 @@ index 3c367bed3bb9..dd7145a56759 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["USE_X11"] = "1" -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -11214,10 +11182,6 @@ index 3c367bed3bb9..dd7145a56759 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -11233,23 +11197,16 @@ index 3c367bed3bb9..dd7145a56759 100644 - 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+ DEFINES["USE_X11"] = "1" - - Library("rtp_parameters_gn") +- + 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 2c59bcc25159..6e18f5b8ccfa 100644 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build @@ -12005,7 +11962,7 @@ index a040d96e814e..01068ebc09ba 100644 - Library("sequence_checker_gn") diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build -index 9baf23450a32..abb4c1fd1905 100644 +index 508948c5ed5b..abb4c1fd1905 100644 --- third_party/libwebrtc/api/simulated_network_api_gn/moz.build +++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -12030,7 +11987,7 @@ index 9baf23450a32..abb4c1fd1905 100644 FINAL_LIBRARY = "webrtc" -@@ -39,170 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,157 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12050,7 +12007,6 @@ index 9baf23450a32..abb4c1fd1905 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -12079,11 +12035,6 @@ index 9baf23450a32..abb4c1fd1905 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "dl", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -12124,13 +12075,6 @@ index 9baf23450a32..abb4c1fd1905 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -13194,7 +13138,7 @@ index 1908dc466677..888e6cd29d2b 100644 Library("field_trial_based_config_gn") diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build -index 53db9cfb52f8..b4bf72798b33 100644 +index b438b01c9f76..b4bf72798b33 100644 --- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build +++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -13219,7 +13163,7 @@ index 53db9cfb52f8..b4bf72798b33 100644 FINAL_LIBRARY = "webrtc" -@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13239,7 +13183,6 @@ index 53db9cfb52f8..b4bf72798b33 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -13269,7 +13212,6 @@ index 53db9cfb52f8..b4bf72798b33 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - @@ -15379,7 +15321,7 @@ index d1ce652a1d21..09d5c53c0e8c 100644 Library("timestamp_gn") diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build -index a0d8b5aba6db..7ad1ec737b60 100644 +index ae89a504490d..7ad1ec737b60 100644 --- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build +++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -15404,7 +15346,7 @@ index a0d8b5aba6db..7ad1ec737b60 100644 FINAL_LIBRARY = "webrtc" -@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,181 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15454,7 +15396,6 @@ index a0d8b5aba6db..7ad1ec737b60 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - @@ -15592,7 +15533,7 @@ index a0d8b5aba6db..7ad1ec737b60 100644 Library("builtin_video_bitrate_allocator_factory_gn") diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build -index 4a46bed39a5e..27a72c527aae 100644 +index 5c92663f5d1b..27a72c527aae 100644 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -15617,7 +15558,7 @@ index 4a46bed39a5e..27a72c527aae 100644 FINAL_LIBRARY = "webrtc" -@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -15637,7 +15578,6 @@ index 4a46bed39a5e..27a72c527aae 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -15667,7 +15607,6 @@ index 4a46bed39a5e..27a72c527aae 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - @@ -16009,7 +15948,7 @@ index decf74cfbedb..4c16ea3d2ae3 100644 Library("encoded_image_gn") diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build -index d3a206301635..01a2a71c9623 100644 +index 7a31ccedc72e..01a2a71c9623 100644 --- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build +++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -16034,7 +15973,7 @@ index d3a206301635..01a2a71c9623 100644 FINAL_LIBRARY = "webrtc" -@@ -43,182 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,180 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -16054,7 +15993,6 @@ index d3a206301635..01a2a71c9623 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -16084,7 +16022,6 @@ index d3a206301635..01a2a71c9623 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "dl", - "rt" - ] - @@ -17952,7 +17889,7 @@ index 6e742c8d81d8..443eb4d84288 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 b9243d3e5a39..ce7f52845f53 100644 +index 3fa0830088fc..0eec78099ce6 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,21 @@ AllowCompilerWarnings() @@ -17977,7 +17914,7 @@ index b9243d3e5a39..ce7f52845f53 100644 FINAL_LIBRARY = "webrtc" -@@ -49,182 +59,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -50,173 +60,21 @@ if not CONFIG["MOZ_DEBUG"]: *** 13077 LINES SKIPPED ***