diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-01-08 00:47:13 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-01-08 00:47:13 +0000 |
| commit | b88d91d721990d0b7337d53ce0a35ae829aeb4e9 (patch) | |
| tree | 26e93a203d107f67b950b528bf4fff40ccc362c0 /www/libxul | |
| parent | 3543458ddf359e005292aee46cac0292b289521f (diff) | |
Notes
Diffstat (limited to 'www/libxul')
| -rw-r--r-- | www/libxul/files/patch-bug1148203 | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/www/libxul/files/patch-bug1148203 b/www/libxul/files/patch-bug1148203 new file mode 100644 index 000000000000..fcbe7677d3e5 --- /dev/null +++ b/www/libxul/files/patch-bug1148203 @@ -0,0 +1,38 @@ +# HG changeset patch +# User Chris Double <chris.double@double.co.nz> +# Date 1427767594 -46800 +# Tue Mar 31 15:06:34 2015 +1300 +# Node ID 858ea94746eedc4b65734f8ceedfff7021940cb2 +# Parent 1b8f36a7ee321ca62cf87424910d0e2ed6fed076 +Bug 1148203 - Fix build errors with combinations of enable/disable of ffmp4/ffmpeg/eme - r=cpearce,ted + +Fixes build error with all three disabled. Prevents other combinations +that cause build errors by detecting them at configure time and displaying +an error message. + +diff --git a/configure.in b/configure.in +--- configure.in ++++ configure.in +@@ -5316,6 +5316,10 @@ MOZ_ARG_DISABLE_BOOL(fmp4, + MOZ_FMP4=, + MOZ_FMP4=1) + ++if test -n "$MOZ_FFMPEG" -a -z "$MOZ_FMP4"; then ++ AC_MSG_ERROR([Fragmented MP4 support must be enabled if using FFMPEG]) ++fi ++ + if test -n "$MOZ_FMP4"; then + AC_DEFINE(MOZ_FMP4) + MOZ_EME=1 +diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp +--- media/libstagefright/binding/MoofParser.cpp ++++ media/libstagefright/binding/MoofParser.cpp +@@ -9,7 +9,7 @@ + + #include "prlog.h" + +-#ifdef PR_LOGGING ++#if defined(MOZ_FMP4) && defined(PR_LOGGING) + extern PRLogModuleInfo* GetDemuxerLog(); + + /* Polyfill __func__ on MSVC to pass to the log. */ |