Date: Thu, 16 Apr 2026 17:51:42 +0000 From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b96a271bbc08 - main - www/firefox: update to 150.0 (rc1) Message-ID: <69e121ae.35efd.389f7498@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=b96a271bbc0820a058e89001c9ac2309cbf8a60d commit b96a271bbc0820a058e89001c9ac2309cbf8a60d Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2026-04-16 17:51:06 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2026-04-16 17:51:06 +0000 www/firefox: update to 150.0 (rc1) Release Notes (soon): https://www.firefox.com/en-US/firefox/150.0/releasenotes/ --- www/firefox/Makefile | 4 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-ipc_glue_ForkServer.cpp | 35 + www/firefox/files/patch-libwebrtc-generated | 5111 ++++++++++++-------- www/firefox/files/patch-pipewire_init | 103 +- www/firefox/files/patch-python_sites_build.txt | 17 + www/firefox/files/patch-python_sites_mach.txt | 32 +- .../files/patch-xpcom_base_nsMemoryInfoDumper.cpp | 19 + 8 files changed, 3210 insertions(+), 2117 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index f4ec6bcbb932..b4f6f39890d3 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,5 +1,5 @@ PORTNAME= firefox -DISTVERSION= 149.0.2 +DISTVERSION= 150.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ @@ -11,7 +11,7 @@ COMMENT= Web browser based on the browser portion of Mozilla WWW= https://www.firefox.com/ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.121.0:security/nss \ + nss>=3.122.1:security/nss \ libevent>=2.1.8:devel/libevent \ harfbuzz>=10.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index f2d17033b6fb..49db847b7b29 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1775232995 -SHA256 (firefox-149.0.2.source.tar.xz) = 6a931a2cf087164c689099c3856b3091a7e156a7b94fab8ab5712affe87870ce -SIZE (firefox-149.0.2.source.tar.xz) = 697497732 +TIMESTAMP = 1776360451 +SHA256 (firefox-150.0.source.tar.xz) = fbe43df4c8a135cee4b29c375574bd9f609ee37a9f3b43bb96a83680e8ef3994 +SIZE (firefox-150.0.source.tar.xz) = 710220724 diff --git a/www/firefox/files/patch-ipc_glue_ForkServer.cpp b/www/firefox/files/patch-ipc_glue_ForkServer.cpp new file mode 100644 index 000000000000..6632ff89fa51 --- /dev/null +++ b/www/firefox/files/patch-ipc_glue_ForkServer.cpp @@ -0,0 +1,35 @@ +commit cf2fba7d3f8414cfc993b6a2d9ab01b43f6669d5 +Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> + + we need signal.h and BinaryPath.h + +diff --git ipc/glue/ForkServer.cpp ipc/glue/ForkServer.cpp +index d18fab02d686..837d0ac62f40 100644 +--- ipc/glue/ForkServer.cpp ++++ ipc/glue/ForkServer.cpp +@@ -22,12 +22,15 @@ + #include <string.h> + #include <sys/wait.h> + #include <unistd.h> ++#if defined(XP_FREEBSD) ++#include <signal.h> ++#endif + + #if defined(XP_LINUX) && defined(MOZ_SANDBOX) + # include "mozilla/SandboxLaunch.h" + #endif + +-#if defined(XP_OPENBSD) ++#if defined(XP_OPENBSD) || defined(XP_FREEBSD) + # include "BinaryPath.h" + # include <err.h> + #endif +@@ -76,7 +79,7 @@ ForkServer::ForkServer(int* aArgc, char*** aArgv) : mArgc(aArgc), mArgv(aArgv) { + */ + static void ForkServerPreload(int& aArgc, char** aArgv) { + Omnijar::ChildProcessInit(aArgc, aArgv); +-#if defined(XP_OPENBSD) ++#if defined(XP_OPENBSD) || defined(XP_FREEBSD) + char binaryPath[MAXPATHLEN]; + nsresult rv = mozilla::BinaryPath::Get(binaryPath); + if (NS_FAILED(rv)) { diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 5616dedad585..143105cfb3b5 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit 0ba3ac0f8602edfec3e8ce41a10f8e23cc691636 +commit a4fe5e199d4349894a54417391eb398ab3a5ac13 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> - regenerate FreeBSD libwebrtc patch for gecko 149 + regenerate FreeBSD libwebrtc patch for gecko 150 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 a4922c66929f..210a9a828897 100644 @@ -12338,7 +12338,7 @@ index 8a09b2f6a451..4cd767026bc4 100644 Library("rtc_error_gn") diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -index e736b4682ea0..9f5e2d9ba4a3 100644 +index 643e3b2729b4..5f87ed663020 100644 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" @@ -12363,7 +12363,7 @@ index e736b4682ea0..9f5e2d9ba4a3 100644 FINAL_LIBRARY = "xul" -@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -12447,18 +12447,11 @@ index e736b4682ea0..9f5e2d9ba4a3 100644 - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -18341,6 +18334,206 @@ index 5eb24e52173a..bae12fef07bf 100644 + DEFINES["WEBRTC_ENABLE_AVX2"] = True Library("builtin_video_bitrate_allocator_factory_gn") +diff --git third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build +index 7d27f32fdcc4..df99de8e431f 100644 +--- third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build ++++ third_party/libwebrtc/api/video/corruption_detection/corruption_detection_settings_generator_gn/moz.build +@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" + 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_PROTOBUF"] = "0" + DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True + 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 = "xul" + +@@ -46,86 +55,7 @@ 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"] = "r27_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = 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["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = 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["WEBRTC_BSD"] = 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_NONSTDC_NO_WARNINGS"] = 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 +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + +@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": + DEFINES["WEBRTC_HAS_NEON"] = True + DEFINES["__ARM_NEON__"] = "1" + +-if CONFIG["TARGET_CPU"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["TARGET_CPU"] == "loongarch64": +- +- DEFINES["_GNU_SOURCE"] = True +- + if CONFIG["TARGET_CPU"] == "mips32": + + DEFINES["MIPS32_LE"] = True + DEFINES["MIPS_FPU_LE"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["TARGET_CPU"] == "mips64": +- +- DEFINES["_GNU_SOURCE"] = True + + if CONFIG["TARGET_CPU"] == "x86": + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["TARGET_CPU"] == "x86_64": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["_DEBUG"] = True +- +-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" +- +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": +- + CXXFLAGS += [ + "-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": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": ++if CONFIG["TARGET_CPU"] == "x86_64": + +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("corruption_detection_settings_generator_gn") diff --git third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build index e38f35fd89c4..7f0f4946ad7c 100644 --- third_party/libwebrtc/api/video/corruption_detection/filter_settings_gn/moz.build @@ -23236,10 +23429,10 @@ index 67ef507d3097..7c7190358344 100644 + DEFINES["WEBRTC_ENABLE_AVX2"] = True Library("builtin_video_decoder_factory_gn") -diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -index 86d649512c50..b757e05614e6 100644 ---- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build +diff --git third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build +index e530a601ccdb..9e28578aba61 100644 +--- third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/encoder_speed_controller_factory_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -23262,7 +23455,7 @@ index 86d649512c50..b757e05614e6 100644 FINAL_LIBRARY = "xul" -@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23282,7 +23475,6 @@ index 86d649512c50..b757e05614e6 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -23358,7 +23550,7 @@ index 86d649512c50..b757e05614e6 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -23443,11 +23635,11 @@ index 86d649512c50..b757e05614e6 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("rtc_software_fallback_wrappers_gn") -diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build -index a6663bb723e5..d08276393a91 100644 ---- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build + Library("encoder_speed_controller_factory_gn") +diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build +index 86d649512c50..b757e05614e6 100644 +--- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -23470,7 +23662,7 @@ index a6663bb723e5..d08276393a91 100644 FINAL_LIBRARY = "xul" -@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,94 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23490,6 +23682,7 @@ index a6663bb723e5..d08276393a91 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ +- "GLESv2", - "log" - ] - @@ -23554,11 +23747,18 @@ index a6663bb723e5..d08276393a91 100644 - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -142,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -23643,11 +23843,11 @@ index a6663bb723e5..d08276393a91 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("scalability_mode_gn") -diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build -index a9bb91e7a5c5..e46a698b55c9 100644 ---- third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build + Library("rtc_software_fallback_wrappers_gn") +diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build +index a6663bb723e5..d08276393a91 100644 +--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -23670,7 +23870,7 @@ index a9bb91e7a5c5..e46a698b55c9 100644 FINAL_LIBRARY = "xul" -@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,86 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23754,18 +23954,11 @@ index a9bb91e7a5c5..e46a698b55c9 100644 - DEFINES["_WINDOWS"] = True - DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": -@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -133,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -23850,11 +24043,11 @@ index a9bb91e7a5c5..e46a698b55c9 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("scalability_mode_helper_gn") -diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build -index 32e58da25377..fb69cedb88b3 100644 ---- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build + Library("scalability_mode_gn") +diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build +index a9bb91e7a5c5..e46a698b55c9 100644 +--- third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/scalability_mode_helper_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -23877,7 +24070,7 @@ index 32e58da25377..fb69cedb88b3 100644 FINAL_LIBRARY = "xul" -@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -23972,7 +24165,7 @@ index 32e58da25377..fb69cedb88b3 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -24057,11 +24250,11 @@ index 32e58da25377..fb69cedb88b3 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("video_codecs_api_gn") -diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build -index 4ace541c8629..1ba39e749117 100644 ---- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build + Library("scalability_mode_helper_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build +index 32e58da25377..fb69cedb88b3 100644 +--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -24084,7 +24277,7 @@ index 4ace541c8629..1ba39e749117 100644 FINAL_LIBRARY = "xul" -@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -56,93 +65,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24179,12 +24372,16 @@ index 4ace541c8629..1ba39e749117 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -150,82 +73,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -24205,199 +24402,12 @@ index 4ace541c8629..1ba39e749117 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD": -- -- DEFINES["_DEBUG"] = True -- --if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT": -- -- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -- --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["_GNU_SOURCE"] = True -- --if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["_GNU_SOURCE"] = True -- - Library("video_encoder_factory_template_gn") -diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build -index 2a97afcba467..cc35215f7f73 100644 ---- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build -@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" - DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" - 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_PROTOBUF"] = "0" - DEFINES["WEBRTC_ENCODER_PSNR_STATS"] = True - 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 = "xul" - -@@ -42,94 +51,7 @@ 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"] = "r27_1" -- DEFINES["HAVE_SYS_UIO_H"] = True -- DEFINES["WEBRTC_ANDROID"] = True -- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True -- DEFINES["WEBRTC_LINUX"] = True -- DEFINES["WEBRTC_POSIX"] = True -- DEFINES["_GNU_SOURCE"] = True -- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True -- DEFINES["__STDC_CONSTANT_MACROS"] = True -- DEFINES["__STDC_FORMAT_MACROS"] = True -- -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- --if CONFIG["OS_TARGET"] == "Darwin": -- -- DEFINES["WEBRTC_MAC"] = True -- DEFINES["WEBRTC_POSIX"] = True -- 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_OZONE"] = "1" -- DEFINES["USE_UDEV"] = 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["WEBRTC_BSD"] = 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_NONSTDC_NO_WARNINGS"] = 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 -- DEFINES["_WIN32_WINNT"] = "0x0A00" -- DEFINES["_WINDOWS"] = True -- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True -- DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] -+ DEFINES["_DEBUG"] = True - - if CONFIG["TARGET_CPU"] == "aarch64": - -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": - DEFINES["WEBRTC_HAS_NEON"] = True - DEFINES["__ARM_NEON__"] = "1" - --if CONFIG["TARGET_CPU"] == "arm": -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- --if CONFIG["TARGET_CPU"] == "loongarch64": -- -- DEFINES["_GNU_SOURCE"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - - if CONFIG["TARGET_CPU"] == "mips32": - - DEFINES["MIPS32_LE"] = True - DEFINES["MIPS_FPU_LE"] = True -- DEFINES["_GNU_SOURCE"] = True +-if CONFIG["TARGET_CPU"] == "x86_64": - --if CONFIG["TARGET_CPU"] == "mips64": +- DEFINES["WEBRTC_ENABLE_AVX2"] = True - -- DEFINES["_GNU_SOURCE"] = True - - if CONFIG["TARGET_CPU"] == "x86": - -@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -24418,6 +24428,12 @@ index 2a97afcba467..cc35215f7f73 100644 - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": +- + CXXFLAGS += [ + "-msse2" + ] + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -24428,17 +24444,24 @@ index 2a97afcba467..cc35215f7f73 100644 - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": - -- DEFINES["_GNU_SOURCE"] = True +- CXXFLAGS += [ +- "-msse2" +- ] - +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- ++if CONFIG["TARGET_CPU"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- - Library("video_encoder_factory_template_libaom_av1_adapter_gn") -diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build -index 0ed909d22eaa..30b36e992434 100644 ---- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("video_codecs_api_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build +index 4ace541c8629..1ba39e749117 100644 +--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -24461,7 +24484,7 @@ index 0ed909d22eaa..30b36e992434 100644 FINAL_LIBRARY = "xul" -@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -42,93 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -24481,7 +24504,6 @@ index 0ed909d22eaa..30b36e992434 100644 - DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "GLESv2", - "log" - ] - @@ -24557,7 +24579,7 @@ index 0ed909d22eaa..30b36e992434 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -136,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -24583,7 +24605,7 @@ index 0ed909d22eaa..30b36e992434 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -24623,11 +24645,11 @@ index 0ed909d22eaa..30b36e992434 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("video_encoder_factory_template_libvpx_vp8_adapter_gn") -diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build -index 35016b696d1f..c7733ec4e5b5 100644 ---- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build + Library("video_encoder_factory_template_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build +index 2a97afcba467..cc35215f7f73 100644 +--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -24812,11 +24834,11 @@ index 35016b696d1f..c7733ec4e5b5 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("video_encoder_factory_template_libvpx_vp9_adapter_gn") -diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build -index d6781fc429cb..e8a512374002 100644 ---- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build + Library("video_encoder_factory_template_libaom_av1_adapter_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build +index 0ed909d22eaa..30b36e992434 100644 +--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -25001,11 +25023,11 @@ index d6781fc429cb..e8a512374002 100644 - - DEFINES["_GNU_SOURCE"] = True - - Library("video_encoder_factory_template_open_h264_adapter_gn") -diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -index 0da2c0072645..528d6c674073 100644 ---- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build -+++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build + Library("video_encoder_factory_template_libvpx_vp8_adapter_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build +index 35016b696d1f..c7733ec4e5b5 100644 +--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -25028,7 +25050,7 @@ index 0da2c0072645..528d6c674073 100644 FINAL_LIBRARY = "xul" -@@ -46,94 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -42,94 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -25124,16 +25146,12 @@ index 0da2c0072645..528d6c674073 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -141,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -137,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" -if CONFIG["TARGET_CPU"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -25154,12 +25172,10 @@ index 0da2c0072645..528d6c674073 100644 if CONFIG["TARGET_CPU"] == "x86": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- --if CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- +@@ -165,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -25180,12 +25196,6 @@ index 0da2c0072645..528d6c674073 100644 - - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - --if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86": -- - CXXFLAGS += [ - "-msse2" - ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["_GNU_SOURCE"] = True @@ -25196,24 +25206,206 @@ index 0da2c0072645..528d6c674073 100644 - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": - -- CXXFLAGS += [ -- "-msse2" -- ] +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["_GNU_SOURCE"] = True -+ DEFINES["WEBRTC_ENABLE_AVX2"] = True +- + Library("video_encoder_factory_template_libvpx_vp9_adapter_gn") +diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build +index d6781fc429cb..e8a512374002 100644 +--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build ++++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build *** 6983 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e121ae.35efd.389f7498>
