Date: Wed, 25 Mar 2026 21:49:17 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Martin Filla <freebsd@sysctl.cz> Subject: git: 874596a5d486 - main - www/librewolf: Update 148.0.2-3 => 149.0-1 Message-ID: <69c4585d.33514.17c3eda6@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=874596a5d486d6b52aec8261be82278fc720f812 commit 874596a5d486d6b52aec8261be82278fc720f812 Author: Martin Filla <freebsd@sysctl.cz> AuthorDate: 2026-03-25 21:47:33 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-25 21:47:33 +0000 www/librewolf: Update 148.0.2-3 => 149.0-1 Release Notes: https://www.firefox.com/en-US/firefox/149.0/releasenotes/ PR: 294044 MFH: 2026Q1 --- www/librewolf/Makefile | 7 +- www/librewolf/distinfo | 6 +- www/librewolf/files/patch-bug1626236 | 22 +- www/librewolf/files/patch-libwebrtc-generated | 13845 ++++++++++++++---------- 4 files changed, 8321 insertions(+), 5559 deletions(-) diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile index dccbcac143dd..0ba3ef426c53 100644 --- a/www/librewolf/Makefile +++ b/www/librewolf/Makefile @@ -1,8 +1,7 @@ PORTNAME= librewolf -DISTVERSION= 148.0.2 -LWPATCH= -3 +DISTVERSION= 149.0 +LWPATCH= -1 DISTVERSIONSUFFIX= ${LWPATCH}.source -PORTREVISION= 3 CATEGORIES= www wayland MASTER_SITES= https://codeberg.org/api/packages/librewolf/generic/librewolf-source/${DISTVERSION}${LWPATCH}/ @@ -14,7 +13,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.120.1:security/nss \ + nss>=3.121.0:security/nss \ icu>=76.1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=10.1.0:print/harfbuzz \ diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo index 9d5001086b58..02c0833ea24e 100644 --- a/www/librewolf/distinfo +++ b/www/librewolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1773773145 -SHA256 (librewolf-148.0.2-3.source.tar.gz) = e00c0de9330b6655fbfa2e31540d5f02248f6b1959bbece384d4afb1a0d6efa7 -SIZE (librewolf-148.0.2-3.source.tar.gz) = 1047728695 +TIMESTAMP = 1774450043 +SHA256 (librewolf-149.0-1.source.tar.gz) = 5ada766bcf505b9bea0ad473277de8680ba6801d90fb42f00f5cf84e6b410497 +SIZE (librewolf-149.0-1.source.tar.gz) = 1086167922 diff --git a/www/librewolf/files/patch-bug1626236 b/www/librewolf/files/patch-bug1626236 index ae3b522f6b90..f6064dc9e47f 100644 --- a/www/librewolf/files/patch-bug1626236 +++ b/www/librewolf/files/patch-bug1626236 @@ -10,10 +10,10 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096 imported patch decoder_workaround.patch diff --git image/decoders/nsGIFDecoder2.cpp image/decoders/nsGIFDecoder2.cpp -index ebb0b7d..d52ef47 100644 +index 2776cff50c9d..1e2511459b18 100644 --- image/decoders/nsGIFDecoder2.cpp +++ image/decoders/nsGIFDecoder2.cpp -@@ -422,6 +422,9 @@ void nsGIFDecoder2::ConvertColormap(uint32_t* aColormap, uint32_t aColors) { +@@ -488,6 +488,9 @@ void nsGIFDecoder2::ConvertColormap(uint32_t* aColormap, uint32_t aColors) { MOZ_ASSERT(mSwizzleFn); uint8_t* data = reinterpret_cast<uint8_t*>(aColormap); mSwizzleFn(data, data, aColors); @@ -24,10 +24,10 @@ index ebb0b7d..d52ef47 100644 LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator, diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp -index 9ea4403..d82772c 100644 +index c34757d08463..69c21aac6b25 100644 --- image/decoders/nsJPEGDecoder.cpp +++ image/decoders/nsJPEGDecoder.cpp -@@ -257,6 +257,9 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData( +@@ -297,6 +297,9 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData( case JCS_YCbCr: // By default, we will output directly to BGRA. If we need to apply // special color transforms, this may change. @@ -37,7 +37,7 @@ index 9ea4403..d82772c 100644 switch (SurfaceFormat::OS_RGBX) { case SurfaceFormat::B8G8R8X8: mInfo.out_color_space = JCS_EXT_BGRX; -@@ -271,6 +274,7 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData( +@@ -311,6 +314,7 @@ LexerTransition<nsJPEGDecoder::State> nsJPEGDecoder::ReadJPEGData( mState = JPEG_ERROR; return Transition::TerminateFailure(); } @@ -46,19 +46,19 @@ index 9ea4403..d82772c 100644 case JCS_CMYK: case JCS_YCCK: diff --git image/decoders/nsPNGDecoder.cpp image/decoders/nsPNGDecoder.cpp -index e3e4ef4..3cc7315 100644 +index 647ff094aaad..2c4bab58b15b 100644 --- image/decoders/nsPNGDecoder.cpp +++ image/decoders/nsPNGDecoder.cpp -@@ -356,7 +356,7 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator, +@@ -400,7 +400,7 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator, IResumable* aOnResume) { MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!"); - return mLexer.Lex(aIterator, aOnResume, + LexerResult res = mLexer.Lex(aIterator, aOnResume, - [=](State aState, const char* aData, size_t aLength) { + [this](State aState, const char* aData, size_t aLength) { switch (aState) { case State::PNG_DATA: -@@ -366,6 +366,14 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator, +@@ -410,6 +410,14 @@ LexerResult nsPNGDecoder::DoDecode(SourceBufferIterator& aIterator, } MOZ_CRASH("Unknown State"); }); @@ -74,10 +74,10 @@ index e3e4ef4..3cc7315 100644 LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData( diff --git image/decoders/nsWebPDecoder.cpp image/decoders/nsWebPDecoder.cpp -index e58ca92..2056ebb 100644 +index 2496ea2fe2f4..86852dcd3e14 100644 --- image/decoders/nsWebPDecoder.cpp +++ image/decoders/nsWebPDecoder.cpp -@@ -247,7 +247,12 @@ nsresult nsWebPDecoder::CreateFrame(const OrientedIntRect& aFrameRect) { +@@ -253,7 +253,12 @@ nsresult nsWebPDecoder::CreateFrame(const OrientedIntRect& aFrameRect) { // WebP doesn't guarantee that the alpha generated matches the hint in the // header, so we always need to claim the input is BGRA. If the output is // BGRX, swizzling will mask off the alpha channel. diff --git a/www/librewolf/files/patch-libwebrtc-generated b/www/librewolf/files/patch-libwebrtc-generated index d98bedc5154b..5616dedad585 100644 --- a/www/librewolf/files/patch-libwebrtc-generated +++ b/www/librewolf/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit 02d52bc6ba30ef400ff1c683972262a8771c1a58 +commit 0ba3ac0f8602edfec3e8ce41a10f8e23cc691636 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> - regenerate FreeBSD libwebrtc patch for gecko 148 + regenerate FreeBSD libwebrtc patch for gecko 149 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 @@ -6757,7 +6757,7 @@ index 2d2e381b8423..bd8e01b40700 100644 - Library("call_api_gn") diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -index 803d3f1eff52..cf3f00cfd583 100644 +index 69f8f6d11554..cf3f00cfd583 100644 --- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build +++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" @@ -6782,7 +6782,7 @@ index 803d3f1eff52..cf3f00cfd583 100644 FINAL_LIBRARY = "xul" -@@ -42,86 +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" @@ -6866,11 +6866,18 @@ index 803d3f1eff52..cf3f00cfd583 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": -@@ -129,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" @@ -6896,7 +6903,7 @@ index 803d3f1eff52..cf3f00cfd583 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -6938,7 +6945,7 @@ index 803d3f1eff52..cf3f00cfd583 100644 - Library("frame_decryptor_interface_gn") diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build -index 64ce06200fbe..a4f99ff8357a 100644 +index 9a0878536bcf..a4f99ff8357a 100644 --- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build +++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" @@ -6963,7 +6970,7 @@ index 64ce06200fbe..a4f99ff8357a 100644 FINAL_LIBRARY = "xul" -@@ -42,86 +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" @@ -7047,11 +7054,18 @@ index 64ce06200fbe..a4f99ff8357a 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": -@@ -129,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" @@ -7077,7 +7091,7 @@ index 64ce06200fbe..a4f99ff8357a 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": +@@ -164,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -13122,7 +13136,7 @@ index 7b9074f4195f..3f90e181f653 100644 - Library("rtp_packet_sender_gn") diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build -index 4abaae2609eb..8228db31aa88 100644 +index 606080c53eb5..8228db31aa88 100644 --- third_party/libwebrtc/api/rtp_parameters_gn/moz.build +++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build @@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" @@ -13147,7 +13161,7 @@ index 4abaae2609eb..8228db31aa88 100644 FINAL_LIBRARY = "xul" -@@ -47,86 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -13231,11 +13245,18 @@ index 4abaae2609eb..8228db31aa88 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": -@@ -134,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -23623,6 +23644,213 @@ index a6663bb723e5..d08276393a91 100644 + 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 +@@ -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,93 +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 +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + +@@ -140,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("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 @@ -32978,10 +33206,10 @@ index 1ac713b1e2a5..552eb9cf4167 100644 + DEFINES["WEBRTC_ENABLE_AVX2"] = True Library("rtc_event_bwe_gn") -diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build -index c1305a84a6cc..3087fdcc327a 100644 ---- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build +diff --git third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build +index d07ba27be008..c87ee9777bfc 100644 +--- third_party/libwebrtc/logging/rtc_event_bwe_update_scream_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_bwe_update_scream_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 @@ -33004,7 +33232,7 @@ index c1305a84a6cc..3087fdcc327a 100644 FINAL_LIBRARY = "xul" -@@ -49,93 +58,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" @@ -33099,7 +33327,7 @@ index c1305a84a6cc..3087fdcc327a 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -33184,11 +33412,11 @@ index c1305a84a6cc..3087fdcc327a 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("rtc_event_field_gn") -diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build -index 81e5642488fb..27983ddaa07f 100644 ---- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build + Library("rtc_event_bwe_update_scream_gn") +diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build +index c1305a84a6cc..3087fdcc327a 100644 +--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_field_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 @@ -33211,7 +33439,7 @@ index 81e5642488fb..27983ddaa07f 100644 FINAL_LIBRARY = "xul" -@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33295,16 +33523,27 @@ index 81e5642488fb..27983ddaa07f 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": -@@ -129,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +66,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 @@ -33325,10 +33564,12 @@ index 81e5642488fb..27983ddaa07f 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -157,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - +- 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 @@ -33349,6 +33590,12 @@ index 81e5642488fb..27983ddaa07f 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 @@ -33359,17 +33606,24 @@ index 81e5642488fb..27983ddaa07f 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("rtc_event_log_parse_status_gn") -diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build -index 68c681097dd3..f050b1ed6acd 100644 ---- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + + Library("rtc_event_field_gn") +diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build +index 81e5642488fb..27983ddaa07f 100644 +--- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_log_parse_status_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 @@ -33392,7 +33646,7 @@ index 68c681097dd3..f050b1ed6acd 100644 FINAL_LIBRARY = "xul" -@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -42,86 +51,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33480,16 +33734,12 @@ index 68c681097dd3..f050b1ed6acd 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -129,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 @@ -33510,12 +33760,10 @@ index 68c681097dd3..f050b1ed6acd 100644 if CONFIG["TARGET_CPU"] == "x86": -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- --if CONFIG["TARGET_CPU"] == "x86_64": -- -- DEFINES["WEBRTC_ENABLE_AVX2"] = True -- +@@ -157,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 @@ -33536,12 +33784,6 @@ index 68c681097dd3..f050b1ed6acd 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 @@ -33552,24 +33794,17 @@ index 68c681097dd3..f050b1ed6acd 100644 - -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("rtc_event_number_encodings_gn") -diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -index 8e54172d3ffc..15705b114eb9 100644 ---- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build +- + Library("rtc_event_log_parse_status_gn") +diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build +index 68c681097dd3..f050b1ed6acd 100644 +--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_number_encodings_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 @@ -33592,7 +33827,7 @@ index 8e54172d3ffc..15705b114eb9 100644 FINAL_LIBRARY = "xul" -@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -48,86 +57,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -33676,18 +33911,11 @@ index 8e54172d3ffc..15705b114eb9 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": +@@ -135,82 +65,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -33772,11 +34000,11 @@ index 8e54172d3ffc..15705b114eb9 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("rtc_event_pacing_gn") -diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -index 3e27015753fd..7a52b559595d 100644 ---- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build + Library("rtc_event_number_encodings_gn") +diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build +index 8e54172d3ffc..15705b114eb9 100644 +--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_pacing_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 @@ -33799,7 +34027,7 @@ index 3e27015753fd..7a52b559595d 100644 FINAL_LIBRARY = "xul" -@@ -49,93 +58,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" @@ -33894,7 +34122,7 @@ index 3e27015753fd..7a52b559595d 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -33979,11 +34207,11 @@ index 3e27015753fd..7a52b559595d 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("rtc_event_rtp_rtcp_gn") -diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -index 79fa2f18c369..42638e9c1a58 100644 ---- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build + Library("rtc_event_pacing_gn") +diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build +index 3e27015753fd..7a52b559595d 100644 +--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_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 @@ -34006,7 +34234,7 @@ index 79fa2f18c369..42638e9c1a58 100644 FINAL_LIBRARY = "xul" -@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -49,93 +58,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34101,7 +34329,7 @@ index 79fa2f18c369..42638e9c1a58 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -143,82 +66,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -34186,11 +34414,11 @@ index 79fa2f18c369..42638e9c1a58 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("rtc_event_video_gn") -diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -index 4567caafbe26..2017f2c23000 100644 ---- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build -+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build + Library("rtc_event_rtp_rtcp_gn") +diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build +index 79fa2f18c369..42638e9c1a58 100644 +--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_event_video_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 @@ -34213,7 +34441,7 @@ index 4567caafbe26..2017f2c23000 100644 FINAL_LIBRARY = "xul" -@@ -46,93 +55,7 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -47,93 +56,7 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -34308,7 +34536,7 @@ index 4567caafbe26..2017f2c23000 100644 if CONFIG["TARGET_CPU"] == "aarch64": -@@ -140,82 +63,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -141,82 +64,21 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_HAS_NEON"] = True DEFINES["__ARM_NEON__"] = "1" @@ -34393,11 +34621,11 @@ index 4567caafbe26..2017f2c23000 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("rtc_stream_config_gn") -diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build -index 170ceb38ea18..ff3ef7c10365 100644 ---- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build -+++ third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build + Library("rtc_event_video_gn") +diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build +index 4567caafbe26..2017f2c23000 100644 +--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build ++++ third_party/libwebrtc/logging/rtc_stream_config_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 @@ -34600,11 +34828,11 @@ index 170ceb38ea18..ff3ef7c10365 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["WEBRTC_ENABLE_AVX2"] = True - Library("adapted_video_track_source_gn") -diff --git third_party/libwebrtc/media/audio_source_gn/moz.build third_party/libwebrtc/media/audio_source_gn/moz.build -index f1168831de90..5fd47ccaeddd 100644 ---- third_party/libwebrtc/media/audio_source_gn/moz.build -+++ third_party/libwebrtc/media/audio_source_gn/moz.build + Library("rtc_stream_config_gn") +diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build +index 170ceb38ea18..ff3ef7c10365 100644 +--- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build ++++ third_party/libwebrtc/media/adapted_video_track_source_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 @@ -34627,7 +34855,7 @@ index f1168831de90..5fd47ccaeddd 100644 FINAL_LIBRARY = "xul" -@@ -42,82 +51,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" @@ -34646,6 +34874,10 @@ index f1168831de90..5fd47ccaeddd 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -34707,16 +34939,27 @@ index f1168831de90..5fd47ccaeddd 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": -@@ -125,25 +59,10 @@ if CONFIG["TARGET_CPU"] == "aarch64": +@@ -140,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 @@ -34737,10 +34980,12 @@ index f1168831de90..5fd47ccaeddd 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -153,40 +72,4 @@ if CONFIG["TARGET_CPU"] == "x86_64": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - +- 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 @@ -34761,6 +35006,12 @@ index f1168831de90..5fd47ccaeddd 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 @@ -34771,17 +35022,24 @@ index f1168831de90..5fd47ccaeddd 100644 - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": *** 19084 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c4585d.33514.17c3eda6>