Re: git: 3ce075bfa54a - main - www/firefox: update to 128.0 (rc1)
Date: Thu, 04 Jul 2024 08:14:13 UTC
Hello Christoph,
I've opened a PR for firefox 128.0 failing on aarch64 main.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280120
Any hints are welcome.
Thanks,
Christoph Moench-Tegeder <cmt@freebsd.org> escreveu (terça, 2/07/2024 à(s)
17:15):
> The branch main has been updated by cmt:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=3ce075bfa54a54023d682d6985d61fb081a019d4
>
> commit 3ce075bfa54a54023d682d6985d61fb081a019d4
> Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
> AuthorDate: 2024-07-02 16:13:34 +0000
> Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org>
> CommitDate: 2024-07-02 16:15:24 +0000
>
> www/firefox: update to 128.0 (rc1)
>
> Release Notes (soon):
> https://www.mozilla.org/en-US/firefox/128.0/releasenotes/
> ---
> www/firefox/Makefile | 6 +-
> www/firefox/distinfo | 6 +-
> www/firefox/files/patch-bug847568 | 2 +-
> .../files/patch-gfx_skia_skia_src_base_SkEndian.h | 24 +-
> .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 23 +-
> ...patch-gfx_skia_skia_src_core_SkRasterPipeline.h | 14 +-
> www/firefox/files/patch-libwebrtc-generated | 5571
> ++++++++++++--------
> .../files/patch-tools_profiler_core_patform.cpp | 51 -
> 8 files changed, 3452 insertions(+), 2245 deletions(-)
>
> diff --git a/www/firefox/Makefile b/www/firefox/Makefile
> index 002b5d8f7621..14a897f494ad 100644
> --- a/www/firefox/Makefile
> +++ b/www/firefox/Makefile
> @@ -1,5 +1,5 @@
> PORTNAME= firefox
> -DISTVERSION= 127.0.2
> +DISTVERSION= 128.0
> PORTEPOCH= 2
> CATEGORIES= www wayland
> MASTER_SITES=
> MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
> @@ -11,10 +11,10 @@ COMMENT= Web browser based on the browser portion
> of Mozilla
> WWW= https://www.mozilla.com/firefox
>
> BUILD_DEPENDS= nspr>=4.32:devel/nspr \
> - nss>=3.100:security/nss \
> + nss>=3.101:security/nss \
> icu>=73.1:devel/icu \
> libevent>=2.1.8:devel/libevent \
> - harfbuzz>=8.4.0:print/harfbuzz \
> + harfbuzz>=8.5.0:print/harfbuzz \
> graphite2>=1.3.14:graphics/graphite2 \
> png>=1.6.43:graphics/png \
> dav1d>=1.0.0:multimedia/dav1d \
> diff --git a/www/firefox/distinfo b/www/firefox/distinfo
> index c0f7cfa82129..b85b5adf2a9b 100644
> --- a/www/firefox/distinfo
> +++ b/www/firefox/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1719265362
> -SHA256 (firefox-127.0.2.source.tar.xz) =
> 0b7b2a8c3def52fcab13c48769645d0e963902ee916e4f3d2a0098796e73e3e8
> -SIZE (firefox-127.0.2.source.tar.xz) = 554998504
> +TIMESTAMP = 1719875233
> +SHA256 (firefox-128.0.source.tar.xz) =
> 358b2f67c6c96c2a857588e1678e10bf233d5c324ff845055f2da043d1bf59ca
> +SIZE (firefox-128.0.source.tar.xz) = 561251876
> diff --git a/www/firefox/files/patch-bug847568
> b/www/firefox/files/patch-bug847568
> index 95bd181256e8..2ee46579d43d 100644
> --- a/www/firefox/files/patch-bug847568
> +++ b/www/firefox/files/patch-bug847568
> @@ -64,7 +64,7 @@ index 000000000000..24e8d7a03274
> +# Match bundled graphite2 configuration
> +AllowCompilerWarnings()
> +
> -+FINAL_LIBRARY = 'gkmedias'
> ++FINAL_LIBRARY = 'xul'
> diff --git gfx/harfbuzz/README-mozilla.fbsd
> gfx/harfbuzz/README-mozilla.fbsd
> new file mode 100644
> index 000000000000..2a10eb1e2b42
> diff --git a/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
> b/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
> index 656127071a78..4bfe48f0592c 100644
> --- a/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
> +++ b/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
> @@ -1,11 +1,13 @@
> ---- gfx/skia/skia/src/base/SkEndian.h.orig 2023-06-16
> 01:32:16.999830000 +0200
> -+++ gfx/skia/skia/src/base/SkEndian.h 2023-06-16 01:32:41.701673000 +0200
> -@@ -131,7 +131,7 @@
> - #define SkTEndian_SwapLE64(n) (n)
> - #else // SK_CPU_BENDIAN
> - #define SkEndian_SwapBE16(n) (n)
> -- #define SkEndian_SwapBE32(n) (n)
> -+ #define SkEndian_SwapBE32(n) uint32_t(n)
> - #define SkEndian_SwapBE64(n) (n)
> - #define SkEndian_SwapLE16(n) SkEndianSwap16(n)
> - #define SkEndian_SwapLE32(n) SkEndianSwap32(n)
> +diff --git gfx/skia/skia/src/base/SkEndian.h
> gfx/skia/skia/src/base/SkEndian.h
> +index d015f8bff2bf..cc390a53f30c 100644
> +--- gfx/skia/skia/src/base/SkEndian.h
> ++++ gfx/skia/skia/src/base/SkEndian.h
> +@@ -140,7 +140,7 @@ static inline void SkEndianSwap64s(uint64_t array[],
> int count) {
> + #define SkEndian_SwapLE64(n) SkEndianSwap64(n)
> +
> + #define SkTEndian_SwapBE16(n) (n)
> +- #define SkTEndian_SwapBE32(n) (n)
> ++ #define SkTEndian_SwapBE32(n) uint32_t(n)
> + #define SkTEndian_SwapBE64(n) (n)
> + #define SkTEndian_SwapLE16(n) SkTEndianSwap16<n>::value
> + #define SkTEndian_SwapLE32(n) SkTEndianSwap32<n>::value
> diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
> b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
> index 0cee5dac92a1..e23f0eb4f904 100644
> --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
> +++ b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
> @@ -4,13 +4,17 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of
> undeclared identifier 'get
> uint32_t hwcaps = getauxval(AT_HWCAP);
> ^
>
> ---- gfx/skia/skia/src/core/SkCpu.cpp.orig 2020-02-07 22:13:22 UTC
> +diff --git gfx/skia/skia/src/core/SkCpu.cpp
> gfx/skia/skia/src/core/SkCpu.cpp
> +index cdac7db2be2c..4da2ee4bd4b4 100644
> +--- gfx/skia/skia/src/core/SkCpu.cpp
> +++ gfx/skia/skia/src/core/SkCpu.cpp
> -@@ -72,6 +72,23 @@
> - return features;
> - }
> +@@ -81,6 +81,22 @@
> + if (hwcap & HWCAP_LOONGARCH_LSX) { features |=
> SkCpu::LOONGARCH_SX; }
> + if (hwcap & HWCAP_LOONGARCH_LASX) { features |=
> SkCpu::LOONGARCH_ASX; }
>
> -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
> ++ return features;
> ++ }
> ++#elif
> + #include <machine/armreg.h>
> + #ifndef ID_AA64ISAR0_CRC32_VAL
> + #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
> @@ -24,9 +28,6 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of
> undeclared identifier 'get
> + if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) ==
> ID_AA64ISAR0_CRC32_BASE) {
> + features |= SkCpu::CRC32;
> + }
> -+ return features;
> -+ }
> -+
> - #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
> - #include <sys/auxv.h>
> -
> + return features;
> + }
> + #else
> diff --git
> a/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
> b/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
> index 64e279cf29f0..05cf110b1192 100644
> --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
> +++ b/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
> @@ -1,11 +1,13 @@
> ---- gfx/skia/skia/src/core/SkRasterPipeline.h.orig 2023-06-10
> 14:20:18.155477000 +0200
> -+++ gfx/skia/skia/src/core/SkRasterPipeline.h 2023-06-10
> 14:20:30.760915000 +0200
> -@@ -24,7 +24,7 @@
> - struct SkImageInfo;
> +diff --git gfx/skia/skia/src/core/SkRasterPipeline.h
> gfx/skia/skia/src/core/SkRasterPipeline.h
> +index 2475ea0d398d..67967483656d 100644
> +--- gfx/skia/skia/src/core/SkRasterPipeline.h
> ++++ gfx/skia/skia/src/core/SkRasterPipeline.h
> +@@ -27,7 +27,7 @@ struct SkImageInfo;
> struct skcms_TransferFunction;
>
> --#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) &&
> !defined(SK_CPU_ARM32)
> -+#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) &&
> !defined(SK_CPU_ARM32) && !defined(__powerpc__)
> + #if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) &&
> !defined(SK_CPU_ARM32) && \
> +- !defined(SK_CPU_LOONGARCH)
> ++ !defined(SK_CPU_LOONGARCH) && !defined(__powerpc__)
> #define SK_HAS_MUSTTAIL 1
> #else
> #define SK_HAS_MUSTTAIL 0
> diff --git a/www/firefox/files/patch-libwebrtc-generated
> b/www/firefox/files/patch-libwebrtc-generated
> index 4230b31cd227..b59060f6acdc 100644
> --- a/www/firefox/files/patch-libwebrtc-generated
> +++ b/www/firefox/files/patch-libwebrtc-generated
> @@ -1,10 +1,10 @@
> -commit 1fb2333e2d53204e69a318a8c803981d8ded116b
> +commit 39df5a98686dce37f31f3741ec4f7198be4251c9
> Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
>
> - regenerate FreeBSD libwebrtc patch for Firefox 127
> + regenerate FreeBSD libwebrtc patch for Firefox 128
>
> 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 b0671b5d4adb..642f867db664 100644
> +index 2dbd5881583e..332ca04819ee 100644
> ---
> third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
> +++
> third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -27,7 +27,7 @@ index b0671b5d4adb..642f867db664 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -215,7 +215,7 @@ index b0671b5d4adb..642f867db664 100644
>
> 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 e090bcdfc55c..935f8560bd05 100644
> +index df2c86715cac..6c4e403f6dc1 100644
> --- third_party/libwebrtc/api/array_view_gn/moz.build
> +++ third_party/libwebrtc/api/array_view_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -238,7 +238,7 @@ index e090bcdfc55c..935f8560bd05 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -406,7 +406,7 @@ index e090bcdfc55c..935f8560bd05 100644
> -
> Library("array_view_gn")
> diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
> third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
> -index 6a2d55b776db..8512989cc3ea 100644
> +index 4d678a1de7c9..e163a7c1f440 100644
> --- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
> +++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -429,7 +429,7 @@ index 6a2d55b776db..8512989cc3ea 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -605,7 +605,7 @@ index 6a2d55b776db..8512989cc3ea 100644
> -
> Library("async_dns_resolver_gn")
> diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
> third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
> -index ee6df1d36f53..d217e83eb683 100644
> +index cbd6f2e6f0d5..3bfa575693b2 100644
> --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
> +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -628,7 +628,7 @@ index ee6df1d36f53..d217e83eb683 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -816,7 +816,7 @@ index ee6df1d36f53..d217e83eb683 100644
>
> Library("aec3_config_gn")
> diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
> third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
> -index 0c3ce503ad9e..4e9cb792fd2e 100644
> +index 746585483f96..33ea9b79d47b 100644
> --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
> +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
> @@ -12,12 +12,22 @@ AllowCompilerWarnings()
> @@ -840,7 +840,7 @@ index 0c3ce503ad9e..4e9cb792fd2e 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -1039,7 +1039,7 @@ index 0c3ce503ad9e..4e9cb792fd2e 100644
>
> Library("aec3_factory_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 1317ad89b0d7..2fecbfa52bb7 100644
> +index e2561db08f06..59da7761dd35 100644
> --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
> +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -1062,7 +1062,7 @@ index 1317ad89b0d7..2fecbfa52bb7 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -1257,7 +1257,7 @@ index 1317ad89b0d7..2fecbfa52bb7 100644
>
> Library("audio_frame_api_gn")
> diff --git
> third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
> third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
> -index e04682bee3fa..cdd13155790d 100644
> +index 7dd1c4b91100..960b60c3311c 100644
> --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
> +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -1280,7 +1280,7 @@ index e04682bee3fa..cdd13155790d 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -1444,7 +1444,7 @@ index e04682bee3fa..cdd13155790d 100644
> -
> Library("audio_frame_processor_gn")
> diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
> third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
> -index c74637daa356..d4a66ce81d9b 100644
> +index 36d43783a3e7..fd0111ba0ffd 100644
> --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
> +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -1467,7 +1467,7 @@ index c74637daa356..d4a66ce81d9b 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -1642,7 +1642,7 @@ index c74637daa356..d4a66ce81d9b 100644
> -
> 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 eb9e4ec6697b..08b8d7df91dd 100644
> +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()
> @@ -1665,7 +1665,7 @@ index eb9e4ec6697b..08b8d7df91dd 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -1833,7 +1833,7 @@ index eb9e4ec6697b..08b8d7df91dd 100644
> -
> 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 9dcc9826de61..0973b9bab0b3 100644
> +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()
> @@ -1856,7 +1856,7 @@ index 9dcc9826de61..0973b9bab0b3 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -2051,7 +2051,7 @@ index 9dcc9826de61..0973b9bab0b3 100644
>
> 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 b5c7fe8b37a8..8e851ee1eac0 100644
> +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()
> @@ -2074,7 +2074,7 @@ index b5c7fe8b37a8..8e851ee1eac0 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -2269,7 +2269,7 @@ index b5c7fe8b37a8..8e851ee1eac0 100644
>
> 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 8eaebf875c3c..acac009b8893 100644
> +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()
> @@ -2292,7 +2292,7 @@ index 8eaebf875c3c..acac009b8893 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -2487,7 +2487,7 @@ index 8eaebf875c3c..acac009b8893 100644
>
> Library("audio_codecs_api_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
> -index 3ce5ad2d5d21..edfab7737136 100644
> +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()
> @@ -2512,7 +2512,7 @@ index 3ce5ad2d5d21..edfab7737136 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -2711,7 +2711,7 @@ index 3ce5ad2d5d21..edfab7737136 100644
>
> 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 e8acc1186e04..dd0e328737c6 100644
> +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()
> @@ -2736,7 +2736,7 @@ index e8acc1186e04..dd0e328737c6 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -2935,7 +2935,7 @@ index e8acc1186e04..dd0e328737c6 100644
>
> 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 2dbe0fd6bce3..a29327a65377 100644
> +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()
> @@ -2958,7 +2958,7 @@ index 2dbe0fd6bce3..a29327a65377 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -3153,7 +3153,7 @@ index 2dbe0fd6bce3..a29327a65377 100644
>
> 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 a1b1f8e9fccb..68424c136524 100644
> +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
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -3176,7 +3176,7 @@ index a1b1f8e9fccb..68424c136524 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -3371,7 +3371,7 @@ index a1b1f8e9fccb..68424c136524 100644
>
> Library("audio_encoder_g711_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
> -index 838977ba1042..4577862a247d 100644
> +index cf9228dcab3c..7eb3130288e3 100644
> ---
> third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -3394,7 +3394,7 @@ index 838977ba1042..4577862a247d 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -3589,7 +3589,7 @@ index 838977ba1042..4577862a247d 100644
>
> Library("audio_decoder_g722_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
> -index 2b1c0d220c3e..cdb668cf70bc 100644
> +index 3b1a814ac7b2..048ddee2cbdb 100644
> ---
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -3612,7 +3612,7 @@ index 2b1c0d220c3e..cdb668cf70bc 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -3787,7 +3787,7 @@ index 2b1c0d220c3e..cdb668cf70bc 100644
> -
> Library("audio_encoder_g722_config_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
> -index 367caa077f2d..3a983cc69d40 100644
> +index 57bdfeaf74c0..f04086fa4375 100644
> ---
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -3810,7 +3810,7 @@ index 367caa077f2d..3a983cc69d40 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -4005,7 +4005,7 @@ index 367caa077f2d..3a983cc69d40 100644
>
> Library("audio_encoder_g722_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
> -index b8bf808d3d73..af4f54885d1e 100644
> +index ae2d4f5dc9b4..8d5eb0cadc34 100644
> ---
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -4028,7 +4028,7 @@ index b8bf808d3d73..af4f54885d1e 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -4227,7 +4227,7 @@ index b8bf808d3d73..af4f54885d1e 100644
>
> Library("audio_decoder_ilbc_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
> -index 909cc8c26f96..9e4afff2cb93 100644
> +index 2ec1c97ea240..ee5d451c740d 100644
> ---
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -4250,7 +4250,7 @@ index 909cc8c26f96..9e4afff2cb93 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -4414,7 +4414,7 @@ index 909cc8c26f96..9e4afff2cb93 100644
> -
> Library("audio_encoder_ilbc_config_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
> -index 08b426b9abd7..b52f29085529 100644
> +index ff9d947abb85..cdb5435b0bf3 100644
> ---
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -4437,7 +4437,7 @@ index 08b426b9abd7..b52f29085529 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -4636,7 +4636,7 @@ index 08b426b9abd7..b52f29085529 100644
>
> Library("audio_encoder_ilbc_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
> -index c36b4324e4b3..19274344f17c 100644
> +index 06926f2550c6..3bb8979209c8 100644
> ---
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -4659,7 +4659,7 @@ index c36b4324e4b3..19274344f17c 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -4854,7 +4854,7 @@ index c36b4324e4b3..19274344f17c 100644
>
> Library("audio_decoder_multiopus_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
> -index a9896dd203d6..e666d73db50a 100644
> +index a40417692306..11dc887d7856 100644
> ---
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -4877,7 +4877,7 @@ index a9896dd203d6..e666d73db50a 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -5052,7 +5052,7 @@ index a9896dd203d6..e666d73db50a 100644
> -
> Library("audio_decoder_opus_config_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
> -index 7c7ed25cbc12..2a0eaf5162ae 100644
> +index a52b290d08bc..191d27589e54 100644
> ---
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -5075,7 +5075,7 @@ index 7c7ed25cbc12..2a0eaf5162ae 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -5274,7 +5274,7 @@ index 7c7ed25cbc12..2a0eaf5162ae 100644
>
> Library("audio_decoder_opus_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
> -index 7a8b6dc2e652..a1e0aebdd00b 100644
> +index 1847aa9f2334..b1a86854c6cd 100644
> ---
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -5297,7 +5297,7 @@ index 7a8b6dc2e652..a1e0aebdd00b 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -5492,7 +5492,7 @@ index 7a8b6dc2e652..a1e0aebdd00b 100644
>
> Library("audio_encoder_multiopus_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
> -index f68dce0d9dee..1814a45bd0b9 100644
> +index b4ed20ad8589..220221aeeed4 100644
> ---
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
> @@ -12,12 +12,22 @@ AllowCompilerWarnings()
> @@ -5516,7 +5516,7 @@ index f68dce0d9dee..1814a45bd0b9 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -48,174 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -5700,7 +5700,7 @@ index f68dce0d9dee..1814a45bd0b9 100644
>
> Library("audio_encoder_opus_config_gn")
> diff --git
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
> -index f44d8836ef29..3c36a8e40946 100644
> +index dc73c7abc386..b76dd0fcc777 100644
> ---
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
> +++
> third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -5723,7 +5723,7 @@ index f44d8836ef29..3c36a8e40946 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -5922,7 +5922,7 @@ index f44d8836ef29..3c36a8e40946 100644
>
> Library("audio_encoder_opus_gn")
> diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build
> third_party/libwebrtc/api/audio_options_api_gn/moz.build
> -index 5e169a3ffe4c..dee079f27798 100644
> +index 974d1dbdf2c7..90ca4ab68ba8 100644
> --- third_party/libwebrtc/api/audio_options_api_gn/moz.build
> +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -5945,7 +5945,7 @@ index 5e169a3ffe4c..dee079f27798 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -6133,7 +6133,7 @@ index 5e169a3ffe4c..dee079f27798 100644
>
> Library("audio_options_api_gn")
> diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
> third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
> -index 530662eb2f31..1fb50aa9e1e4 100644
> +index 500eff54bbfd..a1f84da5a485 100644
> --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
> +++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -6156,7 +6156,7 @@ index 530662eb2f31..1fb50aa9e1e4 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -6324,7 +6324,7 @@ index 530662eb2f31..1fb50aa9e1e4 100644
> -
> Library("bitrate_allocation_gn")
> diff --git third_party/libwebrtc/api/call_api_gn/moz.build
> third_party/libwebrtc/api/call_api_gn/moz.build
> -index 5656999ecb9a..93c7cd55cf2e 100644
> +index 372f0888fbba..86c73a9fd726 100644
> --- third_party/libwebrtc/api/call_api_gn/moz.build
> +++ third_party/libwebrtc/api/call_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -6347,7 +6347,7 @@ index 5656999ecb9a..93c7cd55cf2e 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -6511,7 +6511,7 @@ index 5656999ecb9a..93c7cd55cf2e 100644
> -
> Library("call_api_gn")
> diff --git
> third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
> third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
> -index 4147b3868be0..1f0c3440b172 100644
> +index 2a9b6d96dd75..c032ee4fe916 100644
> ---
> third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
> +++
> third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -6534,7 +6534,7 @@ index 4147b3868be0..1f0c3440b172 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -6702,7 +6702,7 @@ index 4147b3868be0..1f0c3440b172 100644
> -
> Library("frame_decryptor_interface_gn")
> diff --git
> third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
> third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
> -index 93034ef6e23e..2f5ff0067bee 100644
> +index f1716e6b6267..7d3b6bae0048 100644
> ---
> third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
> +++
> third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -6725,7 +6725,7 @@ index 93034ef6e23e..2f5ff0067bee 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -6893,7 +6893,7 @@ index 93034ef6e23e..2f5ff0067bee 100644
> -
> Library("frame_encryptor_interface_gn")
> diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build
> third_party/libwebrtc/api/crypto/options_gn/moz.build
> -index 9b5cca4f8b98..33542ced4242 100644
> +index fae93b139253..5726c9c835be 100644
> --- third_party/libwebrtc/api/crypto/options_gn/moz.build
> +++ third_party/libwebrtc/api/crypto/options_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -6916,7 +6916,7 @@ index 9b5cca4f8b98..33542ced4242 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -7100,7 +7100,7 @@ index 9b5cca4f8b98..33542ced4242 100644
>
> Library("options_gn")
> diff --git
> third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
> third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
> -index 77a2224baf94..5c7930031464 100644
> +index 9388642ab5e6..2a4db566b430 100644
> --- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
> +++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -7123,7 +7123,7 @@ index 77a2224baf94..5c7930031464 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -7322,7 +7322,7 @@ index 77a2224baf94..5c7930031464 100644
>
> Library("environment_factory_gn")
> diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build
> third_party/libwebrtc/api/environment/environment_gn/moz.build
> -index e7105ff57383..b7d434e7f0e5 100644
> +index 5b7b361ac342..b18f7c018485 100644
> --- third_party/libwebrtc/api/environment/environment_gn/moz.build
> +++ third_party/libwebrtc/api/environment/environment_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -7345,7 +7345,7 @@ index e7105ff57383..b7d434e7f0e5 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -7509,7 +7509,7 @@ index e7105ff57383..b7d434e7f0e5 100644
> -
> Library("environment_gn")
> diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build
> third_party/libwebrtc/api/fec_controller_api_gn/moz.build
> -index 619ea937f07b..29117e092916 100644
> +index 653eae8f233f..383f2f1c9661 100644
> --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
> +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -7532,7 +7532,7 @@ index 619ea937f07b..29117e092916 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -7700,7 +7700,7 @@ index 619ea937f07b..29117e092916 100644
> -
> Library("fec_controller_api_gn")
> diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build
> third_party/libwebrtc/api/field_trials_registry_gn/moz.build
> -index 01ce20c5a613..bbfe2fc66a9b 100644
> +index 76e121ec9f5e..544a531d83f1 100644
> --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
> +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -7723,7 +7723,7 @@ index 01ce20c5a613..bbfe2fc66a9b 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -7918,7 +7918,7 @@ index 01ce20c5a613..bbfe2fc66a9b 100644
>
> Library("field_trials_registry_gn")
> diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build
> third_party/libwebrtc/api/field_trials_view_gn/moz.build
> -index 967e416aad11..41db496b2998 100644
> +index a6ac64bf50c6..541f2359270f 100644
> --- third_party/libwebrtc/api/field_trials_view_gn/moz.build
> +++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -7941,7 +7941,7 @@ index 967e416aad11..41db496b2998 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -8105,7 +8105,7 @@ index 967e416aad11..41db496b2998 100644
> -
> Library("field_trials_view_gn")
> diff --git
> third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
> third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
> -index ea4cac127680..42bd8a0ebee8 100644
> +index 2ed19fd691d7..5a66e1d8aace 100644
> --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
> +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -8128,7 +8128,7 @@ index ea4cac127680..42bd8a0ebee8 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -8303,7 +8303,7 @@ index ea4cac127680..42bd8a0ebee8 100644
> -
> Library("frame_transformer_interface_gn")
> diff --git third_party/libwebrtc/api/function_view_gn/moz.build
> third_party/libwebrtc/api/function_view_gn/moz.build
> -index 980c9d9ca606..96dce96e8ab5 100644
> +index feea8c2c0ba6..7c48aab74157 100644
> --- third_party/libwebrtc/api/function_view_gn/moz.build
> +++ third_party/libwebrtc/api/function_view_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -8326,7 +8326,7 @@ index 980c9d9ca606..96dce96e8ab5 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -8494,7 +8494,7 @@ index 980c9d9ca606..96dce96e8ab5 100644
> -
> Library("function_view_gn")
> diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
> third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
> -index b3a3b0ee1b12..b71b016ae856 100644
> +index 6729abedf9bd..314418594b0e 100644
> --- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
> +++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -8517,7 +8517,7 @@ index b3a3b0ee1b12..b71b016ae856 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -8681,7 +8681,7 @@ index b3a3b0ee1b12..b71b016ae856 100644
> -
> Library("jingle_logging_api_gn")
> diff --git
> third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
> third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
> -index fbbb882ebf1f..a8d741a090d2 100644
> +index f815d7da4e62..d8c0189951f6 100644
> --- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
> +++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -8704,7 +8704,7 @@ index fbbb882ebf1f..a8d741a090d2 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -8868,7 +8868,7 @@ index fbbb882ebf1f..a8d741a090d2 100644
> -
> Library("jingle_peerconnection_api_gn")
> diff --git third_party/libwebrtc/api/location_gn/moz.build
> third_party/libwebrtc/api/location_gn/moz.build
> -index dcdca04077c0..364fda084155 100644
> +index 706b1d5026cc..673b106c6cea 100644
> --- third_party/libwebrtc/api/location_gn/moz.build
> +++ third_party/libwebrtc/api/location_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -8891,7 +8891,7 @@ index dcdca04077c0..364fda084155 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -9055,7 +9055,7 @@ index dcdca04077c0..364fda084155 100644
> -
> Library("location_gn")
> diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build
> third_party/libwebrtc/api/make_ref_counted_gn/moz.build
> -index f90e27491698..7ecc837f314f 100644
> +index 6bedaf55cd03..6f4e516cb13f 100644
> --- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
> +++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
> @@ -12,11 +12,21 @@ AllowCompilerWarnings()
> @@ -9078,7 +9078,7 @@ index f90e27491698..7ecc837f314f 100644
> +DEFINES["__STDC_CONSTANT_MACROS"] = True
> +DEFINES["__STDC_FORMAT_MACROS"] = True
>
> - FINAL_LIBRARY = "webrtc"
> + FINAL_LIBRARY = "xul"
>
> @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
> if CONFIG["MOZ_DEBUG"] == "1":
> @@ -9242,7 +9242,7 @@ index f90e27491698..7ecc837f314f 100644
> *** 13172 LINES SKIPPED ***
>
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org