From nobody Mon Jan 15 21:17:33 2024 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 4TDQ2k56kjz57bDS; Mon, 15 Jan 2024 21:17:34 +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 4TDQ2k4cDfz4t4D; Mon, 15 Jan 2024 21:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705353454; 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=OtNis1rpNvmMrIzHvDCjhjnix7/IzvmgN/T0WLpCfw0=; b=dxXa4uQO6s6KNyhbhIdbEmni3vS/9qcoUkYI2UdqytnlUlN9TUp9n6tyENRQY/fYAPbyiu FOzexTqKKWZ+DXwip7V0t+8S5l6pYty9D/g5fcK+TZKvV9htXthzMiZ+FgxhEAX/j/ti+4 Cp6wBy6FzCWn6xQvewDU+xKCPEbM3epgfDzUNMe83HoAk/Y6/LB/WWVYcKQxUCqEYVNnl+ nLuuH6pjaeTRb2z4WyqztTs1gRoPOKb+K339RChKFDrOiflM8HdczGfBopA/vA3keOzal8 hnc/Jhrimw1CTGiMxB+K5r2LxzIed32pPyr/7ct2nn6ujn3LF2G1VPN4esPnYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705353454; 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=OtNis1rpNvmMrIzHvDCjhjnix7/IzvmgN/T0WLpCfw0=; b=bCpHrOd9XUliISrU8I9Ccfoweo8qb63DoSH9a66yaSHPS7D6Al1fiILvr+eOGbXZdiqX38 XXXbxNEo5eXVJqmbX0/CZVFcr2PDP/6s4LKACkksQzLBg4LzIv11pEGNzWV6NLtaNg6Hzm GTywo8nnpmeYlL8phyJoZCNfM70EgFKgi/qkLupTouBEqY8LyYTAhDXBfRTTbRPYCx3rXH ovRroZU5DIzgC5C1fm4gvUdRV56kkHi+YN5OXh15L6F/RvfDMK76kDfcdiDaOC+J8/OqQS pltqDQEuLOKG10jIH1nVM1lCGhOkz5QEcDA1h/ndGliSEp8rM0JhDlqBCeIONg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705353454; a=rsa-sha256; cv=none; b=snG7QxEckDs3Sk+QerM+Lx/oHGYXfHjoKSdHaEkUMvNUeqdVUFTBIAue0N/GlcJNz3D3tu lj1PQKY+rCRvGdYnMhvm9vb4Clzx5bVlVNmUt1yX6FlCtI+gtToXPpcaTomSe1zP4n9N2s rRqDU/6S7+TmkkudF+4wkIAIzDru8ubuyICqUR9zYHcT6PQdfvhiEUdSKla20v8NEsvD5R fRKEI3sSoU01k4pMXMLGDiuZllLyq5rUHQ2pEm3Uvrw0TH5ltQLnvc08CAPu1dxWz63dkn 4HGY0f7g60g/HAXCbGb4Bt9SaXwxyU+SKQkzo2hzeJRacYviIfOOt0ngGk7Sog== 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 4TDQ2k3dtKz1BsN; Mon, 15 Jan 2024 21:17:34 +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 40FLHYqD000526; Mon, 15 Jan 2024 21:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FLHXmj000522; Mon, 15 Jan 2024 21:17:33 GMT (envelope-from git) Date: Mon, 15 Jan 2024 21:17:33 GMT Message-Id: <202401152117.40FLHXmj000522@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: 545f42a44886 - main - www/firefox: update to 122.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: 545f42a44886fd11e11fcb4c25e9c510b00eb156 Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=545f42a44886fd11e11fcb4c25e9c510b00eb156 commit 545f42a44886fd11e11fcb4c25e9c510b00eb156 Author: Christoph Moench-Tegeder AuthorDate: 2024-01-15 21:14:13 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-01-15 21:17:23 +0000 www/firefox: update to 122.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/122.0/releasenotes/ --- www/firefox/Makefile | 5 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug1559213 | 28 +- www/firefox/files/patch-bug847568 | 59 +- ...edia_webrtc_third__party__build_webrtc.mozbuild | 27 + www/firefox/files/patch-libwebrtc-generated | 16401 +++++++++++-------- www/firefox/files/patch-mozglue_misc_SSE.h | 2 +- www/firefox/files/patch-toolkit_xre_glxtest.cpp | 17 - 8 files changed, 9341 insertions(+), 7204 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index a0250af09b45..8ebc2dd4b8d7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,5 @@ PORTNAME= firefox -DISTVERSION= 121.0.1 -PORTREVISION= 2 +DISTVERSION= 122.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ @@ -15,7 +14,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.95:security/nss \ icu>=73.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=8.2.2:print/harfbuzz \ + harfbuzz>=8.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 3691f726ee01..c02fba616473 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704740557 -SHA256 (firefox-121.0.1.source.tar.xz) = b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce -SIZE (firefox-121.0.1.source.tar.xz) = 532719356 +TIMESTAMP = 1705351264 +SHA256 (firefox-122.0.source.tar.xz) = 97c414238823f618f6f339b7a9b4eea3f0a4a814a9c1c4358785ac90102386a0 +SIZE (firefox-122.0.source.tar.xz) = 535933232 diff --git a/www/firefox/files/patch-bug1559213 b/www/firefox/files/patch-bug1559213 index 516328d61aca..7fbffbbff396 100644 --- a/www/firefox/files/patch-bug1559213 +++ b/www/firefox/files/patch-bug1559213 @@ -11,10 +11,10 @@ Date: Thu Jun 13 11:53:00 2019 -0700 4 files changed, 34 insertions(+), 3 deletions(-) diff --git config/external/moz.build config/external/moz.build -index a0877c9d717e..5caa2036e0ec 100644 +index 2fc8df57992e..63d18e50a961 100644 --- config/external/moz.build +++ config/external/moz.build -@@ -45,8 +45,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: +@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: external_dirs += ["media/libvpx"] if CONFIG["MOZ_AV1"]: @@ -27,11 +27,11 @@ index a0877c9d717e..5caa2036e0ec 100644 if not CONFIG["MOZ_SYSTEM_PNG"]: external_dirs += ["media/libpng"] diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index d9489c8f15e4..4d2f15e18c1c 100644 +index 07d48e7f9748..e56e5e084518 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1291,6 +1291,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: - 'proxy.h', +@@ -1304,6 +1304,14 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]: + "proxy.h", ] +if CONFIG['MOZ_SYSTEM_AV1']: @@ -42,14 +42,14 @@ index d9489c8f15e4..4d2f15e18c1c 100644 + 'dav1d/dav1d.h', + ] + - if CONFIG['MOZ_SYSTEM_LIBVPX']: + if CONFIG["MOZ_SYSTEM_ICU"]: system_headers += [ - 'vpx_mem/vpx_mem.h', + "unicode/calendar.h", diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build -index c71f22a22eee..efbd523b1225 100644 +index 5c6e25b3980b..ce99ebfb6d3f 100644 --- dom/media/platforms/moz.build +++ dom/media/platforms/moz.build -@@ -80,6 +80,11 @@ if CONFIG["MOZ_AV1"]: +@@ -81,6 +81,11 @@ if CONFIG["MOZ_AV1"]: "agnostic/AOMDecoder.cpp", "agnostic/DAV1DDecoder.cpp", ] @@ -62,10 +62,10 @@ index c71f22a22eee..efbd523b1225 100644 if CONFIG["MOZ_OMX"]: EXPORTS += [ diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build -index 5675c28234a1..56344e5e4c98 100644 +index 761fc8cf4cd9..793a5b8697a8 100644 --- media/ffvpx/libavcodec/moz.build +++ media/ffvpx/libavcodec/moz.build -@@ -109,10 +109,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: +@@ -120,10 +120,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: 'vp9recon.c', 'vpx_rac.c', ] @@ -85,10 +85,10 @@ index 5675c28234a1..56344e5e4c98 100644 LOCAL_INCLUDES += ['/media/mozva'] SOURCES += [ diff --git toolkit/moz.configure toolkit/moz.configure -index 2e56fa46ce59..23e30935c4bc 100644 +index f93a5d64fec8..814357f4e979 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -745,7 +745,23 @@ def av1(value): +@@ -744,7 +744,23 @@ def av1(value): return True @@ -113,7 +113,7 @@ index 2e56fa46ce59..23e30935c4bc 100644 def dav1d_asm(target): if target.cpu in ("aarch64", "x86", "x86_64"): return True -@@ -761,6 +777,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm) +@@ -760,6 +776,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm) set_define("MOZ_DAV1D_ASM", dav1d_asm) set_config("MOZ_AV1", av1) set_define("MOZ_AV1", av1) diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index 2b3c5e14e99e..37619c17f883 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -1,11 +1,11 @@ # Allow building against system-wide graphite2/harfbuzz. diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index a1b58eb..a0a0943 100644 +index 07d48e7f9748..a35804b443e5 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1289,6 +1289,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: - 'proxy.h', +@@ -1304,6 +1304,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]: + "proxy.h", ] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: @@ -21,14 +21,14 @@ index a1b58eb..a0a0943 100644 + 'harfbuzz/hb.h', + ] + - if CONFIG['MOZ_SYSTEM_LIBVPX']: + if CONFIG["MOZ_SYSTEM_ICU"]: system_headers += [ - 'vpx_mem/vpx_mem.h', + "unicode/calendar.h", diff --git dom/base/moz.build dom/base/moz.build -index d390adf..4508f19 100644 +index 26fe7e716da8..9015fc360402 100644 --- dom/base/moz.build +++ dom/base/moz.build -@@ -576,6 +576,9 @@ FINAL_LIBRARY = "xul" +@@ -608,6 +608,9 @@ FINAL_LIBRARY = "xul" if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] @@ -40,7 +40,7 @@ index d390adf..4508f19 100644 script="gen-usecounters.py", diff --git gfx/graphite2/geckoextra/moz.build gfx/graphite2/geckoextra/moz.build new file mode 100644 -index 0000000..24e8d7a +index 000000000000..24e8d7a03274 --- /dev/null +++ gfx/graphite2/geckoextra/moz.build @@ -0,0 +1,21 @@ @@ -66,7 +66,7 @@ index 0000000..24e8d7a + +FINAL_LIBRARY = 'gkmedias' diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh -index b91d9c1..a97e6eb 100755 +index b91d9c161cc7..a97e6eb20322 100755 --- gfx/graphite2/moz-gr-update.sh +++ gfx/graphite2/moz-gr-update.sh @@ -1,6 +1,7 @@ @@ -95,8 +95,9 @@ index b91d9c1..a97e6eb 100755 echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding -diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla -index 3180257..4587a3b 100644 +diff --git gfx/harfbuzz/README-mozilla.fbsd gfx/harfbuzz/README-mozilla.fbsd +new file mode 100644 +index 000000000000..2a10eb1e2b42 --- /dev/null +++ gfx/harfbuzz/README-mozilla.fbsd @@ -0,0 +1,4 @@ @@ -105,7 +106,7 @@ index 3180257..4587a3b 100644 +with checkout version or increment latest tag by one if it's not based +on upstream release. diff --git gfx/moz.build gfx/moz.build -index 4d6d63d..cd57b0c 100644 +index 56ea317bedfc..07dd7f66f1bc 100644 --- gfx/moz.build +++ gfx/moz.build @@ -10,6 +10,14 @@ with Files("**"): @@ -133,10 +134,10 @@ index 4d6d63d..cd57b0c 100644 "thebes", "ipc", diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py -index 5e0fd17..860b80a 100755 +index c161d24df853..8c7dd395b371 100755 --- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py -@@ -96,6 +96,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): +@@ -91,6 +91,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -147,10 +148,10 @@ index 5e0fd17..860b80a 100755 LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", diff --git gfx/skia/moz.build gfx/skia/moz.build -index 524bd28..615c93b 100755 +index 83aa2957a938..0859316a1f09 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -488,6 +488,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): +@@ -601,6 +601,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -161,10 +162,10 @@ index 524bd28..615c93b 100755 LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", diff --git gfx/thebes/moz.build gfx/thebes/moz.build -index baa6f09..4f02a9e 100644 +index 97f02d59f51a..04c75cc7234d 100644 --- gfx/thebes/moz.build +++ gfx/thebes/moz.build -@@ -286,7 +286,13 @@ if CONFIG["MOZ_WAYLAND"]: +@@ -290,7 +290,13 @@ if CONFIG["MOZ_WAYLAND"]: LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] @@ -177,13 +178,13 @@ index baa6f09..4f02a9e 100644 +if CONFIG["MOZ_SYSTEM_HARFBUZZ"]: + CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"] - if CONFIG["CC_TYPE"] == "clang": - # Suppress warnings from Skia header files. + CXXFLAGS += ["-Werror=switch"] + diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build -index 301eb9a..7cece5e 100644 +index 2bbd00415cae..f66bd37695d4 100644 --- intl/unicharutil/util/moz.build +++ intl/unicharutil/util/moz.build -@@ -25,6 +25,9 @@ UNIFIED_SOURCES += [ +@@ -24,6 +24,9 @@ UNIFIED_SOURCES += [ "nsUnicodeProperties.cpp", ] @@ -194,7 +195,7 @@ index 301eb9a..7cece5e 100644 GeneratedFile( diff --git netwerk/dns/moz.build netwerk/dns/moz.build -index f769e27..315bdd4 100644 +index 784a1631fba9..574e739e22a0 100644 --- netwerk/dns/moz.build +++ netwerk/dns/moz.build @@ -102,6 +102,9 @@ GeneratedFile( @@ -208,10 +209,10 @@ index f769e27..315bdd4 100644 LOCAL_INCLUDES += [ "/netwerk/base", diff --git old-configure.in old-configure.in -index d147957..d332b34 100644 +index 86424df3f879..09c0bd470172 100644 --- old-configure.in +++ old-configure.in -@@ -1335,6 +1335,27 @@ fi +@@ -1141,6 +1141,27 @@ fi AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID) AC_SUBST(MOZ_MACBUNDLE_ID) @@ -240,10 +241,10 @@ index d147957..d332b34 100644 dnl = Child Process Name for IPC dnl ======================================================== diff --git toolkit/library/moz.build toolkit/library/moz.build -index 2c3f869..e8a9d23 100644 +index da1d8c47f83e..e5fa5d5c45a1 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -269,6 +269,12 @@ if CONFIG["MOZ_SYSTEM_PNG"]: +@@ -295,6 +295,12 @@ if CONFIG["MOZ_SYSTEM_PNG"]: if CONFIG["MOZ_SYSTEM_WEBP"]: OS_LIBS += CONFIG["MOZ_WEBP_LIBS"] @@ -257,10 +258,10 @@ index 2c3f869..e8a9d23 100644 OS_LIBS += CONFIG["MOZ_LIBEVENT_LIBS"] diff --git toolkit/moz.configure toolkit/moz.configure -index 0069865..9bb1864 100644 +index f93a5d64fec8..6cd072f7aaeb 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -1058,6 +1058,25 @@ def geckodriver_default(enable_tests, target, cross_compile, hazard, asan, autom +@@ -1279,6 +1279,25 @@ def geckodriver_default(enable_tests, target, cross_compile, hazard, asan, autom return False return True diff --git a/www/firefox/files/patch-dom_media_webrtc_third__party__build_webrtc.mozbuild b/www/firefox/files/patch-dom_media_webrtc_third__party__build_webrtc.mozbuild new file mode 100644 index 000000000000..3242763d64a6 --- /dev/null +++ b/www/firefox/files/patch-dom_media_webrtc_third__party__build_webrtc.mozbuild @@ -0,0 +1,27 @@ +commit 0a4dfe06e072222335bff7724b64a1f479e56569 +Author: Christoph Moench-Tegeder + + flag WEBRTC_USE_PIPEWIRE just as on Linux + +diff --git dom/media/webrtc/third_party_build/webrtc.mozbuild dom/media/webrtc/third_party_build/webrtc.mozbuild +index 940420e3f8c4..08e07f77056f 100644 +--- dom/media/webrtc/third_party_build/webrtc.mozbuild ++++ dom/media/webrtc/third_party_build/webrtc.mozbuild +@@ -40,6 +40,17 @@ if CONFIG["MOZ_WEBRTC"]: + DEFINES["HAVE_WINSOCK2_H"] = True + elif CONFIG["OS_TARGET"] in ("DragonFly", "FreeBSD", "NetBSD", "OpenBSD"): + DEFINES["WEBRTC_BSD"] = True ++ if ( ++ CONFIG["TARGET_CPU"] == "x86" ++ or CONFIG["TARGET_CPU"] == "x86_64" ++ or CONFIG["TARGET_CPU"] == "arm" ++ or CONFIG["TARGET_CPU"] == "aarch64" ++ or ( ++ CONFIG["TARGET_ENDIANNESS"] == "little" ++ and CONFIG["TARGET_CPU"].startswith("mips") ++ ) ++ ): ++ DEFINES["WEBRTC_USE_PIPEWIRE"] = True + elif CONFIG["OS_TARGET"] == "Android": + DEFINES["WEBRTC_LINUX"] = True + DEFINES["WEBRTC_ANDROID"] = True diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 63b7d364b811..9e738d51a306 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,19 +1,20 @@ -commit c9b787241510e3d357366a6a6c9c83c29880080e +commit 51e6b92d3903fe970db280deb69924432107ca55 Author: Christoph Moench-Tegeder - regenerate FreeBSD libwebrtc patch for Firefox 121 + regenerate FreeBSD libwebrtc patch for Firefox 122 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 +index c06f943d1b75..642f867db664 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() +@@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -28,7 +29,7 @@ index cf60c534b8df..e6a2d969a1fd 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -40,6 +41,7 @@ index cf60c534b8df..e6a2d969a1fd 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -66,6 +68,7 @@ index cf60c534b8df..e6a2d969a1fd 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -80,6 +83,7 @@ index cf60c534b8df..e6a2d969a1fd 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -115,12 +119,12 @@ index cf60c534b8df..e6a2d969a1fd 100644 - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True - if CONFIG["CPU_ARCH"] == "aarch64": + if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" @@ -130,21 +134,21 @@ index cf60c534b8df..e6a2d969a1fd 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - - if CONFIG["CPU_ARCH"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips32": DEFINES["MIPS32_LE"] = True DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "mips64": +-if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - if CONFIG["CPU_ARCH"] == "x86": + if CONFIG["TARGET_CPU"] == "x86": - DEFINES["WEBRTC_ENABLE_AVX2"] = True - --if CONFIG["CPU_ARCH"] == "x86_64": +-if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - @@ -172,14 +176,14 @@ index cf60c534b8df..e6a2d969a1fd 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ - "android_support", - "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": - CXXFLAGS += [ "-msse2" @@ -189,26 +193,26 @@ index cf60c534b8df..e6a2d969a1fd 100644 - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": + DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] -+if CONFIG["CPU_ARCH"] == "x86_64": ++if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - DEFINES["_GNU_SOURCE"] = True @@ -216,16 +220,17 @@ index cf60c534b8df..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 d8f3d9bc8f6f..552c7e77985a 100644 +index e89811c36f3a..935f8560bd05 100644 --- third_party/libwebrtc/api/array_view_gn/moz.build +++ third_party/libwebrtc/api/array_view_gn/moz.build -@@ -12,11 +12,20 @@ AllowCompilerWarnings() +@@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -240,7 +245,7 @@ index d8f3d9bc8f6f..552c7e77985a 100644 FINAL_LIBRARY = "webrtc" -@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -252,6 +257,7 @@ index d8f3d9bc8f6f..552c7e77985a 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -278,6 +284,7 @@ index d8f3d9bc8f6f..552c7e77985a 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -292,6 +299,7 @@ index d8f3d9bc8f6f..552c7e77985a 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -327,30 +335,30 @@ index d8f3d9bc8f6f..552c7e77985a 100644 - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True - if CONFIG["CPU_ARCH"] == "aarch64": + if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["TARGET_CPU"] == "arm": - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - - if CONFIG["CPU_ARCH"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips32": DEFINES["MIPS32_LE"] = True DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "mips64": +-if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - if CONFIG["CPU_ARCH"] == "x86": + if CONFIG["TARGET_CPU"] == "x86": -@@ -150,57 +68,8 @@ if CONFIG["CPU_ARCH"] == "x86_64": +@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -379,47 +387,48 @@ index d8f3d9bc8f6f..552c7e77985a 100644 DEFINES["USE_X11"] = "1" --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ - "android_support", - "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": - - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["_GNU_SOURCE"] = True - Library("array_view_gn") diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -index d79aa2f0200c..1b3eb3a6acb6 100644 +index 4b9691091908..d217e83eb683 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() +@@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -434,7 +443,7 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 FINAL_LIBRARY = "webrtc" -@@ -43,180 +52,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -446,6 +455,7 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -472,6 +482,7 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -486,6 +497,7 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -521,12 +533,12 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - DEFINES["__STD_C"] = True + DEFINES["_DEBUG"] = True - if CONFIG["CPU_ARCH"] == "aarch64": + if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" @@ -536,21 +548,21 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - - if CONFIG["CPU_ARCH"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips32": DEFINES["MIPS32_LE"] = True DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "mips64": +-if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - if CONFIG["CPU_ARCH"] == "x86": + if CONFIG["TARGET_CPU"] == "x86": - DEFINES["WEBRTC_ENABLE_AVX2"] = True - --if CONFIG["CPU_ARCH"] == "x86_64": +-if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - @@ -578,14 +590,14 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ - "android_support", - "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": - CXXFLAGS += [ "-msse2" @@ -595,26 +607,26 @@ index d79aa2f0200c..1b3eb3a6acb6 100644 - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": + DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] -+if CONFIG["CPU_ARCH"] == "x86_64": ++if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - DEFINES["_GNU_SOURCE"] = True @@ -622,10 +634,10 @@ index d79aa2f0200c..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 2c211f384b72..f9c2d536b5d3 100644 +index de044719ccf5..4e9cb792fd2e 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() +@@ -12,12 +12,22 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -633,6 +645,7 @@ index 2c211f384b72..f9c2d536b5d3 100644 +DEFINES["USE_OZONE"] = "1" DEFINES["WEBRTC_APM_DEBUG_DUMP"] = "1" +DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -647,7 +660,7 @@ index 2c211f384b72..f9c2d536b5d3 100644 FINAL_LIBRARY = "webrtc" -@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -659,6 +672,7 @@ index 2c211f384b72..f9c2d536b5d3 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -685,6 +699,7 @@ index 2c211f384b72..f9c2d536b5d3 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -703,6 +718,7 @@ index 2c211f384b72..f9c2d536b5d3 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -745,12 +761,12 @@ index 2c211f384b72..f9c2d536b5d3 100644 - ] + DEFINES["_DEBUG"] = True - if CONFIG["CPU_ARCH"] == "aarch64": + if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True --if CONFIG["CPU_ARCH"] == "arm": +-if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" @@ -760,21 +776,21 @@ index 2c211f384b72..f9c2d536b5d3 100644 - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True - - if CONFIG["CPU_ARCH"] == "mips32": + if CONFIG["TARGET_CPU"] == "mips32": DEFINES["MIPS32_LE"] = True DEFINES["MIPS_FPU_LE"] = True - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "mips64": +-if CONFIG["TARGET_CPU"] == "mips64": - - DEFINES["_GNU_SOURCE"] = True - if CONFIG["CPU_ARCH"] == "x86": + if CONFIG["TARGET_CPU"] == "x86": - DEFINES["WEBRTC_ENABLE_AVX2"] = True - --if CONFIG["CPU_ARCH"] == "x86_64": +-if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - @@ -802,14 +818,14 @@ index 2c211f384b72..f9c2d536b5d3 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ - "android_support", - "unwind" - ] - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": - CXXFLAGS += [ "-msse2" @@ -819,26 +835,26 @@ index 2c211f384b72..f9c2d536b5d3 100644 - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": - - DEFINES["_GNU_SOURCE"] = True - --if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": + DEFINES["WEBRTC_ENABLE_AVX2"] = True - CXXFLAGS += [ - "-msse2" - ] -+if CONFIG["CPU_ARCH"] == "x86_64": ++if CONFIG["TARGET_CPU"] == "x86_64": - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - DEFINES["_GNU_SOURCE"] = True @@ -846,16 +862,17 @@ 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 bbe919aa5953..ce2f85ba66dc 100644 +index ca2c90ecfa0d..2fecbfa52bb7 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() +@@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True +DEFINES["USE_GLIB"] = "1" +DEFINES["USE_OZONE"] = "1" +DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" DEFINES["WEBRTC_LIBRARY_IMPL"] = True DEFINES["WEBRTC_MOZILLA_BUILD"] = True @@ -870,7 +887,7 @@ index bbe919aa5953..ce2f85ba66dc 100644 FINAL_LIBRARY = "webrtc" -@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -882,6 +899,7 @@ index bbe919aa5953..ce2f85ba66dc 100644 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_GNU_SOURCE"] = True @@ -908,6 +926,7 @@ index bbe919aa5953..ce2f85ba66dc 100644 - DEFINES["USE_NSS_CERTS"] = "1" - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_LINUX"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" @@ -922,6 +941,7 @@ index bbe919aa5953..ce2f85ba66dc 100644 - DEFINES["USE_OZONE"] = "1" - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True - DEFINES["WEBRTC_POSIX"] = True - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True @@ -964,12 +984,12 @@ index bbe919aa5953..ce2f85ba66dc 100644 - ] + DEFINES["_DEBUG"] = True - if CONFIG["CPU_ARCH"] == "aarch64": + if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True *** 61911 LINES SKIPPED ***