aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2021-04-18 13:44:07 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2021-04-19 07:56:21 +0000
commitbf868a2c50870a03f6807ab8a8537bbed9e862a7 (patch)
tree0b3cf7cc81f1dd6b9ffad0aa2b4db89e486e70b7
parent16ad4d81058a4dcae8b0a719bf25930f834f3c5e (diff)
downloadports-bf868a2c50870a03f6807ab8a8537bbed9e862a7.tar.gz
ports-bf868a2c50870a03f6807ab8a8537bbed9e862a7.zip
www/firefox: fix build on powerpc64*
SupportsMimeType() now uses one argument. (cherry picked from commit 1dddbd517339425d59febc4cde1b037958e92920)
-rw-r--r--www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
index e3f60e8ecf64..954b78f5bf37 100644
--- a/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
+++ b/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
@@ -1,8 +1,6 @@
Enable FLAC on platforms without ffvpx like powerpc*
-diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
-index 53fc3c9937f7..b23771ab80fa 100644
---- dom/media/flac/FlacDecoder.cpp
+--- dom/media/flac/FlacDecoder.cpp.orig 2021-04-15 19:44:28 UTC
+++ dom/media/flac/FlacDecoder.cpp
@@ -7,6 +7,7 @@
#include "FlacDecoder.h"
@@ -12,15 +10,14 @@ index 53fc3c9937f7..b23771ab80fa 100644
namespace mozilla {
-@@ -14,6 +15,11 @@ namespace mozilla {
+@@ -14,6 +15,10 @@ namespace mozilla {
bool FlacDecoder::IsEnabled() {
#ifdef MOZ_FFVPX
return StaticPrefs::media_flac_enabled();
+#elif defined(MOZ_FFMPEG)
+ RefPtr<PDMFactory> platform = new PDMFactory();
+ return StaticPrefs::media_flac_enabled() &&
-+ platform->SupportsMimeType("audio/flac"_ns,
-+ /* DecoderDoctorDiagnostics* */ nullptr);
++ platform->SupportsMimeType("audio/flac"_ns);
#else
- // Until bug 1295886 is fixed.
return false;
+ #endif