[SVN-Commit] r1585 - in trunk: . mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Tue May 20 02:34:12 UTC 2014
Author: jbeich
Date: Tue May 20 02:34:02 2014
New Revision: 1585
Log:
abort build early and notify users if audio/soundtouch is built with API-incompatible INTEGER_SAMPLES
http://lists.freebsd.org/pipermail/freebsd-ports/2014-May/092418.html
PR: ports/189217
PR: ports/189488
Added:
trunk/Gecko_UPDATING
Modified:
trunk/mail/thunderbird/files/patch-zz-bug517422
trunk/www/firefox-esr/files/patch-zz-bug517422
trunk/www/firefox-nightly/files/patch-z-bug517422
trunk/www/firefox/files/patch-z-bug517422
trunk/www/libxul/files/patch-zz-bug517422
trunk/www/seamonkey/files/patch-z-bug517422
Added: trunk/Gecko_UPDATING
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/Gecko_UPDATING Tue May 20 02:34:02 2014 (r1585)
@@ -0,0 +1,8 @@
+20140429:
+ AFFECTS: users of www/firefox, www/seamonkey, mail/thunderbird, www/libxul
+ AUTHOR: gecko at FreeBSD.org
+
+ Gecko ports were switched to use more system libraries. Some of them
+ must be built with certain options unset (default).
+
+ - audio/soundtouch has to be installed with INTEGER_SAMPLES option disabled
Modified: trunk/mail/thunderbird/files/patch-zz-bug517422
==============================================================================
--- trunk/mail/thunderbird/files/patch-zz-bug517422 Tue May 6 18:53:56 2014 (r1584)
+++ trunk/mail/thunderbird/files/patch-zz-bug517422 Tue May 20 02:34:02 2014 (r1585)
@@ -178,7 +178,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -245,6 +245,27 @@
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ _SAVE_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++ AC_CACHE_CHECK(for soundtouch sample type,
++ ac_cv_soundtouch_sample_type,
++ [AC_TRY_COMPILE([#include <SoundTouch.h>
++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++ #error soundtouch expects float samples
++ #endif],
++ [],
++ [ac_cv_soundtouch_sample_type=short],
++ [ac_cv_soundtouch_sample_type=float])])
++ CXXFLAGS=$_SAVE_CXXFLAGS
++ AC_LANG_RESTORE
++
++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++ fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
Modified: trunk/www/firefox-esr/files/patch-zz-bug517422
==============================================================================
--- trunk/www/firefox-esr/files/patch-zz-bug517422 Tue May 6 18:53:56 2014 (r1584)
+++ trunk/www/firefox-esr/files/patch-zz-bug517422 Tue May 20 02:34:02 2014 (r1585)
@@ -178,7 +178,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -245,6 +245,27 @@
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ _SAVE_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++ AC_CACHE_CHECK(for soundtouch sample type,
++ ac_cv_soundtouch_sample_type,
++ [AC_TRY_COMPILE([#include <SoundTouch.h>
++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++ #error soundtouch expects float samples
++ #endif],
++ [],
++ [ac_cv_soundtouch_sample_type=short],
++ [ac_cv_soundtouch_sample_type=float])])
++ CXXFLAGS=$_SAVE_CXXFLAGS
++ AC_LANG_RESTORE
++
++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++ fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
Modified: trunk/www/firefox-nightly/files/patch-z-bug517422
==============================================================================
--- trunk/www/firefox-nightly/files/patch-z-bug517422 Tue May 6 18:53:56 2014 (r1584)
+++ trunk/www/firefox-nightly/files/patch-z-bug517422 Tue May 20 02:34:02 2014 (r1585)
@@ -185,7 +185,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -252,6 +252,27 @@
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
++
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ _SAVE_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++ AC_CACHE_CHECK(for soundtouch sample type,
++ ac_cv_soundtouch_sample_type,
++ [AC_TRY_COMPILE([#include <SoundTouch.h>
++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++ #error soundtouch expects float samples
++ #endif],
++ [],
++ [ac_cv_soundtouch_sample_type=short],
++ [ac_cv_soundtouch_sample_type=float])])
++ CXXFLAGS=$_SAVE_CXXFLAGS
++ AC_LANG_RESTORE
++
++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++ fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
Modified: trunk/www/firefox/files/patch-z-bug517422
==============================================================================
--- trunk/www/firefox/files/patch-z-bug517422 Tue May 6 18:53:56 2014 (r1584)
+++ trunk/www/firefox/files/patch-z-bug517422 Tue May 20 02:34:02 2014 (r1585)
@@ -185,7 +185,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -252,6 +252,27 @@
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ _SAVE_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++ AC_CACHE_CHECK(for soundtouch sample type,
++ ac_cv_soundtouch_sample_type,
++ [AC_TRY_COMPILE([#include <SoundTouch.h>
++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++ #error soundtouch expects float samples
++ #endif],
++ [],
++ [ac_cv_soundtouch_sample_type=short],
++ [ac_cv_soundtouch_sample_type=float])])
++ CXXFLAGS=$_SAVE_CXXFLAGS
++ AC_LANG_RESTORE
++
++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++ fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
Modified: trunk/www/libxul/files/patch-zz-bug517422
==============================================================================
--- trunk/www/libxul/files/patch-zz-bug517422 Tue May 6 18:53:56 2014 (r1584)
+++ trunk/www/libxul/files/patch-zz-bug517422 Tue May 20 02:34:02 2014 (r1585)
@@ -178,7 +178,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -245,6 +245,27 @@
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ _SAVE_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++ AC_CACHE_CHECK(for soundtouch sample type,
++ ac_cv_soundtouch_sample_type,
++ [AC_TRY_COMPILE([#include <SoundTouch.h>
++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++ #error soundtouch expects float samples
++ #endif],
++ [],
++ [ac_cv_soundtouch_sample_type=short],
++ [ac_cv_soundtouch_sample_type=float])])
++ CXXFLAGS=$_SAVE_CXXFLAGS
++ AC_LANG_RESTORE
++
++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++ fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
Modified: trunk/www/seamonkey/files/patch-z-bug517422
==============================================================================
--- trunk/www/seamonkey/files/patch-z-bug517422 Tue May 6 18:53:56 2014 (r1584)
+++ trunk/www/seamonkey/files/patch-z-bug517422 Tue May 20 02:34:02 2014 (r1585)
@@ -180,7 +180,7 @@
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -247,6 +247,27 @@
+
+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++ _SAVE_CXXFLAGS=$CXXFLAGS
++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++ AC_CACHE_CHECK(for soundtouch sample type,
++ ac_cv_soundtouch_sample_type,
++ [AC_TRY_COMPILE([#include <SoundTouch.h>
++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++ #error soundtouch expects float samples
++ #endif],
++ [],
++ [ac_cv_soundtouch_sample_type=short],
++ [ac_cv_soundtouch_sample_type=float])])
++ CXXFLAGS=$_SAVE_CXXFLAGS
++ AC_LANG_RESTORE
++
++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++ fi
+fi
+
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
More information about the freebsd-gecko
mailing list