From c960c03a4857ee2765dbd4b622df7b3993824dc6 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 7 May 2020 10:18:18 +0200
Subject: Disable ffvpx when va-api is enabled

---
 firefox-disable-ffvpx-with-vapi.patch | 41 +++++++++++++++++++++++++++++++++++
 firefox.spec                          |  7 +++++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 firefox-disable-ffvpx-with-vapi.patch

diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
new file mode 100644
index 0000000..df179b0
--- /dev/null
+++ b/firefox-disable-ffvpx-with-vapi.patch
@@ -0,0 +1,41 @@
+diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
+--- a/dom/media/platforms/PDMFactory.cpp
++++ b/dom/media/platforms/PDMFactory.cpp
+@@ -21,16 +21,17 @@
+ #include "mozilla/GpuDecoderModule.h"
+ #include "mozilla/RemoteDecoderModule.h"
+ #include "mozilla/SharedThreadPool.h"
+ #include "mozilla/StaticPrefs_media.h"
+ #include "mozilla/StaticPtr.h"
+ #include "mozilla/SyncRunnable.h"
+ #include "mozilla/TaskQueue.h"
+ #include "mozilla/gfx/gfxVars.h"
++#include "gfxPlatformGtk.h"
+ 
+ #ifdef XP_WIN
+ #  include "WMFDecoderModule.h"
+ #  include "mozilla/WindowsVersion.h"
+ #endif
+ #ifdef MOZ_FFVPX
+ #  include "FFVPXRuntimeLinker.h"
+ #endif
+@@ -362,17 +363,18 @@ void PDMFactory::CreatePDMs() {
+ #endif
+ #ifdef MOZ_OMX
+   if (StaticPrefs::media_omx_enabled()) {
+     m = OmxDecoderModule::Create();
+     StartupPDM(m);
+   }
+ #endif
+ #ifdef MOZ_FFVPX
+-  if (StaticPrefs::media_ffvpx_enabled()) {
++  if (StaticPrefs::media_ffvpx_enabled() &&
++      !gfxPlatformGtk::GetPlatform()->UseWaylandHardwareVideoDecoding()) {
+     m = FFVPXRuntimeLinker::CreateDecoderModule();
+     StartupPDM(m);
+   }
+ #endif
+ #ifdef MOZ_FFMPEG
+   if (StaticPrefs::media_ffmpeg_enabled()) {
+     m = FFmpegRuntimeLinker::CreateDecoderModule();
+     mFFmpegFailedToLoad = !StartupPDM(m);
diff --git a/firefox.spec b/firefox.spec
index 7e2bc01..e59368c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -118,7 +118,7 @@ ExcludeArch: aarch64
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        76.0
-Release:        2%{?nss_tag}%{?dist}
+Release:        3%{?nss_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
@@ -193,6 +193,7 @@ Patch580:        mozilla-1628690.patch
 Patch581:        mozilla-1630754.patch
 Patch582:        mozilla-1619543.patch
 Patch583:        mozilla-1632059.patch
+Patch584:        firefox-disable-ffvpx-with-vapi.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -404,6 +405,7 @@ This package contains results of tests executed during build.
 %patch579 -p1 -b .mozilla-1625431
 %patch581 -p1 -b .mozilla-1630754
 %patch583 -p1 -b .mozilla-1632059
+%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 
 # PGO patches
 %patch600 -p1 -b .pgo
@@ -978,6 +980,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu May 7 2020 Martin Stransky <stransky@redhat.com> - 76.0-3
+- Disable ffvpx when va-api is enabled.
+
 * Tue May 05 2020 Jan Horak <jhorak@redhat.com> - 76.0-2
 - Don't use google safe browsing api key for the geolocation
 
-- 
cgit