ref: 3036a8f1d23c346ada28ec85e2651d1279e1e419
parent: 7a12d05bb2b9521510e8bf62319d44c8330ebee8
author: cbagwell <cbagwell>
date: Sat Feb 19 12:37:09 EST 2011
Update references to external libraries used. Update build descriptions to indicate lame is no longer needed.
--- a/INSTALL
+++ b/INSTALL
@@ -25,6 +25,7 @@
FLAC http://flac.sourceforge.net BSD
LADSPA http://www.ladspa.org LGPL + plugins' licence
Lame MP3 encoder http://lame.sourceforge.net LGPL
+libltdl http://www.gnu.org/software/libtool LGPL
MAD MP3 decoder http://www.underbit.com/products/mad GPL
MP3 ID3 tags http://www.underbit.com/products/mad GPL
Magic http://www.darwinsys.com/file GPL
--- a/README.osx
+++ b/README.osx
@@ -9,20 +9,9 @@
If the sox executable is invoked with an executable name of soxi, play,
or rec it will perform the functions of those applications as defined
-in included documents.
+in included documents. Symlinks are included with this package
+but you can also make your own.
-Symlinks can be created for this purpose; such as:
-
-ln -s sox soxi
-ln -s sox play
-ln -s sox rec
-
-This also roughly equates to invoking sox with following options:
-
-soxi: sox --info [input files and options]
-play: sox [input files and options] -d [effects]
-rec: sox -d [output file and options] [effects]
-
wget
----
@@ -42,15 +31,21 @@
SoX - http://sox.sourceforge.net
- Ogg Vorbis - http://www.vorbis.com
-
FLAC - http://flac.sourceforge.net
+ LADSPA - http://www.ladspa.org
+
+ libid3tag - http://www.underbit.com/products/mad
+
+ libltdl - http://www.gnu.org/software/libtool
+
libsndfile - http://www.mega-nerd.com/libsndfile
- WavPack - http://www.wavpack.com
+ Ogg Vorbis - http://www.vorbis.com
PNG - http://www.libpng.org/pub/png
+
+ WavPack - http://www.wavpack.com
Enjoy,
The SoX Development Team
--- a/README.win32
+++ b/README.win32
@@ -5,7 +5,7 @@
Please refer to the README file for general information.
The binary SOX.EXE can be installed anywhere you desire. The only
-restriction is that the included CYGWIN1.DLL and CYGGOMP-1.DLL must be
+restriction is that the included CYGWIN1.DLL and CYGGOMP-1.DLL must be
located in the same directory as SOX.EXE or somewhere within your PATH.
SoX Helper Applications
@@ -15,7 +15,7 @@
behaviors are documented in included PDF's. They have the same
install restrictions as SOX.EXE.
-SOXI.EXE, PLAY.EXE, and REC.EXE are not distributed with this package to
+SOXI.EXE, PLAY.EXE, and REC.EXE are not distributed with this package to
reduce size requirements. They are, in fact, only copies of the original
SOX.EXE binary which changes SOX.EXE's behavior based on the
executable's filename.
@@ -63,15 +63,19 @@
SoX - http://sox.sourceforge.net
- Ogg Vorbis - http://www.vorbis.com
-
FLAC - http://flac.sourceforge.net
+ LADSPA - http://www.ladspa.org
+
+ libid3tag - http://www.underbit.com/products/mad
+
libsndfile - http://www.mega-nerd.com/libsndfile
- WavPack - http://www.wavpack.com
+ Ogg Vorbis - http://www.vorbis.com
PNG - http://www.libpng.org/pub/png
+
+ WavPack - http://www.wavpack.com
Enjoy,
The SoX Development Team
--- a/mingwbuild
+++ b/mingwbuild
@@ -3,27 +3,27 @@
# This script will automates the steps used to producing a static win32
# package of SoX.
#
-# It is used on a Fedora box with mingw cross compiler and wine to
+# It is used on a Fedora box with mingw cross compiler and wine to
# test. It can also be used under MSYS but will not generate PDF docs.
#
-# It will optionally package up VC++ version of wget if found in
+# It will optionally package up VC++ version of wget if found in
# ../wget-1.11.4.
#
# Various notes:
#
# Script makes use of "-static" option to tell compiler to prefer static
-# external libraries so that we do not need to distribute DLL's.
+# external libraries so that we do not need to distribute DLL's.
#
-# Libtool will get confused with this flag for external libraries
-# that have a libtool lib*.la file and support shared libraries as
-# well as static libraries (but usually only if that library
-# further depends on other external libraries with lib*.la files).
+# Libtool will get confused with this flag for external libraries
+# that have a libtool lib*.la file and support shared libraries as
+# well as static libraries (but usually only if that library
+# further depends on other external libraries with lib*.la files).
# Libtool may ignore -static option or it may link first external
# library as static but other dependent libraries as shared (usually
# because it follows $dependency_libs and that ignores -static option).
#
-# Work arounds include to only install static libraries, delete the lib*.la
-# file, or edit the lib*.la file and set dlnames and library_names variables
+# Work arounds include to only install static libraries, delete the lib*.la
+# file, or edit the lib*.la file and set dlnames and library_names variables
# to empty string ("").#
# The following command lines were used to generate the static external
@@ -53,20 +53,17 @@
#
# Compile libsndfile after FLAC and ogg vorbis so that it will include
# support for that.
-# MINGW work around: Can either add -lwsock32 to end of *_LDADD for any
+# MINGW work around: Can either add -lwsock32 to end of *_LDADD for any
# failed program links or modify top leve Makefile and remove
# "programs", "examples", "regtests", and "tests" from SUBDIRS.
# cd ../libsndfile-1.0.21
# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
#
-# To get MP3 header files used to enable MP3 support (no libraries used):
-#
-# cd ../lame-398-2
-# mingw32-configure --enable-shared --disable-static;mingw32-make;sudo mingw32-make install
-#
# libid3tag does not like to be compiled shared on mingw32 cross compiler.
# cd ../libid3tag-0.15.1b
# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
+#
+# To get MP3 header files used to enable MP3 support (no libraries used):
#
# MINGW work around: Edit Makefile and remove -fforce-mem from CFLAGS
# cd ../libmad-0.15.1b
--- a/osxbuild
+++ b/osxbuild
@@ -38,17 +38,14 @@
# cd ../libsndfile-1.0.21
#./configure CXXFLAGS="-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CFLAGS="-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --disable-shared --enable-static;make;sudo make install
#
-#
-# To get MP3 header files used to enable MP3 support (no libraries used):
-#
-# cd ../lame-398-2
-#./configure CFLAGS="-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --enable-shared --disable-static;make;sudo make install
-#
# cd ../libid3tag-0.15.1b
#./configure CXXFLAGS="-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CFLAGS="-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --enable-static --disable-shared;make;sudo make install
#
+# To get MP3 header files used to enable MP3 support (no libraries used):
+#
# cd ../libmad-0.15.1b
#./configure CFLAGS="-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --enable-shared --disable-static;make;sudo make install
+#
[ ! -x configure ] && autoreconf -i