rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added upstream fix for mozbz#1656436

Browse Source
This commit is contained in:
Martin Stransky 2020-08-04 13:37:42 +02:00
parent 6fc00e4ffa
commit 20aed3671c
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firefox.spec
View File

@ -114,7 +114,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 79.0 Version: 79.0
Release: 4%{?dist} Release: 5%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ 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 Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -184,6 +184,7 @@ Patch575: firefox-pipewire-0-3.patch
Patch584: firefox-disable-ffvpx-with-vapi.patch Patch584: firefox-disable-ffvpx-with-vapi.patch
Patch585: firefox-vaapi-extra-frames.patch Patch585: firefox-vaapi-extra-frames.patch
Patch586: mozilla-1645671.patch Patch586: mozilla-1645671.patch
Patch589: mozilla-1656436.patch
# PGO/LTO patches # PGO/LTO patches
Patch600: pgo.patch Patch600: pgo.patch
@ -390,6 +391,7 @@ This package contains results of tests executed during build.
%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
%patch585 -p1 -b .firefox-vaapi-extra-frames %patch585 -p1 -b .firefox-vaapi-extra-frames
%patch586 -p1 -b .mozilla-1645671 %patch586 -p1 -b .mozilla-1645671
%patch589 -p1 -b .mozilla-1656436
# PGO patches # PGO patches
%patch600 -p1 -b .pgo %patch600 -p1 -b .pgo
@ -958,6 +960,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Aug 4 2020 Martin Stransky <stransky@redhat.com> - 79.0-5
- Added upstream fix for mozbz#1656436.
* Mon Aug 3 2020 Martin Stransky <stransky@redhat.com> - 79.0-4 * Mon Aug 3 2020 Martin Stransky <stransky@redhat.com> - 79.0-4
- Updated fix for mozbz#1645671 - Updated fix for mozbz#1645671

28
mozilla-1656436.patch Normal file
View File

@ -0,0 +1,28 @@
diff -up firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.mozilla-1656436 firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
--- firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.mozilla-1656436 2020-08-04 13:31:49.476663242 +0200
+++ firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2020-08-04 13:32:28.201448682 +0200
@@ -766,6 +766,11 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER
mDMABufSurfaces.EmplaceBack(surface, mLib);
surfaceWrapper = &(mDMABufSurfaces[mDMABufSurfaces.Length() - 1]);
} else {
+ // Release VAAPI surface data before we reuse it.
+ if (mVAAPIDeviceContext) {
+ surfaceWrapper->ReleaseVAAPIData();
+ }
+
surface = surfaceWrapper->GetDMABufSurface();
bool ret;
diff -up firefox-79.0/widget/gtk/DMABufSurface.cpp.mozilla-1656436 firefox-79.0/widget/gtk/DMABufSurface.cpp
--- firefox-79.0/widget/gtk/DMABufSurface.cpp.mozilla-1656436 2020-08-04 13:31:49.477663237 +0200
+++ firefox-79.0/widget/gtk/DMABufSurface.cpp 2020-08-04 13:33:07.666230023 +0200
@@ -744,7 +744,8 @@ bool DMABufSurfaceYUV::UpdateYUVData(con
return false;
}
if (mDmabufFds[0] >= 0) {
- ReleaseSurface();
+ NS_WARNING("DMABufSurfaceYUV is already created!");
+ return false;
}
mSurfaceFormat = gfx::SurfaceFormat::NV12;