Bug 779997 - Disable build and linking of libsoundtouch as it is not used for now. r=glandium, a=akeybl
authorPaul Adenot <paul@paul.cx>
Mon, 19 Nov 2012 16:36:06 +0000
changeset 121623 2f801d18884d51008b7fcf72fa1f281004fd1ca0
parent 121622 15d4ae634345d531b0a73ef41249338629349904
child 121624 25369927b36453122892d1f00721e2b78c688f78
push id1997
push userakeybl@mozilla.com
push dateMon, 07 Jan 2013 21:25:26 +0000
treeherdermozilla-beta@4baf45cdcf21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, akeybl
bugs779997
milestone19.0a2
Bug 779997 - Disable build and linking of libsoundtouch as it is not used for now. r=glandium, a=akeybl
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
config/system-headers
configure.in
js/src/config/system-headers
toolkit/library/Makefile.in
toolkit/mozapps/installer/packager.mk
toolkit/toolkit-makefiles.sh
toolkit/toolkit-tiers.mk
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -49,17 +49,16 @@
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 #else
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -49,17 +49,16 @@
 #endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
 #ifdef XP_WIN32
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@
 #ifdef MOZ_SHARED_MOZGLUE
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 #ifndef MOZ_NATIVE_NSPR
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
--- a/config/system-headers
+++ b/config/system-headers
@@ -977,17 +977,16 @@ plbase64.h
 plerror.h
 plgetopt.h
 plresolv.h
 plstr.h
 plarenas.h
 plarena.h
 plhash.h
 speex/speex_resampler.h
-soundtouch/SoundTouch.h
 #if MOZ_NATIVE_PNG==1
 png.h
 #endif
 #if MOZ_NATIVE_ZLIB==1
 zlib.h
 #endif
 #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 libsn/sn.h
--- a/configure.in
+++ b/configure.in
@@ -4188,17 +4188,16 @@ MOZ_FEEDS=1
 MOZ_FLEXBOX=1
 MOZ_WEBAPP_RUNTIME=
 MOZ_JSDEBUGGER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_OGG=1
 MOZ_RAW=
 MOZ_SYDNEYAUDIO=
 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_MEDIA=
 MOZ_OPUS=1
@@ -5549,29 +5548,16 @@ dnl ====================================
 if test -n "$MOZ_SYDNEYAUDIO"; then
     AC_DEFINE(MOZ_SYDNEYAUDIO)
 fi
 
 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 -z "$GNU_CC" -a "$OS_ARCH" = "WINNT"; then
-   SOUNDTOUCH_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX)'
-else
-    SOUNDTOUCH_LIBS='-lsoundtouch'
-fi
-AC_SUBST(SOUNDTOUCH_CFLAGS)
-AC_SUBST(SOUNDTOUCH_LIBS)
-AC_SUBST(SOUNDTOUCH_CONFIG)
-
 if test -n "$MOZ_CUBEB"; then
     case "$target" in
     *-android*|*-linuxandroid*)
         if test -n "$gonkdir"; then
             AC_DEFINE(MOZ_CUBEB)
         fi
         dnl No Android implementation of libcubeb yet.
         ;;
@@ -8603,17 +8589,16 @@ 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_MEDIA)
 AC_SUBST(MOZ_SYDNEYAUDIO)
 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_DASH)
 AC_SUBST(MOZ_MEDIA_PLUGINS)
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -977,17 +977,16 @@ plbase64.h
 plerror.h
 plgetopt.h
 plresolv.h
 plstr.h
 plarenas.h
 plarena.h
 plhash.h
 speex/speex_resampler.h
-soundtouch/SoundTouch.h
 #if MOZ_NATIVE_PNG==1
 png.h
 #endif
 #if MOZ_NATIVE_ZLIB==1
 zlib.h
 #endif
 #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
 libsn/sn.h
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -359,17 +359,16 @@ endif
 
 EXTRA_DSO_LDOPTS += \
   $(LIBS_DIR) \
   $(MOZ_JS_LIBS) \
   $(NSS_LIBS) \
   $(MOZ_CAIRO_OSLIBS) \
   $(MOZ_APP_EXTRA_LIBS) \
   $(SQLITE_LIBS) \
-  $(SOUNDTOUCH_LIBS) \
   $(NULL)
 
 ifdef MOZ_NATIVE_JPEG
 EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS)
 endif
 
 ifdef MOZ_NATIVE_PNG
 EXTRA_DSO_LDOPTS += $(MOZ_PNG_LIBS)
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -261,17 +261,16 @@ DIST_FILES += lib.id
 endif
 
 DIST_FILES += \
   libmozalloc.so \
   libnspr4.so \
   libplc4.so \
   libplds4.so \
   libmozsqlite3.so \
-  libsoundtouch.so \
   libnssutil3.so \
   libnss3.so \
   libssl3.so \
   libsmime3.so \
   libxul.so \
   libxpcom.so \
   libnssckbi.so \
   libfreebl3.so \
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -1724,15 +1724,8 @@ fi
 
 if [ "$MOZ_SPEEX_RESAMPLER" ]; then
   add_makefiles "
     media/libspeex_resampler/Makefile
     media/libspeex_resampler/src/Makefile
   "
 fi
 
-if [ "$MOZ_SOUNDTOUCH" ]; then
-  add_makefiles "
-    media/libsoundtouch/Makefile
-    media/libsoundtouch/src/Makefile
-  "
-fi
-
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -146,22 +146,16 @@ tier_platform_dirs += \
 endif
 
 ifdef MOZ_SPEEX_RESAMPLER
 tier_platform_dirs += \
 		media/libspeex_resampler \
 		$(NULL)
 endif
 
-ifdef MOZ_SOUNDTOUCH
-tier_platform_dirs += \
-		media/libsoundtouch \
-		$(NULL)
-endif
-
 ifdef MOZ_CUBEB
 tier_platform_dirs += \
 		media/libcubeb \
 		$(NULL)
 endif
 
 ifdef MOZ_OMX_PLUGIN
 tier_platform_dirs += \