From nobody Tue Aug 27 10:24:37 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WtNvT4Z87z5VTs0; Tue, 27 Aug 2024 10:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtNvT4FjMz4kJr; Tue, 27 Aug 2024 10:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724754277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+c8uY9+iRC3WUEXPb4/r93i4SrMVtB019b23uOMc84=; b=IPsHltsYw6K0Xw47rW2yOM80JN4RCmUwK2kQsT6rwkI2UK7eoKAlXBvF9xEirj1rnSlodS 9p0SUBormU+PiZ+fQxR2o9T6uec8xywEQCSCiGbjcwOlJAKKjhIPDdzrIdZNn/NkQMA3Qk I7deFKLCacT32ViqJKYOj8pIaDnv/O7vQLYF0c3Uoa2cW/8xU5zZwkIscLXbDj43lfqL44 qL+z9LlrvF6H0mTkJ28glmOscqwmkVfRtlNaQhJRN7CnIGCHQ+84cHW95UlWqqg1foHp8i w0blznqSRfZIs0Bg/xxdM9Qsj2ZYpL0qO9TSGC9HvW/hWJCbbLDYwaYljQ/MQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724754277; a=rsa-sha256; cv=none; b=heAxChqlb05HYud/g5mBxcNGrQw8X+h+EhNUjlFaOaCV5d6GDzcxKbNYBWFn/BqqaOyTJi VQujrBgqx/WomDp+dhnQeaPyIFtWd8AsyMgvBFNxTpxoJvdHEUBqObHvLkJsnsr3cwztbs vl9i+qeqCuf5irTGuAAUVV86l3BuUnaArK4LvGH3SG93g6dCtHTkDRJhXvQdN9B4pJlRoS Icgd+raVw7nQA/IXNYHQQGUC7BBoJviz2DK/T5XmIfzk7Kj5BT+eNB4H3r1CUCNqIhrt2c E3BqKtDf9IpRE/64NSiNjJGyJtLzewEuBeJ1J4cxqLIRAlnT5S0EKRf0e+74Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724754277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+c8uY9+iRC3WUEXPb4/r93i4SrMVtB019b23uOMc84=; b=ZoJ+5oXPZX4j5ovK+DK8EL9DZ7ON+zsIdB03VaqgTOs2V5BFrS2dyPOW6QWajGjdzb5omf 0/736fwqq3TbSeeyKw1QekgfKRVyqi0chcwWIaphLuexyoFn2pi9L+wY/Sj92xXCkvZ2kH /MT2Fssgz94AetjLhLbXGTHTTt7dANe37x435E9xFqrm/Ri/p6oN6C22N7TlYO7ITtXBa1 ZmhIrspIFv2QYGntSEoNZOB2+ZuPFoQFcNi6zzHjxscTRpVTvQjqhege3BVfjJTz04Wn++ +J6dSxTbyWV0lVbBdl6vy3Dn8o3azMyJPD15WzU6le8rrX/DFD436kOlbI3oZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WtNvT3SQXzmf0; Tue, 27 Aug 2024 10:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47RAObHA012195; Tue, 27 Aug 2024 10:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RAObM3012192; Tue, 27 Aug 2024 10:24:37 GMT (envelope-from git) Date: Tue, 27 Aug 2024 10:24:37 GMT Message-Id: <202408271024.47RAObM3012192@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: f2a04eb29525 - main - www/firefox: update to 130.0 (rc1) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a04eb29525c34b6cec71eae7236d79abbb1cc0 Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2a04eb29525c34b6cec71eae7236d79abbb1cc0 commit f2a04eb29525c34b6cec71eae7236d79abbb1cc0 Author: Christoph Moench-Tegeder AuthorDate: 2024-08-27 10:24:03 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-08-27 10:24:03 +0000 www/firefox: update to 130.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/130.0/releasenotes/ --- www/firefox/Makefile | 3 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-bug847568 | 55 +- www/firefox/files/patch-libwebrtc-generated | 9406 +++++++++++++-------------- 4 files changed, 4601 insertions(+), 4869 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 29baae4ca7f1..d9da685be40e 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,6 +1,5 @@ PORTNAME= firefox -DISTVERSION= 129.0.2 -PORTREVISION= 1 +DISTVERSION= 130.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 93e766fbc928..7253ed18b31b 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724099797 -SHA256 (firefox-129.0.2.source.tar.xz) = 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344 -SIZE (firefox-129.0.2.source.tar.xz) = 559547204 +TIMESTAMP = 1724711189 +SHA256 (firefox-130.0.source.tar.xz) = 42efa35ea30bfde3784919e4dfabaf69cbc43e5e121dbe2be7526fa335038b62 +SIZE (firefox-130.0.source.tar.xz) = 566803424 diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index 2ee46579d43d..f3e7ecbc1a13 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -1,10 +1,10 @@ -# Allow building against system-wide graphite2/harfbuzz. +Allow building against system-wide graphite2/harfbuzz diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index 0c06f581b33b..10f125be25ab 100644 +index af44c89057fc..c0ac271917fb 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1307,6 +1307,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]: +@@ -1304,6 +1304,19 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]: "proxy.h", ] @@ -25,10 +25,10 @@ index 0c06f581b33b..10f125be25ab 100644 system_headers += [ "unicode/calendar.h", diff --git dom/base/moz.build dom/base/moz.build -index 14c9f9dd96fb..bd1c8f241e9b 100644 +index 170d19f09aa9..a47fc8b1193c 100644 --- dom/base/moz.build +++ dom/base/moz.build -@@ -606,6 +606,9 @@ FINAL_LIBRARY = "xul" +@@ -620,6 +620,9 @@ FINAL_LIBRARY = "xul" if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] @@ -40,7 +40,7 @@ index 14c9f9dd96fb..bd1c8f241e9b 100644 script="gen-usecounters.py", diff --git gfx/graphite2/geckoextra/moz.build gfx/graphite2/geckoextra/moz.build new file mode 100644 -index 000000000000..24e8d7a03274 +index 000000000000..ed0323eba9d5 --- /dev/null +++ gfx/graphite2/geckoextra/moz.build @@ -0,0 +1,21 @@ @@ -104,10 +104,10 @@ index 56ea317bedfc..07dd7f66f1bc 100644 "thebes", "ipc", diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py -index c161d24df853..8c7dd395b371 100755 +index b589efde1c5c..47f49e10df70 100755 --- gfx/skia/generate_mozbuild.py +++ gfx/skia/generate_mozbuild.py -@@ -91,6 +91,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): +@@ -95,6 +95,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -118,10 +118,10 @@ index c161d24df853..8c7dd395b371 100755 LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", diff --git gfx/skia/moz.build gfx/skia/moz.build -index 83aa2957a938..0859316a1f09 100644 +index 7fee54534878..ba1a4038e4a0 100644 --- gfx/skia/moz.build +++ gfx/skia/moz.build -@@ -601,6 +601,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): +@@ -623,6 +623,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', ] @@ -132,10 +132,10 @@ index 83aa2957a938..0859316a1f09 100644 LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", diff --git gfx/thebes/moz.build gfx/thebes/moz.build -index fd1fcf236d81..958d3f699ffd 100644 +index 48f2849e2025..7d0a161a91b4 100644 --- gfx/thebes/moz.build +++ gfx/thebes/moz.build -@@ -293,7 +293,13 @@ if CONFIG["MOZ_WAYLAND"]: +@@ -295,7 +295,13 @@ if CONFIG["MOZ_WAYLAND"]: LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] @@ -151,7 +151,7 @@ index fd1fcf236d81..958d3f699ffd 100644 CXXFLAGS += ["-Werror=switch"] diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build -index 2bbd00415cae..f66bd37695d4 100644 +index 2396210428ee..092baac6f79c 100644 --- intl/unicharutil/util/moz.build +++ intl/unicharutil/util/moz.build @@ -24,6 +24,9 @@ UNIFIED_SOURCES += [ @@ -165,10 +165,10 @@ index 2bbd00415cae..f66bd37695d4 100644 GeneratedFile( diff --git netwerk/dns/moz.build netwerk/dns/moz.build -index c926d14707d1..35a3f33e2885 100644 +index 1bb0430f01aa..0360e0f468c0 100644 --- netwerk/dns/moz.build +++ netwerk/dns/moz.build -@@ -112,6 +112,9 @@ GeneratedFile( +@@ -111,6 +111,9 @@ GeneratedFile( "etld_data.inc", script="prepare_tlds.py", inputs=["effective_tld_names.dat"] ) @@ -179,10 +179,10 @@ index c926d14707d1..35a3f33e2885 100644 LOCAL_INCLUDES += [ "/netwerk/base", diff --git old-configure.in old-configure.in -index 2ca88a20a4b3..88bc9b873eff 100644 +index 1af75c496b15..f1c7d7c48d28 100644 --- old-configure.in +++ old-configure.in -@@ -1067,6 +1067,27 @@ fi +@@ -167,6 +167,27 @@ fi AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID) AC_SUBST(MOZ_MACBUNDLE_ID) @@ -210,11 +210,24 @@ index 2ca88a20a4b3..88bc9b873eff 100644 dnl ======================================================== dnl = Child Process Name for IPC dnl ======================================================== +diff --git security/rlbox/moz.build security/rlbox/moz.build +index 7ad8d076f0f1..835b9d905e03 100644 +--- security/rlbox/moz.build ++++ security/rlbox/moz.build +@@ -47,6 +47,8 @@ if CONFIG["MOZ_WASM_SANDBOXING_GRAPHITE"]: + for k, v in graphite_defines: + WASM_DEFINES[k] = v + LOCAL_INCLUDES += ["/gfx/graphite2/src"] ++ if CONFIG["MOZ_SYSTEM_GRAPHITE2"]: ++ WASM_CXXFLAGS += CONFIG["MOZ_GRAPHITE2_CFLAGS"] + + if CONFIG["MOZ_WASM_SANDBOXING_OGG"]: + include("/media/libogg/sources.mozbuild") diff --git toolkit/library/moz.build toolkit/library/moz.build -index 76746f308011..f6844f4c400b 100644 +index ee6051567c8e..c24a5a513bbc 100644 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -292,6 +292,12 @@ if CONFIG["MOZ_SYSTEM_PNG"]: +@@ -298,6 +298,12 @@ if CONFIG["MOZ_SYSTEM_PNG"]: if CONFIG["MOZ_SYSTEM_WEBP"]: OS_LIBS += CONFIG["MOZ_WEBP_LIBS"] @@ -228,10 +241,10 @@ index 76746f308011..f6844f4c400b 100644 OS_LIBS += CONFIG["MOZ_LIBEVENT_LIBS"] diff --git toolkit/moz.configure toolkit/moz.configure -index a060a59f728f..f0778d1ae2d6 100644 +index 1f85d2831f2f..04ce56e2cc0b 100644 --- toolkit/moz.configure +++ toolkit/moz.configure -@@ -1218,6 +1218,26 @@ def enable_cairo_ft(target, tree_freetype, freetype2_info): +@@ -1397,6 +1397,26 @@ def enable_cairo_ft(target, tree_freetype, freetype2_info): set_config("MOZ_ENABLE_CAIRO_FT", True, when=enable_cairo_ft) set_config("CAIRO_FT_CFLAGS", ft2_info.cflags, when=enable_cairo_ft) diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index c547d211c7d4..5629747667ae 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit 8f47d0fc87c264faae3f47b2023f8a7eb4c36101 +commit 3acbc7017b7e5799d225abfa8f8725a0990e059c Author: Christoph Moench-Tegeder - regenerate FreeBSD libwebrtc patch for Firefox 129 + regenerate FreeBSD libwebrtc patch for Firefox 130 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 2dbd5881583e..332ca04819ee 100644 @@ -1038,6 +1038,197 @@ index 746585483f96..33ea9b79d47b 100644 + DEFINES["USE_X11"] = "1" Library("aec3_factory_gn") +diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build +index 9609692094c1..f0da29e5d200 100644 +--- third_party/libwebrtc/api/audio/audio_device_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build +@@ -12,11 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "xul" + +@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["RTC_ENABLE_WIN_WGC"] = True +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-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"] == "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": + +@@ -153,50 +69,8 @@ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": +- +- OS_LIBS += [ +- "unwind" +- ] +- +-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("audio_device_gn") diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build index e2561db08f06..59da7761dd35 100644 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build @@ -1641,10 +1832,10 @@ index 36d43783a3e7..fd0111ba0ffd 100644 - DEFINES["_GNU_SOURCE"] = True - Library("audio_mixer_api_gn") -diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build -index 06f43e765114..6c06b87bcfe3 100644 ---- third_party/libwebrtc/api/audio/echo_control_gn/moz.build -+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build +diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build +index 7226d2a92a40..c60a400c218b 100644 +--- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -1667,7 +1858,7 @@ index 06f43e765114..6c06b87bcfe3 100644 FINAL_LIBRARY = "xul" -@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1764,6 +1955,10 @@ index 06f43e765114..6c06b87bcfe3 100644 -if CONFIG["TARGET_CPU"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -1780,10 +1975,12 @@ index 06f43e765114..6c06b87bcfe3 100644 if CONFIG["TARGET_CPU"] == "x86": -@@ -153,50 +69,8 @@ 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 @@ -1805,16 +2002,21 @@ index 06f43e765114..6c06b87bcfe3 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" - +- +- DEFINES["USE_X11"] = "1" +- -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": - - OS_LIBS += [ - "unwind" - ] - +-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 @@ -1824,18 +2026,27 @@ index 06f43e765114..6c06b87bcfe3 100644 - DEFINES["_GNU_SOURCE"] = True - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + +- CXXFLAGS += [ +- "-msse2" +- ] ++if CONFIG["TARGET_CPU"] == "x86_64": + - DEFINES["_GNU_SOURCE"] = True -- ++ DEFINES["WEBRTC_ENABLE_AVX2"] = True + -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": -- ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + - DEFINES["_GNU_SOURCE"] = True -- - Library("echo_control_gn") -diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build -index 5811f4d9321b..0f11017e2f6c 100644 ---- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build ++ DEFINES["USE_X11"] = "1" + + Library("audio_processing_gn") +diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build +index d7629659d6ba..cb69c23840a0 100644 +--- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build ++++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -1858,7 +2069,7 @@ index 5811f4d9321b..0f11017e2f6c 100644 FINAL_LIBRARY = "xul" -@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -1877,10 +2088,6 @@ index 5811f4d9321b..0f11017e2f6c 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_MAC"] = True @@ -1946,13 +2153,6 @@ index 5811f4d9321b..0f11017e2f6c 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["TARGET_CPU"] == "aarch64": @@ -2049,11 +2249,202 @@ index 5811f4d9321b..0f11017e2f6c 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("audio_decoder_L16_gn") -diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build -index f4fb06ef3f09..90113fd85d92 100644 ---- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build + Library("audio_processing_statistics_gn") +diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build +index 06f43e765114..6c06b87bcfe3 100644 +--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build ++++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build +@@ -12,11 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "xul" + +@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True +- DEFINES["_LARGEFILE_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "WINNT": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["RTC_ENABLE_WIN_WGC"] = True +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_WIN"] = True +- DEFINES["WIN32"] = True +- DEFINES["WIN32_LEAN_AND_MEAN"] = True +- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP" +- DEFINES["WINVER"] = "0x0A00" +- DEFINES["_ATL_NO_OPENGL"] = True +- DEFINES["_CRT_RAND_S"] = True +- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True +- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True +- DEFINES["_HAS_EXCEPTIONS"] = "0" +- DEFINES["_HAS_NODISCARD"] = True +- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True +- DEFINES["_SECURE_ATL"] = True +- DEFINES["_UNICODE"] = True +- DEFINES["_WIN32_WINNT"] = "0x0A00" +- DEFINES["_WINDOWS"] = True +- DEFINES["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["TARGET_CPU"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-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"] == "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": + +@@ -153,50 +69,8 @@ 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm": +- +- OS_LIBS += [ +- "unwind" +- ] +- +-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("echo_control_gn") +diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build +index 5811f4d9321b..0f11017e2f6c 100644 +--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -2267,11 +2658,11 @@ index f4fb06ef3f09..90113fd85d92 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("audio_encoder_L16_gn") -diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build -index faed7e9b0f61..84835da8965c 100644 ---- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build + Library("audio_decoder_L16_gn") +diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build +index f4fb06ef3f09..90113fd85d92 100644 +--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build @@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -2294,7 +2685,7 @@ index faed7e9b0f61..84835da8965c 100644 FINAL_LIBRARY = "xul" -@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2485,12 +2876,12 @@ index faed7e9b0f61..84835da8965c 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - 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 5de9c2960769..a0d91297b550 100644 ---- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build -@@ -12,13 +12,23 @@ AllowCompilerWarnings() + Library("audio_encoder_L16_gn") +diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build +index faed7e9b0f61..84835da8965c 100644 +--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build +@@ -12,11 +12,21 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -2504,8 +2895,6 @@ index 5de9c2960769..a0d91297b550 100644 DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" - DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1" - DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -2514,7 +2903,7 @@ index 5de9c2960769..a0d91297b550 100644 FINAL_LIBRARY = "xul" -@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -2562,10 +2951,6 @@ index 5de9c2960769..a0d91297b550 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "rt" -- ] -- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -2709,11 +3094,11 @@ index 5de9c2960769..a0d91297b550 100644 - DEFINES["_GNU_SOURCE"] = True + 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 5ff7dfd0ffd4..334acbe7d342 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 + 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 5de9c2960769..a0d91297b550 100644 +--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build @@ -12,13 +12,23 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -2933,12 +3318,12 @@ index 5ff7dfd0ffd4..334acbe7d342 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("builtin_audio_encoder_factory_gn") -diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -index e1c8fa6a08bc..7799b83b91bb 100644 ---- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build -@@ -12,11 +12,21 @@ AllowCompilerWarnings() + 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 5ff7dfd0ffd4..334acbe7d342 100644 +--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build +@@ -12,13 +12,23 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True DEFINES["RTC_ENABLE_VP9"] = True @@ -2952,6 +3337,8 @@ index e1c8fa6a08bc..7799b83b91bb 100644 DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" + DEFINES["WEBRTC_USE_BUILTIN_ILBC"] = "1" + DEFINES["WEBRTC_USE_BUILTIN_OPUS"] = "1" +DEFINES["_FILE_OFFSET_BITS"] = "64" +DEFINES["_LARGEFILE64_SOURCE"] = True +DEFINES["_LARGEFILE_SOURCE"] = True @@ -2960,7 +3347,7 @@ index e1c8fa6a08bc..7799b83b91bb 100644 FINAL_LIBRARY = "xul" -@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -3008,6 +3395,10 @@ index e1c8fa6a08bc..7799b83b91bb 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "rt" +- ] +- -if CONFIG["OS_TARGET"] == "OpenBSD": - - DEFINES["USE_GLIB"] = "1" @@ -3151,11 +3542,229 @@ index e1c8fa6a08bc..7799b83b91bb 100644 - DEFINES["_GNU_SOURCE"] = True + DEFINES["USE_X11"] = "1" - Library("audio_decoder_g711_gn") -diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -index 39513d15b310..aff5480ad0b3 100644 ---- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build -+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build + Library("builtin_audio_encoder_factory_gn") +diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build +index e1c8fa6a08bc..7799b83b91bb 100644 +--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build ++++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build +@@ -12,11 +12,21 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" ++DEFINES["WEBRTC_POSIX"] = True + DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" ++DEFINES["_FILE_OFFSET_BITS"] = "64" ++DEFINES["_LARGEFILE64_SOURCE"] = True ++DEFINES["_LARGEFILE_SOURCE"] = True ++DEFINES["__STDC_CONSTANT_MACROS"] = True ++DEFINES["__STDC_FORMAT_MACROS"] = True + + FINAL_LIBRARY = "xul" + +@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_FILE_OFFSET_BITS"] = "64" +- DEFINES["_LARGEFILE64_SOURCE"] = True *** 11898 LINES SKIPPED ***