Date: Fri, 8 Jan 2016 00:47:14 +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: r405496 - in head: mail/thunderbird/files www/firefox-esr/files www/libxul/files Message-ID: <201601080047.u080lERu016079@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Jan 8 00:47:13 2016 New Revision: 405496 URL: https://svnweb.freebsd.org/changeset/ports/405496 Log: gecko: unbreak FFMPEG=off build on esr38 PR: 205747 MFH: 2016Q1 Added: head/mail/thunderbird/files/patch-bug1148203 (contents, props changed) head/www/firefox-esr/files/patch-bug1148203 (contents, props changed) head/www/libxul/files/patch-bug1148203 (contents, props changed) Added: head/mail/thunderbird/files/patch-bug1148203 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1148203 Fri Jan 8 00:47:13 2016 (r405496) @@ -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 +--- 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. */ Added: head/www/firefox-esr/files/patch-bug1148203 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug1148203 Fri Jan 8 00:47:13 2016 (r405496) @@ -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. */ Added: head/www/libxul/files/patch-bug1148203 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/libxul/files/patch-bug1148203 Fri Jan 8 00:47:13 2016 (r405496) @@ -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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601080047.u080lERu016079>