Merge branch 'a9' into a9-plus
This commit is contained in:
commit
58f6c5fe22
9
.gitignore
vendored
9
.gitignore
vendored
@ -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:
|
|
@ -1,12 +1,12 @@
|
|||||||
diff -up firefox-97.0/toolkit/moz.configure.disable-elfhack firefox-97.0/toolkit/moz.configure
|
diff -up firefox-115.0.2/toolkit/moz.configure.disable-elfhack firefox-115.0.2/toolkit/moz.configure
|
||||||
--- firefox-97.0/toolkit/moz.configure.disable-elfhack 2022-02-08 09:58:47.518047952 +0100
|
--- firefox-115.0.2/toolkit/moz.configure.disable-elfhack 2023-07-18 12:21:22.507358334 +0200
|
||||||
+++ firefox-97.0/toolkit/moz.configure 2022-02-08 10:17:49.552945956 +0100
|
+++ firefox-115.0.2/toolkit/moz.configure 2023-07-18 12:52:55.972727498 +0200
|
||||||
@@ -1273,7 +1273,7 @@ with only_when("--enable-compile-environ
|
@@ -1520,7 +1520,7 @@ with only_when("--enable-compile-environ
|
||||||
help="{Enable|Disable} elf hacks",
|
"Cannot enable elfhack with lld."
|
||||||
|
" Use --enable-linker=bfd, --enable-linker=gold, or --disable-elf-hack"
|
||||||
)
|
)
|
||||||
|
- return True
|
||||||
|
+ return False
|
||||||
|
|
||||||
- set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: True))
|
set_config("USE_ELF_HACK", use_elf_hack)
|
||||||
+ set_config("USE_ELF_HACK", depends_if("--enable-elf-hack")(lambda _: False))
|
|
||||||
|
|
||||||
|
|
||||||
@depends(build_environment)
|
|
||||||
|
12
SOURCES/build-ppc64-abiv2.patch
Normal file
12
SOURCES/build-ppc64-abiv2.patch
Normal file
@ -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")
|
||||||
|
|
||||||
|
|
||||||
|
12
SOURCES/build-tb-rnp-openssl.patch
Normal file
12
SOURCES/build-tb-rnp-openssl.patch
Normal file
@ -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. */
|
|
@ -1,7 +1,7 @@
|
|||||||
diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
|
diff -up firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp
|
||||||
--- firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2021-03-18 14:48:36.000000000 +0100
|
--- firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2023-07-10 21:08:53.000000000 +0200
|
||||||
+++ firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2021-03-22 19:20:02.429310184 +0100
|
+++ firefox-115.0.2/extensions/pref/autoconfig/src/nsReadConfig.cpp 2023-07-17 10:33:23.443355156 +0200
|
||||||
@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
|
@@ -263,8 +263,20 @@ nsresult nsReadConfig::openAndEvaluateJS
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
|
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
|
||||||
@ -23,10 +23,10 @@ diff -up firefox-87.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
|
|||||||
} else {
|
} else {
|
||||||
nsAutoCString location("resource://gre/defaults/autoconfig/");
|
nsAutoCString location("resource://gre/defaults/autoconfig/");
|
||||||
location += aFileName;
|
location += aFileName;
|
||||||
diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modules/libpref/Preferences.cpp
|
diff -up firefox-115.0.2/modules/libpref/Preferences.cpp.1170092 firefox-115.0.2/modules/libpref/Preferences.cpp
|
||||||
--- firefox-87.0/modules/libpref/Preferences.cpp.1170092 2021-03-18 14:48:54.000000000 +0100
|
--- firefox-115.0.2/modules/libpref/Preferences.cpp.1170092 2023-07-10 21:09:00.000000000 +0200
|
||||||
+++ firefox-87.0/modules/libpref/Preferences.cpp 2021-03-22 19:20:02.429310184 +0100
|
+++ firefox-115.0.2/modules/libpref/Preferences.cpp 2023-07-17 10:33:23.444355156 +0200
|
||||||
@@ -4499,6 +4499,9 @@ nsresult Preferences::InitInitialObjects
|
@@ -4825,6 +4825,9 @@ nsresult Preferences::InitInitialObjects
|
||||||
//
|
//
|
||||||
// Thus, in the omni.jar case, we always load app-specific default
|
// Thus, in the omni.jar case, we always load app-specific default
|
||||||
// preferences from omni.jar, whether or not `$app == $gre`.
|
// preferences from omni.jar, whether or not `$app == $gre`.
|
||||||
@ -36,10 +36,10 @@ diff -up firefox-87.0/modules/libpref/Preferences.cpp.1170092 firefox-87.0/modul
|
|||||||
|
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
UniquePtr<nsZipFind> find;
|
UniquePtr<nsZipFind> find;
|
||||||
diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/toolkit/xre/nsXREDirProvider.cpp
|
diff -up firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp
|
||||||
--- firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2021-03-18 14:52:00.000000000 +0100
|
--- firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp.1170092 2023-07-10 22:57:20.000000000 +0200
|
||||||
+++ firefox-87.0/toolkit/xre/nsXREDirProvider.cpp 2021-03-22 19:37:56.574480347 +0100
|
+++ firefox-115.0.2/toolkit/xre/nsXREDirProvider.cpp 2023-07-17 10:56:25.309692121 +0200
|
||||||
@@ -65,6 +65,7 @@
|
@@ -72,6 +72,7 @@
|
||||||
#endif
|
#endif
|
||||||
#ifdef XP_UNIX
|
#ifdef XP_UNIX
|
||||||
# include <ctype.h>
|
# include <ctype.h>
|
||||||
@ -47,13 +47,11 @@ diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/tool
|
|||||||
#endif
|
#endif
|
||||||
#ifdef XP_IOS
|
#ifdef XP_IOS
|
||||||
# include "UIKitDirProvider.h"
|
# include "UIKitDirProvider.h"
|
||||||
@@ -552,6 +553,21 @@ nsXREDirProvider::GetFile(const char* aP
|
@@ -478,6 +479,17 @@ nsXREDirProvider::GetFile(const char* aP
|
||||||
}
|
rv = file->AppendNative(nsLiteralCString(PREF_OVERRIDE_DIRNAME));
|
||||||
}
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
}
|
rv = EnsureDirectoryExists(file);
|
||||||
+
|
+ } else if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
|
||||||
+#if defined(XP_UNIX)
|
|
||||||
+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
|
|
||||||
+ nsCString sysConfigDir = nsLiteralCString("/etc/");
|
+ nsCString sysConfigDir = nsLiteralCString("/etc/");
|
||||||
+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
|
+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
|
||||||
+ if (!appInfo)
|
+ if (!appInfo)
|
||||||
@ -62,14 +60,12 @@ diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/tool
|
|||||||
+ appInfo->GetName(appName);
|
+ appInfo->GetName(appName);
|
||||||
+ ToLowerCase(appName);
|
+ ToLowerCase(appName);
|
||||||
+ sysConfigDir.Append(appName);
|
+ sysConfigDir.Append(appName);
|
||||||
+ return NS_NewNativeLocalFile(sysConfigDir, false, aFile);
|
+ NS_NewNativeLocalFile(sysConfigDir, false, getter_AddRefs(file));
|
||||||
+ }
|
+ rv = EnsureDirectoryExists(file);
|
||||||
+#endif
|
} else {
|
||||||
+
|
// We don't know anything about this property. Fail without warning, because
|
||||||
if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
|
// otherwise we'll get too much warning spam due to
|
||||||
|
@@ -694,6 +706,16 @@ nsXREDirProvider::GetFiles(const char* a
|
||||||
if (ensureFilePermissions) {
|
|
||||||
@@ -874,6 +890,16 @@ nsresult nsXREDirProvider::GetFilesInter
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -86,10 +82,10 @@ diff -up firefox-87.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-87.0/tool
|
|||||||
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
|
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
|
||||||
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
|
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
|
||||||
// NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
|
// NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
|
||||||
diff -up firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h
|
diff -up firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h
|
||||||
--- firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2021-03-18 14:51:58.000000000 +0100
|
--- firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2023-07-10 21:09:13.000000000 +0200
|
||||||
+++ firefox-87.0/xpcom/io/nsAppDirectoryServiceDefs.h 2021-03-22 19:20:02.430310213 +0100
|
+++ firefox-115.0.2/xpcom/io/nsAppDirectoryServiceDefs.h 2023-07-17 10:33:23.444355156 +0200
|
||||||
@@ -59,6 +59,7 @@
|
@@ -58,6 +58,7 @@
|
||||||
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
|
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
|
||||||
#define NS_APP_PREFS_OVERRIDE_DIR \
|
#define NS_APP_PREFS_OVERRIDE_DIR \
|
||||||
"PrefDOverride" // Directory for per-profile defaults
|
"PrefDOverride" // Directory for per-profile defaults
|
@ -1,43 +1,34 @@
|
|||||||
# HG changeset patch
|
# HG changeset patch
|
||||||
# Parent b5471d23321d16a0bacc25b7afd27d2e16adba1a
|
# Parent 9fcbd287056a40084b1e679f787bf683b291f323
|
||||||
Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
|
Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
|
||||||
|
|
||||||
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
|
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
|
||||||
--- a/gfx/2d/DrawTargetSkia.cpp
|
--- a/gfx/2d/DrawTargetSkia.cpp
|
||||||
+++ b/gfx/2d/DrawTargetSkia.cpp
|
+++ b/gfx/2d/DrawTargetSkia.cpp
|
||||||
@@ -130,18 +130,17 @@ static IntRect CalculateSurfaceBounds(co
|
@@ -156,7 +156,8 @@ static IntRect CalculateSurfaceBounds(co
|
||||||
Rect sampledBounds = inverse.TransformBounds(*aBounds);
|
|
||||||
if (!sampledBounds.ToIntRect(&bounds)) {
|
|
||||||
return surfaceBounds;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return surfaceBounds.Intersect(bounds);
|
static const int kARGBAlphaOffset =
|
||||||
}
|
|
||||||
|
|
||||||
-static const int kARGBAlphaOffset =
|
|
||||||
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
||||||
+static const int kARGBAlphaOffset = 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
+ 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==
|
||||||
|
+ // SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
||||||
|
|
||||||
static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
|
static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
|
||||||
const int32_t aStride, SurfaceFormat aFormat) {
|
const int32_t aStride, SurfaceFormat aFormat) {
|
||||||
if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// We should've initialized the data to be opaque already
|
|
||||||
// On debug builds, verify that this is actually true.
|
|
||||||
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
|
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
|
||||||
--- a/gfx/2d/Types.h
|
--- a/gfx/2d/Types.h
|
||||||
+++ b/gfx/2d/Types.h
|
+++ b/gfx/2d/Types.h
|
||||||
@@ -84,25 +84,18 @@ enum class SurfaceFormat : int8_t {
|
@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t {
|
||||||
Depth,
|
|
||||||
|
|
||||||
// This represents the unknown format.
|
// This represents the unknown format.
|
||||||
UNKNOWN,
|
UNKNOWN, // TODO: Replace uses with Maybe<SurfaceFormat>.
|
||||||
|
|
||||||
// The following values are endian-independent synonyms. The _UINT32 suffix
|
-// The following values are endian-independent synonyms. The _UINT32 suffix
|
||||||
// indicates that the name reflects the layout when viewed as a uint32_t
|
-// indicates that the name reflects the layout when viewed as a uint32_t
|
||||||
// value.
|
-// value.
|
||||||
-#if MOZ_LITTLE_ENDIAN()
|
-#if MOZ_LITTLE_ENDIAN()
|
||||||
|
+ // The following values are endian-independent synonyms. The _UINT32 suffix
|
||||||
|
+ // indicates that the name reflects the layout when viewed as a uint32_t
|
||||||
|
+ // value.
|
||||||
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
|
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
|
||||||
X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
|
X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
|
||||||
-#elif MOZ_BIG_ENDIAN()
|
-#elif MOZ_BIG_ENDIAN()
|
||||||
@ -49,20 +40,10 @@ diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
|
|||||||
|
|
||||||
// The following values are OS and endian-independent synonyms.
|
// The following values are OS and endian-independent synonyms.
|
||||||
//
|
//
|
||||||
// TODO(aosmond): When everything blocking bug 1581828 has been resolved, we
|
diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
|
||||||
// can make this use R8B8G8A8 and R8B8G8X8 for non-Windows platforms.
|
--- a/gfx/skia/skia/modules/skcms/skcms.cc
|
||||||
OS_RGBA = A8R8G8B8_UINT32,
|
+++ b/gfx/skia/skia/modules/skcms/skcms.cc
|
||||||
OS_RGBX = X8R8G8B8_UINT32
|
@@ -30,6 +30,8 @@
|
||||||
};
|
|
||||||
diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_party/skcms/skcms.cc
|
|
||||||
--- a/gfx/skia/skia/third_party/skcms/skcms.cc
|
|
||||||
+++ b/gfx/skia/skia/third_party/skcms/skcms.cc
|
|
||||||
@@ -25,16 +25,18 @@
|
|
||||||
// it'd be a lot slower. But we want all those headers included so we
|
|
||||||
// can use their features after runtime checks later.
|
|
||||||
#include <smmintrin.h>
|
|
||||||
#include <avxintrin.h>
|
|
||||||
#include <avx2intrin.h>
|
|
||||||
#include <avx512fintrin.h>
|
#include <avx512fintrin.h>
|
||||||
#include <avx512dqintrin.h>
|
#include <avx512dqintrin.h>
|
||||||
#endif
|
#endif
|
||||||
@ -70,30 +51,21 @@ diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_part
|
|||||||
+ #define SKCMS_PORTABLE
|
+ #define SKCMS_PORTABLE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
|
static bool runtime_cpu_detection = true;
|
||||||
// We have better testing on 64-bit machines, so force 32-bit machines to behave like 64-bit.
|
@@ -324,20 +326,28 @@ enum {
|
||||||
//
|
|
||||||
// Please do not use sizeof() directly, and size_t only when required.
|
|
||||||
// (We have no way of enforcing these requests...)
|
|
||||||
#define SAFE_SIZEOF(x) ((uint64_t)sizeof(x))
|
|
||||||
@@ -275,30 +277,38 @@ enum {
|
|
||||||
skcms_Signature_sf32 = 0x73663332,
|
|
||||||
// XYZ is also a PCS signature, so it's defined in skcms.h
|
|
||||||
// skcms_Signature_XYZ = 0x58595A20,
|
|
||||||
};
|
|
||||||
|
|
||||||
static uint16_t read_big_u16(const uint8_t* ptr) {
|
static uint16_t read_big_u16(const uint8_t* ptr) {
|
||||||
uint16_t be;
|
uint16_t be;
|
||||||
memcpy(&be, ptr, sizeof(be));
|
memcpy(&be, ptr, sizeof(be));
|
||||||
-#if defined(_MSC_VER)
|
-#if defined(_MSC_VER)
|
||||||
|
- return _byteswap_ushort(be);
|
||||||
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||||
+ return be;
|
+ return be;
|
||||||
+#else
|
#else
|
||||||
|
- return __builtin_bswap16(be);
|
||||||
+ #if defined(_MSC_VER)
|
+ #if defined(_MSC_VER)
|
||||||
return _byteswap_ushort(be);
|
+ return _byteswap_ushort(be);
|
||||||
-#else
|
|
||||||
+ #else
|
+ #else
|
||||||
return __builtin_bswap16(be);
|
+ return __builtin_bswap16(be);
|
||||||
+ #endif
|
+ #endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -102,20 +74,16 @@ diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_part
|
|||||||
uint32_t be;
|
uint32_t be;
|
||||||
memcpy(&be, ptr, sizeof(be));
|
memcpy(&be, ptr, sizeof(be));
|
||||||
-#if defined(_MSC_VER)
|
-#if defined(_MSC_VER)
|
||||||
|
- return _byteswap_ulong(be);
|
||||||
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
|
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
|
||||||
+ return be;
|
+ return be;
|
||||||
+#else
|
#else
|
||||||
|
- return __builtin_bswap32(be);
|
||||||
+ #if defined(_MSC_VER)
|
+ #if defined(_MSC_VER)
|
||||||
return _byteswap_ulong(be);
|
+ return _byteswap_ulong(be);
|
||||||
-#else
|
|
||||||
+ #else
|
+ #else
|
||||||
return __builtin_bswap32(be);
|
+ return __builtin_bswap32(be);
|
||||||
+ #endif
|
+ #endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static int32_t read_big_i32(const uint8_t* ptr) {
|
|
||||||
return (int32_t)read_big_u32(ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
static float read_big_fixed(const uint8_t* ptr) {
|
|
||||||
|
@ -1,64 +1,17 @@
|
|||||||
# HG changeset patch
|
# HG changeset patch
|
||||||
# Parent d1d66f7e4d0e7fd45e91e4fcee07555e72046d48
|
# Parent 09cd4ac2cc607e85aa572425b824fbab386af607
|
||||||
For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
|
For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
|
||||||
right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
|
right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
|
||||||
|
|
||||||
diff --git a/gfx/skia/skia/include/private/SkNx.h b/gfx/skia/skia/include/private/SkNx.h
|
|
||||||
--- a/gfx/skia/skia/include/private/SkNx.h
|
|
||||||
+++ b/gfx/skia/skia/include/private/SkNx.h
|
|
||||||
@@ -233,17 +233,28 @@ struct SkNx<1,T> {
|
|
||||||
AI SkNx operator<<(int bits) const { return fVal << bits; }
|
|
||||||
AI SkNx operator>>(int bits) const { return fVal >> bits; }
|
|
||||||
|
|
||||||
AI SkNx operator+(const SkNx& y) const { return fVal + y.fVal; }
|
|
||||||
AI SkNx operator-(const SkNx& y) const { return fVal - y.fVal; }
|
|
||||||
AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
|
|
||||||
AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
|
|
||||||
|
|
||||||
+ // On Big endian the commented out variant doesn't work,
|
|
||||||
+ // and honestly, I have no idea why it exists in the first place.
|
|
||||||
+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
|
|
||||||
+ // which gets a 64-bit integer, and FromBits returns 32-bit,
|
|
||||||
+ // cutting off the wrong half again.
|
|
||||||
+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
|
|
||||||
+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
|
|
||||||
+#ifdef SK_CPU_BENDIAN
|
|
||||||
+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
|
|
||||||
+#else
|
|
||||||
AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
|
|
||||||
+#endif
|
|
||||||
AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
|
|
||||||
AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
|
|
||||||
|
|
||||||
AI SkNx operator==(const SkNx& y) const { return FromBits(fVal == y.fVal ? ~0 : 0); }
|
|
||||||
AI SkNx operator!=(const SkNx& y) const { return FromBits(fVal != y.fVal ? ~0 : 0); }
|
|
||||||
AI SkNx operator<=(const SkNx& y) const { return FromBits(fVal <= y.fVal ? ~0 : 0); }
|
|
||||||
AI SkNx operator>=(const SkNx& y) const { return FromBits(fVal >= y.fVal ? ~0 : 0); }
|
|
||||||
AI SkNx operator< (const SkNx& y) const { return FromBits(fVal < y.fVal ? ~0 : 0); }
|
|
||||||
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
||||||
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
||||||
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
||||||
@@ -198,17 +198,23 @@ namespace SK_OPTS_NS {
|
@@ -210,6 +210,8 @@ namespace SK_OPTS_NS {
|
||||||
const SkAlpha* mask, size_t maskRB,
|
|
||||||
int w, int h) {
|
|
||||||
auto fn = [](const Sk4px& d, const Sk4px& aa) {
|
|
||||||
// = (s + d(1-sa))aa + d(1-aa)
|
|
||||||
// = s*aa + d(1-sa*aa)
|
|
||||||
// ~~~>
|
// ~~~>
|
||||||
// a = 1*aa + d(1-1*aa) = aa + d(1-aa)
|
// a = 1*aa + d(1-1*aa) = aa + d(1-aa)
|
||||||
// c = 0*aa + d(1-1*aa) = d(1-aa)
|
// c = 0*aa + d(1-1*aa) = d(1-aa)
|
||||||
+
|
+ // TODO: Check this for endian-issues!
|
||||||
+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
|
+ // Do we need to switch 255 to the front for all of those tuples?
|
||||||
+#ifdef SK_CPU_BENDIAN
|
return (aa & Sk4px(skvx::byte16{0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255}))
|
||||||
+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
|
|
||||||
+#else
|
|
||||||
return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
|
|
||||||
+#endif
|
|
||||||
+ d.approxMulDiv255(aa.inv());
|
+ d.approxMulDiv255(aa.inv());
|
||||||
};
|
};
|
||||||
while (h --> 0) {
|
|
||||||
Sk4px::MapDstAlpha(w, dst, mask, fn);
|
|
||||||
dst += dstRB / sizeof(*dst);
|
|
||||||
mask += maskRB / sizeof(*mask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/media/mp4/MP4Demuxer.cpp
|
diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/media/mp4/MP4Demuxer.cpp
|
||||||
--- firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
|
--- firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2023-06-06 23:14:43.000000000 +0200
|
||||||
+++ firefox-99.0/dom/media/mp4/MP4Demuxer.cpp 2022-04-04 09:58:35.606351546 +0200
|
+++ firefox-115.0/dom/media/mp4/MP4Demuxer.cpp 2023-06-08 08:15:48.214109403 +0200
|
||||||
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
|
@@ -32,6 +32,8 @@ mozilla::LogModule* GetDemuxerLog() { re
|
||||||
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
|
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
|
||||||
__func__, ##__VA_ARGS__)
|
__func__, ##__VA_ARGS__)
|
||||||
|
|
||||||
@ -9,8 +9,8 @@ diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/medi
|
|||||||
+
|
+
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
|
||||||
DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
|
using TimeUnit = media::TimeUnit;
|
||||||
@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData> MP4TrackD
|
@@ -404,6 +406,12 @@ already_AddRefed<MediaRawData> MP4TrackD
|
||||||
[[fallthrough]];
|
[[fallthrough]];
|
||||||
case H264::FrameType::OTHER: {
|
case H264::FrameType::OTHER: {
|
||||||
bool keyframe = type == H264::FrameType::I_FRAME;
|
bool keyframe = type == H264::FrameType::I_FRAME;
|
||||||
@ -23,19 +23,19 @@ diff -up firefox-99.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-99.0/dom/medi
|
|||||||
if (sample->mKeyframe != keyframe) {
|
if (sample->mKeyframe != keyframe) {
|
||||||
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
|
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
|
||||||
"@ pts:%" PRId64 " dur:%" PRId64
|
"@ pts:%" PRId64 " dur:%" PRId64
|
||||||
diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/dom/media/platforms/PDMFactory.cpp
|
diff -up firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-115.0/dom/media/platforms/PDMFactory.cpp
|
||||||
--- firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 2022-03-31 01:24:44.000000000 +0200
|
--- firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 2023-06-06 23:14:44.000000000 +0200
|
||||||
+++ firefox-99.0/dom/media/platforms/PDMFactory.cpp 2022-04-04 10:09:57.383419125 +0200
|
+++ firefox-115.0/dom/media/platforms/PDMFactory.cpp 2023-06-08 08:09:33.145289602 +0200
|
||||||
@@ -58,6 +58,8 @@
|
@@ -67,6 +67,8 @@
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
+bool gUseKeyframeFromContainer = false;
|
+bool gUseKeyframeFromContainer = false;
|
||||||
+
|
+
|
||||||
namespace mozilla {
|
using DecodeSupport = mozilla::media::DecodeSupport;
|
||||||
|
using DecodeSupportSet = mozilla::media::DecodeSupportSet;
|
||||||
#define PDM_INIT_LOG(msg, ...) \
|
using MediaCodec = mozilla::media::MediaCodec;
|
||||||
@@ -495,7 +497,7 @@ void PDMFactory::CreateRddPDMs() {
|
@@ -562,7 +564,7 @@ void PDMFactory::CreateRddPDMs() {
|
||||||
#ifdef MOZ_FFMPEG
|
#ifdef MOZ_FFMPEG
|
||||||
if (StaticPrefs::media_ffmpeg_enabled() &&
|
if (StaticPrefs::media_ffmpeg_enabled() &&
|
||||||
StaticPrefs::media_rdd_ffmpeg_enabled() &&
|
StaticPrefs::media_rdd_ffmpeg_enabled() &&
|
||||||
@ -44,21 +44,22 @@ diff -up firefox-99.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-99.0/do
|
|||||||
mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
|
mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
|
||||||
FFmpegRuntimeLinker::LinkStatusCode());
|
FFmpegRuntimeLinker::LinkStatusCode());
|
||||||
}
|
}
|
||||||
@@ -602,8 +604,9 @@ void PDMFactory::CreateDefaultPDMs() {
|
@@ -738,9 +740,10 @@ void PDMFactory::CreateDefaultPDMs() {
|
||||||
|
|
||||||
CreateAndStartupPDM<AgnosticDecoderModule>();
|
CreateAndStartupPDM<AgnosticDecoderModule>();
|
||||||
|
|
||||||
- if (StaticPrefs::media_gmp_decoder_enabled() &&
|
- if (StaticPrefs::media_gmp_decoder_enabled() &&
|
||||||
+ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
|
+ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
|
||||||
!CreateAndStartupPDM<GMPDecoderModule>()) {
|
!StartupPDM(GMPDecoderModule::Create(),
|
||||||
|
StaticPrefs::media_gmp_decoder_preferred())) {
|
||||||
+ gUseKeyframeFromContainer = true;
|
+ gUseKeyframeFromContainer = true;
|
||||||
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
|
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff -up firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 firefox-99.0/dom/media/platforms/PDMFactory.h
|
diff -up firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 firefox-115.0/dom/media/platforms/PDMFactory.h
|
||||||
--- firefox-99.0/dom/media/platforms/PDMFactory.h.1670333 2022-03-31 01:24:44.000000000 +0200
|
--- firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 2023-06-06 23:14:42.000000000 +0200
|
||||||
+++ firefox-99.0/dom/media/platforms/PDMFactory.h 2022-04-04 09:58:35.606351546 +0200
|
+++ firefox-115.0/dom/media/platforms/PDMFactory.h 2023-06-08 08:09:33.145289602 +0200
|
||||||
@@ -121,6 +121,7 @@ class PDMFactory final {
|
@@ -103,6 +103,7 @@ class PDMFactory final {
|
||||||
RefPtr<PlatformDecoderModule> mNullPDM;
|
RefPtr<PlatformDecoderModule> mNullPDM;
|
||||||
|
|
||||||
DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
|
DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
|
89
SOURCES/mozilla-bmo1789216-disable-av1.patch
Normal file
89
SOURCES/mozilla-bmo1789216-disable-av1.patch
Normal file
@ -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',
|
||||||
|
|
@ -6,15 +6,11 @@ Solution: Problem is with skia once again. Output of webgl seems endian-correct,
|
|||||||
So we swizzle the output of webgl after reading it from readpixels()
|
So we swizzle the output of webgl after reading it from readpixels()
|
||||||
Note: This does not fix all webGL sites, but is a step in the right direction
|
Note: This does not fix all webGL sites, but is a step in the right direction
|
||||||
|
|
||||||
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
|
Index: firefox-115.0/gfx/gl/GLContext.h
|
||||||
--- a/gfx/gl/GLContext.h
|
===================================================================
|
||||||
+++ b/gfx/gl/GLContext.h
|
--- firefox-115.0.orig/gfx/gl/GLContext.h
|
||||||
@@ -1548,16 +1548,23 @@ class GLContext : public GenericAtomicRe
|
+++ firefox-115.0/gfx/gl/GLContext.h
|
||||||
AFTER_GL_CALL;
|
@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe
|
||||||
}
|
|
||||||
|
|
||||||
void raw_fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
|
|
||||||
GLenum format, GLenum type, GLvoid* pixels) {
|
|
||||||
BEFORE_GL_CALL;
|
BEFORE_GL_CALL;
|
||||||
mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
|
mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
|
||||||
OnSyncCall();
|
OnSyncCall();
|
||||||
@ -28,8 +24,3 @@ diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
|
|||||||
AFTER_GL_CALL;
|
AFTER_GL_CALL;
|
||||||
mHeavyGLCallsSinceLastFlush = true;
|
mHeavyGLCallsSinceLastFlush = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
|
|
||||||
GLenum format, GLenum type, GLvoid* pixels);
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
@ -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
|
|
@ -1,31 +1,35 @@
|
|||||||
ac_add_options --enable-application=comm/mail
|
ac_add_options --enable-application=comm/mail
|
||||||
|
|
||||||
ac_add_options --prefix="$PREFIX"
|
ac_add_options --allow-addon-sideload
|
||||||
ac_add_options --libdir="$LIBDIR"
|
ac_add_options --disable-bootstrap
|
||||||
ac_add_options --with-system-zlib
|
ac_add_options --disable-crashreporter
|
||||||
|
#ac_add_options --disable-elf-hack
|
||||||
|
ac_add_options --disable-jemalloc
|
||||||
ac_add_options --disable-strip
|
ac_add_options --disable-strip
|
||||||
ac_add_options --disable-tests
|
ac_add_options --disable-tests
|
||||||
#ac_add_options --enable-libnotify
|
|
||||||
ac_add_options --enable-necko-wifi
|
|
||||||
ac_add_options --disable-updater
|
ac_add_options --disable-updater
|
||||||
ac_add_options --enable-chrome-format=omni
|
ac_add_options --enable-chrome-format=omni
|
||||||
ac_add_options --enable-pulseaudio
|
ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
|
||||||
ac_add_options --without-system-icu
|
|
||||||
ac_add_options --enable-release
|
|
||||||
ac_add_options --allow-addon-sideload
|
|
||||||
ac_add_options --with-system-jpeg
|
|
||||||
ac_add_options --enable-js-shell
|
ac_add_options --enable-js-shell
|
||||||
ac_add_options --with-unsigned-addon-scopes=app,system
|
ac_add_options --enable-necko-wifi
|
||||||
ac_add_options --without-sysroot
|
ac_add_options --enable-official-branding
|
||||||
|
ac_add_options --enable-official-branding
|
||||||
|
ac_add_options --enable-pulseaudio
|
||||||
|
ac_add_options --enable-release
|
||||||
|
ac_add_options --enable-system-ffi
|
||||||
|
ac_add_options --libdir="$LIBDIR"
|
||||||
|
ac_add_options --prefix="$PREFIX"
|
||||||
ac_add_options --update-channel=release
|
ac_add_options --update-channel=release
|
||||||
# investigate this one:
|
|
||||||
ac_add_options --without-wasm-sandboxed-libraries
|
|
||||||
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
|
||||||
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
||||||
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
||||||
ac_add_options --disable-crashreporter
|
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||||
ac_add_options --enable-official-branding
|
ac_add_options --without-sysroot
|
||||||
ac_add_options --disable-bootstrap
|
ac_add_options --without-system-icu
|
||||||
|
ac_add_options --without-wasm-sandboxed-libraries
|
||||||
|
ac_add_options --with-system-jpeg
|
||||||
|
ac_add_options --with-system-jpeg
|
||||||
|
ac_add_options --with-system-zlib
|
||||||
|
ac_add_options --with-unsigned-addon-scopes=app,system
|
||||||
|
|
||||||
export BUILD_OFFICIAL=1
|
export BUILD_OFFICIAL=1
|
||||||
export MOZILLA_OFFICIAL=1
|
export MOZILLA_OFFICIAL=1
|
||||||
|
@ -10,12 +10,12 @@
|
|||||||
MOZ_ARCH=$(uname -m)
|
MOZ_ARCH=$(uname -m)
|
||||||
case $MOZ_ARCH in
|
case $MOZ_ARCH in
|
||||||
x86_64 | s390x | sparc64 )
|
x86_64 | s390x | sparc64 )
|
||||||
MOZ_LIB_DIR="%PREFIX%/lib64"
|
MOZ_LIB_DIR="__PREFIX__/lib64"
|
||||||
SECONDARY_LIB_DIR="%PREFIX%/lib"
|
SECONDARY_LIB_DIR="__PREFIX__/lib"
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
MOZ_LIB_DIR="%PREFIX%/lib"
|
MOZ_LIB_DIR="__PREFIX__/lib"
|
||||||
SECONDARY_LIB_DIR="%PREFIX%/lib64"
|
SECONDARY_LIB_DIR="__PREFIX__/lib64"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ fi
|
|||||||
##
|
##
|
||||||
## Set MOZ_APP_LAUNCHER for gnome-session
|
## Set MOZ_APP_LAUNCHER for gnome-session
|
||||||
##
|
##
|
||||||
export MOZ_APP_LAUNCHER="%PREFIX%/bin/thunderbird"
|
export MOZ_APP_LAUNCHER="__PREFIX__/bin/thunderbird"
|
||||||
|
|
||||||
##
|
##
|
||||||
## Disable the GNOME crash dialog, Moz has it's own
|
## Disable the GNOME crash dialog, Moz has it's own
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user