svn commit: r405504 - in branches/2016Q1: mail/thunderbird/files www/firefox-esr/files www/libxul/files

[Jan Beich]

Author: jbeich
Date: Fri Jan  8 01:47:01 2016
New Revision: 405504
URL: https://svnweb.freebsd.org/changeset/ports/405504

Log:
  MFH: r405496
  
  gecko: unbreak FFMPEG=off build on esr38
  
  PR:		205747
  Approved by:	ports-secteam (miwi)

Added:
  branches/2016Q1/mail/thunderbird/files/patch-bug1148203
     - copied unchanged from r405496, head/mail/thunderbird/files/patch-bug1148203
  branches/2016Q1/www/firefox-esr/files/patch-bug1148203
     - copied unchanged from r405496, head/www/firefox-esr/files/patch-bug1148203
  branches/2016Q1/www/libxul/files/patch-bug1148203
     - copied unchanged from r405496, head/www/libxul/files/patch-bug1148203
Modified:
Directory Properties:
  branches/2016Q1/   (props changed)

Copied: branches/2016Q1/mail/thunderbird/files/patch-bug1148203 (from r405496, head/mail/thunderbird/files/patch-bug1148203)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/mail/thunderbird/files/patch-bug1148203	Fri Jan  8 01:47:01 2016	(r405504, copy of r405496, head/mail/thunderbird/files/patch-bug1148203)
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Chris Double <chris.double at 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. */

Copied: branches/2016Q1/www/firefox-esr/files/patch-bug1148203 (from r405496, head/www/firefox-esr/files/patch-bug1148203)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/firefox-esr/files/patch-bug1148203	Fri Jan  8 01:47:01 2016	(r405504, copy of r405496, head/www/firefox-esr/files/patch-bug1148203)
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Chris Double <chris.double at 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. */

Copied: branches/2016Q1/www/libxul/files/patch-bug1148203 (from r405496, head/www/libxul/files/patch-bug1148203)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/www/libxul/files/patch-bug1148203	Fri Jan  8 01:47:01 2016	(r405504, copy of r405496, head/www/libxul/files/patch-bug1148203)
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User Chris Double <chris.double at 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. */