MSVSphere Packaging Team
1 year ago
parent
6730d1316a
commit
b3f563dcb8
@ -1,5 +1,6 @@
|
|||||||
SOURCES/cbindgen-vendor.tar.xz
|
SOURCES/cbindgen-vendor.tar.xz
|
||||||
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
||||||
SOURCES/nss-3.79.0-11.el8_1.src.rpm
|
SOURCES/nss-3.90.0-2.el8_1.src.rpm
|
||||||
SOURCES/thunderbird-102.15.1.processed-source.tar.xz
|
SOURCES/nss-3.90.0-3.el9_0.src.rpm
|
||||||
SOURCES/thunderbird-langpacks-102.15.1-20230913.tar.xz
|
SOURCES/thunderbird-115.3.1.processed-source.tar.xz
|
||||||
|
SOURCES/thunderbird-langpacks-115.3.1-20230929.tar.xz
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
|
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
|
||||||
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
||||||
a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
|
39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm
|
||||||
d0810f989e325cd666650fb2917874e6c39803fb SOURCES/thunderbird-102.15.1.processed-source.tar.xz
|
df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm
|
||||||
b48034523269fd13c8a425884912ee57aaac350c SOURCES/thunderbird-langpacks-102.15.1-20230913.tar.xz
|
f7fb65ec6b54fd7c652e5ef7f90b2975f6ea47e1 SOURCES/thunderbird-115.3.1.processed-source.tar.xz
|
||||||
|
6c731bd5d70d3c84d92848dcf91117307be64418 SOURCES/thunderbird-langpacks-115.3.1-20230929.tar.xz
|
||||||
|
|||||||
@ -1,44 +0,0 @@
|
|||||||
From efd5bc0715e5477318be95a76811cda0a89e8289 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
|
|
||||||
Date: Fri, 4 Mar 2022 12:00:26 +0100
|
|
||||||
Subject: [PATCH] GLIBCXX fix for GCC 12?
|
|
||||||
|
|
||||||
---
|
|
||||||
build/unix/stdc++compat/stdc++compat.cpp | 14 ++++++++++++++
|
|
||||||
1 file changed, 14 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
|
|
||||||
index 0180f6bcfa998..8d7a542ff11f0 100644
|
|
||||||
--- a/build/unix/stdc++compat/stdc++compat.cpp
|
|
||||||
+++ b/build/unix/stdc++compat/stdc++compat.cpp
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
GLIBCXX_3.4.27 is from gcc 10
|
|
||||||
GLIBCXX_3.4.28 is from gcc 10
|
|
||||||
GLIBCXX_3.4.29 is from gcc 11
|
|
||||||
+ GLIBCXX_3.4.30 is from gcc 12
|
|
||||||
|
|
||||||
This file adds the necessary compatibility tricks to avoid symbols with
|
|
||||||
version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
|
|
||||||
@@ -69,6 +70,19 @@ void __attribute__((weak)) __throw_bad_array_new_length() { MOZ_CRASH(); }
|
|
||||||
} // namespace std
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if _GLIBCXX_RELEASE >= 12
|
|
||||||
+namespace std {
|
|
||||||
+
|
|
||||||
+/* This avoids the GLIBCXX_3.4.30 symbol version. */
|
|
||||||
+void __attribute__((weak))
|
|
||||||
+__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
|
|
||||||
+ const char* __condition) {
|
|
||||||
+ MOZ_CRASH();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+} // namespace std
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* While we generally don't build with exceptions, we have some host tools
|
|
||||||
* that do use them. libstdc++ from GCC 5.0 added exception constructors with
|
|
||||||
* char const* argument. Older versions only have a constructor with
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
|
|
||||||
--- a/parser/expat/lib/xmlparse.c
|
|
||||||
+++ b/parser/expat/lib/xmlparse.c
|
|
||||||
@@ -5652,12 +5652,18 @@
|
|
||||||
else
|
|
||||||
#endif /* XML_DTD */
|
|
||||||
{
|
|
||||||
processor = contentProcessor;
|
|
||||||
/* see externalEntityContentProcessor vs contentProcessor */
|
|
||||||
- return doContent(parser, parentParser ? 1 : 0, encoding, s, end,
|
|
||||||
- nextPtr, (XML_Bool)!ps_finalBuffer);
|
|
||||||
+ result = doContent(parser, parser->m_parentParser ? 1 : 0,
|
|
||||||
+ parser->m_encoding, s, end, nextPtr,
|
|
||||||
+ (XML_Bool)! parser->m_parsingStatus.finalBuffer);
|
|
||||||
+ if (result == XML_ERROR_NONE) {
|
|
||||||
+ if (! storeRawNames(parser))
|
|
||||||
+ return XML_ERROR_NO_MEMORY;
|
|
||||||
+ }
|
|
||||||
+ return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static enum XML_Error PTRCALL
|
|
||||||
errorProcessor(XML_Parser parser,
|
|
||||||
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
|
|
||||||
--- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia 2020-01-02 22:33:02.000000000 +0100
|
|
||||||
+++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h 2020-01-03 09:00:37.537296105 +0100
|
|
||||||
@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
|
|
||||||
|
|
||||||
static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
|
|
||||||
Sk4h hs = Sk4h::Load(&rgba);
|
|
||||||
-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
float32x4_t fs;
|
|
||||||
asm ("fcvtl %[fs].4s, %[hs].4h \n" // vcvt_f32_f16(...)
|
|
||||||
: [fs] "=w" (fs) // =w: write-only NEON register
|
|
||||||
@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
|
|
||||||
-#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
|
|
||||||
float32x4_t vec = fs.fVec;
|
|
||||||
asm ("fcvtn %[vec].4h, %[vec].4s \n" // vcvt_f16_f32(vec)
|
|
||||||
: [vec] "+w" (vec)); // +w: read-write NEON register
|
|
||||||
diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
|
|
||||||
--- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia 2020-01-03 09:00:37.538296107 +0100
|
|
||||||
+++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h 2020-01-03 10:11:41.259219508 +0100
|
|
||||||
@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
|
|
||||||
}
|
|
||||||
|
|
||||||
SI U16 to_half(F f) {
|
|
||||||
-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
|
||||||
+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
|
|
||||||
&& !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
|
||||||
return vcvt_f16_f32(f);
|
|
||||||
|
|
||||||
diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
|
|
||||||
--- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia 2020-01-03 09:00:37.538296107 +0100
|
|
||||||
+++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h 2020-01-03 10:11:53.513250979 +0100
|
|
||||||
@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
|
|
||||||
SI U16 Half_from_F(F f) {
|
|
||||||
#if defined(USING_NEON_FP16)
|
|
||||||
return bit_pun<U16>(f);
|
|
||||||
-#elif defined(USING_NEON_F16C)
|
|
||||||
- return (U16)vcvt_f16_f32(f);
|
|
||||||
#elif defined(USING_AVX512F)
|
|
||||||
return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
|
|
||||||
#elif defined(USING_AVX_F16C)
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build
|
|
||||||
--- firefox-73.0/media/libaom/moz.build.old 2020-02-07 23:13:28.000000000 +0200
|
|
||||||
+++ firefox-73.0/media/libaom/moz.build 2020-02-17 10:30:08.509805092 +0200
|
|
||||||
@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
|
|
||||||
|
|
||||||
for f in SOURCES:
|
|
||||||
if f.endswith('neon.c'):
|
|
||||||
- SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
|
|
||||||
+ SOURCES[f].flags += CONFIG['NEON_FLAGS']
|
|
||||||
|
|
||||||
if CONFIG['OS_TARGET'] == 'Android':
|
|
||||||
# For cpu-features.h
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old firefox-66.0/media/libopus/silk/arm/arm_silk_map.c
|
|
||||||
--- firefox-66.0/media/libopus/silk/arm/arm_silk_map.c.old 2019-03-12 21:07:35.356677522 +0100
|
|
||||||
+++ firefox-66.0/media/libopus/silk/arm/arm_silk_map.c 2019-03-12 21:07:42.937693394 +0100
|
|
||||||
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include "main_FIX.h"
|
|
||||||
+#include "fixed/main_FIX.h"
|
|
||||||
#include "NSQ.h"
|
|
||||||
#include "SigProc_FIX.h"
|
|
||||||
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
diff -up firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py.build-ascii-decode-fail-rhel7 firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py
|
|
||||||
--- firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py.build-ascii-decode-fail-rhel7 2022-06-23 09:11:39.000000000 +0200
|
|
||||||
+++ firefox-102.0/third_party/python/PyYAML/lib3/yaml/reader.py 2022-08-16 13:24:31.697757209 +0200
|
|
||||||
@@ -73,6 +73,8 @@ class Reader(object):
|
|
||||||
self.name = "<unicode string>"
|
|
||||||
self.check_printable(stream)
|
|
||||||
self.buffer = stream+'\0'
|
|
||||||
+ #self.encoding = 'utf-8'
|
|
||||||
+ #self.raw_decode = codecs.utf_8_decode
|
|
||||||
elif isinstance(stream, bytes):
|
|
||||||
self.name = "<byte string>"
|
|
||||||
self.raw_buffer = stream
|
|
||||||
@@ -83,6 +85,11 @@ class Reader(object):
|
|
||||||
self.eof = False
|
|
||||||
self.raw_buffer = None
|
|
||||||
self.determine_encoding()
|
|
||||||
+ print("DEBUG_OUTPUT:")
|
|
||||||
+ print(self.name)
|
|
||||||
+ print(self.encoding)
|
|
||||||
+ print(self.stream)
|
|
||||||
+ #print(self.stream.read())
|
|
||||||
|
|
||||||
def peek(self, index=0):
|
|
||||||
try:
|
|
||||||
diff -up firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py.build-ascii-decode-fail-rhel7 firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py
|
|
||||||
--- firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py.build-ascii-decode-fail-rhel7 2022-08-16 14:16:33.432529817 +0200
|
|
||||||
+++ firefox-102.0/toolkit/components/nimbus/generate/generate_feature_manifest.py 2022-08-17 08:01:38.175878171 +0200
|
|
||||||
@@ -37,7 +37,7 @@ def generate_feature_manifest(fd, input_
|
|
||||||
write_fm_js_headers(fd)
|
|
||||||
nimbus_dir_path = pathlib.Path(input_file).parent
|
|
||||||
try:
|
|
||||||
- with open(input_file, "r") as yaml_input:
|
|
||||||
+ with open(input_file, "r", encoding="utf-8") as yaml_input:
|
|
||||||
data = yaml.safe_load(yaml_input)
|
|
||||||
with pathlib.Path(nimbus_dir_path, FEATURE_MANIFEST_SCHEMA).open() as f:
|
|
||||||
schema = json.load(f)
|
|
||||||
@@ -92,7 +92,7 @@ def generate_platform_feature_manifest(f
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
- with open(input_file, "r") as yaml_input:
|
|
||||||
+ with open(input_file, "r", encoding="utf-8") as yaml_input:
|
|
||||||
data = yaml.safe_load(yaml_input)
|
|
||||||
fd.write(file_structure(data))
|
|
||||||
except (IOError) as e:
|
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -up firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2 firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s
|
||||||
|
--- firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2 2023-07-25 09:01:42.602375809 +0200
|
||||||
|
+++ firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s 2023-07-25 09:01:48.273373924 +0200
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
# See the full LICENSE under scripts/.
|
||||||
|
|
||||||
|
.machine "any"
|
||||||
|
-.abiversion 2
|
||||||
|
+.abiversion 1
|
||||||
|
.text
|
||||||
|
|
||||||
|
.globl sha512_block_p8
|
||||||
@ -1,49 +0,0 @@
|
|||||||
diff -up firefox-102.0/media/ffvpx/config_common.h.dav1d-remove firefox-102.0/media/ffvpx/config_common.h
|
|
||||||
--- firefox-102.0/media/ffvpx/config_common.h.dav1d-remove 2022-08-08 12:48:33.218128539 +0200
|
|
||||||
+++ firefox-102.0/media/ffvpx/config_common.h 2022-08-08 12:48:52.986003374 +0200
|
|
||||||
@@ -24,15 +24,11 @@
|
|
||||||
#undef CONFIG_VP8_VAAPI_HWACCEL
|
|
||||||
#undef CONFIG_VP9_VAAPI_HWACCEL
|
|
||||||
#undef CONFIG_AV1_VAAPI_HWACCEL
|
|
||||||
-#undef CONFIG_LIBDAV1D
|
|
||||||
-#undef CONFIG_AV1_DECODER
|
|
||||||
#define CONFIG_VAAPI 1
|
|
||||||
#define CONFIG_VAAPI_1 1
|
|
||||||
#define CONFIG_VP8_VAAPI_HWACCEL 1
|
|
||||||
#define CONFIG_VP9_VAAPI_HWACCEL 1
|
|
||||||
#define CONFIG_AV1_VAAPI_HWACCEL 1
|
|
||||||
-#define CONFIG_LIBDAV1D 1
|
|
||||||
-#define CONFIG_AV1_DECODER 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff -up firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove firefox-102.0/media/ffvpx/libavcodec/moz.build
|
|
||||||
--- firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove 2022-08-08 12:44:24.098710736 +0200
|
|
||||||
+++ firefox-102.0/media/ffvpx/libavcodec/moz.build 2022-08-08 12:46:42.635828719 +0200
|
|
||||||
@@ -104,17 +104,23 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
|
|
||||||
]
|
|
||||||
if CONFIG['MOZ_WAYLAND']:
|
|
||||||
LOCAL_INCLUDES += ['/media/mozva']
|
|
||||||
+ if CONFIG['MOZ_DAV1D_ASM']:
|
|
||||||
+ SOURCES += [
|
|
||||||
+ 'libdav1d.c',
|
|
||||||
+ ]
|
|
||||||
SOURCES += [
|
|
||||||
'atsc_a53.c',
|
|
||||||
- 'libdav1d.c',
|
|
||||||
'vaapi_av1.c',
|
|
||||||
'vaapi_decode.c',
|
|
||||||
'vaapi_vp8.c',
|
|
||||||
'vaapi_vp9.c',
|
|
||||||
]
|
|
||||||
+ if CONFIG['MOZ_DAV1D_ASM']:
|
|
||||||
+ USE_LIBS += [
|
|
||||||
+ 'dav1d',
|
|
||||||
+ 'media_libdav1d_asm',
|
|
||||||
+ ]
|
|
||||||
USE_LIBS += [
|
|
||||||
- 'dav1d',
|
|
||||||
- 'media_libdav1d_asm',
|
|
||||||
'mozva'
|
|
||||||
]
|
|
||||||
|
|
||||||
@ -1,11 +1,11 @@
|
|||||||
--- thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py.build-rhel7-lower-node-min-version 2022-10-14 21:42:10.000000000 +0200
|
--- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2022-10-10 17:55:56.000000000 +0200
|
||||||
+++ thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 18:49:44.490667820 +0200
|
+++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 14:57:47.476182627 +0200
|
||||||
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
|
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
|
||||||
from mozfile import which
|
from mozfile import which
|
||||||
from six import PY3
|
from six import PY3
|
||||||
|
|
||||||
-NODE_MIN_VERSION = StrictVersion("10.24.1")
|
-NODE_MIN_VERSION = StrictVersion("12.22.12")
|
||||||
+NODE_MIN_VERSION = StrictVersion("10.24.0")
|
+NODE_MIN_VERSION = StrictVersion("10.24.0")
|
||||||
NPM_MIN_VERSION = StrictVersion("6.14.12")
|
NPM_MIN_VERSION = StrictVersion("6.14.16")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,12 @@
|
|||||||
|
diff -up thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl thunderbird-115.1.0/comm/third_party/rnp/moz.build
|
||||||
|
--- thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl 2023-08-07 16:38:39.272780256 +0200
|
||||||
|
+++ thunderbird-115.1.0/comm/third_party/rnp/moz.build 2023-08-07 16:38:42.822780087 +0200
|
||||||
|
@@ -93,7 +93,7 @@ elif CONFIG["MZLA_LIBRNP_BACKEND"] == "o
|
||||||
|
# Supported, but not with RHEL's OpenSSL, disabled for now;
|
||||||
|
"ENABLE_BRAINPOOL": False,
|
||||||
|
})
|
||||||
|
- rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
|
||||||
|
+ #rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
|
||||||
|
if CONFIG["MZLA_LIBRNP_OPENSSL_VERSION"][0] == "3":
|
||||||
|
rnp_defines["CRYPTO_BACKEND_OPENSSL3"] = True
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
diff -up firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old firefox-81.0/toolkit/modules/GMPInstallManager.jsm
|
|
||||||
--- firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old 2020-09-25 10:39:04.769458703 +0200
|
|
||||||
+++ firefox-81.0/toolkit/modules/GMPInstallManager.jsm 2020-09-25 10:39:22.038504747 +0200
|
|
||||||
@@ -54,10 +54,6 @@ function getScopedLogger(prefix) {
|
|
||||||
|
|
||||||
const LOCAL_GMP_SOURCES = [
|
|
||||||
{
|
|
||||||
- id: "gmp-gmpopenh264",
|
|
||||||
- src: "chrome://global/content/gmp-sources/openh264.json",
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
id: "gmp-widevinecdm",
|
|
||||||
src: "chrome://global/content/gmp-sources/widevinecdm.json",
|
|
||||||
},
|
|
||||||
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
|
||||||
--- a/toolkit/content/jar.mn
|
|
||||||
+++ b/toolkit/content/jar.mn
|
|
||||||
@@ -108,7 +108,6 @@ toolkit.jar:
|
|
||||||
#ifdef XP_MACOSX
|
|
||||||
content/global/macWindowMenu.js
|
|
||||||
#endif
|
|
||||||
- content/global/gmp-sources/openh264.json (gmp-sources/openh264.json)
|
|
||||||
content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
|
|
||||||
|
|
||||||
# Third party files
|
|
||||||
diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
|
|
||||||
--- a/toolkit/modules/GMPInstallManager.jsm
|
|
||||||
+++ b/toolkit/modules/GMPInstallManager.jsm
|
|
||||||
@@ -238,6 +234,9 @@ GMPInstallManager.prototype = {
|
|
||||||
* downloaderr, verifyerr or previouserrorencountered
|
|
||||||
*/
|
|
||||||
installAddon(gmpAddon) {
|
|
||||||
+ if (gmpAddon.isOpenH264) {
|
|
||||||
+ return Promise.reject({ type: "disabled" });
|
|
||||||
+ }
|
|
||||||
if (this._deferred) {
|
|
||||||
let log = getScopedLogger("GMPInstallManager.installAddon");
|
|
||||||
log.error("previous error encountered");
|
|
||||||
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
|
|
||||||
--- firefox-73.0/build/unix/run-mozilla.sh.old 2020-02-12 09:58:00.150895904 +0100
|
|
||||||
+++ firefox-73.0/build/unix/run-mozilla.sh 2020-02-12 09:58:06.505860696 +0100
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/bin/sh
|
|
||||||
+#!/usr/bin/sh
|
|
||||||
#
|
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- thunderbird-102.6.0/build/moz.configure/nss.configure.firefox-nss-version 2022-12-09 19:00:45.849518718 +0100
|
|
||||||
+++ thunderbird-102.6.0/build/moz.configure/nss.configure 2022-12-09 19:02:47.739198796 +0100
|
|
||||||
@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", h
|
|
||||||
imply_option("--with-system-nspr", True, when="--with-system-nss")
|
|
||||||
|
|
||||||
nss_pkg = pkg_check_modules(
|
|
||||||
- "NSS", "nss >= 3.79.2", when="--with-system-nss", config=False
|
|
||||||
+ "NSS", "nss >= 3.79", when="--with-system-nss", config=False
|
|
||||||
)
|
|
||||||
|
|
||||||
set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
diff -up firefox-84.0/security/sandbox/linux/moz.build.1516803 firefox-84.0/security/sandbox/linux/moz.build
|
|
||||||
--- firefox-84.0/security/sandbox/linux/moz.build.1516803 2020-12-10 16:17:55.425139545 +0100
|
|
||||||
+++ firefox-84.0/security/sandbox/linux/moz.build 2020-12-10 16:29:21.945860841 +0100
|
|
||||||
@@ -114,9 +114,8 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc")
|
|
||||||
# gcc lto likes to put the top level asm in syscall.cc in a different partition
|
|
||||||
# from the function using it which breaks the build. Work around that by
|
|
||||||
# forcing there to be only one partition.
|
|
||||||
-for f in CONFIG["OS_CXXFLAGS"]:
|
|
||||||
- if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang":
|
|
||||||
- LDFLAGS += ["--param lto-partitions=1"]
|
|
||||||
+if CONFIG['CC_TYPE'] != 'clang':
|
|
||||||
+ LDFLAGS += ['--param', 'lto-partitions=1']
|
|
||||||
|
|
||||||
DEFINES["NS_NO_XPCOM"] = True
|
|
||||||
DisableStlWrapping()
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- firefox-81.0.1/build/mach_initialize.py.old 2020-10-06 14:16:06.212974910 +0200
|
|
||||||
+++ firefox-81.0.1/build/mach_initialize.py 2020-10-06 14:19:03.313179557 +0200
|
|
||||||
@@ -507,7 +507,10 @@ class ImportHook(object):
|
|
||||||
# doesn't happen or because it doesn't matter).
|
|
||||||
if not os.path.exists(module.__file__[:-1]):
|
|
||||||
if os.path.exists(module.__file__):
|
|
||||||
- os.remove(module.__file__)
|
|
||||||
+ try:
|
|
||||||
+ os.remove(module.__file__)
|
|
||||||
+ except:
|
|
||||||
+ pass
|
|
||||||
del sys.modules[module.__name__]
|
|
||||||
module = self(name, globals, locals, fromlist, level)
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
|
|
||||||
index 8579f8bb3622..d9ca79d4fcb8 100644
|
|
||||||
--- a/third_party/libwebrtc/moz.build
|
|
||||||
+++ b/third_party/libwebrtc/moz.build
|
|
||||||
@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
"/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
|
|
||||||
"/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
|
|
||||||
"/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
|
|
||||||
- "/third_party/libwebrtc/modules/audio_coding/isac_gn"
|
|
||||||
+ "/third_party/libwebrtc/modules/audio_coding/isac_gn",
|
|
||||||
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
|
|
||||||
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
|
|
||||||
+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
|
|
||||||
]
|
|
||||||
|
|
||||||
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User Steve Singer <steve@ssinger.info>
|
|
||||||
# Date 1558451540 -7200
|
|
||||||
# Tue May 21 17:12:20 2019 +0200
|
|
||||||
# Node ID 433beec63e6b5f409683af20a0c1ab137cc7bfad
|
|
||||||
# Parent c0fdccc716e80a6d289c94f5d507ae141c62a3bf
|
|
||||||
Bug 1005535 - Get skia GPU building on big endian.
|
|
||||||
|
|
||||||
diff --git a/gfx/skia/skia/src/gpu/GrColor.h b/gfx/skia/skia/src/gpu/GrColor.h
|
|
||||||
--- a/gfx/skia/skia/src/gpu/GrColor.h
|
|
||||||
+++ b/gfx/skia/skia/src/gpu/GrColor.h
|
|
||||||
@@ -59,17 +59,17 @@ static inline GrColor GrColorPackRGBA(un
|
|
||||||
#define GrColorUnpackG(color) (((color) >> GrColor_SHIFT_G) & 0xFF)
|
|
||||||
#define GrColorUnpackB(color) (((color) >> GrColor_SHIFT_B) & 0xFF)
|
|
||||||
#define GrColorUnpackA(color) (((color) >> GrColor_SHIFT_A) & 0xFF)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Since premultiplied means that alpha >= color, we construct a color with
|
|
||||||
* each component==255 and alpha == 0 to be "illegal"
|
|
||||||
*/
|
|
||||||
-#define GrColor_ILLEGAL (~(0xFF << GrColor_SHIFT_A))
|
|
||||||
+#define GrColor_ILLEGAL ((uint32_t)(~(0xFF << GrColor_SHIFT_A)))
|
|
||||||
|
|
||||||
/** Normalizes and coverts an uint8_t to a float. [0, 255] -> [0.0, 1.0] */
|
|
||||||
static inline float GrNormalizeByteToFloat(uint8_t value) {
|
|
||||||
static const float ONE_OVER_255 = 1.f / 255.f;
|
|
||||||
return value * ONE_OVER_255;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Used to pick vertex attribute types. */
|
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
--- a/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
+++ b/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
@@ -755,12 +755,15 @@
|
||||||
|
extern FFCodec ff_libaom_av1_encoder;
|
||||||
|
extern const FFCodec ff_libaribb24_decoder;
|
||||||
|
extern const FFCodec ff_libcelt_decoder;
|
||||||
|
extern const FFCodec ff_libcodec2_encoder;
|
||||||
|
extern const FFCodec ff_libcodec2_decoder;
|
||||||
|
+#if CONFIG_MOZ_AV1
|
||||||
|
extern const FFCodec ff_libdav1d_decoder;
|
||||||
|
extern const FFCodec ff_libdavs2_decoder;
|
||||||
|
+extern const FFCodec ff_libuavs3d_decoder;
|
||||||
|
+#endif
|
||||||
|
extern const FFCodec ff_libfdk_aac_encoder;
|
||||||
|
extern const FFCodec ff_libfdk_aac_decoder;
|
||||||
|
extern const FFCodec ff_libgsm_encoder;
|
||||||
|
extern const FFCodec ff_libgsm_decoder;
|
||||||
|
extern const FFCodec ff_libgsm_ms_encoder;
|
||||||
|
@@ -783,11 +786,10 @@
|
||||||
|
extern const FFCodec ff_libspeex_encoder;
|
||||||
|
extern const FFCodec ff_libspeex_decoder;
|
||||||
|
extern const FFCodec ff_libsvtav1_encoder;
|
||||||
|
extern const FFCodec ff_libtheora_encoder;
|
||||||
|
extern const FFCodec ff_libtwolame_encoder;
|
||||||
|
-extern const FFCodec ff_libuavs3d_decoder;
|
||||||
|
extern const FFCodec ff_libvo_amrwbenc_encoder;
|
||||||
|
extern const FFCodec ff_libvorbis_encoder;
|
||||||
|
extern const FFCodec ff_libvorbis_decoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_encoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_decoder;
|
||||||
|
diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
--- a/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
+++ b/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
@@ -9,12 +9,14 @@
|
||||||
|
&ff_flac_decoder,
|
||||||
|
#endif
|
||||||
|
#if CONFIG_MP3_DECODER
|
||||||
|
&ff_mp3_decoder,
|
||||||
|
#endif
|
||||||
|
+#if CONFIG_MOZ_AV1
|
||||||
|
#if CONFIG_LIBDAV1D
|
||||||
|
&ff_libdav1d_decoder,
|
||||||
|
#endif
|
||||||
|
#if CONFIG_AV1_DECODER
|
||||||
|
&ff_av1_decoder,
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
NULL };
|
||||||
|
diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
|
||||||
|
--- a/media/ffvpx/libavcodec/moz.build
|
||||||
|
+++ b/media/ffvpx/libavcodec/moz.build
|
||||||
|
@@ -84,11 +84,10 @@
|
||||||
|
'cbs.c',
|
||||||
|
'cbs_av1.c',
|
||||||
|
'golomb.c',
|
||||||
|
'h264pred.c',
|
||||||
|
'imgconvert.c',
|
||||||
|
- 'libdav1d.c',
|
||||||
|
'mathtables.c',
|
||||||
|
'qsv_api.c',
|
||||||
|
'raw.c',
|
||||||
|
'videodsp.c',
|
||||||
|
'vp8.c',
|
||||||
|
@@ -107,14 +106,19 @@
|
||||||
|
'vp9mvs.c',
|
||||||
|
'vp9prob.c',
|
||||||
|
'vp9recon.c',
|
||||||
|
'vpx_rac.c',
|
||||||
|
]
|
||||||
|
- USE_LIBS += [
|
||||||
|
- 'dav1d',
|
||||||
|
- 'media_libdav1d_asm',
|
||||||
|
- ]
|
||||||
|
+ if CONFIG['MOZ_AV1']:
|
||||||
|
+ USE_LIBS += [
|
||||||
|
+ 'dav1d',
|
||||||
|
+ 'media_libdav1d_asm',
|
||||||
|
+ ]
|
||||||
|
+ SOURCES += [
|
||||||
|
+ 'libdav1d.c',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_WAYLAND']:
|
||||||
|
LOCAL_INCLUDES += ['/media/mozva']
|
||||||
|
SOURCES += [
|
||||||
|
'vaapi_av1.c',
|
||||||
|
'vaapi_decode.c',
|
||||||
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -up firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h
|
|
||||||
--- firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h.arm 2017-03-03 13:53:52.480754536 +0100
|
|
||||||
+++ firefox-52.0/gfx/skia/skia/include/core/SkPreConfig.h 2017-03-03 13:56:01.476018102 +0100
|
|
||||||
@@ -203,6 +203,10 @@
|
|
||||||
#define SK_ARM_HAS_CRC32
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if defined(__aarch64__)
|
|
||||||
+ #undef SK_ARM_HAS_NEON
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#if !defined(SKIA_IMPLEMENTATION)
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User msirringhaus@suse.de
|
|
||||||
# Date 1558452408 -7200
|
|
||||||
# Tue May 21 17:26:48 2019 +0200
|
|
||||||
# Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
|
|
||||||
# Parent 136e1f2c44a3099b3e49a576fa62c8ad77aa431e
|
|
||||||
[mq]: mozilla-s390-context.patch
|
|
||||||
|
|
||||||
diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
|
|
||||||
--- a/js/src/wasm/WasmSignalHandlers.cpp
|
|
||||||
+++ b/js/src/wasm/WasmSignalHandlers.cpp
|
|
||||||
@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
|
|
||||||
# define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
|
|
||||||
# endif
|
|
||||||
# if defined(__linux__) && defined(__loongarch__)
|
|
||||||
# define EPC_sig(p) ((p)->uc_mcontext.pc)
|
|
||||||
# define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
|
|
||||||
# define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
|
|
||||||
# define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
|
|
||||||
# endif
|
|
||||||
+# if defined(__linux__) && defined(__s390x__)
|
|
||||||
+# define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
|
|
||||||
+# define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
|
|
||||||
+# endif
|
|
||||||
# elif defined(__NetBSD__)
|
|
||||||
# define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
|
|
||||||
# define EBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EBP])
|
|
||||||
# define ESP_sig(p) ((p)->uc_mcontext.__gregs[_REG_ESP])
|
|
||||||
# define RIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RIP])
|
|
||||||
# define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
|
|
||||||
# define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
|
|
||||||
# define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
|
|
||||||
@@ -399,16 +403,20 @@ struct macos_aarch64_context {
|
|
||||||
# define PC_sig(p) R32_sig(p)
|
|
||||||
# define SP_sig(p) R01_sig(p)
|
|
||||||
# define FP_sig(p) R01_sig(p)
|
|
||||||
# elif defined(__loongarch__)
|
|
||||||
# define PC_sig(p) EPC_sig(p)
|
|
||||||
# define FP_sig(p) RFP_sig(p)
|
|
||||||
# define SP_sig(p) RSP_sig(p)
|
|
||||||
# define LR_sig(p) RRA_sig(p)
|
|
||||||
+# elif defined(__s390x__)
|
|
||||||
+# define PC_sig(p) PSWa_sig(p)
|
|
||||||
+# define SP_sig(p) GR_sig(p, 15)
|
|
||||||
+# define FP_sig(p) GR_sig(p, 11)
|
|
||||||
# endif
|
|
||||||
|
|
||||||
static void SetContextPC(CONTEXT* context, uint8_t* pc) {
|
|
||||||
# ifdef PC_sig
|
|
||||||
*reinterpret_cast<uint8_t**>(&PC_sig(context)) = pc;
|
|
||||||
# else
|
|
||||||
MOZ_CRASH();
|
|
||||||
# endif
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# Parent acf59ea86dd1d878b43920832093f082dcfc61c0
|
|
||||||
|
|
||||||
diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
|
|
||||||
--- a/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Mon Mar 09 08:26:10 2020 +0100
|
|
||||||
+++ b/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Fri Mar 27 13:30:28 2020 +0100
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
|
|
||||||
#include "include/core/SkPaint.h"
|
|
||||||
#include "src/shaders/gradients/Sk4fLinearGradient.h"
|
|
||||||
-
|
|
||||||
+#include "src/core/SkEndian.h"
|
|
||||||
#include <cmath>
|
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
|
|
||||||
while (n >= 4) {
|
|
||||||
DstTraits<premul>::store4x(c0, c1, c2, c3, dst, bias0, bias1);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ SkEndianSwap32s(dst, 4);
|
|
||||||
+#endif
|
|
||||||
dst += 4;
|
|
||||||
|
|
||||||
c0 = c0 + dc4;
|
|
||||||
@@ -37,12 +40,23 @@
|
|
||||||
n -= 4;
|
|
||||||
}
|
|
||||||
if (n & 2) {
|
|
||||||
- DstTraits<premul>::store(c0, dst++, bias0);
|
|
||||||
- DstTraits<premul>::store(c1, dst++, bias1);
|
|
||||||
+ DstTraits<premul>::store(c0, dst, bias0);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ *dst = SkEndianSwap32(*dst);
|
|
||||||
+#endif
|
|
||||||
+ ++dst;
|
|
||||||
+ DstTraits<premul>::store(c1, dst, bias1);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ *dst = SkEndianSwap32(*dst);
|
|
||||||
+#endif
|
|
||||||
+ ++dst;
|
|
||||||
c0 = c0 + dc2;
|
|
||||||
}
|
|
||||||
if (n & 1) {
|
|
||||||
DstTraits<premul>::store(c0, dst, bias0);
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ *dst = SkEndianSwap32(*dst);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
diff -up firefox-99.0/build/moz.configure/lto-pgo.configure.pgo firefox-99.0/build/moz.configure/lto-pgo.configure
|
|
||||||
--- firefox-99.0/build/moz.configure/lto-pgo.configure.pgo 2022-03-31 01:24:38.000000000 +0200
|
|
||||||
+++ firefox-99.0/build/moz.configure/lto-pgo.configure 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -247,8 +247,8 @@ def lto(
|
|
||||||
cflags.append("-flto")
|
|
||||||
ldflags.append("-flto")
|
|
||||||
else:
|
|
||||||
- cflags.append("-flto=thin")
|
|
||||||
- ldflags.append("-flto=thin")
|
|
||||||
+ cflags.append("-flto")
|
|
||||||
+ ldflags.append("-flto")
|
|
||||||
|
|
||||||
if target.os == "Android" and value == "cross":
|
|
||||||
# Work around https://github.com/rust-lang/rust/issues/90088
|
|
||||||
@@ -264,7 +264,7 @@ def lto(
|
|
||||||
if value == "full":
|
|
||||||
cflags.append("-flto")
|
|
||||||
else:
|
|
||||||
- cflags.append("-flto=thin")
|
|
||||||
+ cflags.append("-flto")
|
|
||||||
# With clang-cl, -flto can only be used with -c or -fuse-ld=lld.
|
|
||||||
# AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
|
|
||||||
cflags.append("-fuse-ld=lld")
|
|
||||||
diff -up firefox-99.0/build/pgo/profileserver.py.pgo firefox-99.0/build/pgo/profileserver.py
|
|
||||||
--- firefox-99.0/build/pgo/profileserver.py.pgo 2022-03-31 01:24:38.000000000 +0200
|
|
||||||
+++ firefox-99.0/build/pgo/profileserver.py 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -11,7 +11,7 @@ import glob
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
import mozcrash
|
|
||||||
-from mozbuild.base import MozbuildObject, BinaryNotFoundException
|
|
||||||
+from mozbuild.base import MozbuildObject, BinaryNotFoundException, BuildEnvironmentNotFoundException
|
|
||||||
from mozfile import TemporaryDirectory
|
|
||||||
from mozhttpd import MozHttpd
|
|
||||||
from mozprofile import FirefoxProfile, Preferences
|
|
||||||
@@ -87,9 +87,22 @@ if __name__ == "__main__":
|
|
||||||
locations = ServerLocations()
|
|
||||||
locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
|
|
||||||
|
|
||||||
- old_profraw_files = glob.glob("*.profraw")
|
|
||||||
- for f in old_profraw_files:
|
|
||||||
- os.remove(f)
|
|
||||||
+ using_gcc = False
|
|
||||||
+ try:
|
|
||||||
+ if build.config_environment.substs.get('CC_TYPE') == 'gcc':
|
|
||||||
+ using_gcc = True
|
|
||||||
+ except BuildEnvironmentNotFoundException:
|
|
||||||
+ pass
|
|
||||||
+
|
|
||||||
+ if using_gcc:
|
|
||||||
+ for dirpath, _, filenames in os.walk('.'):
|
|
||||||
+ for f in filenames:
|
|
||||||
+ if f.endswith('.gcda'):
|
|
||||||
+ os.remove(os.path.join(dirpath, f))
|
|
||||||
+ else:
|
|
||||||
+ old_profraw_files = glob.glob('*.profraw')
|
|
||||||
+ for f in old_profraw_files:
|
|
||||||
+ os.remove(f)
|
|
||||||
|
|
||||||
with TemporaryDirectory() as profilePath:
|
|
||||||
# TODO: refactor this into mozprofile
|
|
||||||
@@ -212,6 +225,10 @@ if __name__ == "__main__":
|
|
||||||
print("Firefox exited successfully, but produced a crashreport")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
+ print('Copying profile data....')
|
|
||||||
+ os.system('pwd');
|
|
||||||
+ os.system('tar cf profdata.tar.gz `find . -name "*.gcda"`; cd ..; tar xf instrumented/profdata.tar.gz;');
|
|
||||||
+
|
|
||||||
llvm_profdata = env.get("LLVM_PROFDATA")
|
|
||||||
if llvm_profdata:
|
|
||||||
profraw_files = glob.glob("*.profraw")
|
|
||||||
diff -up firefox-99.0/build/unix/mozconfig.unix.pgo firefox-99.0/build/unix/mozconfig.unix
|
|
||||||
--- firefox-99.0/build/unix/mozconfig.unix.pgo 2022-03-31 01:24:38.000000000 +0200
|
|
||||||
+++ firefox-99.0/build/unix/mozconfig.unix 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
|
|
||||||
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
|
|
||||||
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
|
|
||||||
|
|
||||||
+ if [ -n "$MOZ_PGO" ]; then
|
|
||||||
+ if [ -z "$USE_ARTIFACT" ]; then
|
|
||||||
+ ac_add_options --enable-lto
|
|
||||||
+ fi
|
|
||||||
+ export AR="$topsrcdir/gcc/bin/gcc-ar"
|
|
||||||
+ export NM="$topsrcdir/gcc/bin/gcc-nm"
|
|
||||||
+ export RANLIB="$topsrcdir/gcc/bin/gcc-ranlib"
|
|
||||||
+ fi
|
|
||||||
+
|
|
||||||
# We want to make sure we use binutils and other binaries in the tooltool
|
|
||||||
# package.
|
|
||||||
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
|
|
||||||
diff -up firefox-99.0/extensions/spellcheck/src/moz.build.pgo firefox-99.0/extensions/spellcheck/src/moz.build
|
|
||||||
--- firefox-99.0/extensions/spellcheck/src/moz.build.pgo 2022-03-31 01:24:50.000000000 +0200
|
|
||||||
+++ firefox-99.0/extensions/spellcheck/src/moz.build 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
@@ -28,3 +28,5 @@ EXPORTS.mozilla += [
|
|
||||||
"mozInlineSpellChecker.h",
|
|
||||||
"mozSpellChecker.h",
|
|
||||||
]
|
|
||||||
+
|
|
||||||
+CXXFLAGS += ['-fno-devirtualize']
|
|
||||||
diff -up firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo firefox-99.0/toolkit/components/terminator/nsTerminator.cpp
|
|
||||||
--- firefox-99.0/toolkit/components/terminator/nsTerminator.cpp.pgo 2022-04-04 10:15:45.387694143 +0200
|
|
||||||
+++ firefox-99.0/toolkit/components/terminator/nsTerminator.cpp 2022-04-04 10:19:07.022239556 +0200
|
|
||||||
@@ -466,6 +466,11 @@ void nsTerminator::StartWatchdog() {
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ // Disable watchdog for PGO train builds - writting profile information at
|
|
||||||
+ // exit may take time and it is better to make build hang rather than
|
|
||||||
+ // silently produce poorly performing binary.
|
|
||||||
+ crashAfterMS = INT32_MAX;
|
|
||||||
+
|
|
||||||
UniquePtr<Options> options(new Options());
|
|
||||||
// crashAfterTicks is guaranteed to be > 0 as
|
|
||||||
// crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
|
|
||||||
--- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 2017-07-31 18:20:48.000000000 +0200
|
|
||||||
+++ firefox-55.0/js/src/old-configure.in 2017-08-02 14:31:32.190243669 +0200
|
|
||||||
@@ -541,7 +541,7 @@ case "$host" in
|
|
||||||
|
|
||||||
*-linux*|*-kfreebsd*-gnu|*-gnu*)
|
|
||||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
|
||||||
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
|
||||||
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
@@ -617,8 +617,8 @@ case "$target" in
|
|
||||||
|
|
||||||
*-*linux*)
|
|
||||||
if test "$GNU_CC" -o "$GNU_CXX"; then
|
|
||||||
- MOZ_PGO_OPTIMIZE_FLAGS="-O3"
|
|
||||||
- MOZ_OPTIMIZE_FLAGS="-O3"
|
|
||||||
+ MOZ_PGO_OPTIMIZE_FLAGS="-O1"
|
|
||||||
+ MOZ_OPTIMIZE_FLAGS="-O1"
|
|
||||||
if test -z "$CLANG_CC"; then
|
|
||||||
MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
|
|
||||||
fi
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue