Date: Thu, 20 Jun 2024 21:09:29 GMT From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9ff37db68d65 - main - www/librewolf: update to librewolf-126.0.1.1 Message-ID: <202406202109.45KL9TtF088957@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ff37db68d6584eb033546bd99fe07661112caee commit 9ff37db68d6584eb033546bd99fe07661112caee Author: Martin Filla <freebsd@sysctl.cz> AuthorDate: 2024-06-19 07:37:42 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2024-06-20 21:09:07 +0000 www/librewolf: update to librewolf-126.0.1.1 ChangeLog: https://gitlab.com/librewolf-community/browser/bsys6/-/releases PR: 279716 Reported by: freebsd@sysctl.cz (maintainer) --- www/librewolf/Makefile | 4 +- www/librewolf/distinfo | 6 +- www/librewolf/files/patch-bug1628567 | 32 - www/librewolf/files/patch-bug1876366 | 201 +- .../files/patch-dom_media_flac_FlacDecoder.cpp | 23 - www/librewolf/files/patch-libwebrtc-generated | 7469 +++++++------------- www/librewolf/files/patch-rust-1.78.0 | 3542 ---------- www/librewolf/files/patch-rust-1.78.0-arm | 60 - www/librewolf/files/patch-wayland-proxy | 15 - www/librewolf/files/unity-menubar.patch | 5268 -------------- 10 files changed, 2647 insertions(+), 13973 deletions(-) diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile index 348e2afe4e61..128edb1713e0 100644 --- a/www/librewolf/Makefile +++ b/www/librewolf/Makefile @@ -1,6 +1,5 @@ PORTNAME= librewolf -DISTVERSION= 124.0.1-1 -PORTREVISION= 2 +DISTVERSION= 126.0.1-1 CATEGORIES= www wayland MASTER_SITES= https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${DISTVERSION:R}-1/ DISTNAME= ${PORTNAME}-${DISTVERSION:R}-1.source. @@ -28,7 +27,6 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip -EXTRA_PATCHES= ${FILESDIR}/unity-menubar.patch:-p1 .include "${.CURDIR}/../../www/firefox/Makefile.options" diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo index aeea0574a536..5808a7abcec8 100644 --- a/www/librewolf/distinfo +++ b/www/librewolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711462823 -SHA256 (librewolf-124.0-1.source.tar.gz) = 31c5683d3ce427d42f6c69497a2ded429d292f29af86257f9b15dbdaf5a90d22 -SIZE (librewolf-124.0-1.source.tar.gz) = 972863269 +TIMESTAMP = 1718275256 +SHA256 (librewolf-126.0-1.source.tar.gz) = 545e4d26522c4ed1a669814340dc8fee7ca8d60452a07a91f30ec28198ec072d +SIZE (librewolf-126.0-1.source.tar.gz) = 990551134 diff --git a/www/librewolf/files/patch-bug1628567 b/www/librewolf/files/patch-bug1628567 deleted file mode 100644 index 003ba36d3ad1..000000000000 --- a/www/librewolf/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/librewolf/files/patch-bug1876366 b/www/librewolf/files/patch-bug1876366 index a6f39ffabab8..78483c3fbab7 100644 --- a/www/librewolf/files/patch-bug1876366 +++ b/www/librewolf/files/patch-bug1876366 @@ -1,188 +1,23 @@ -commit 54d21b7398dc1a8ff22a987c660d400347b144a9 +commit 46a89fb0319d673b3139a068e3d89aed9f44fc16 Author: Christoph Moench-Tegeder <cmt@burggraben.net> -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/librewolf/files/patch-dom_media_flac_FlacDecoder.cpp b/www/librewolf/files/patch-dom_media_flac_FlacDecoder.cpp deleted file mode 100644 index 6dc197d9455e..000000000000 --- a/www/librewolf/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<PDMFactory> platform = new PDMFactory(); -+ return StaticPrefs::media_flac_enabled() && -+ !platform->SupportsMimeType("audio/flac"_ns).isEmpty(); - #else - return false; - #endif diff --git a/www/librewolf/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated index 73b01ec37c0c..a56d291ae041 100644 --- a/www/librewolf/files/patch-libwebrtc-generated +++ b/www/librewolf/files/patch-libwebrtc-generated @@ -1,10 +1,10 @@ -commit dc3c9060f191382e543c26328f99a06f10176309 +commit e0f8f58bed7cc4cd65c82ef0ea0e795ac6eeda65 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> - regenerate FreeBSD libwebrtc patch for Firefox 124 + regenerate FreeBSD libwebrtc patch for Firefox 126 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,10 +2908,6 @@ index 6965c4298fe3..dd0e328737c6 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -3015,7 +2935,7 @@ index 6965c4298fe3..dd0e328737c6 100644 Library("builtin_audio_encoder_factory_gn") diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -index e0dcf8f03274..a29327a65377 100644 +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() @@ -3040,7 +2960,7 @@ index e0dcf8f03274..a29327a65377 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" @@ -3197,7 +3117,6 @@ index e0dcf8f03274..a29327a65377 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -3207,10 +3126,6 @@ index e0dcf8f03274..a29327a65377 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -3238,7 +3153,7 @@ index e0dcf8f03274..a29327a65377 100644 Library("audio_decoder_g711_gn") diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -index 708744cf3b72..68424c136524 100644 +index a1b1f8e9fccb..68424c136524 100644 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -3263,7 +3178,7 @@ index 708744cf3b72..68424c136524 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" @@ -3420,7 +3335,6 @@ index 708744cf3b72..68424c136524 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -3430,10 +3344,6 @@ index 708744cf3b72..68424c136524 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -3461,7 +3371,7 @@ index 708744cf3b72..68424c136524 100644 Library("audio_encoder_g711_gn") diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build -index 4b96ef206879..4577862a247d 100644 +index 838977ba1042..4577862a247d 100644 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -3486,7 +3396,7 @@ index 4b96ef206879..4577862a247d 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" @@ -3643,7 +3553,6 @@ index 4b96ef206879..4577862a247d 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ -- "android_support", - "unwind" - ] - @@ -3653,10 +3562,6 @@ index 4b96ef206879..4577862a247d 100644 "-msse2" ] -- OS_LIBS += [ -- "android_support" -- ] -- -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -3684,7 +3589,7 @@ index 4b96ef206879..4577862a247d 100644 Library("audio_decoder_g722_gn") diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build -index bddf7d557198..cdb668cf70bc 100644 +index 2b1c0d220c3e..cdb668cf70bc 100644 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() @@ -3829,7 +3734,7 @@ index bddf7d557198..cdb668cf70bc 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 @@ -3861,16 +3766,9 @@ index bddf7d557198..cdb668cf70bc 100644 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": *** 28731 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406202109.45KL9TtF088957>