Bug 943159 - Remove MOZ_SPEEX_RESAMPLER/MOZ_SOUNDTOUCH defines since we don't support building without them anyway. r=doublec,gps
authorMatthew Gregan <kinetik@flim.org>
Thu, 28 Nov 2013 17:06:59 +1300
changeset 172673 21bce5b41a7ce858147bbfcbf78b13742a6bd07a
parent 172672 352121e47cc171c58803c856d5700fa6a18ac8fe
child 172674 dc9ebdf27e988c526aaee61ca443bd83ca1704fc
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdoublec, gps
bugs943159
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 943159 - Remove MOZ_SPEEX_RESAMPLER/MOZ_SOUNDTOUCH defines since we don't support building without them anyway. r=doublec,gps
config/external/moz.build
configure.in
layout/media/symbols.def.in
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -28,23 +28,21 @@ if CONFIG['MOZ_WEBM']:
     external_dirs += ['media/libnestegg']
 
 if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
     external_dirs += ['media/libvpx']
 
 if CONFIG['MOZ_OGG']:
     external_dirs += ['media/libogg', 'media/libtheora']
 
-if CONFIG['MOZ_SPEEX_RESAMPLER']:
-    external_dirs += ['media/libspeex_resampler']
-
-if CONFIG['MOZ_SOUNDTOUCH']:
-    external_dirs += ['media/libsoundtouch']
-
 if CONFIG['MOZ_CUBEB']:
     external_dirs += ['media/libcubeb']
 
 if not CONFIG['MOZ_NATIVE_PNG']:
     external_dirs += ['media/libpng']
 
-external_dirs += ['media/kiss_fft']
+external_dirs += [
+    'media/kiss_fft',
+    'media/libspeex_resampler',
+    'media/libsoundtouch',
+]
 
 PARALLEL_DIRS += ['../../' + i for i in external_dirs]
--- a/configure.in
+++ b/configure.in
@@ -3933,18 +3933,16 @@ ENABLE_SYSTEM_EXTENSION_DIRS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_FEEDS=1
 MOZ_WEBAPP_RUNTIME=
 MOZ_JSDEBUGGER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_OGG=1
 MOZ_RAW=
-MOZ_SPEEX_RESAMPLER=1
-MOZ_SOUNDTOUCH=1
 MOZ_CUBEB=
 MOZ_VORBIS=
 MOZ_TREMOR=
 MOZ_WAVE=1
 MOZ_SAMPLE_TYPE_FLOAT32=
 MOZ_SAMPLE_TYPE_S16=
 MOZ_OPUS=1
 MOZ_WEBM=1
@@ -5516,24 +5514,16 @@ if test -n "$MOZ_WAVE"; then
     AC_DEFINE(MOZ_WAVE)
     MOZ_CUBEB=1
 fi
 
 dnl ========================================================
 dnl = Handle dependent CUBEB and MEDIA defines
 dnl ========================================================
 
-if test -n "$MOZ_SPEEX_RESAMPLER"; then
-    AC_DEFINE(MOZ_SPEEX_RESAMPLER)
-fi
-
-if test -n "$MOZ_SOUNDTOUCH"; then
-    AC_DEFINE(MOZ_SOUNDTOUCH)
-fi
-
 if test -n "$MOZ_CUBEB"; then
     AC_DEFINE(MOZ_CUBEB)
 fi
 
 if test -n "$MOZ_OPUS" -a -z "$MOZ_OGG"; then
     AC_MSG_ERROR([MOZ_OPUS requires MOZ_OGG which is disabled.])
 fi
 
@@ -8660,18 +8650,16 @@ AC_SUBST(USE_N32)
 AC_SUBST(CC_VERSION)
 AC_SUBST(CXX_VERSION)
 AC_SUBST(MSMANIFEST_TOOL)
 AC_SUBST(NS_ENABLE_TSF)
 AC_SUBST(MOZ_NSS_PATCH)
 AC_SUBST(MOZ_APP_COMPONENT_LIBS)
 AC_SUBST(MOZ_APP_EXTRA_LIBS)
 
-AC_SUBST(MOZ_SPEEX_RESAMPLER)
-AC_SUBST(MOZ_SOUNDTOUCH)
 AC_SUBST(MOZ_CUBEB)
 AC_SUBST(MOZ_WAVE)
 AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_OPUS)
 AC_SUBST(MOZ_WEBM)
 AC_SUBST(MOZ_WMF)
 AC_SUBST(MOZ_FMP4)
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -90,17 +90,16 @@ vorbis_packet_blocksize
 vorbis_synthesis
 vorbis_synthesis_blockin
 vorbis_synthesis_headerin
 vorbis_synthesis_init
 vorbis_synthesis_pcmout
 vorbis_synthesis_read
 vorbis_synthesis_restart
 #endif
-#ifdef MOZ_SPEEX_RESAMPLER
 speex_resampler_init
 speex_resampler_init_frac
 speex_resampler_destroy
 speex_resampler_process_float
 speex_resampler_process_int
 speex_resampler_process_interleaved_float
 speex_resampler_process_interleaved_int
 speex_resampler_set_rate
@@ -113,17 +112,16 @@ speex_resampler_set_input_stride
 speex_resampler_get_input_stride
 speex_resampler_set_output_stride
 speex_resampler_get_output_stride
 speex_resampler_get_input_latency
 speex_resampler_get_output_latency
 speex_resampler_skip_zeros
 speex_resampler_reset_mem
 speex_resampler_strerror
-#endif
 #ifdef MOZ_CUBEB
 cubeb_destroy
 cubeb_init
 cubeb_get_max_channel_count
 cubeb_get_min_latency
 cubeb_get_preferred_sample_rate
 cubeb_stream_destroy
 cubeb_stream_get_position