From nobody Fri Jan 28 21:03:30 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 F397C197E8C4; Fri, 28 Jan 2022 21:03:33 +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 4JlqgT6FDXz4qgw; Fri, 28 Jan 2022 21:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643403813; 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=JLVFpNkg8j/Kbg394B6wwZfhvME1IVc5D4+foPPdIEI=; b=iE/KzY0aG5At7eEhvhnpLgKW1R1G9tZgiOBLjbAfLJ6p8mAYIgfFE4Sl29chfo+74rY9qX EUrRtZcjwfiK/btbSJ17VnG5auGfLvBwUTKioDSpq7GHtXNOrYaYq0xIAQQK6FW646AiNI XxA6tk/42SKTlL+t+iD67q+r0PgM2IohyikOdSsiLpZF5OVwK9yEpnosbxdMS8CguV8J7P wTiTtAD07Qz5woUPpsUiGjhBQXAXaVpHSXg0agXNBSUINFVKKZc/mbCs/ZmynfIMw5XcTc PC1TX1bJ0G2U8B5cfWJLJzJSMjnc0FgW3CljoEbZAsZ9kQW18moHV+IXLXcPIw== 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 B7F01130C; Fri, 28 Jan 2022 21:03:33 +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 20SL3Xk5003493; Fri, 28 Jan 2022 21:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SL3Ui9003488; Fri, 28 Jan 2022 21:03:30 GMT (envelope-from git) Date: Fri, 28 Jan 2022 21:03:30 GMT Message-Id: <202201282103.20SL3Ui9003488@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: 52389fd51a12 - 2022Q1 - www/firefox: update to 96.0.3 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 52389fd51a12d674f56c44b6f31adb1cd9f3a1b5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643403813; 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=JLVFpNkg8j/Kbg394B6wwZfhvME1IVc5D4+foPPdIEI=; b=CbHs4n/MgyKYz1ppYI1LbpRCAxkbMPuex2XSADLkJw4OJvQCdS0X/CNXO00I2iaWtzYq19 Lp76L/pUhiyGARNzg0M5V+axmkRJnk+STxvIPtQ7frPB3uNLMObrIPzQSxhQ0TN+wnM2Ot hGasQQ5w/tF7FnmD9ZYr2QVXdh/lJ//xwSJAiMqTm+Mzomu+L9817VLt5So12f2EsyITU3 ywU0SUH1J7/B62wi5hOuIG/+zIbw5bADFT1F4jlveaQGmlJtKsvl9t2F5Ev4uMkpTpOC2H XzOs7A1JmWwEJ8SOQtlHZeY/BLKUNk5jJueglyN+eyjylgvCqruV3dn8O/wZYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643403813; a=rsa-sha256; cv=none; b=PzFMEFIp+Irl1HERkoivY4nkpm9aI0SnOKEMsNkhlxDMM7cZ3heskHwdse4w5oH7Xjhc4D hvD16kgFjIQWY+s0SEJ9dbrw8b+ggRY2zAohgnuPuse4Z7q1gvyJInh9+c2JyC1zimJhDh mzuwP1V7iv0UI7DZ6TVVMQE1BgYScHa0dhEGzMVxJWbSn7QmqqFZxrrmkLiQPCaN0zmB/5 +PwTy6F1v8WsVf1x0LWLRedUR8jqkbjTjTaCOnsj9XT4MtuwLVs3v0+/qv/14Mm/CGgnRm H1mhCQV/XvvayuyvR4ClkiZVu8hLnBKKZTs6qze3G3qscHDjGIBQVUyA3QeMUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=52389fd51a12d674f56c44b6f31adb1cd9f3a1b5 commit 52389fd51a12d674f56c44b6f31adb1cd9f3a1b5 Author: Evgeniy Khramtsov AuthorDate: 2022-01-28 02:30:16 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2022-01-28 21:02:42 +0000 www/firefox: update to 96.0.3 PR: 261410 Reported by: Stefan Ehmann Tested by: Stefan Ehmann (prior v0.3), jbeich (PipeWire screen capture) (prior v0.8 via mail), cmt (prior v0.8 + 96.0.3 bump) (cherry picked from commit 7b007c9d1e67ccffc09f0b60d1d039cc7f8af693) --- Mk/bsd.gecko.mk | 3 + www/firefox/Makefile | 7 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-addon-search | 16 +- .../files/patch-browser-app-nsBrowserApp.cpp | 14 +- www/firefox/files/patch-bug1288587 | 37 - www/firefox/files/patch-bug1504834_comment10 | 10 +- www/firefox/files/patch-bug1504834_comment5 | 71 +- www/firefox/files/patch-bug1559213 | 24 +- www/firefox/files/patch-bug1612184 | 25961 -- www/firefox/files/patch-bug1618914 | 35 - www/firefox/files/patch-bug1626236 | 40 +- www/firefox/files/patch-bug1628567 | 4 +- www/firefox/files/patch-bug1640982 | 16 +- www/firefox/files/patch-bug1676134 | 122 - www/firefox/files/patch-bug1745560 | 26 - www/firefox/files/patch-bug847568 | 89 +- www/firefox/files/patch-pipewire_init | 41 +- www/firefox/files/patch-webrtc | 253107 ++++++++++++++++++ 19 files changed, 253299 insertions(+), 26330 deletions(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index e875a09d7244..9b60776392e9 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -67,6 +67,9 @@ USE_GL= gl USE_GNOME= cairo gdkpixbuf2 gtk30 USE_PERL5= build USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrender xt +.if ${MOZILLA_VER:R:R} >= 96 +USE_XORG+= xrandr +.endif HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes LDFLAGS+= -Wl,--as-needed diff --git a/www/firefox/Makefile b/www/firefox/Makefile index e3cec497f389..7b574b3473d5 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,7 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 95.0.2 -PORTREVISION= 1 +DISTVERSION= 96.0.3 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -13,8 +12,8 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.72:security/nss \ - icu>=69.1,1:devel/icu \ + nss>=3.73:security/nss \ + icu>=70.1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.9.1:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 187fb7311346..862c1dda9361 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639939431 -SHA256 (firefox-95.0.2.source.tar.xz) = c178cbf61979bd39a8daa9a09c6e03089da37baded692ad1f745ecfcaae74d64 -SIZE (firefox-95.0.2.source.tar.xz) = 384674224 +TIMESTAMP = 1643336011 +SHA256 (firefox-96.0.3.source.tar.xz) = 1a741d6fcf20e6833a90169f41d29141ea4610f58b848e06091a683af6304dea +SIZE (firefox-96.0.3.source.tar.xz) = 406721708 diff --git a/www/firefox/files/patch-addon-search b/www/firefox/files/patch-addon-search index 99ab877a16d0..f405eab2aab1 100644 --- a/www/firefox/files/patch-addon-search +++ b/www/firefox/files/patch-addon-search @@ -2,10 +2,10 @@ https://github.com/mozilla/addons/issues/708 https://github.com/mozilla/addons-frontend/issues/4610 diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js -index 75c2c5e435e35..4d8c09c02759b 100644 +index af08811..77a3b18 100644 --- browser/app/profile/firefox.js +++ browser/app/profile/firefox.js -@@ -39,7 +39,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true); +@@ -38,7 +38,7 @@ pref("extensions.postDownloadThirdPartyPrompt", true); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v4/addons/search/?guid=%IDS%&lang=%LOCALE%"); @@ -14,7 +14,7 @@ index 75c2c5e435e35..4d8c09c02759b 100644 pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); -@@ -176,8 +176,8 @@ pref("app.update.langpack.enabled", true); +@@ -193,8 +193,8 @@ pref("app.update.langpack.enabled", true); // .. etc .. // pref("extensions.update.enabled", true); @@ -26,10 +26,10 @@ index 75c2c5e435e35..4d8c09c02759b 100644 // Themes every day diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm -index f70fd8d7e3bd8..81e8cd7764fdf 100644 +index 661c902..a41b32f 100644 --- toolkit/mozapps/extensions/internal/AddonRepository.jsm +++ toolkit/mozapps/extensions/internal/AddonRepository.jsm -@@ -602,7 +602,7 @@ var AddonRepository = { +@@ -592,7 +592,7 @@ var AddonRepository = { addon.version = String(aEntry.current_version.version); if (Array.isArray(aEntry.current_version.files)) { for (let file of aEntry.current_version.files) { @@ -39,10 +39,10 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 addon.sourceURI = NetUtil.newURI(file.url); } diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm -index f70fd8d7e3bd8..81e8cd7764fdf 100644 +index f8c99c7..c6ba8a1 100644 --- toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm -@@ -355,7 +355,7 @@ class AddonInternal { +@@ -520,7 +520,7 @@ class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { @@ -50,4 +50,4 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 + if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { if (platform.abi) { needsABI = true; - if (platform.abi === abi) + if (platform.abi === abi) { diff --git a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp index 68cb778b95a7..3b9097714e21 100644 --- a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp +++ b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp @@ -1,12 +1,14 @@ ---- browser/app/nsBrowserApp.cpp.orig 2016-09-19 16:19:28 UTC +diff --git browser/app/nsBrowserApp.cpp browser/app/nsBrowserApp.cpp +index 87c2e16..a41f1d9 100644 +--- browser/app/nsBrowserApp.cpp +++ browser/app/nsBrowserApp.cpp -@@ -324,6 +324,9 @@ int main(int argc, char* argv[], char* e - { - mozilla::TimeStamp start = mozilla::TimeStamp::Now(); +@@ -337,6 +337,9 @@ int main(int argc, char* argv[], char* envp[]) { + } + #endif + setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + #ifdef HAS_DLL_BLOCKLIST - DllBlocklist_Initialize(); - + DllBlocklist_Initialize(gBlocklistInitFlags); + #endif diff --git a/www/firefox/files/patch-bug1288587 b/www/firefox/files/patch-bug1288587 deleted file mode 100644 index 0925ac98733c..000000000000 --- a/www/firefox/files/patch-bug1288587 +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 855214a..1e91d51 100644 ---- build/moz.configure/init.configure -+++ build/moz.configure/init.configure -@@ -238,6 +238,7 @@ option( - @imports(_from="mozbuild.pythonutil", _import="find_python3_executable") - @imports(_from="mozbuild.pythonutil", _import="python_executable_version") - @imports(_from="six", _import="ensure_text") -+@imports(_from="__builtin__", _import="KeyError") - def virtualenv_python3(env_python, build_env, mozconfig, help): - # Avoid re-executing python when running configure --help. - if help: -@@ -271,6 +272,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu - python = mozconfig["vars"]["added"]["PYTHON3"] - elif "PYTHON3" in mozconfig["vars"]["modified"]: - python = mozconfig["vars"]["modified"]["PYTHON3"][1] -+ for i in ("env", "vars"): -+ for j in ("added", "modified"): -+ try: -+ del mozconfig[i][j]["PYTHON3"] -+ except KeyError: -+ pass - - log.debug("python3: executable from configuration: %r" % python) - -@@ -364,7 +371,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu - ) - log.info("Re-executing in the virtualenv") - if env_python: -- del os.environ["PYTHON3"] -+ try: -+ del os.environ["PYTHON3"] -+ except KeyError: -+ pass - # Another quirk on macOS, with the system python, the virtualenv is - # not fully operational (missing entries in sys.path) if - # __PYVENV_LAUNCHER__ is set. diff --git a/www/firefox/files/patch-bug1504834_comment10 b/www/firefox/files/patch-bug1504834_comment10 index e8e28bace434..2d584adb17ef 100644 --- a/www/firefox/files/patch-bug1504834_comment10 +++ b/www/firefox/files/patch-bug1504834_comment10 @@ -14,10 +14,11 @@ Solution: This is not a real solution, but a hack. The real solution would have are readable, albeit not as pretty to look at as they could be. Side-effects: I have not yet found an unwanted side-effect. -diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp ---- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 -+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 -@@ -1861,6 +1861,14 @@ +diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp +index 6bbef8d..161b96f 100644 +--- gfx/2d/DrawTargetSkia.cpp ++++ gfx/2d/DrawTargetSkia.cpp +@@ -1903,6 +1903,14 @@ void DrawTargetSkia::PushLayerWithBlend(bool aOpaque, Float aOpacity, SkCanvas::kPreserveLCDText_SaveLayerFlag | (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); @@ -32,3 +33,4 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp mCanvas->saveLayer(saveRec); SetPermitSubpixelAA(aOpaque); + diff --git a/www/firefox/files/patch-bug1504834_comment5 b/www/firefox/files/patch-bug1504834_comment5 index db2663ccfb34..4d4886823f0f 100644 --- a/www/firefox/files/patch-bug1504834_comment5 +++ b/www/firefox/files/patch-bug1504834_comment5 @@ -3,9 +3,44 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600 Rough progress patch -diff -r 53107afbc21e gfx/skia/skia/third_party/skcms/skcms.cc ---- gfx/skia/skia/third_party/skcms/skcms.cc Wed Nov 07 04:50:21 2018 +0000 -+++ gfx/skia/skia/third_party/skcms/skcms.cc Thu Nov 29 12:49:35 2018 +0000 +diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp +index 6bbef8d..82b04ba 100644 +--- gfx/2d/DrawTargetSkia.cpp ++++ gfx/2d/DrawTargetSkia.cpp +@@ -154,8 +154,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds, + return surfaceBounds.Intersect(bounds); + } + +-static const int kARGBAlphaOffset = +- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; ++static const int kARGBAlphaOffset = 0; + + static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, + const int32_t aStride, SurfaceFormat aFormat) { +diff --git gfx/2d/Types.h gfx/2d/Types.h +index 6b3bdc7..7c6c342 100644 +--- gfx/2d/Types.h ++++ gfx/2d/Types.h +@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t { + // The following values are endian-independent synonyms. The _UINT32 suffix + // indicates that the name reflects the layout when viewed as a uint32_t + // value. +-#if MOZ_LITTLE_ENDIAN() + A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB + X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB +-#elif MOZ_BIG_ENDIAN() +- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB +- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB +-#else +-# error "bad endianness" +-#endif + + // 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 @@ -30,6 +30,8 @@ #include #include @@ -48,33 +83,3 @@ diff -r 53107afbc21e gfx/skia/skia/third_party/skcms/skcms.cc #endif } ---- gfx/2d/DrawTargetSkia.cpp.orig 2019-09-21 15:51:04.129603000 +0200 -+++ gfx/2d/DrawTargetSkia.cpp 2019-09-21 15:52:11.900316000 +0200 -@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a - return surfaceBounds.Intersect(bounds); - } - --static const int kARGBAlphaOffset = -- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; -+static const int kARGBAlphaOffset = 0; - - static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, - const int32_t aStride, SurfaceFormat aFormat) { ---- gfx/2d/Types.h.orig 2019-09-21 15:52:47.044803000 +0200 -+++ gfx/2d/Types.h 2019-09-21 15:53:40.113641000 +0200 -@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t { - // The following values are endian-independent synonyms. The _UINT32 suffix - // indicates that the name reflects the layout when viewed as a uint32_t - // value. --#if MOZ_LITTLE_ENDIAN() - A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB - X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB --#elif MOZ_BIG_ENDIAN() -- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB -- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB --#else --# error "bad endianness" --#endif - - // The following values are OS and endian-independent synonyms. - // diff --git a/www/firefox/files/patch-bug1559213 b/www/firefox/files/patch-bug1559213 index 16928f792f89..ceaba53522aa 100644 --- a/www/firefox/files/patch-bug1559213 +++ b/www/firefox/files/patch-bug1559213 @@ -11,10 +11,10 @@ Date: Thu Jun 13 11:53:00 2019 -0700 4 files changed, 34 insertions(+), 3 deletions(-) diff --git config/external/moz.build config/external/moz.build -index 03e4fa143bd1..a67d10b11fe6 100644 +index ab77121..75595d9 100644 --- config/external/moz.build +++ config/external/moz.build -@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: +@@ -49,8 +49,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]: external_dirs += ["media/libvpx"] if CONFIG["MOZ_AV1"]: @@ -27,11 +27,11 @@ index 03e4fa143bd1..a67d10b11fe6 100644 if not CONFIG["MOZ_SYSTEM_PNG"]: external_dirs += ["media/libpng"] diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index bcf5c4925564..48964a999a9b 100644 +index a1b58eb..65729f9 100644 --- config/system-headers.mozbuild +++ config/system-headers.mozbuild -@@ -1305,6 +1305,14 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - 'harfbuzz/hb.h', +@@ -1289,6 +1289,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: + 'proxy.h', ] +if CONFIG['MOZ_SYSTEM_AV1']: @@ -46,7 +46,7 @@ index bcf5c4925564..48964a999a9b 100644 system_headers += [ 'vpx_mem/vpx_mem.h', diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build -index 092cee0c9b66..38e45de5b5f0 100644 +index 8509aec..eb6f129 100644 --- dom/media/platforms/moz.build +++ dom/media/platforms/moz.build @@ -78,6 +78,11 @@ if CONFIG["MOZ_AV1"]: @@ -62,10 +62,10 @@ index 092cee0c9b66..38e45de5b5f0 100644 if CONFIG["MOZ_OMX"]: EXPORTS += [ diff --git toolkit/moz.configure toolkit/moz.configure -index 82b5a59acf42..e2329560b42b 100644 ---- toolkit/moz.configure.orig 2021-04-13 16:12:34.770032000 +0200 -+++ toolkit/moz.configure 2021-04-18 00:03:41.432698000 +0200 -@@ -538,7 +538,23 @@ +index 0069865..e806fc8 100644 +--- toolkit/moz.configure ++++ toolkit/moz.configure +@@ -523,7 +523,23 @@ def av1(value): return True @@ -90,11 +90,11 @@ index 82b5a59acf42..e2329560b42b 100644 def dav1d_asm(target): if target.cpu in ("aarch64", "x86", "x86_64"): return True -@@ -554,6 +570,7 @@ +@@ -539,6 +555,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm) set_define("MOZ_DAV1D_ASM", dav1d_asm) set_config("MOZ_AV1", av1) set_define("MOZ_AV1", av1) +set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True)) - # Built-in fragmented MP4 support. + # JXL Image Codec Support # ============================================================== diff --git a/www/firefox/files/patch-bug1612184 b/www/firefox/files/patch-bug1612184 deleted file mode 100644 index 33d391a3b647..000000000000 --- a/www/firefox/files/patch-bug1612184 +++ /dev/null @@ -1,25961 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1612184 -https://bug1612184.bmoattachments.org/attachment.cgi?id=9126363 - - -diff -r 388a4d04e911 media/webrtc/gn-configs/ppc64_False_ppc64_freebsd.json ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ dom/media/webrtc/third_party_build/gn-configs/ppc64_False_ppc64_freebsd.json Thu Feb 13 11:11:51 2020 +0100 -@@ -0,0 +1,13237 @@ -+{ -+ "gn_gen_args": { -+ "host_cpu": "ppc64", -+ "is_debug": false, -+ "target_cpu": "ppc64", -+ "target_os": "freebsd" -+ }, -+ "mozbuild_args": { -+ "CPU_ARCH": "ppc64", -+ "HOST_CPU_ARCH": "ppc64", -+ "MOZ_DEBUG": null, -+ "OS_TARGET": "FreeBSD" -+ }, -+ "sandbox_vars": { -+ "COMPILE_FLAGS": { -+ "WARNINGS_AS_ERRORS": [] -+ }, -+ "FINAL_LIBRARY": "webrtc" -+ }, -+ "targets": { -+ "//:webrtc": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", -+ "-fcolor-diagnostics", -+ "-Wall", -+ "-Werror", -+ "-Wextra", -+ "-Wno-missing-field-initializers", -+ "-Wno-unused-parameter", -+ "-Wno-c++11-narrowing", -+ "-Wno-covered-switch-default", -+ "-Wno-unneeded-internal-declaration", -+ "-Wno-inconsistent-missing-override", -+ "-Wno-undefined-var-template", -+ "-Wno-nonportable-include-path", -+ "-Wno-address-of-packed-member", -+ "-Wno-unused-lambda-capture", -+ "-Wno-user-defined-warnings", -+ "-O2", -+ "-fno-ident", -+ "-fdata-sections", -+ "-ffunction-sections", -+ "-fomit-frame-pointer", -+ "-g2", -+ "-fvisibility=hidden", -+ "-Xclang", -+ "-add-plugin", -+ "-Xclang", -+ "find-bad-constructs", -+ "-Xclang", -+ "-plugin-arg-find-bad-constructs", -+ "-Xclang", -+ "check-auto-raw-pointer", -+ "-Wheader-hygiene", -+ "-Wstring-conversion", -+ "-Wtautological-overlap-compare", -+ "-Wextra", -+ "-Wno-unused-parameter", -+ "-Wno-missing-field-initializers", -+ "-Wno-strict-overflow", -+ "-Wc++11-narrowing", -+ "-Wimplicit-fallthrough", -+ "-Wthread-safety", -+ "-Winconsistent-missing-override", -+ "-Wundef", -+ "-Wunused-lambda-capture" -+ ], -+ "defines": [ -+ "V8_DEPRECATION_WARNINGS", -+ "USE_X11=1", -+ "CHROMIUM_BUILD", -+ "_FILE_OFFSET_BITS=64", -+ "NDEBUG", -+ "NVALGRIND", -+ "DYNAMIC_ANNOTATIONS_ENABLED=0", -+ "WEBRTC_ENABLE_PROTOBUF=0", -+ "WEBRTC_RESTRICT_LOGGING", -+ "WEBRTC_MOZILLA_BUILD", -+ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", -+ "WEBRTC_POSIX", -+ "WEBRTC_BSD", -+ "HAVE_WEBRTC_VIDEO", -+ "HAVE_WEBRTC_VOICE" -+ ], -+ "deps": [ -+ "//:webrtc_common", -+ "//api:base_peerconnection_api", -+ "//api:transport_api", -+ "//api:video_frame_api", -+ "//audio:audio", -+ "//call:call", -+ "//common_audio:common_audio", -+ "//common_video:common_video", -+ "//media:media", -+ "//modules:modules", -+ "//modules/video_capture:video_capture_internal_impl", -+ "//rtc_base:rtc_base", -+ "//system_wrappers:field_trial_default", -+ "//system_wrappers:metrics_default", -+ "//system_wrappers:system_wrappers_default", -+ "//video:video", -+ "//voice_engine:voice_engine" -+ ], -+ "include_dirs": [ -+ "//", -+ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/", -+ "//common_audio/resampler/include/", -+ "//common_audio/signal_processing/include/", -+ "//common_audio/vad/include/", -+ "//common_video/include/", -+ "/media/libyuv/libyuv/include/", -+ "//modules/audio_coding/include/", -+ "//modules/include/", -+ "//modules/include/", -+ "//modules/audio_device/include/", -+ "//modules/audio_device/dummy/" -+ ], -+ "libs": [ -+ "X11", -+ "X11-xcb", -+ "xcb", -+ "Xcomposite", -+ "Xcursor", -+ "Xdamage", -+ "Xext", -+ "Xfixes", -+ "Xi", -+ "Xrender" -+ ], -+ "sources": [], -+ "type": "static_library" -+ }, -+ "//:webrtc_common": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", -+ "-fcolor-diagnostics", -+ "-Wall", -+ "-Werror", -+ "-Wextra", -+ "-Wno-missing-field-initializers", -+ "-Wno-unused-parameter", -+ "-Wno-c++11-narrowing", -+ "-Wno-covered-switch-default", -+ "-Wno-unneeded-internal-declaration", -+ "-Wno-inconsistent-missing-override", -+ "-Wno-undefined-var-template", -+ "-Wno-nonportable-include-path", -+ "-Wno-address-of-packed-member", -+ "-Wno-unused-lambda-capture", -+ "-Wno-user-defined-warnings", -+ "-O2", -+ "-fno-ident", -+ "-fdata-sections", -+ "-ffunction-sections", -+ "-fomit-frame-pointer", -+ "-g2", -+ "-fvisibility=hidden", -+ "-Wheader-hygiene", -+ "-Wstring-conversion", -+ "-Wtautological-overlap-compare", -+ "-Wextra", -+ "-Wno-unused-parameter", -+ "-Wno-missing-field-initializers", -+ "-Wno-strict-overflow", -+ "-Wc++11-narrowing", -+ "-Wimplicit-fallthrough", -+ "-Wthread-safety", -+ "-Winconsistent-missing-override", -+ "-Wundef", -+ "-Wunused-lambda-capture" -+ ], -+ "defines": [ -+ "V8_DEPRECATION_WARNINGS", -+ "USE_X11=1", -+ "CHROMIUM_BUILD", -+ "_FILE_OFFSET_BITS=64", -+ "NDEBUG", -+ "NVALGRIND", -+ "DYNAMIC_ANNOTATIONS_ENABLED=0", -+ "WEBRTC_ENABLE_PROTOBUF=0", -+ "WEBRTC_RESTRICT_LOGGING", -+ "WEBRTC_MOZILLA_BUILD", -+ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", -+ "WEBRTC_POSIX", -+ "WEBRTC_BSD" -+ ], -+ "deps": [], -+ "include_dirs": [ -+ "//", -+ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/" -+ ], -+ "libs": [], -+ "sources": [ -+ "//common_types.cc", -+ "//common_types.h", -+ "//typedefs.h" -+ ], -+ "type": "static_library" -+ }, -+ "//api/audio_codecs/L16:audio_decoder_L16": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", -+ "-fcolor-diagnostics", -+ "-Wall", -+ "-Werror", -+ "-Wextra", -+ "-Wno-missing-field-initializers", -+ "-Wno-unused-parameter", -+ "-Wno-c++11-narrowing", -+ "-Wno-covered-switch-default", -+ "-Wno-unneeded-internal-declaration", -+ "-Wno-inconsistent-missing-override", -+ "-Wno-undefined-var-template", -+ "-Wno-nonportable-include-path", -+ "-Wno-address-of-packed-member", -+ "-Wno-unused-lambda-capture", -+ "-Wno-user-defined-warnings", -+ "-O2", -+ "-fno-ident", -+ "-fdata-sections", -+ "-ffunction-sections", -+ "-fomit-frame-pointer", -+ "-g2", -+ "-fvisibility=hidden", -+ "-Xclang", -+ "-add-plugin", -+ "-Xclang", -+ "find-bad-constructs", -+ "-Xclang", -+ "-plugin-arg-find-bad-constructs", -+ "-Xclang", -+ "check-auto-raw-pointer", -+ "-Wheader-hygiene", -+ "-Wstring-conversion", -+ "-Wtautological-overlap-compare", -+ "-Wextra", -+ "-Wno-unused-parameter", -+ "-Wno-missing-field-initializers", -+ "-Wno-strict-overflow", -+ "-Wc++11-narrowing", -+ "-Wimplicit-fallthrough", -+ "-Wthread-safety", -+ "-Winconsistent-missing-override", -+ "-Wundef", -+ "-Wunused-lambda-capture" -+ ], -+ "defines": [ -+ "V8_DEPRECATION_WARNINGS", -+ "USE_X11=1", -+ "CHROMIUM_BUILD", -+ "_FILE_OFFSET_BITS=64", -+ "NDEBUG", -+ "NVALGRIND", -+ "DYNAMIC_ANNOTATIONS_ENABLED=0", -+ "WEBRTC_ENABLE_PROTOBUF=0", -+ "WEBRTC_RESTRICT_LOGGING", -+ "WEBRTC_MOZILLA_BUILD", -+ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", -+ "WEBRTC_POSIX", -+ "WEBRTC_BSD" -+ ], -+ "deps": [ -+ "//:webrtc_common", -+ "//api:optional", -+ "//api/audio_codecs:audio_codecs_api", -+ "//modules/audio_coding:pcm16b", -+ "//rtc_base:rtc_base_approved" -+ ], -+ "include_dirs": [ -+ "//", -+ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/", -+ "//modules/audio_coding/codecs/pcm16b/include/" -+ ], -+ "libs": [], -+ "sources": [ -+ "//api/audio_codecs/L16/audio_decoder_L16.cc", -+ "//api/audio_codecs/L16/audio_decoder_L16.h" -+ ], -+ "type": "static_library" -+ }, -+ "//api/audio_codecs/L16:audio_encoder_L16": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", -+ "-fcolor-diagnostics", -+ "-Wall", -+ "-Werror", -+ "-Wextra", -+ "-Wno-missing-field-initializers", -+ "-Wno-unused-parameter", -+ "-Wno-c++11-narrowing", -+ "-Wno-covered-switch-default", -+ "-Wno-unneeded-internal-declaration", -+ "-Wno-inconsistent-missing-override", -+ "-Wno-undefined-var-template", -+ "-Wno-nonportable-include-path", -+ "-Wno-address-of-packed-member", -+ "-Wno-unused-lambda-capture", -+ "-Wno-user-defined-warnings", -+ "-O2", -+ "-fno-ident", -+ "-fdata-sections", -+ "-ffunction-sections", -+ "-fomit-frame-pointer", -+ "-g2", -+ "-fvisibility=hidden", -+ "-Xclang", -+ "-add-plugin", -+ "-Xclang", -+ "find-bad-constructs", -+ "-Xclang", -+ "-plugin-arg-find-bad-constructs", -+ "-Xclang", -+ "check-auto-raw-pointer", -+ "-Wheader-hygiene", -+ "-Wstring-conversion", -+ "-Wtautological-overlap-compare", -+ "-Wextra", -+ "-Wno-unused-parameter", -+ "-Wno-missing-field-initializers", -+ "-Wno-strict-overflow", -+ "-Wc++11-narrowing", -+ "-Wimplicit-fallthrough", -+ "-Wthread-safety", -+ "-Winconsistent-missing-override", -+ "-Wundef", -+ "-Wunused-lambda-capture" -+ ], -+ "defines": [ -+ "V8_DEPRECATION_WARNINGS", -+ "USE_X11=1", -+ "CHROMIUM_BUILD", -+ "_FILE_OFFSET_BITS=64", -+ "NDEBUG", -+ "NVALGRIND", -+ "DYNAMIC_ANNOTATIONS_ENABLED=0", -+ "WEBRTC_ENABLE_PROTOBUF=0", -+ "WEBRTC_RESTRICT_LOGGING", -+ "WEBRTC_MOZILLA_BUILD", -+ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", -+ "WEBRTC_POSIX", -+ "WEBRTC_BSD" -+ ], -+ "deps": [ -+ "//:webrtc_common", -+ "//api:optional", -+ "//api/audio_codecs:audio_codecs_api", -+ "//modules/audio_coding:pcm16b", -+ "//rtc_base:rtc_base_approved" -+ ], -+ "include_dirs": [ -+ "//", -+ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/", -+ "//modules/audio_coding/codecs/pcm16b/include/" -+ ], -+ "libs": [], -+ "sources": [ -+ "//api/audio_codecs/L16/audio_encoder_L16.cc", -+ "//api/audio_codecs/L16/audio_encoder_L16.h" -+ ], -+ "type": "static_library" -+ }, -+ "//api/audio_codecs/g711:audio_decoder_g711": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", -+ "-fcolor-diagnostics", -+ "-Wall", -+ "-Werror", -+ "-Wextra", -+ "-Wno-missing-field-initializers", -+ "-Wno-unused-parameter", -+ "-Wno-c++11-narrowing", -+ "-Wno-covered-switch-default", -+ "-Wno-unneeded-internal-declaration", -+ "-Wno-inconsistent-missing-override", -+ "-Wno-undefined-var-template", -+ "-Wno-nonportable-include-path", -+ "-Wno-address-of-packed-member", -+ "-Wno-unused-lambda-capture", -+ "-Wno-user-defined-warnings", -+ "-O2", -+ "-fno-ident", -+ "-fdata-sections", -+ "-ffunction-sections", -+ "-fomit-frame-pointer", -+ "-g2", -+ "-fvisibility=hidden", -+ "-Xclang", -+ "-add-plugin", -+ "-Xclang", -+ "find-bad-constructs", -+ "-Xclang", -+ "-plugin-arg-find-bad-constructs", -+ "-Xclang", -+ "check-auto-raw-pointer", -+ "-Wheader-hygiene", -+ "-Wstring-conversion", -+ "-Wtautological-overlap-compare", -+ "-Wextra", -+ "-Wno-unused-parameter", -+ "-Wno-missing-field-initializers", -+ "-Wno-strict-overflow", -+ "-Wc++11-narrowing", -+ "-Wimplicit-fallthrough", -+ "-Wthread-safety", -+ "-Winconsistent-missing-override", -+ "-Wundef", -+ "-Wunused-lambda-capture" -+ ], -+ "defines": [ -+ "V8_DEPRECATION_WARNINGS", -+ "USE_X11=1", -+ "CHROMIUM_BUILD", -+ "_FILE_OFFSET_BITS=64", -+ "NDEBUG", -+ "NVALGRIND", -+ "DYNAMIC_ANNOTATIONS_ENABLED=0", -+ "WEBRTC_ENABLE_PROTOBUF=0", -+ "WEBRTC_RESTRICT_LOGGING", -+ "WEBRTC_MOZILLA_BUILD", -+ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", -+ "WEBRTC_POSIX", -+ "WEBRTC_BSD" -+ ], -+ "deps": [ -+ "//:webrtc_common", -+ "//api:optional", -+ "//api/audio_codecs:audio_codecs_api", -+ "//modules/audio_coding:g711", -+ "//rtc_base:rtc_base_approved" -+ ], -+ "include_dirs": [ -+ "//", -+ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/", -+ "//modules/audio_coding/codecs/g711/include/" -+ ], -+ "libs": [], -+ "sources": [ -+ "//api/audio_codecs/g711/audio_decoder_g711.cc", -+ "//api/audio_codecs/g711/audio_decoder_g711.h" -+ ], -+ "type": "static_library" -+ }, -+ "//api/audio_codecs/g711:audio_encoder_g711": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", -+ "-fcolor-diagnostics", -+ "-Wall", -+ "-Werror", -+ "-Wextra", -+ "-Wno-missing-field-initializers", -+ "-Wno-unused-parameter", -+ "-Wno-c++11-narrowing", -+ "-Wno-covered-switch-default", -+ "-Wno-unneeded-internal-declaration", -+ "-Wno-inconsistent-missing-override", -+ "-Wno-undefined-var-template", -+ "-Wno-nonportable-include-path", -+ "-Wno-address-of-packed-member", -+ "-Wno-unused-lambda-capture", -+ "-Wno-user-defined-warnings", -+ "-O2", -+ "-fno-ident", -+ "-fdata-sections", -+ "-ffunction-sections", -+ "-fomit-frame-pointer", -+ "-g2", -+ "-fvisibility=hidden", -+ "-Xclang", -+ "-add-plugin", -+ "-Xclang", -+ "find-bad-constructs", -+ "-Xclang", -+ "-plugin-arg-find-bad-constructs", -+ "-Xclang", -+ "check-auto-raw-pointer", -+ "-Wheader-hygiene", -+ "-Wstring-conversion", -+ "-Wtautological-overlap-compare", -+ "-Wextra", -+ "-Wno-unused-parameter", -+ "-Wno-missing-field-initializers", -+ "-Wno-strict-overflow", -+ "-Wc++11-narrowing", -+ "-Wimplicit-fallthrough", -+ "-Wthread-safety", -+ "-Winconsistent-missing-override", -+ "-Wundef", -+ "-Wunused-lambda-capture" -+ ], -+ "defines": [ -+ "V8_DEPRECATION_WARNINGS", -+ "USE_X11=1", -+ "CHROMIUM_BUILD", -+ "_FILE_OFFSET_BITS=64", -+ "NDEBUG", -+ "NVALGRIND", -+ "DYNAMIC_ANNOTATIONS_ENABLED=0", -+ "WEBRTC_ENABLE_PROTOBUF=0", -+ "WEBRTC_RESTRICT_LOGGING", -+ "WEBRTC_MOZILLA_BUILD", -+ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0", -+ "WEBRTC_POSIX", -+ "WEBRTC_BSD" -+ ], -+ "deps": [ -+ "//:webrtc_common", -+ "//api:optional", -+ "//api/audio_codecs:audio_codecs_api", -+ "//modules/audio_coding:g711", -+ "//rtc_base:rtc_base_approved" -+ ], -+ "include_dirs": [ -+ "//", -+ "/root/firefox_upstream/firefox/obj-powerpc64-unknown-freebsd13.0/media/webrtc/trunk/webrtc/gn-output/gen/", -+ "//modules/audio_coding/codecs/g711/include/" -+ ], -+ "libs": [], -+ "sources": [ -+ "//api/audio_codecs/g711/audio_encoder_g711.cc", -+ "//api/audio_codecs/g711/audio_encoder_g711.h" -+ ], -+ "type": "static_library" -+ }, -+ "//api/audio_codecs/g722:audio_decoder_g722": { -+ "cflags": [ -+ "-fno-strict-aliasing", -+ "--param=ssp-buffer-size=4", -+ "-fstack-protector", -+ "-Wno-builtin-macro-redefined", -+ "-D__DATE__=", -+ "-D__TIME__=", -+ "-D__TIMESTAMP__=", -+ "-funwind-tables", *** 279137 LINES SKIPPED ***