Date: Mon, 19 Apr 2021 07:57:20 GMT From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: bf868a2c5087 - 2021Q2 - www/firefox: fix build on powerpc64* Message-ID: <202104190757.13J7vKLX090928@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf868a2c50870a03f6807ab8a8537bbed9e862a7 commit bf868a2c50870a03f6807ab8a8537bbed9e862a7 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-04-18 13:44:07 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2021-04-19 07:56:21 +0000 www/firefox: fix build on powerpc64* SupportsMimeType() now uses one argument. (cherry picked from commit 1dddbd517339425d59febc4cde1b037958e92920) --- www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp | 11 ++++------- 1 file 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104190757.13J7vKLX090928>