shithub: sox

Info  •  Files  •  Log  •  Branches

Allow compiling MP3 support without libmad.  Don't distribute
libsox.pdf on windows since we are not distributing libsox.dll.

--- a/ChangeLog

+++ b/ChangeLog

@@ -4,6 +4,13 @@

 This file contains a list of all changes starting after the release of

 sox-11gamma, followed by a list of prior authors and features.

+sox-x.x.x	xxxx-xx-xx

+---------

+

+File formats:

+

+o Fix regression where MP3 handler required libmad headers to be installed.

+  (Samuli Suominen) 

 sox-14.3.1	2010-04-11

 ----------

--- a/cygbuild

+++ b/cygbuild

@@ -104,7 +104,6 @@

   sox.pdf \

   soxformat.pdf \

   soxi.pdf \

-  libsox.pdf \

   scripts/batch-example.bat \

   $dir

--- a/mingwbuild

+++ b/mingwbuild

@@ -97,7 +97,7 @@

   SYS_ROOT="/usr/i686-pc-mingw32/sys-root"

   CONFIGURE=mingw32-configure

   DOC_TARGETS="pdf"

-  DOCS="sox.pdf soxformat.pdf soxi.pdf libsox.pdf"

+  DOCS="sox.pdf soxformat.pdf soxi.pdf"

   TMP_SNDFILE_LIBS="-lsndfile -lFLAC -lwsock32 -lvorbisenc -lvorbisfile -lvorbis -logg"

   STRIP=i686-pc-mingw32-strip

 esac

--- a/src/mp3.c

+++ b/src/mp3.c

@@ -56,8 +56,10 @@

  * Sidestep the issue by defining our own mad_timer_zero. This is needed because

  * mad_timer_zero is used in some of the mad.h macros.

  */

+#ifdef HAVE_MAD_H

 #define mad_timer_zero mad_timer_zero_stub

 static mad_timer_t const mad_timer_zero_stub = {0, 0};

+#endif

 #define MAXFRAMESIZE 2880

 #define ID3PADDING 128