From nobody Mon Jul 18 20:24:53 2022 X-Original-To: dev-commits-ports-branches@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 4Lmtjy5s0Fz4X5MM; Mon, 18 Jul 2022 20:24:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lmtjy5hBDz3pmZ; Mon, 18 Jul 2022 20:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658175894; 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=a+UJdjELHzfMFgQrBZPBzUqTMPLvV45yWjeVOcF49KE=; b=YksyiSRx1LhfsvRM8PGSbkGeD+fb3h18IgIquDU6hp6T05HauUzWfpnSAYc1oTRw/7/x2c DsxNPxFON/g0cCb4x7f/6TwCIXNv2haj//ugJl4Pjh7QPQE/XHIoyqCnwqJTMZfEsZzRzs G7Go7F5OqOMqaMVaFCcdnVx8CwYMs/0DYA2JX0PaCb1eRXgb+qSQZIDTZ9T6YnoEz4mzGS 14y0S6H2mYRNQKHugBAMDvyh1E4bCXZ3vLiynnmfmXvP7RS8VnH6PXfxk8nG8hcU7VfWdI +Be3pY/m60gJP8/vVx+tZFbcIDB2UAq83o4oBjbRbS0vSVrsGNsS8iS+r7yCeA== 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 4Lmtjy4kxQzshg; Mon, 18 Jul 2022 20:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26IKOsCi011847; Mon, 18 Jul 2022 20:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IKOrqQ011846; Mon, 18 Jul 2022 20:24:53 GMT (envelope-from git) Date: Mon, 18 Jul 2022 20:24:53 GMT Message-Id: <202207182024.26IKOrqQ011846@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 7edac146a978 - 2022Q3 - www/firefox: update to 103.0 (rc1) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 7edac146a978311c32d0c31956456c0bf1a3137f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658175894; 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=a+UJdjELHzfMFgQrBZPBzUqTMPLvV45yWjeVOcF49KE=; b=Zd4p72tQpIoZ44rGSaF6m/D9JeEs+mcC2I9U+lDQeL21sLMI6Lv6+UR7LDYimCozg8YLFa gJnVw2RXZG70cAuzZ5XN1yWSz5LpX+MrMeMmUzblq/uQmIt7e72iuzpkbqlNhue1vzlvFd TdRz0xsKTtzFYwlvUhzsGc9ZnLEYWSmATGrrvTPCJxBSPyPl5a5TG05HG4AdN7ztJzOUYs LbFZ1B4BhA12y1xj6cOHto7g4qg4epSMAY1X+7eRYk0eA/b18apwaolLSuWBjJXZkfYhlU FXsJ8jdTKH26o/feWzpoB3y/59WRp8B3belsuPfBw/fxHuJz5hQydMcwkOAHfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658175894; a=rsa-sha256; cv=none; b=VYfbxl9R3npGQzJDc4+tEt9WgMqMIC4adsr7scfubAT75bADTdv5VGFW/ftjJyc0weeBiq MbbDYYKY+ip/S+3cUuP2WyI2zLDfsGbRBAu8/gV2yBFOfps6A1kpzzysoL4q43cHgZ+9ae FUef2VJtCtsZ8QJHWSFj/o4sY1HsWAvqFmAzNz5NN8p1YiAAvTP7QWnU7U0QWWygq/WOhX lSF/0vnbCf1H1BZiTJj0k4hIxzAio21JqPxIArg9m2ZgwkIf7gG051u3jRRU9YxKdK/wer Vv4tr3QQVrQvBFKJWmblrLBgf6oxqwLiQf9PjjF5W7OEpNZrwWUjnICz4BrY1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7edac146a978311c32d0c31956456c0bf1a3137f commit 7edac146a978311c32d0c31956456c0bf1a3137f Author: Christoph Moench-Tegeder AuthorDate: 2022-07-18 20:20:42 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-07-18 20:24:36 +0000 www/firefox: update to 103.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/103.0/releasenotes/ (cherry picked from commit 8e804768bbb0bea5e44dba92f7483dd1015fd9a6) --- Mk/bsd.gecko.mk | 2 +- www/firefox/Makefile | 10 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-addon-search | 4 +- www/firefox/files/patch-bug1773070 | 26 - www/firefox/files/patch-libwebrtc-generate | 192 - www/firefox/files/patch-libwebrtc-generated | 88154 +++++++++++++++---- ...patch-python_mozbuild_mozbuild_gn__processor.py | 31 + ...rd__party_libwebrtc_build_config_BUILDCONFIG.gn | 42 + 9 files changed, 69243 insertions(+), 19224 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 146779a26df9..fca648ce281c 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -78,7 +78,7 @@ BINARY_ALIAS+= python3=${PYTHON_CMD} BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ - rust-cbindgen>=0.23.0:devel/rust-cbindgen \ + rust-cbindgen>=0.24.3:devel/rust-cbindgen \ ${RUST_DEFAULT}>=1.61.0:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 9d3fe531e016..e996d41ba97c 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,10 +1,10 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 102.0.1 +DISTVERSION= 103.0 PORTEPOCH= 2 CATEGORIES= www -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} @@ -12,10 +12,10 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.79:security/nss \ + nss>=3.80:security/nss \ icu>=71.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=4.1.0:print/harfbuzz \ + harfbuzz>=4.3.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ @@ -36,6 +36,8 @@ CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" USES= tar:xz +# helpful when testing beta +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png diff --git a/www/firefox/distinfo b/www/firefox/distinfo index fc2ee5a62c8f..f8c0fbd87688 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657041319 -SHA256 (firefox-102.0.1.source.tar.xz) = 7bba6ffd6e8e42d5c38aa2a453f5fa30dfc9ef150f2175aa0625edb68fddae70 -SIZE (firefox-102.0.1.source.tar.xz) = 477609884 +TIMESTAMP = 1658174030 +SHA256 (firefox-103.0.source.tar.xz) = acc41d050560db4c4177ea86e2d00e47d74229041fea4c02c0e9e87e64093773 +SIZE (firefox-103.0.source.tar.xz) = 475708060 diff --git a/www/firefox/files/patch-addon-search b/www/firefox/files/patch-addon-search index f405eab2aab1..f9d788fbad73 100644 --- a/www/firefox/files/patch-addon-search +++ b/www/firefox/files/patch-addon-search @@ -33,8 +33,8 @@ index 661c902..a41b32f 100644 addon.version = String(aEntry.current_version.version); if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { -- if (file.platform == "all" || file.platform == PLATFORM) { -+ if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) { +- if (file.platform == "all" || file.platform == lazy.PLATFORM) { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == lazy.PLATFORM) { if (file.url) { addon.sourceURI = NetUtil.newURI(file.url); } diff --git a/www/firefox/files/patch-bug1773070 b/www/firefox/files/patch-bug1773070 deleted file mode 100644 index 0c1b3c4dac0e..000000000000 --- a/www/firefox/files/patch-bug1773070 +++ /dev/null @@ -1,26 +0,0 @@ -In file included from Unified_cpp_accessible_html0.cpp:29: -In file included from accessible/html/HTMLImageMapAccessible.cpp:14: -In file included from layout/generic/nsImageFrame.h:17: -In file included from ../.build/dist/include/nsDisplayList.h:48: -In file included from ../.build/dist/include/nsCSSRenderingBorders.h:20: -In file included from ../.build/dist/include/gfxUtils.h:23: -In file included from ../.build/dist/include/mozilla/webrender/WebRenderTypes.h:11: -In file included from ../.build/dist/include/mozilla/webrender/webrender_ffi.h:103: -../.build/dist/include/mozilla/webrender/webrender_ffi_generated.h:24:33: error: redefinition of 'ROOT_CLIP_CHAIN' -constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0; - ^ -../.build/dist/include/mozilla/webrender/webrender_ffi.h:75:16: note: previous definition is here -const uint64_t ROOT_CLIP_CHAIN = ~0; - ^ - ---- gfx/webrender_bindings/webrender_ffi.h.orig 2022-06-08 21:06:36 UTC -+++ gfx/webrender_bindings/webrender_ffi.h -@@ -72,8 +72,6 @@ using WrPipelineIdEpochs = nsTArray; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla - diff --git a/www/firefox/files/patch-libwebrtc-generate b/www/firefox/files/patch-libwebrtc-generate deleted file mode 100644 index fc8cd43d4686..000000000000 --- a/www/firefox/files/patch-libwebrtc-generate +++ /dev/null @@ -1,192 +0,0 @@ -# Below are the changes needed for generate-gn-build-files.sh -# except for depot_tools -# https://bugzilla.mozilla.org/show_bug.cgi?id=1654448 - -diff --git dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_freebsd.mozconfig -new file mode 100644 -index 0000000000..7c76576969 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_freebsd.mozconfig -@@ -0,0 +1,12 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=aarch64 -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-arm64_False_arm64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_freebsd.mozconfig -new file mode 100644 -index 0000000000..d056686355 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_freebsd.mozconfig -@@ -0,0 +1,13 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=aarch64 -+ac_add_options --enable-debug -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-arm64_True_arm64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh -index 4452b0ce76..34a8ddf28e 100755 ---- dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh -+++ dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh -@@ -57,17 +57,6 @@ set -eEuo pipefail - - SYS_NAME=`uname` - --# Check for modified files and abort if present. --MODIFIED_FILES=`hg status --modified --added --exclude "**/moz.build" --exclude "dom/media/webrtc/third_party_build/**.json"` --if [ "x$MODIFIED_FILES" = "x" ]; then -- # Completely clean the mercurial checkout before proceeding -- hg update -C -r . -- hg purge --else -- echo "There are modified files in the checkout. Cowardly aborting!" -- echo "$MODIFIED_FILES" -- exit 1 --fi - - IS_WIN=0 - IS_DARWIN=0 -@@ -94,6 +83,10 @@ elif [ "x$SYS_NAME" = "xMINGW32_NT-6.2" ]; then - IS_WIN=1 - elif [ "x$SYS_NAME" = "xOpenBSD" ]; then - CONFIGS="x64_False_x64_openbsd x64_True_x64_openbsd" -+elif [ "x$SYS_NAME" = "xFreeBSD" ]; then -+ CONFIGS="x64_False_x64_freebsd x64_True_x64_freebsd" -+ CONFIGS="$CONFIGS x64_False_x86_freebsd x64_True_x86_freebsd" -+ #CONFIGS="arm64_False_arm64_freebsd arm64_True_arm64_freebsd" - else - # Ensure rust has the correct targets for building x86 and arm64. These - # operations succeed quickly if previously completed. -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_freebsd.mozconfig -new file mode 100644 -index 0000000000..37319939ba ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_freebsd.mozconfig -@@ -0,0 +1,11 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_False_x64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_freebsd.mozconfig -new file mode 100644 -index 0000000000..4bcac5d797 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_freebsd.mozconfig -@@ -0,0 +1,12 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=i686 -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_False_x86_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_freebsd.mozconfig -new file mode 100644 -index 0000000000..7c5ae25d67 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_freebsd.mozconfig -@@ -0,0 +1,12 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --enable-debug -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_True_x64_freebsd -diff --git dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_freebsd.mozconfig dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_freebsd.mozconfig -new file mode 100644 -index 0000000000..ee95c64a23 ---- /dev/null -+++ dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_freebsd.mozconfig -@@ -0,0 +1,13 @@ -+export M4=/usr/local/bin/gm4 -+export CC=/usr/local/bin/clang13 -+export CXX=/usr/local/bin/clang++13 -+export CPP=/usr/local/bin/clang-cpp13 -+ac_add_options --prefix="/usr/local" -+ac_add_options --with-libclang-path="/usr/local/llvm13/lib" -+ac_add_options --with-wasi-sysroot="/usr/local/share/wasi-sysroot" -+ -+ac_add_options --target=i686 -+ac_add_options --enable-debug -+ac_add_options --enable-bootstrap -+ -+mk_add_options MOZ_OBJDIR=obj-x64_True_x86_freebsd -diff --git third_party/libwebrtc/build/config/BUILDCONFIG.gn third_party/libwebrtc/build/config/BUILDCONFIG.gn -index fe6f5b7d2a..1092f99c65 100644 ---- third_party/libwebrtc/build/config/BUILDCONFIG.gn -+++ third_party/libwebrtc/build/config/BUILDCONFIG.gn -@@ -131,10 +131,12 @@ declare_args() { - is_official_build = false - - # Whether we're a traditional desktop unix. -- is_desktop_linux = current_os == "linux" || current_os == "openbsd" -+ is_desktop_linux = current_os == "linux" || current_os == "openbsd" || -+ current_os == "freebsd" - - # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || current_os == "openbsd" || -+ current_os == "freebsd" || - (current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "ppc64" && current_cpu != "ppc" && - current_cpu != "mips" && current_cpu != "mips64") -@@ -186,7 +188,7 @@ if (host_toolchain == "") { - # TODO(dpranke): Add some sort of assert here that verifies that - # no toolchain omitted host_toolchain from its toolchain_args(). - -- if (host_os == "linux" || host_os == "openbsd") { -+ if (host_os == "linux" || host_os == "openbsd" || host_os == "freebsd" ) { - if (target_os != "linux") { - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" - } else if (is_clang) { -@@ -224,7 +226,8 @@ if (target_os == "android") { - assert(host_os == "linux" || host_os == "mac", - "Android builds are only supported on Linux and Mac hosts.") - _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" --} else if (target_os == "chromeos" || target_os == "linux" || target_os == "openbsd") { -+} else if (target_os == "chromeos" || target_os == "linux" || -+ target_os == "openbsd" || target_os == "freebsd") { - # See comments in build/toolchain/cros/BUILD.gn about board compiles. - if (is_clang) { - _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -289,7 +292,7 @@ is_chromeos = current_os == "chromeos" - is_fuchsia = current_os == "fuchsia" - is_ios = current_os == "ios" - is_linux = current_os == "chromeos" || current_os == "linux" --is_bsd = current_os == "openbsd" -+is_bsd = current_os == "openbsd" || current_os == "freebsd" - is_mac = current_os == "mac" - is_nacl = current_os == "nacl" - is_win = current_os == "win" || current_os == "winuwp" diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index 90d481d0446f..d7f0fdecd9c8 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,20130 +1,70292 @@ 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 989f348be6cc..db0bcfcded11 100644 +index 445f027e82b0..c286ec3735a7 100644 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build -@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin": - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -+if CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_X11"] = "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"] == "Linux": - - DEFINES["USE_AURA"] = "1" -@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_FORTIFY_SOURCE"] = "2" - -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - -+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -+ +@@ -11,10 +11,19 @@ AllowCompilerWarnings() + + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_X11"] = "1" ++DEFINES["WEBRTC_BSD"] = 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["_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" + +@@ -40,164 +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"] = "r20_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["__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_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_X11"] = "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["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 +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True -@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - "android_support" - ] -+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ CXXFLAGS += [ -+ "-msse2" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + 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" +- +-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["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["CPU_ARCH"] == "x86": CXXFLAGS += [ + "-msse2" + ] + +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("resource_adaptation_api_gn") diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build -index b9e9f3dd7ff9..9df1a7163a5a 100644 +index 0ae35513c8c6..efaa7dd2f99c 100644 --- third_party/libwebrtc/api/array_view_gn/moz.build +++ third_party/libwebrtc/api/array_view_gn/moz.build -@@ -63,6 +63,18 @@ if CONFIG["OS_TARGET"] == "Darwin": - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -+if CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_X11"] = "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"] == "Linux": - - DEFINES["USE_AURA"] = "1" -@@ -141,6 +153,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_FORTIFY_SOURCE"] = "2" - -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -157,6 +173,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - -+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -+ +@@ -11,10 +11,19 @@ AllowCompilerWarnings() + + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_X11"] = "1" ++DEFINES["WEBRTC_BSD"] = 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["_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" + +@@ -36,148 +45,11 @@ 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"] = "r20_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["__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_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_X11"] = "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["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["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - DEFINES["_DEBUG"] = True + if CONFIG["CPU_ARCH"] == "aarch64": + + 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 +- +-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" +- +-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": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["_GNU_SOURCE"] = True +- + Library("array_view_gn") diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -index fa1cc1f3a3ab..da73ac5884e9 100644 +index fd8b99d9255f..682ad0f9d8bd 100644 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build -@@ -67,6 +67,18 @@ if CONFIG["OS_TARGET"] == "Darwin": - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -+if CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ DEFINES["USE_GLIB"] = "1" -+ DEFINES["USE_X11"] = "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"] == "Linux": - - DEFINES["USE_AURA"] = "1" -@@ -153,6 +165,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_FORTIFY_SOURCE"] = "2" - -+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ DEFINES["_FORTIFY_SOURCE"] = "2" -+ - if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_FORTIFY_SOURCE"] = "2" -@@ -169,6 +185,10 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["_DEBUG"] = True - -+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": -+ +@@ -11,10 +11,19 @@ AllowCompilerWarnings() + + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_X11"] = "1" ++DEFINES["WEBRTC_BSD"] = 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["_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" + +@@ -40,164 +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"] = "r20_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["__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_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_X11"] = "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["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 +- +- OS_LIBS += [ +- "winmm" +- ] + DEFINES["_DEBUG"] = True -+ - if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux": - - DEFINES["_DEBUG"] = True -@@ -195,6 +215,12 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - "android_support" - ] -+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": -+ -+ CXXFLAGS += [ -+ "-msse2" -+ ] -+ - if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + 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 *** 88727 LINES SKIPPED ***