4f75cf25fd
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
26 lines
857 B
Diff
26 lines
857 B
Diff
Enable FLAC on platforms without ffvpx like powerpc*
|
|
|
|
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
|
index 53fc3c9937f7..b23771ab80fa 100644
|
|
--- a/dom/media/flac/FlacDecoder.cpp
|
|
+++ b/dom/media/flac/FlacDecoder.cpp
|
|
@@ -7,6 +7,7 @@
|
|
#include "FlacDecoder.h"
|
|
#include "MediaContainerType.h"
|
|
#include "mozilla/StaticPrefs_media.h"
|
|
+#include "PDMFactory.h"
|
|
|
|
namespace mozilla {
|
|
|
|
@@ -14,6 +15,11 @@ 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);
|
|
#else
|
|
// Until bug 1295886 is fixed.
|
|
return false;
|