From nobody Mon Apr 8 21:19:23 2024 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 4VD2635qnNz5FqMH; Mon, 8 Apr 2024 21:19:23 +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 4VD2635cjlz4KBT; Mon, 8 Apr 2024 21:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712611163; 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=WazYOJy5m1DjOM3v4Mx+G+FOymh0ueaNfU2lXvWq4Hg=; b=guQGkrtoiwlEAZ9cVAemOA6XRNuEsvuscUIkdJB6PLxnczZu4AxZk6GsdEaNHLBnCs3TFS Rlm3KBpoeVjTXT13lEHOQkRjqvTUWoCR0QDe6KMhPvAWqQWHKjCveVv10CNp/WHe/VBucS xCsSvxhdMrc1BXwcnCGN6mstxBevQQhyS+UI+lnHt7H6X7WIrNHv5R5mDZvy+tXV2pXpDW YDeml2OC8xbW+7Qd+X/VxwOcqWXBonjHXbgsCDj4g3YicpMQqfqutrqpD5oUl6Y8aW7FdC q1AF5ui4VEGvF8cEB8Ywu3EiqxUNP8gYxAugpnCPSeVeDejXt8Oo8xGmFfCBGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712611163; a=rsa-sha256; cv=none; b=OCUr1VShi1i82C5srEQuZJkGjZfG13qW0Ut5ikdABv0NSovJmGyuL331k54wMdlj0UCU0k OkLrPvx3X5xizNHbV7/1hue8dQ7AXDRGEA9OOkcWesSSAs0aQKzmqBkJMEcqwIKm25qhNT P//7N1jcmVDRcRTDpMGokYoBxULUvTdtYp8/fbqIHJJzwvRtNZ11+yKmmbi6YdktTYc1BT AkbZ/vzZuTLvv571mecmjwFMSSs7BESKP6363s/R4YJP7JQjDT8fMV+L+lDnN8vUjF4Jyv EqR33sQFBtav95GQD3+A4bp8BJFN86C4u2aptrKdRYAZBO/Uqw2QDXQq4nGH3A== 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=1712611163; 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=WazYOJy5m1DjOM3v4Mx+G+FOymh0ueaNfU2lXvWq4Hg=; b=HxMLZ5yLVJgpXyCqKR35orBvzS65jZSc9D/yRxaGSNgrlX7idk4w8lYyZV9A+z8hCp08hO EsZYsajkaIdfnhvKTYR/PiS5Xy8rdhmmy9sVSl9aOqXQm/T5PrFMfGzJrN7EGolPmewx/N MYdsqWMk4azeAyH1WmOrKQzikKfo+TQDysImr/ov9skO5W9sMv70R/r2UPOGdphxLP1AEz Z4o+ufv/A9S6MFywZvBe14M43Kkk4REY87rRuR/wWuFAmdB8hwb9+ExAzz5BWgSlSz29Zl bMmoEBb9y8eJWc4fLqLDPZgxEfNftnJIHQ5/IDglpMicEcfrOdJvvhlKGmnP8A== 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 4VD2635D2czRrV; Mon, 8 Apr 2024 21:19:23 +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 438LJNt3027293; Mon, 8 Apr 2024 21:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438LJNaJ027290; Mon, 8 Apr 2024 21:19:23 GMT (envelope-from git) Date: Mon, 8 Apr 2024 21:19:23 GMT Message-Id: <202404082119.438LJNaJ027290@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: ad52760220c0 - main - www/firefox: update to 125.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/main X-Git-Reftype: branch X-Git-Commit: ad52760220c04cebeb8316cc78076304bce91bae Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad52760220c04cebeb8316cc78076304bce91bae commit ad52760220c04cebeb8316cc78076304bce91bae Author: Christoph Moench-Tegeder AuthorDate: 2024-04-08 21:18:32 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-04-08 21:18:32 +0000 www/firefox: update to 125.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/125.0/releasenotes/ --- www/firefox/Makefile | 6 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug1628567 | 32 - www/firefox/files/patch-bug1876366 | 201 +- .../files/patch-dom_media_flac_FlacDecoder.cpp | 23 - www/firefox/files/patch-libwebrtc-generated | 8470 +++++++------------- www/firefox/files/patch-wayland-proxy | 15 - 7 files changed, 3046 insertions(+), 5707 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index c31f6315d761..0fcdbf5b6b45 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,5 +1,5 @@ PORTNAME= firefox -DISTVERSION= 124.0.2 +DISTVERSION= 125.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ @@ -11,12 +11,12 @@ 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.98:security/nss \ + nss>=3.99:security/nss \ icu>=73.1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=8.3.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ - png>=1.6.39:graphics/png \ + png>=1.6.43:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.14.0:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 02e740f96ccf..7dfe49732726 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711995792 -SHA256 (firefox-124.0.2.source.tar.xz) = a6526d3540e19c8875cb7364e4490436c189478d375c4cb5216b0414e4b2d91c -SIZE (firefox-124.0.2.source.tar.xz) = 555223648 +TIMESTAMP = 1712608770 +SHA256 (firefox-125.0.source.tar.xz) = beeef124a0808ca2e71b84b45251de42c4b1a818467505b8778935df1d829b19 +SIZE (firefox-125.0.source.tar.xz) = 545906816 diff --git a/www/firefox/files/patch-bug1628567 b/www/firefox/files/patch-bug1628567 deleted file mode 100644 index 003ba36d3ad1..000000000000 --- a/www/firefox/files/patch-bug1628567 +++ /dev/null @@ -1,32 +0,0 @@ -Don't pass --target when CC/CXX contains clang - -diff --git third_party/rust/cc/src/lib.rs third_party/rust/cc/src/lib.rs -index 8cafd2a..f40b746 100644 ---- third_party/rust/cc/src/lib.rs -+++ third_party/rust/cc/src/lib.rs -@@ -2796,24 +2796,7 @@ impl Tool { - } - - fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { -- // Try to detect family of the tool from its name, falling back to Gnu. -- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { -- if fname.contains("clang-cl") { -- ToolFamily::Msvc { clang_cl: true } -- } else if fname.ends_with("cl") || fname == "cl.exe" { -- ToolFamily::Msvc { clang_cl: false } -- } else if fname.contains("clang") { -- match clang_driver { -- Some("cl") => ToolFamily::Msvc { clang_cl: true }, -- _ => ToolFamily::Clang, -- } -- } else { -- ToolFamily::Gnu -- } -- } else { -- ToolFamily::Gnu -- }; -- -+ let family = ToolFamily::Gnu; - Tool { - path: path, - cc_wrapper_path: None, diff --git a/www/firefox/files/patch-bug1876366 b/www/firefox/files/patch-bug1876366 index a6f39ffabab8..78483c3fbab7 100644 --- a/www/firefox/files/patch-bug1876366 +++ b/www/firefox/files/patch-bug1876366 @@ -1,188 +1,23 @@ -commit 54d21b7398dc1a8ff22a987c660d400347b144a9 +commit 46a89fb0319d673b3139a068e3d89aed9f44fc16 Author: Christoph Moench-Tegeder -Date: Sun Feb 11 19:11:15 2024 +0100 - Bug 1876366: many X11 cursors stopped working + use gdk legacy cursor interface by default - revert switch to newer gdk interface, as it broke cursor shape - switching and living with the default cursor only is no fun. - - Revert "Bug 1872961 [Linux] Use pointer cursor for hyperlinks r=emilio" - - This reverts commit 0574d0cdc438e4b0ce588f1652af802a0357f255. - - Revert "Bug 1871863 - Port from GdkCursorType to gdk_cursor_new_from_name. r=rmader,stransky" - - This reverts commit 5dfa42970a9577f0ac4e0992d9ec58c691e9bef6. + Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=1876366#c16 + hints that we could re-test this once we have GTK 3.24.42 (with the + now-current gtk3-3.24.41 the original problem is still reproducable, + but toggling this flag does fix it for me) -diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp -index a011dcc51fdb..28100db36d89 100644 ---- widget/gtk/nsWindow.cpp -+++ widget/gtk/nsWindow.cpp -@@ -7797,53 +7797,61 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) { - - GdkDisplay* defaultDisplay = gdk_display_get_default(); - -+ // The strategy here is to use standard GDK cursors, and, if not available, -+ // load by standard name with gdk_cursor_new_from_name. -+ // Spec is here: http://www.freedesktop.org/wiki/Specifications/cursor-spec/ - switch (aCursor) { - case eCursor_standard: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "default"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_LEFT_PTR); - break; - case eCursor_wait: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "wait"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_WATCH); - break; - case eCursor_select: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "text"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_XTERM); - break; - case eCursor_hyperlink: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "pointer"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_HAND2); - break; - case eCursor_n_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "n-resize"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_TOP_SIDE); - break; - case eCursor_s_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "s-resize"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_BOTTOM_SIDE); - break; - case eCursor_w_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "w-resize"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_LEFT_SIDE); - break; - case eCursor_e_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "e-resize"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_RIGHT_SIDE); - break; - case eCursor_nw_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "nw-resize"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_TOP_LEFT_CORNER); - break; - case eCursor_se_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "se-resize"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_BOTTOM_RIGHT_CORNER); - break; - case eCursor_ne_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "ne-resize"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_TOP_RIGHT_CORNER); - break; - case eCursor_sw_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "sw-resize"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_BOTTOM_LEFT_CORNER); - break; - case eCursor_crosshair: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "crosshair"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_CROSSHAIR); - break; - case eCursor_move: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "move"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_FLEUR); - break; - case eCursor_help: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "help"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_QUESTION_ARROW); - break; -- case eCursor_copy: -+ case eCursor_copy: // CSS3 - gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "copy"); - if (!gdkcursor) newType = MOZ_CURSOR_COPY; - break; -@@ -7856,14 +7864,18 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) { - if (!gdkcursor) newType = MOZ_CURSOR_CONTEXT_MENU; - break; - case eCursor_cell: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "cell"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_PLUS); - break; -+ // Those two aren’t standardized. Trying both KDE’s and GNOME’s names - case eCursor_grab: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "grab"); -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "openhand"); - if (!gdkcursor) newType = MOZ_CURSOR_HAND_GRAB; - break; - case eCursor_grabbing: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "grabbing"); -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "closedhand"); -+ if (!gdkcursor) { -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "grabbing"); -+ } - if (!gdkcursor) newType = MOZ_CURSOR_HAND_GRABBING; - break; - case eCursor_spinning: -@@ -7880,6 +7892,9 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) { - break; - case eCursor_not_allowed: - gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "not-allowed"); -+ if (!gdkcursor) { // nonstandard, yet common -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "crossed_circle"); -+ } - if (!gdkcursor) newType = MOZ_CURSOR_NOT_ALLOWED; - break; - case eCursor_no_drop: -@@ -7900,35 +7915,46 @@ static GdkCursor* get_gtk_cursor(nsCursor aCursor) { - } - break; - case eCursor_all_scroll: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "move"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_FLEUR); - break; - case eCursor_nesw_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "nesw-resize"); -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "size_bdiag"); - if (!gdkcursor) newType = MOZ_CURSOR_NESW_RESIZE; - break; - case eCursor_nwse_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "nwse-resize"); -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "size_fdiag"); - if (!gdkcursor) newType = MOZ_CURSOR_NWSE_RESIZE; - break; - case eCursor_ns_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "ns-resize"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_V_DOUBLE_ARROW); - break; - case eCursor_ew_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "ew-resize"); -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_H_DOUBLE_ARROW); - break; -+ // Here, two better fitting cursors exist in some cursor themes. Try those -+ // first - case eCursor_row_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "row-resize"); -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "split_v"); -+ if (!gdkcursor) { -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_V_DOUBLE_ARROW); -+ } - break; - case eCursor_col_resize: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "col-resize"); -+ gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "split_h"); -+ if (!gdkcursor) { -+ gdkcursor = -+ gdk_cursor_new_for_display(defaultDisplay, GDK_SB_H_DOUBLE_ARROW); -+ } - break; - case eCursor_none: -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "none"); -- if (!gdkcursor) newType = MOZ_CURSOR_NONE; -+ newType = MOZ_CURSOR_NONE; - break; - default: - NS_ASSERTION(aCursor, "Invalid cursor type"); -- gdkcursor = gdk_cursor_new_from_name(defaultDisplay, "default"); -+ gdkcursor = gdk_cursor_new_for_display(defaultDisplay, GDK_LEFT_PTR); - break; - } +diff --git modules/libpref/init/StaticPrefList.yaml modules/libpref/init/StaticPrefList.yaml +index 835450712a12..f2249006c36d 100644 +--- modules/libpref/init/StaticPrefList.yaml ++++ modules/libpref/init/StaticPrefList.yaml +@@ -16070,7 +16070,7 @@ + # Whether to use gtk legacy cursor API. + - name: widget.gtk.legacy-cursors.enabled + type: bool +- value: false ++ value: true + mirror: always + # Whether to use gtk high contrast themes to disable content styling like on diff --git a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp deleted file mode 100644 index 6dc197d9455e..000000000000 --- a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp +++ /dev/null @@ -1,23 +0,0 @@ -Enable FLAC on platforms without ffvpx like powerpc* - ---- dom/media/flac/FlacDecoder.cpp.orig 2021-04-15 19:44:28 UTC -+++ dom/media/flac/FlacDecoder.cpp -@@ -7,6 +7,7 @@ - #include "FlacDecoder.h" - #include "MediaContainerType.h" - #include "mozilla/StaticPrefs_media.h" -+#include "PDMFactory.h" - - namespace mozilla { - -@@ -14,6 +15,10 @@ namespace mozilla { - bool FlacDecoder::IsEnabled() { - #ifdef MOZ_FFVPX - return StaticPrefs::media_flac_enabled(); -+#elif defined(MOZ_FFMPEG) -+ RefPtr platform = new PDMFactory(); -+ return StaticPrefs::media_flac_enabled() && -+ !platform->SupportsMimeType("audio/flac"_ns).isEmpty(); - #else - return false; - #endif diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 73b01ec37c0c..caec639c4c69 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,10 +1,10 @@ -commit dc3c9060f191382e543c26328f99a06f10176309 +commit 01127134cdeb090ebf87ffdf452c586ca3a3d838 Author: Christoph Moench-Tegeder - regenerate FreeBSD libwebrtc patch for Firefox 124 + regenerate FreeBSD libwebrtc patch for Firefox 125 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 c06f943d1b75..642f867db664 100644 +index b0671b5d4adb..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,21 @@ AllowCompilerWarnings() @@ -29,7 +29,7 @@ index c06f943d1b75..642f867db664 100644 FINAL_LIBRARY = "webrtc" -@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -179,7 +179,6 @@ index c06f943d1b75..642f867db664 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -189,10 +188,6 @@ index c06f943d1b75..642f867db664 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -220,7 +215,7 @@ index c06f943d1b75..642f867db664 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 e89811c36f3a..935f8560bd05 100644 +index e090bcdfc55c..935f8560bd05 100644 --- third_party/libwebrtc/api/array_view_gn/moz.build +++ third_party/libwebrtc/api/array_view_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -358,7 +353,7 @@ index e89811c36f3a..935f8560bd05 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -390,16 +385,9 @@ index e89811c36f3a..935f8560bd05 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -418,7 +406,7 @@ index e89811c36f3a..935f8560bd05 100644 - Library("array_view_gn") diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build -index 5e31fd1734a6..8512989cc3ea 100644 +index 6a2d55b776db..8512989cc3ea 100644 --- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build +++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -564,7 +552,7 @@ index 5e31fd1734a6..8512989cc3ea 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -161,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -161,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -596,16 +584,9 @@ index 5e31fd1734a6..8512989cc3ea 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -624,7 +605,7 @@ index 5e31fd1734a6..8512989cc3ea 100644 - Library("async_dns_resolver_gn") diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -index 4b9691091908..d217e83eb683 100644 +index ee6df1d36f53..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,21 @@ AllowCompilerWarnings() @@ -649,7 +630,7 @@ index 4b9691091908..d217e83eb683 100644 FINAL_LIBRARY = "webrtc" -@@ -43,183 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -799,7 +780,6 @@ index 4b9691091908..d217e83eb683 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -809,10 +789,6 @@ index 4b9691091908..d217e83eb683 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -840,7 +816,7 @@ index 4b9691091908..d217e83eb683 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 de044719ccf5..4e9cb792fd2e 100644 +index 0c3ce503ad9e..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,22 @@ AllowCompilerWarnings() @@ -866,7 +842,7 @@ index de044719ccf5..4e9cb792fd2e 100644 FINAL_LIBRARY = "webrtc" -@@ -44,194 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1027,7 +1003,6 @@ index de044719ccf5..4e9cb792fd2e 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -1037,10 +1012,6 @@ index de044719ccf5..4e9cb792fd2e 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -1068,7 +1039,7 @@ index de044719ccf5..4e9cb792fd2e 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 ca2c90ecfa0d..2fecbfa52bb7 100644 +index 1317ad89b0d7..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,21 @@ AllowCompilerWarnings() @@ -1093,7 +1064,7 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644 FINAL_LIBRARY = "webrtc" -@@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1250,7 +1221,6 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -1260,10 +1230,6 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -1291,7 +1257,7 @@ index ca2c90ecfa0d..2fecbfa52bb7 100644 Library("audio_frame_api_gn") diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build -index 87847bb863f0..cdd13155790d 100644 +index e04682bee3fa..cdd13155790d 100644 --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -1425,7 +1391,7 @@ index 87847bb863f0..cdd13155790d 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -149,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -1457,16 +1423,9 @@ index 87847bb863f0..cdd13155790d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -1485,7 +1444,7 @@ index 87847bb863f0..cdd13155790d 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 27baf1a79656..d4a66ce81d9b 100644 +index c74637daa356..d4a66ce81d9b 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,21 @@ AllowCompilerWarnings() @@ -1630,7 +1589,7 @@ index 27baf1a79656..d4a66ce81d9b 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -160,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -1662,16 +1621,9 @@ index 27baf1a79656..d4a66ce81d9b 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -1690,7 +1642,7 @@ index 27baf1a79656..d4a66ce81d9b 100644 - Library("audio_mixer_api_gn") diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build -index 6a5ce44f46f9..08b8d7df91dd 100644 +index eb9e4ec6697b..08b8d7df91dd 100644 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -1828,7 +1780,7 @@ index 6a5ce44f46f9..08b8d7df91dd 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -153,57 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -1860,16 +1812,9 @@ index 6a5ce44f46f9..08b8d7df91dd 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -1888,7 +1833,7 @@ index 6a5ce44f46f9..08b8d7df91dd 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 9ab87e6a0e84..0973b9bab0b3 100644 +index 9dcc9826de61..0973b9bab0b3 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,21 @@ AllowCompilerWarnings() @@ -1913,7 +1858,7 @@ index 9ab87e6a0e84..0973b9bab0b3 100644 FINAL_LIBRARY = "webrtc" -@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2070,7 +2015,6 @@ index 9ab87e6a0e84..0973b9bab0b3 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -2080,10 +2024,6 @@ index 9ab87e6a0e84..0973b9bab0b3 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -2111,7 +2051,7 @@ index 9ab87e6a0e84..0973b9bab0b3 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 0efa8c28a219..8e851ee1eac0 100644 +index b5c7fe8b37a8..8e851ee1eac0 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,21 @@ AllowCompilerWarnings() @@ -2136,7 +2076,7 @@ index 0efa8c28a219..8e851ee1eac0 100644 FINAL_LIBRARY = "webrtc" -@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2293,7 +2233,6 @@ index 0efa8c28a219..8e851ee1eac0 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -2303,10 +2242,6 @@ index 0efa8c28a219..8e851ee1eac0 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -2334,7 +2269,7 @@ index 0efa8c28a219..8e851ee1eac0 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 6c8b6b3b2b89..acac009b8893 100644 +index 8eaebf875c3c..acac009b8893 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,21 @@ AllowCompilerWarnings() @@ -2359,7 +2294,7 @@ index 6c8b6b3b2b89..acac009b8893 100644 FINAL_LIBRARY = "webrtc" -@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2516,7 +2451,6 @@ index 6c8b6b3b2b89..acac009b8893 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -2526,10 +2460,6 @@ index 6c8b6b3b2b89..acac009b8893 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -2557,7 +2487,7 @@ index 6c8b6b3b2b89..acac009b8893 100644 Library("audio_codecs_api_gn") diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -index f64e3e334075..edfab7737136 100644 +index 3ce5ad2d5d21..edfab7737136 100644 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build @@ -12,13 +12,23 @@ AllowCompilerWarnings() @@ -2584,7 +2514,7 @@ index f64e3e334075..edfab7737136 100644 FINAL_LIBRARY = "webrtc" -@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2745,7 +2675,6 @@ index f64e3e334075..edfab7737136 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -2755,10 +2684,6 @@ index f64e3e334075..edfab7737136 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -2786,7 +2711,7 @@ index f64e3e334075..edfab7737136 100644 Library("builtin_audio_decoder_factory_gn") diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build -index 6965c4298fe3..dd0e328737c6 100644 +index e8acc1186e04..dd0e328737c6 100644 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build @@ -12,13 +12,23 @@ AllowCompilerWarnings() @@ -2813,7 +2738,7 @@ index 6965c4298fe3..dd0e328737c6 100644 FINAL_LIBRARY = "webrtc" -@@ -45,194 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2974,7 +2899,6 @@ index 6965c4298fe3..dd0e328737c6 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -2984,233 +2908,224 @@ index 6965c4298fe3..dd0e328737c6 100644 "-msse2" ] +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["TARGET_CPU"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-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 ++ DEFINES["USE_X11"] = "1" + + 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 2dbe0fd6bce3..a29327a65377 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,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 + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["RTC_ENABLE_WIN_WGC"] = True +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True *** 20520 LINES SKIPPED ***