summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec9
-rw-r--r--mozilla-1701089.patch23
-rwxr-xr-xrun-tests-x116
3 files changed, 33 insertions, 5 deletions
diff --git a/firefox.spec b/firefox.spec
index bafab9c..416a020 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -20,7 +20,7 @@
%global system_nss 1
%global build_with_clang 0
%global build_with_asan 0
-%global test_on_wayland 1
+%global test_on_wayland 0
# There are still build problems on s390x, see
# https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351
@@ -154,7 +154,7 @@ ExcludeArch: armv7hl
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 87.0
-Release: 11%{?pre_tag}%{?dist}
+Release: 12%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -238,6 +238,7 @@ Patch415: mozilla-1670333.patch
Patch416: mozilla-1693472.patch
Patch417: mozilla-1702606.patch
Patch418: mozilla-1703657.patch
+Patch419: mozilla-1701089.patch
# PGO/LTO patches
Patch600: pgo.patch
@@ -492,6 +493,7 @@ This package contains results of tests executed during build.
%patch416 -p1 -b .1693472
%patch417 -p1 -b .1702606
%patch418 -p1 -b .1703657
+%patch419 -p1 -b .1701089
# PGO patches
%if %{build_with_pgo}
@@ -1055,6 +1057,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Mon Apr 12 2021 Martin Stransky <stransky@redhat.com> - 87.0-12
+- Added fix for mozbz#1701089 (Widevine playback issues).
+
* Tue Apr 6 2021 Martin Stransky <stransky@redhat.com> - 87.0-11
- Enabled xpcshell/crashtests on Wayland.
diff --git a/mozilla-1701089.patch b/mozilla-1701089.patch
new file mode 100644
index 0000000..af431f2
--- /dev/null
+++ b/mozilla-1701089.patch
@@ -0,0 +1,23 @@
+diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
+--- a/dom/media/gmp/GMPParent.cpp
++++ b/dom/media/gmp/GMPParent.cpp
+@@ -884,7 +884,7 @@
+ //
+ // Google's code to parse manifests can be used as a reference for strings
+ // the manifest may contain
+- // https://cs.chromium.org/chromium/src/chrome/common/media/cdm_manifest.cc?l=73&rcl=393e60bfc2299449db7ef374c0ef1c324716e562
++ // https://source.chromium.org/chromium/chromium/src/+/master:components/cdm/common/cdm_manifest.cc;l=74;drc=775880ced8a989191281e93854c7f2201f25068f
+ //
+ // Gecko's internal strings can be found at
+ // https://searchfox.org/mozilla-central/rev/ea63a0888d406fae720cf24f4727d87569a8cab5/dom/media/eme/MediaKeySystemAccess.cpp#149-155
+@@ -892,7 +892,8 @@
+ nsCString codec;
+ if (chromiumCodec.EqualsASCII("vp8")) {
+ codec = "vp8"_ns;
+- } else if (chromiumCodec.EqualsASCII("vp9.0")) {
++ } else if (chromiumCodec.EqualsASCII("vp9.0") || // Legacy string.
++ chromiumCodec.EqualsASCII("vp09")) {
+ codec = "vp9"_ns;
+ } else if (chromiumCodec.EqualsASCII("avc1")) {
+ codec = "h264"_ns;
+
diff --git a/run-tests-x11 b/run-tests-x11
index 52f6f1b..3fe4cd1 100755
--- a/run-tests-x11
+++ b/run-tests-x11
@@ -16,9 +16,9 @@ NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
# Basic render testing
export TEST_PARAMS=""
export TEST_FLAVOUR=""
-xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
-xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+#xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
+#xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+#xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
#xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
# WebRender testing
bgstack15