summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec8
-rw-r--r--mozilla-1665324.patch36
-rw-r--r--mozilla-1665329.patch16
3 files changed, 58 insertions, 2 deletions
diff --git a/firefox.spec b/firefox.spec
index ab4b8a4..0ba3b6a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -9,9 +9,9 @@
ExcludeArch: ppc64le
%endif
# Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
-# ExcludeArch: s390x
+ExcludeArch: s390x
# Temporary disabled, filed as rhbz#1872111
-# ExcludeArch: aarch64
+ExcludeArch: aarch64
# Temporary disabled, filed as rhbz#1878519
%if 0%{?fedora} > 32
ExcludeArch: armv7hl
@@ -181,6 +181,8 @@ Patch227: firefox-locale-debug.patch
Patch402: mozilla-1196777.patch
Patch403: mozilla-1656505-1.patch
Patch404: mozilla-1656505-2.patch
+Patch405: mozilla-1665324.patch
+Patch406: mozilla-1665329.patch
# Wayland specific upstream patches
Patch574: firefox-pipewire-0-2.patch
@@ -384,6 +386,8 @@ This package contains results of tests executed during build.
%patch402 -p1 -b .1196777
%patch403 -p1 -b .1656505-1
%patch404 -p1 -b .1656505-2
+%patch405 -p1 -b .1665324
+%patch406 -p1 -b .1665329
# Wayland specific upstream patches
%if 0%{?fedora} < 32
diff --git a/mozilla-1665324.patch b/mozilla-1665324.patch
new file mode 100644
index 0000000..9fdffdb
--- /dev/null
+++ b/mozilla-1665324.patch
@@ -0,0 +1,36 @@
+diff --git a/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h b/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
+--- a/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
++++ b/dom/media/platforms/ffmpeg/FFmpegDecoderModule.h
+@@ -38,14 +38,6 @@
+ if (aParams.VideoConfig().HasAlpha()) {
+ return nullptr;
+ }
+- if (VPXDecoder::IsVPX(aParams.mConfig.mMimeType) &&
+- aParams.mOptions.contains(CreateDecoderParams::Option::LowLatency) &&
+- !StaticPrefs::media_ffmpeg_low_latency_enabled()) {
+- // We refuse to create a decoder with low latency enabled if it's VP8 or
+- // VP9 unless specifically allowed: this will fallback to libvpx later.
+- // We do allow it for h264.
+- return nullptr;
+- }
+ RefPtr<MediaDataDecoder> decoder = new FFmpegVideoDecoder<V>(
+ mLib, aParams.VideoConfig(), aParams.mKnowsCompositor,
+ aParams.mImageContainer,
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+--- a/modules/libpref/init/StaticPrefList.yaml
++++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -7109,13 +7109,6 @@
+ mirror: always
+ #endif
+
+-#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX)
+-- name: media.ffmpeg.low-latency.enabled
+- type: RelaxedAtomicBool
+- value: false
+- mirror: always
+-#endif
+-
+ #ifdef MOZ_WMF
+
+ - name: media.wmf.enabled
+
diff --git a/mozilla-1665329.patch b/mozilla-1665329.patch
new file mode 100644
index 0000000..62ce5ae
--- /dev/null
+++ b/mozilla-1665329.patch
@@ -0,0 +1,16 @@
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+--- a/modules/libpref/init/StaticPrefList.yaml
++++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -7565,11 +7565,7 @@
+ # acceleration for decoding.
+ - name: media.navigator.mediadatadecoder_vpx_enabled
+ type: RelaxedAtomicBool
+- #if defined(NIGHTLY_BUILD)
+ value: true
+- #else
+- value: false
+- #endif
+ mirror: always
+
+ # Use MediaDataDecoder API for H264 in WebRTC. This includes hardware
+
bgstack15