diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-22 01:34:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-22 01:34:53 +0000 |
| commit | 3e81d8d44b83a4c7f3458f1c39d7ac506fdd9563 (patch) | |
| tree | d3303e6ae4359d8d8c45f01b89499acb0fa0b23c /tools | |
| parent | 1d3fa1a83903be2cbd11d25e5dba3f141f533c09 (diff) | |
patch for ugliness in libsndfile 1.0.25, and dir for this and similar future patches
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build-ardour-stack | 6 | ||||
| -rw-r--r-- | tools/misc-patches/libsndfile-1.0.25.patch | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/tools/build-ardour-stack b/tools/build-ardour-stack index fd3b8ee9d7..6a51599998 100755 --- a/tools/build-ardour-stack +++ b/tools/build-ardour-stack @@ -284,16 +284,18 @@ fi tar xf libvorbis-1.3.2.tar.bz2 && \ (set -e && cd libvorbis-1.3.2 && CXXFLAGS="$GLOBAL_CFLAGS" CFLAGS="$GLOBAL_CFLAGS" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX && make && make install) || die "vorbis build failed" +sndfile_patch=`ls $this_script_dir/misc-patches/libsndfile-1.0.25.patch` + if [ x$OSX != x ] ; then # sndfile-play incorrectly includes <Carbon.h> which no longer works on Lion tar xf libsndfile-1.0.25.tar.gz && \ - (set -e && cd libsndfile-1.0.25 && CFLAGS="$GLOBAL_CFLAGS -I/System/Library/Frameworks/Carbon.framework/Headers" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX --disable-silent-rules && make && make install) || die "sndfile build failed" + (set -e && cd libsndfile-1.0.25 && patch -p0 < $sndfile_patch CFLAGS="$GLOBAL_CFLAGS -I/System/Library/Frameworks/Carbon.framework/Headers" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX --disable-silent-rules && make && make install) || die "sndfile build failed" # samplerate incorrectly includes <Carbon.h> which no longer works on Lion tar xf libsamplerate-0.1.8.tar.gz && \ (set -e && cd libsamplerate-0.1.8 && CFLAGS="$GLOBAL_CFLAGS -I/System/Library/Frameworks/Carbon.framework/Headers" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX && make && make install) || die "samplerate build failed" else tar xf libsndfile-1.0.25.tar.gz && \ - (set -e && cd libsndfile-1.0.25 && CFLAGS="$GLOBAL_CFLAGS" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX --disable-silent-rules && make && make install) || die "sndfile build failed" + (set -e && cd libsndfile-1.0.25 && patch -p0 $sndfile_patch && CFLAGS="$GLOBAL_CFLAGS" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX --disable-silent-rules && make && make install) || die "sndfile build failed" tar xf libsamplerate-0.1.8.tar.gz && \ (set -e && cd libsamplerate-0.1.8 && CFLAGS="$GLOBAL_CFLAGS" LDFLAGS="$GLOBAL_LDFLAGS" ./configure --prefix=$PREFIX && make && make install) || die "samplerate build failed" fi diff --git a/tools/misc-patches/libsndfile-1.0.25.patch b/tools/misc-patches/libsndfile-1.0.25.patch new file mode 100644 index 0000000000..3e3ebf4c1c --- /dev/null +++ b/tools/misc-patches/libsndfile-1.0.25.patch @@ -0,0 +1,15 @@ +--- src/broadcast.c~ 2011-03-27 23:53:08.000000000 -0400 ++++ src/broadcast.c 2012-05-21 21:23:11.914815287 -0400 +@@ -82,8 +82,10 @@ + + /* Force coding_history_size to be even. */ + len = strlen (psf->broadcast_16k->coding_history) ; +- len += (len & 1) ? 1 : 2 ; +- psf->broadcast_16k->coding_history_size = len ; ++ if (len && ( len & 1)) { ++ len += 1; ++ } ++ psf->broadcast_16k->coding_history_size = len ; + + /* Currently writing this version. */ + psf->broadcast_16k->version = 1 ; |