diff options
| author | B. Watson <yalhcru@gmail.com> | 2011-07-04 10:56:41 -0300 |
|---|---|---|
| committer | Niels Horn <niels.horn@slackbuilds.org> | 2011-07-04 10:56:41 -0300 |
| commit | b935c77f30255e9387e2227a30929a26a31f35a0 (patch) | |
| tree | 6e76ee2e5e449bbd3889da7cee3fdb9ccbb672be /audio/cmt | |
| parent | 2bcc79b2d7bdeb474a8a3cc8ee19beda1852dbbf (diff) | |
audio/cmt: Added patch to avoid double-free aborts.
Diffstat (limited to 'audio/cmt')
| -rw-r--r-- | audio/cmt/cmt.SlackBuild | 14 | ||||
| -rw-r--r-- | audio/cmt/cmt.info | 2 | ||||
| -rw-r--r-- | audio/cmt/fix_sine.diff | 14 |
3 files changed, 23 insertions, 7 deletions
diff --git a/audio/cmt/cmt.SlackBuild b/audio/cmt/cmt.SlackBuild index 9ce338dffdb7e..98acc87471b51 100644 --- a/audio/cmt/cmt.SlackBuild +++ b/audio/cmt/cmt.SlackBuild @@ -6,15 +6,13 @@ PRGNAM=cmt VERSION=${VERSION:-1.16} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,8 +36,6 @@ else LIBDIRSUFFIX="" fi -FORCE_SLACK_CFLAGS=${FORCE_SLACK_CFLAGS:-no} - set -e rm -rf $PKG @@ -56,10 +52,16 @@ find . \ -exec chmod 644 {} \; chmod 644 doc/* -if [ "$FORCE_SLACK_CFLAGS" = "yes" ]; then +if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then sed -i 's/-O3/'"$SLKCFLAGS"'/' src/makefile fi +# Fix glibc double-free errors when cmt's sine and ladspa_sdk's sine +# both get loaded into the same ladspa host. Sent patch upstream, but +# cmt is "legacy", there hasn't been a release since 2007, so not holding +# my breath. +patch -p1 < $CWD/fix_sine.diff + make -C src mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/ladspa make -C src install INSTALL_PLUGINS_DIR=$PKG/usr/lib$LIBDIRSUFFIX/ladspa diff --git a/audio/cmt/cmt.info b/audio/cmt/cmt.info index 9a9901bdf7db1..0acf90fa07f5f 100644 --- a/audio/cmt/cmt.info +++ b/audio/cmt/cmt.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" -APPROVED="rworkman" +APPROVED="Niels Horn" diff --git a/audio/cmt/fix_sine.diff b/audio/cmt/fix_sine.diff new file mode 100644 index 0000000000000..441f9fc9b71da --- /dev/null +++ b/audio/cmt/fix_sine.diff @@ -0,0 +1,14 @@ +diff -Naur cmt/src/sine.cpp cmt.patched//src/sine.cpp +--- cmt/src/sine.cpp 2002-08-07 17:42:41.000000000 -0400 ++++ cmt.patched//src/sine.cpp 2011-06-21 12:07:36.000000000 -0400 +@@ -36,8 +36,8 @@ + + /*****************************************************************************/ + +-LADSPA_Data * g_pfSineTable = NULL; +-LADSPA_Data g_fPhaseStepBase = 0; ++static LADSPA_Data * g_pfSineTable = NULL; ++static LADSPA_Data g_fPhaseStepBase = 0; + + /*****************************************************************************/ + |