diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-04-12 19:18:55 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-04-12 19:18:55 +0000 |
| commit | 79fd5d2214d2f30a869a8c5a973f53261da13290 (patch) | |
| tree | f664ae9c72bc07e9347d596062d32e310cb5ede2 /mail/thunderbird/files/patch-bug1148203 | |
| parent | Remove accidentally leftover ${PORTSDIR} vars in *_DEPENDS (diff) | |
mail/thunderbird: update to 45.0 (rc1)
Changes: https://www.mozilla.org/thunderbird/45.0/releasenotes/
Security: 92d44f83-a7bf-41cf-91ee-3d1b8ecf579f
MFH: 2016Q2
Diffstat (limited to 'mail/thunderbird/files/patch-bug1148203')
| -rw-r--r-- | mail/thunderbird/files/patch-bug1148203 | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/mail/thunderbird/files/patch-bug1148203 b/mail/thunderbird/files/patch-bug1148203 deleted file mode 100644 index b4b2f230851d..000000000000 --- a/mail/thunderbird/files/patch-bug1148203 +++ /dev/null @@ -1,38 +0,0 @@ -# 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 ---- mozilla/configure.in -+++ mozilla/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 ---- mozilla/media/libstagefright/binding/MoofParser.cpp -+++ mozilla/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. */ |