audio/cmt: Updated for version 1.17.

Signed-off-by: B. Watson <yalhcru@gmail.com>

1 files changed, 26 insertions, 16 deletions

diff --git a/audio/cmt/cmt.SlackBuild b/audio/cmt/cmt.SlackBuild
index c11d64ecc4..2c19bb83ae 100644
--- a/audio/cmt/cmt.SlackBuild
+++ b/audio/cmt/cmt.SlackBuild
@@ -6,9 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20191210 bkw: Update for v1.17. Script can still build v1.16.
+
 PRGNAM=cmt
-VERSION=${VERSION:-1.16}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.17}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,29 +42,37 @@ fi
 
 set -e
 
+# 20191210 bkw: v1.16 tarball has _src_ in the filename, v1.17 doesn't. Be
+# flexible, there's a good case to be made for allowing users to build
+# the older version (if their old ardour projects use it, and if the
+# new version changed the parameters to some plugin they're using...)
+for i in ${PRGNAM}_src_$VERSION.tgz ${PRGNAM}_$VERSION.tgz; do
+  [ -e "$i" ] && TARBALL="$i"
+done
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_src_$VERSION.tgz
-cd $PRGNAM
+rm -rf $PRGNAM ${PRGNAM}_${VERSION}
+tar xvf $CWD/$TARBALL
+# v1.16    || v1.17
+cd $PRGNAM || cd ${PRGNAM}_${VERSION}
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 chmod 644 doc/*
 
 if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
-  sed -i 's/-O3/'"$SLKCFLAGS"'/' src/makefile
+  for i in makefile Makefile; do
+    [ -e src/$i ] && MF=$i
+  done
+  sed -i 's/-O3/'"$SLKCFLAGS"'/' src/$MF
 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
+# Fix glibc double-free errors when cmt-1.16's sine and ladspa_sdk's sine
+# both get loaded into the same ladspa host. Sent patch upstream, it was
+# included in the 1.17 src, so only patch if we're building 1.16.
+[ "$VERSION" = "1.16" ] && patch -p1 < $CWD/fix_sine.diff
 
 make -C src
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/ladspa