Date: Mon, 30 Oct 2017 21:47:20 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453211 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files Message-ID: <201710302147.v9ULlK9d088389@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Oct 30 21:47:20 2017 New Revision: 453211 URL: https://svnweb.freebsd.org/changeset/ports/453211 Log: gecko: better detect FLAC after r453085 MFH: 2017Q4 Modified: head/mail/thunderbird/files/patch-bug1412558 (contents, props changed) head/www/firefox-esr/files/patch-bug1412558 (contents, props changed) head/www/firefox/files/patch-bug1412558 (contents, props changed) head/www/seamonkey/files/patch-bug1412558 (contents, props changed) Modified: head/mail/thunderbird/files/patch-bug1412558 ============================================================================== --- head/mail/thunderbird/files/patch-bug1412558 Mon Oct 30 20:11:27 2017 (r453210) +++ head/mail/thunderbird/files/patch-bug1412558 Mon Oct 30 21:47:20 2017 (r453211) @@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl index 53fc3c9937f7..b23771ab80fa 100644 --- mozilla/dom/media/flac/FlacDecoder.cpp +++ mozilla/dom/media/flac/FlacDecoder.cpp -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- mozilla/media/ffvpx/README_MOZILLA Modified: head/www/firefox-esr/files/patch-bug1412558 ============================================================================== --- head/www/firefox-esr/files/patch-bug1412558 Mon Oct 30 20:11:27 2017 (r453210) +++ head/www/firefox-esr/files/patch-bug1412558 Mon Oct 30 21:47:20 2017 (r453211) @@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl index 53fc3c9937f7..b23771ab80fa 100644 --- dom/media/flac/FlacDecoder.cpp +++ dom/media/flac/FlacDecoder.cpp -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- media/ffvpx/README_MOZILLA Modified: head/www/firefox/files/patch-bug1412558 ============================================================================== --- head/www/firefox/files/patch-bug1412558 Mon Oct 30 20:11:27 2017 (r453210) +++ head/www/firefox/files/patch-bug1412558 Mon Oct 30 21:47:20 2017 (r453211) @@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl index 53fc3c9937f7..b23771ab80fa 100644 --- dom/media/flac/FlacDecoder.cpp +++ dom/media/flac/FlacDecoder.cpp -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- media/ffvpx/README_MOZILLA Modified: head/www/seamonkey/files/patch-bug1412558 ============================================================================== --- head/www/seamonkey/files/patch-bug1412558 Mon Oct 30 20:11:27 2017 (r453210) +++ head/www/seamonkey/files/patch-bug1412558 Mon Oct 30 21:47:20 2017 (r453211) @@ -2,15 +2,25 @@ diff --git dom/media/flac/FlacDecoder.cpp dom/media/fl index 53fc3c9937f7..b23771ab80fa 100644 --- mozilla/dom/media/flac/FlacDecoder.cpp +++ mozilla/dom/media/flac/FlacDecoder.cpp -@@ -36,7 +36,7 @@ FlacDecoder::CreateStateMachine() - /* static */ bool - FlacDecoder::IsEnabled() +@@ -7,6 +7,7 @@ + #include "FlacDecoder.h" + #include "MediaContainerType.h" + #include "MediaPrefs.h" ++#include "PDMFactory.h" + + namespace mozilla { + +@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { --#ifdef MOZ_FFVPX -+#if defined(MOZ_FFMPEG) || defined(MOZ_FFVPX) + #ifdef MOZ_FFVPX return MediaPrefs::FlacEnabled(); ++#elif defined(MOZ_FFMPEG) ++ RefPtr<PDMFactory> platform = new PDMFactory(); ++ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. + return false; diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA index 5d3a6037efe0..43144b726a92 100644 --- mozilla/media/ffvpx/README_MOZILLA
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710302147.v9ULlK9d088389>