Bug 816576 - Link libsoundtouch statically instead of dynamically. CLOBBER NEEDED r=glandium
authorPaul Adenot <paul@paul.cx>
Fri, 30 Nov 2012 14:17:54 +0100
changeset 114593 07acaa0a970f816d71a8c32af0da23ef1468713c
parent 114592 6f354ae56eb3b713647a77fa27542b9e85c5e548
child 114594 dacb25aaf275dbfe875a09a8d9e82f2f414b2413
push id23926
push userryanvm@gmail.com
push dateSat, 01 Dec 2012 15:27:30 +0000
treeherdermozilla-central@ecdf0e332f17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs816576
milestone20.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 816576 - Link libsoundtouch statically instead of dynamically. CLOBBER NEEDED r=glandium
CLOBBER
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
configure.in
layout/media/Makefile.in
media/libsoundtouch/src/Makefile.in
media/libsoundtouch/src/soundtouch.rc
mobile/android/installer/package-manifest.in
mobile/xul/installer/package-manifest.in
toolkit/library/Makefile.in
toolkit/mozapps/installer/packager.mk
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 717372 - The clobber information should live in the tree
+Bug 816576 - libsoundtouch is now part of libxul and not a separate dynamic library.
--- 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/configure.in
+++ b/configure.in
@@ -5569,25 +5569,16 @@ 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.
         ;;
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -82,16 +82,22 @@ SHARED_LIBRARY_LIBS 	+= \
 endif
 
 ifdef MOZ_SPEEX_RESAMPLER
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libspeex_resampler/src/$(LIB_PREFIX)speex_resampler.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
+ifdef MOZ_SOUNDTOUCH
+SHARED_LIBRARY_LIBS 	+= \
+	$(DEPTH)/media/libsoundtouch/src/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX) \
+	$(NULL)
+endif
+
 ifdef MOZ_CUBEB
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libcubeb/src/$(LIB_PREFIX)cubeb.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
 ifndef MOZ_NATIVE_PNG
 SHARED_LIBRARY_LIBS 	+= \
--- a/media/libsoundtouch/src/Makefile.in
+++ b/media/libsoundtouch/src/Makefile.in
@@ -7,28 +7,19 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = soundtouch
 LIBRARY_NAME = soundtouch
 SHORT_LIBNAME = soundt
-FORCE_SHARED_LIB = 1
 VISIBILITY_FLAGS =
 EXPORTS_NAMESPACES = soundtouch
 
-ifeq ($(OS_ARCH),WINNT)
-ifndef GNU_CC
-RCFILE  = soundtouch.rc
-RESFILE = soundtouch.res
-endif
-endif
-
-
 EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
 
 # Use abort() instead of exception in SoundTouch.
 DEFINES += -DST_NO_EXCEPTION_HANDLING=1
 
 EXPORTS_soundtouch = SoundTouch.h \
                      STTypes.h \
                      FIFOSamplePipe.h \
@@ -47,18 +38,16 @@ CPPSRCS = AAFilter.cpp \
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef MOZ_SAMPLE_TYPE_FLOAT32
 CPPSRCS += sse_optimized.cpp
 else
 CPPSRCS += mmx_optimized.cpp
 endif
 endif
 
-SOUNDTOUCH_LIBS = $(DLL_PREFIX)soundtouch$(DLL_SUFFIX)
-
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
 mmx_optimized.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 sse_optimized.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 endif
 ifdef SOLARIS_SUNPRO_CXX
deleted file mode 100644
--- a/media/libsoundtouch/src/soundtouch.rc
+++ /dev/null
@@ -1,53 +0,0 @@
-
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include<winver.h>
-
-// Note: if you contain versioning information in an included 
-// RC script, it will be discarded
-// Use module.ver to explicitly set these values
-
-// Do not edit this file. Changes won't affect the build.
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,0,0
- PRODUCTVERSION 1,7,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "Comments", "SoundTouch Library licensed for 3rd party applications subject to LGPL license v2.1. Visit http://www.surina.net/soundtouch for more information about the SoundTouch library."
-            VALUE "FileDescription", "SoundTouch Dynamic Link Library"
-            VALUE "FileVersion", "1, 7, 0, 0"
-            VALUE "InternalName", "SoundTouch"
-            VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 1999-2012"
-            VALUE "OriginalFilename", "SoundTouch.dll"
-            VALUE "ProductName", " SoundTouch Dynamic Link Library"
-            VALUE "ProductVersion", "1, 7, 0, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
-
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -35,17 +35,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@
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 
 @BINPATH@/AndroidManifest.xml
 @BINPATH@/resources.arsc
 @BINPATH@/package-name.txt
--- a/mobile/xul/installer/package-manifest.in
+++ b/mobile/xul/installer/package-manifest.in
@@ -46,17 +46,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@
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
--- 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 \