4 files changed, 50 insertions, 66 deletions
diff --git a/audio/calf/README b/audio/calf/README
index 75707a3897..80ad9780bf 100644
--- a/audio/calf/README
+++ b/audio/calf/README
@@ -1,24 +1,13 @@
-Calf audio plugin pack for LADSPA, DSSI, LV2 and JACK. Contains effects
-(flanger, reverb, tape-like delay, phaser, rotary speaker, multi-mode
-filter, multi-tap chorus and compressor) and instruments (organ simulator
-and a monophonic synthesizer). This is falkTX's KXStudio fork of Calf,
-which re-adds LADSPA and DSSI support (which was removed from the
-original codebase).
+Calf Studio Gear is an audio plug-in pack for LV2 and JACK environments
+under Linux operating systems. The suite contains lots of effects (delay,
+modulation, signal processing, filters, equalizers, dynamics, distortion
+and mastering effects), instruments (SF2 player, organ simulator and
+a monophonic synthesizer) and tools (analyzer, mono/stereo tools,
+crossovers). Calf Studio Gear aims for a professional audience.
 
-Optional dependencies: By default, these are auto-detected at build time.
-Support for each dep will be built if found, unless disabled with an
-environment variable.
-
-ladspa_sdk: Disable with LADSPA=no (which will also disable DSSI).
-dssi: Disable with DSSI=no.
-lv2 and slv2: Disable with LV2=no.
-lash: cannot be disabled (will always be used if installed).
-
-Even with all the plugin formats disabled, calfjackhost will still
-be built.
-
-To enable some experimental LV2 plugins designed for use with modular
-hosts, set EXPERIMENTAL=yes in the environment (default is "no").
+By default, the package is built with SSE support if the host CPU supports
+SSE. If building for another host, you can set SSE=yes or SSE=no in the
+environment to override the autodetection.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
diff --git a/audio/calf/calf.SlackBuild b/audio/calf/calf.SlackBuild
index f7b62727fa..fe8e9baa2e 100644
--- a/audio/calf/calf.SlackBuild
+++ b/audio/calf/calf.SlackBuild
@@ -4,6 +4,15 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# 20151106 bkw:
+# Switch to -master and upgrade to v0.0.60. No more LADSPA or DSSI
+# support (upstream dropped it). But if you need LADSPA, there's a
+# separate calf-ladspa build now. If there's a popular demand for
+# DSSI, I'll add it to calf-ladspa, not here.
+# fluidsynth is now required, because the build fails without it, even
+# though it's listed as experimental and there's a --disable-experimental
+# option. Since it's required anyway, might as well --enable-experimental.
+
 # 20141030 bkw:
 # Finally getting around to submitting this, there have been no code
 # changes upstream since 20140308.
@@ -14,8 +23,8 @@
 # - Added capability stuff.
 
 PRGNAM=calf
-VERSION=${VERSION:-0.0.19kx}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.0.60}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,39 +54,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "${EXPERIMENTAL:-no}" = "yes" ]; then
-  EXPOPT=enable
-else
-  EXPOPT=disable
-fi
-
-if [ "${LADSPA:-yes}" = "no" ]; then
-  LADSPA_OPT="--without-ladspa"
-else
-  LADSPA_OPT="--with-ladspa-dir=/usr/lib${LIBDIRSUFFIX}/ladspa"
-fi
-
-if [ "${DSSI:-yes}" = "no" ]; then
-  DSSI_OPT="--without-dssi"
-else
-  DSSI_OPT="--with-dssi-dir=/usr/lib${LIBDIRSUFFIX}/dssi"
-fi
-
-if [ "${LV2:-yes}" = "no" ]; then
-  LV2_OPT="--without-lv2"
-else
-  LV2_OPT="--with-lv2-dir=/usr/lib${LIBDIRSUFFIX}/lv2"
-fi
-
-echo "LADSPA_OPT: $LADSPA_OPT, DSSI_OPT: $DSSI_OPT, LV2_OPT: $LV2_OPT"
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -94,12 +77,26 @@ autoreconf -if
 # in the environment.
 if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then
   sed -i -e 's/ -O3[^"]*//' configure
+  SSE=no
 fi
 
+# Build with SSE support?
+case "${SSE:-auto}" in
+  "yes") SSEOPT="--enable-sse"  ;;
+  "no")  SSEOPT="--disable-sse" ;;
+  *)     grep sse /proc/cpuinfo >/dev/null \
+              && SSEOPT="--enable-sse" \
+              || SSEOPT="--disable-sse" ;;
+esac
+
+# For the slack-desc:
+WITHSSE="without"
+[ "$SSEOPT" = "--enable-sse" ] && WITHSSE="with"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --${EXPOPT}-experimental \
+  --enable-experimental \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -109,9 +106,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --htmldir=/usr/doc/$PRGNAM-$VERSION \
   --enable-shared \
   --disable-static \
-  $LADSPA_OPT \
-  $DSSI_OPT \
-  $LV2_OPT \
+  --with-lv2-dir=/usr/lib${LIBDIRSUFFIX}/lv2 \
   --build=$ARCH-slackware-linux
 
 make
@@ -134,7 +129,7 @@ rm -f $PKG/usr/share/icons/hicolor/icon-theme.cache
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITHSSE@,$WITHSSE," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Only add capability stuff if not disabled:
diff --git a/audio/calf/calf.info b/audio/calf/calf.info
index 2376eeb51a..c46bac6fc7 100644
--- a/audio/calf/calf.info
+++ b/audio/calf/calf.info
@@ -1,10 +1,10 @@
 PRGNAM="calf"
-VERSION="0.0.19kx"
+VERSION="0.0.60"
 HOMEPAGE="http://kxstudio.sourceforge.net/Plugins"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/calf-0.0.19kx.tar.gz"
-MD5SUM="ba2147ddc53022ddf1ffdf28c3340a57"
+DOWNLOAD="https://github.com/calf-studio-gear/calf/archive/0.0.60.tar.gz"
+MD5SUM="f54469f4bd3f194e7b979b15dfd3d048"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="dssi jack-audio-connection-kit ladspa_sdk lash slv2"
+REQUIRES="jack-audio-connection-kit lash slv2 fluidsynth"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/audio/calf/slack-desc b/audio/calf/slack-desc
index 0eefa70461..e5ca8673bb 100644
--- a/audio/calf/slack-desc
+++ b/audio/calf/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-calf: calf (audio plugin pack for LADSPA, DSSI, LV2 and JACK)
-calf:
-calf: Calf audio plugin pack for LADSPA, DSSI, LV2 and JACK. Contains
-calf: effects (flanger, reverb, tape-like delay, phaser, rotary speaker,
-calf: multi-mode filter, multi-tap chorus and compressor) and instruments
-calf: (organ simulator and a monophonic synthesizer).
-calf:
-calf:
+calf: Calf Studio Gear is an audio plug-in pack for LV2 and JACK
+calf: environments under Linux operating systems. The suite contains
+calf: lots of effects (delay, modulation, signal processing, filters,
+calf: equalizers, dynamics, distortion and mastering effects), instruments
+calf: (SF2 player, organ simulator and a monophonic synthesizer) and tools
+calf: (analyzer, mono/stereo tools, crossovers). Calf Studio Gear aims
+calf: for a professional audience.
 calf:
+calf: This package was built @WITHSSE@ SSE support.
 calf:
 calf: