4 files changed, 45 insertions, 19 deletions
diff --git a/audio/caps/README b/audio/caps/README
index b628c4b846d6..c02ce92679fb 100644
--- a/audio/caps/README
+++ b/audio/caps/README
@@ -9,9 +9,13 @@ equalization and more.
 By default, CAPS will use SSE and/or SSE3 optimizations, if they are
 supported on the build host. If you're building a package to be deployed
 on a different system, you might need to set FORCE_SLACK_CFLAGS=yes in
-the script's environment (this will completely disable SSE/SSE3).
+the script's environment, which will completely disable SSE/SSE3 (but
+might cause performance problems, your mileage may vary).
 
 The CAPS HTML documentation is about 1MB in size, located in
-/usr/doc/caps-$VERSION/html/index.html. If you want to leave it out
-of the package (e.g. if you're building for an embedded system), set
-DOCS=no in the script's environment.
+/usr/doc/caps-$VERSION/html/index.html. If you want to leave it out of
+the package, set DOCS=no in the script's environment. Note that the HTML
+doc is also available online (it's the caps homepage)... but only the
+most recent version, which might be newer than this build.
+
+If you're upgrading from an older version of caps, read UPGRADE.txt.
diff --git a/audio/caps/UPGRADE.txt b/audio/caps/UPGRADE.txt
new file mode 100644
index 000000000000..d0a0c31ed9a9
--- /dev/null
+++ b/audio/caps/UPGRADE.txt
@@ -0,0 +1,25 @@
+
+0.9.20 upgrade notes:
+
+Some of the plugin names and/or their parameters have changed since the
+old (0.9.7) SlackBuild.
+
+If you're upgrading from 0.9.7, be aware that any of your scripts
+or projects that use caps (e.g. Ardour sessions, or jack-rack presets)
+will need updating. For Ardour 2.x, if the changes prevent your session
+from loading, try:
+
+- Make a backup of your session directory (done with cp or tar, whatever).
+- Start ardour2 with the -d (or --disable-plugins) option, load the session.
+- Remove the offending plugins from their tracks or busses.
+- Save and exit
+- Start ardour2 normally, load the session.
+- Add the plugins back.
+
+If all else fails and you want to downgrade back to 0.9.7, you can
+still build it with this SlackBuild. Upstream removed the 0.9.7
+source from their site, but there's a copy here:
+
+http://urchlay.naptime.net/~urchlay/src/caps_0.9.7.tar.bz2
+
+Build with: VERSION=0.9.7 DOCS=no ./caps.SlackBuild
diff --git a/audio/caps/caps.SlackBuild b/audio/caps/caps.SlackBuild
index 5046500e7fb1..8ef18d0eaa21 100644
--- a/audio/caps/caps.SlackBuild
+++ b/audio/caps/caps.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=caps
-VERSION=${VERSION:-0.9.7}
+VERSION=${VERSION:-0.9.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,9 +40,6 @@ fi
 
 FORCE_SLACK_CFLAGS=${FORCE_SLACK_CFLAGS:-no}
 
-# not sure whether the docs will always be up to date, so:
-DOCVER=${DOCVER:-$VERSION}
-
 set -e
 
 rm -rf $PKG
@@ -59,7 +56,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 if [ "$FORCE_SLACK_CFLAGS" = "yes" ]; then
-  make OPTS="$SLKCFLAGS"
+  make OPTS="$SLKCFLAGS" ARCH=""
 else
   ./configure.py
   make
@@ -67,7 +64,7 @@ fi
 
 make install \
   DEST=$PKG/usr/lib$LIBDIRSUFFIX/ladspa \
-  RDFDEST=$PKG/usr/share/ladspa/rdf
+  RDFDEST=$PKG/usr/share/ladspa/rdf \
 
 # LADSPA standard seems to be mode 0755
 chmod 0755 $PKG/usr/lib$LIBDIRSUFFIX/ladspa/*.so
@@ -76,11 +73,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# docs are in a separate tarball now.
-if [ "$DOCS:-yes" != "yes" ]; then
+# docs are in a separate tarball now, just a wget -r of upstream's site
+if [ "${DOCS:-yes}" = "yes" ]; then
   ( cd $PKG/usr/doc/$PRGNAM-$VERSION
-    tar xvf $CWD/$PRGNAM-doc_$DOCVER.tar.bz2
-	 mv $PRGNAM-doc-$DOCVER html
+    tar xvf $CWD/$PRGNAM-doc-unofficial_$VERSION.tar.bz2
+	 mv $PRGNAM-doc-unofficial_$VERSION html
     chown root.root html/*
     chmod 644 html/*
   )
diff --git a/audio/caps/caps.info b/audio/caps/caps.info
index 2d41b3f6caed..a3110807f3bb 100644
--- a/audio/caps/caps.info
+++ b/audio/caps/caps.info
@@ -1,10 +1,10 @@
 PRGNAM="caps"
-VERSION="0.9.7"
+VERSION="0.9.20"
 HOMEPAGE="http://quitte.de/dsp/caps.html"
-DOWNLOAD="http://quitte.de/dsp/caps_0.9.7.tar.bz2 \
-          http://quitte.de/dsp/caps-doc_0.9.7.tar.bz2"
-MD5SUM="d74582d3ae7a4244d3a77501693bbdf3 \
-        03811f37b483aa793f098690b165df27"
+DOWNLOAD="http://quitte.de/dsp/caps_0.9.20.tar.bz2 \
+          http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.20.tar.bz2"
+MD5SUM="0bb3935f6747a7087ca32a67bd0d8793 \
+        7eea7c1f30363cca78f600544de271f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ladspa_sdk"