Date: Mon, 29 May 2023 20:32:45 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: c89b41a31b57 - 2023Q2 - www/firefox: update to 114.0 (rc1) Message-ID: <202305292032.34TKWjij082674@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c89b41a31b57ad882759f78435a55a632e992ea7 commit c89b41a31b57ad882759f78435a55a632e992ea7 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2023-05-29 20:29:20 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2023-05-29 20:32:25 +0000 www/firefox: update to 114.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/114.0/releasenotes/ (cherry picked from commit 284b22e992123f6e4eb435ed183bd981e50f0c6b) --- www/firefox/Makefile | 3 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug1504834_comment5 | 10 +- www/firefox/files/patch-bug1504834_comment9 | 49 - www/firefox/files/patch-libwebrtc-generated | 9898 +++++++++-------------- www/firefox/files/patch-pipewire_init | 43 +- www/firefox/files/patch-toolkit_xre_glxtest.cpp | 10 +- 7 files changed, 4030 insertions(+), 5989 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index a245d8d21af9..ea74eceaeecb 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,5 @@ PORTNAME= firefox -DISTVERSION= 113.0.2 -PORTREVISION= 1 +DISTVERSION= 114.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index facb9d164287..5f721b214976 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684776109 -SHA256 (firefox-113.0.2.source.tar.xz) = f132b702836311b6cc40873b69df3ce208d035dbc8ce390c390eebd63d27c7a3 -SIZE (firefox-113.0.2.source.tar.xz) = 500503164 +TIMESTAMP = 1685385780 +SHA256 (firefox-114.0.source.tar.xz) = ba177f90bfa9833dbb3694863e08d01229afdd6b478b28b542124fce7dd262ca +SIZE (firefox-114.0.source.tar.xz) = 498171840 diff --git a/www/firefox/files/patch-bug1504834_comment5 b/www/firefox/files/patch-bug1504834_comment5 index 4d4886823f0f..b9897e0b7f66 100644 --- a/www/firefox/files/patch-bug1504834_comment5 +++ b/www/firefox/files/patch-bug1504834_comment5 @@ -37,10 +37,8 @@ index 6b3bdc7..7c6c342 100644 // The following values are OS and endian-independent synonyms. // -diff --git gfx/skia/skia/third_party/skcms/skcms.cc gfx/skia/skia/third_party/skcms/skcms.cc -index 6b4d87b..7c0559d 100644 ---- gfx/skia/skia/third_party/skcms/skcms.cc -+++ gfx/skia/skia/third_party/skcms/skcms.cc +--- gfx/skia/skia/modules/skcms/skcms.cc.orig ++++ gfx/skia/skia/modules/skcms/skcms.cc @@ -30,6 +30,8 @@ #include <avx512fintrin.h> #include <avx512dqintrin.h> @@ -49,8 +47,8 @@ index 6b4d87b..7c0559d 100644 + #define SKCMS_PORTABLE #endif - // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others. -@@ -280,20 +282,28 @@ enum { + static bool runtime_cpu_detection = true; +@@ -324,20 +326,28 @@ static uint16_t read_big_u16(const uint8_t* ptr) { uint16_t be; memcpy(&be, ptr, sizeof(be)); diff --git a/www/firefox/files/patch-bug1504834_comment9 b/www/firefox/files/patch-bug1504834_comment9 deleted file mode 100644 index c3d149ffa37b..000000000000 --- a/www/firefox/files/patch-bug1504834_comment9 +++ /dev/null @@ -1,49 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c9 -https://bugzilla.mozilla.org/attachment.cgi?id=9111146 -mozilla-bmo1504834-part3.patch - - -# HG changeset patch -# Parent aecb4600e5da17443b224c79eee178c1d8e155e3 -For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the -right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). - -diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h ---- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 -@@ -238,7 +238,18 @@ - AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } - AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } - -+ // On Big endian the commented out variant doesn't work, -+ // and honestly, I have no idea why it exists in the first place. -+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits() -+ // which gets a 64-bit integer, and FromBits returns 32-bit, -+ // cutting off the wrong half again. -+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). -+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) -+#ifdef SK_CPU_BENDIAN -+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } -+#else - AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } -+#endif - AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } - AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } - -diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h ---- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 -@@ -203,7 +203,13 @@ - // ~~~> - // a = 1*aa + d(1-1*aa) = aa + d(1-aa) - // c = 0*aa + d(1-1*aa) = d(1-aa) -+ -+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 -+#ifdef SK_CPU_BENDIAN -+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) -+#else - return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) -+#endif - + d.approxMulDiv255(aa.inv()); - }; - while (h --> 0) { diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 28c936432100..0de66b1b0116 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit a8961f42815b94179d9df11555ecdb18fab86a91 +commit 2eafa75dbec1817680f1074cb7baa45d6734c8d9 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> - regenerate FreeBSD libwebrtc patch for Firefox 113 + regenerate FreeBSD libwebrtc patch for Firefox 114 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 c3f52293bf1b..46d0a26b3591 100644 @@ -2176,10 +2176,10 @@ index 3981b81f8a31..7061eeab5dce 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 d5e4bb813c5d..d3fdba7c9fa8 100644 +index 742c17dbd15b..535c9a64c10f 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,25 @@ AllowCompilerWarnings() +@@ -12,13 +12,23 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -2194,8 +2194,6 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 +DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2205,7 +2203,7 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 FINAL_LIBRARY = "webrtc" -@@ -45,228 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2233,8 +2231,6 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -2267,8 +2263,6 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -2284,8 +2278,6 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2326,17 +2318,6 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" -- --if CONFIG["CPU_ARCH"] == "ppc64": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -- OS_LIBS += [ -- "m" -- ] - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2362,11 +2343,6 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -2380,29 +2356,15 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 - "-msse2" - ] - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -2416,33 +2378,21 @@ index d5e4bb813c5d..d3fdba7c9fa8 100644 ] - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] + DEFINES["USE_X11"] = "1" 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 a2c0e3eb322b..41e003f77539 100644 +index dc8555f2f55e..e0acb5f4a4c5 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,25 @@ AllowCompilerWarnings() +@@ -12,13 +12,23 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -2457,8 +2407,6 @@ index a2c0e3eb322b..41e003f77539 100644 +DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True @@ -2468,7 +2416,7 @@ index a2c0e3eb322b..41e003f77539 100644 FINAL_LIBRARY = "webrtc" -@@ -45,228 +57,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,180 +55,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2496,8 +2444,6 @@ index a2c0e3eb322b..41e003f77539 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -2530,8 +2476,6 @@ index a2c0e3eb322b..41e003f77539 100644 - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -2547,8 +2491,6 @@ index a2c0e3eb322b..41e003f77539 100644 - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -2589,17 +2531,6 @@ index a2c0e3eb322b..41e003f77539 100644 - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" -- --if CONFIG["CPU_ARCH"] == "ppc64": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -- OS_LIBS += [ -- "m" -- ] - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -2625,11 +2556,6 @@ index a2c0e3eb322b..41e003f77539 100644 - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - OS_LIBS += [ @@ -2643,29 +2569,15 @@ index a2c0e3eb322b..41e003f77539 100644 - "-msse2" - ] - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -2679,25 +2591,13 @@ index a2c0e3eb322b..41e003f77539 100644 ] - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] + DEFINES["USE_X11"] = "1" Library("builtin_audio_encoder_factory_gn") @@ -4311,71 +4211,36 @@ index 86916311191d..e21fd153a761 100644 + DEFINES["USE_X11"] = "1" Library("audio_encoder_ilbc_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build -deleted file mode 100644 -index 7b4fc60b35e7..000000000000 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build -+++ /dev/null -@@ -1,94 +0,0 @@ --# This Source Code Form is subject to the terms of the Mozilla Public --# License, v. 2.0. If a copy of the MPL was not distributed with this --# file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- -- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### -- ### DO NOT edit it by hand. ### -- --COMPILE_FLAGS["OS_INCLUDES"] = [] --AllowCompilerWarnings() -- --CXXFLAGS += [ -- "-mfpu=neon" --] -- --DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ARCH_ARM"] = True --DEFINES["WEBRTC_ARCH_ARM_V7"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_HAS_NEON"] = True --DEFINES["WEBRTC_LIBRARY_IMPL"] = True --DEFINES["WEBRTC_LINUX"] = 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["_GNU_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "!/third_party/libwebrtc/gen", -- "/ipc/chromium/src", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/tools/profiler/public" --] -- --UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix.cc" --] -- --if not CONFIG["MOZ_DEBUG"]: -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0" -- DEFINES["NDEBUG"] = True -- DEFINES["NVALGRIND"] = True -- --if CONFIG["MOZ_DEBUG"] == "1": -- -- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" -- DEFINES["_DEBUG"] = True +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build +index 28c8a12f99b6..a594e676a6b6 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build +@@ -12,11 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "webrtc" + +@@ -44,173 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" - -if CONFIG["OS_TARGET"] == "Android": - @@ -4384,13 +4249,27 @@ index 7b4fc60b35e7..000000000000 - DEFINES["HAVE_SYS_UIO_H"] = True - DEFINES["WEBRTC_ANDROID"] = True - DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True - - OS_LIBS += [ -- "android_support", -- "log", -- "unwind" +- "log" - ] - +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- -if CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_AURA"] = "1" @@ -4398,23 +4277,148 @@ index 7b4fc60b35e7..000000000000 - DEFINES["USE_NSS_CERTS"] = "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["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = 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["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "rt" +- "winmm" +- ] ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" - ] - +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["USE_X11"] = "1" - --Library("audio_decoder_isac_fix_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build -index 09b0eb1ab0d1..de596c7fc12d 100644 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn/moz.build +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- CXXFLAGS += [ +- "-msse2" +- ] +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True ++ DEFINES["USE_X11"] = "1" + + Library("audio_decoder_multiopus_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build +index 996d829e29b4..508ce91d431b 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -4437,7 +4441,7 @@ index 09b0eb1ab0d1..de596c7fc12d 100644 FINAL_LIBRARY = "webrtc" -@@ -43,159 +53,21 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -39,161 +49,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4485,11 +4489,6 @@ index 09b0eb1ab0d1..de596c7fc12d 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "m", -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -4532,9 +4531,6 @@ index 09b0eb1ab0d1..de596c7fc12d 100644 - DEFINES["__STD_C"] = True - - OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", - "winmm" - ] + DEFINES["_DEBUG"] = True @@ -4544,6 +4540,12 @@ index 09b0eb1ab0d1..de596c7fc12d 100644 DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True +-if CONFIG["CPU_ARCH"] == "arm": +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - - DEFINES["_DEBUG"] = True @@ -4565,15 +4567,19 @@ index 09b0eb1ab0d1..de596c7fc12d 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["USE_X11"] = "1" +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- CXXFLAGS += [ -- "-msse2" -- ] -- - OS_LIBS += [ - "android_support" - ] @@ -4583,29 +4589,27 @@ index 09b0eb1ab0d1..de596c7fc12d 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["CPU_ARCH"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - +- - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - +- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True -+ DEFINES["USE_X11"] = "1" - - Library("audio_decoder_isac_float_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -index e5ec655bdb46..a8c71ccceb2f 100644 ---- third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build -@@ -12,11 +12,23 @@ AllowCompilerWarnings() +- + Library("audio_decoder_opus_config_gn") +diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build +index c6bf3b3966c5..34d6a5a32c25 100644 +--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build +@@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -4619,8 +4623,6 @@ index e5ec655bdb46..a8c71ccceb2f 100644 DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -+DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -4629,7 +4631,7 @@ index e5ec655bdb46..a8c71ccceb2f 100644 FINAL_LIBRARY = "webrtc" -@@ -39,216 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -44,180 +54,21 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -4657,8 +4659,6 @@ index e5ec655bdb46..a8c71ccceb2f 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_MAC"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True - DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" - DEFINES["__STDC_CONSTANT_MACROS"] = True @@ -4691,8 +4691,6 @@ index e5ec655bdb46..a8c71ccceb2f 100644 - DEFINES["WEBRTC_BSD"] = True - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["WEBRTC_POSIX"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_FILE_OFFSET_BITS"] = "64" - DEFINES["_LARGEFILE64_SOURCE"] = True - DEFINES["_LARGEFILE_SOURCE"] = True @@ -4708,8 +4706,6 @@ index e5ec655bdb46..a8c71ccceb2f 100644 - DEFINES["UNICODE"] = True - DEFINES["USE_AURA"] = "1" - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["WEBRTC_WIN"] = True - DEFINES["WIN32"] = True - DEFINES["WIN32_LEAN_AND_MEAN"] = True @@ -4743,20 +4739,13 @@ index e5ec655bdb46..a8c71ccceb2f 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0" -- --if CONFIG["CPU_ARCH"] == "ppc64": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -- OS_LIBS += [ -- "m" -- ] - -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android": - @@ -4779,14 +4768,8 @@ index e5ec655bdb46..a8c71ccceb2f 100644 - DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": -+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": - - DEFINES["USE_X11"] = "1" - --if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +- DEFINES["USE_X11"] = "1" - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - @@ -4797,161 +4780,46 @@ index e5ec655bdb46..a8c71ccceb2f 100644 - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" +- CXXFLAGS += [ +- "-msse2" +- ] - - OS_LIBS += [ - "android_support" - ] - --if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android": -- -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" -- -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["CPU_ARCH"] == "x86": + + CXXFLAGS += [ + "-msse2" + ] + - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True - -- OS_LIBS += [ -- "m" -- ] -- -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["WEBRTC_ENABLE_AVX2"] = True -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0" -- DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1" - DEFINES["_GNU_SOURCE"] = True -- -- OS_LIBS += [ -- "m" -- ] -- - Library("audio_decoder_isac_gn") -diff --git third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build *** 15912 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305292032.34TKWjij082674>