audio/TiMidity++: Updated for version 2.13.2

5 files changed, 45 insertions, 6 deletions

diff --git a/audio/TiMidity++/README b/audio/TiMidity++/README
index ac3f717d2f..266ea30bd6 100644
--- a/audio/TiMidity++/README
+++ b/audio/TiMidity++/README
@@ -1,5 +1,11 @@
 TiMidity++ is a software synthesizer.  It can play MIDI files by converting
 them into PCM waveform data or other various audio file formats.
 
-The freepats package, also available at SlackBuilds.org, is recommended
-for use with TiMidity++.
+TiMidity++ can also be run as an ALSA sequencer client.  To do this, make
+/etc/rc.d/rc.timidity executable and add this line to /etc/rc.d/rc.local:
+
+/etc/rc.d/rc.timidity start
+
+You will need a set of instrument patch files for TiMidity++ to be of any
+use.  The freepats and eawpats packages, also available at SlackBuilds.org,
+both provide a set of patch files.
diff --git a/audio/TiMidity++/TiMidity++.SlackBuild b/audio/TiMidity++/TiMidity++.SlackBuild
index ce60b14524..181d2d760b 100644
--- a/audio/TiMidity++/TiMidity++.SlackBuild
+++ b/audio/TiMidity++/TiMidity++.SlackBuild
@@ -9,7 +9,7 @@
 PRGNAM="TiMidity++"
 VERSION="2.13.2"
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -67,7 +67,8 @@ EXTRACFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/timidity \
   --enable-audio=alsa,oss,arts,esd,ao,vorbis,flac \
-  --enable-dynamic=gtk,ncurses,motif,tcltk,emacs,vt100,alsaseq \
+  --enable-dynamic=gtk,ncurses,motif,tcltk,emacs,vt100 \
+  --enable-alsaseq \
   --enable-server \
   --enable-network \
   --enable-spectrogram \
@@ -89,6 +90,10 @@ cat > $PKG/etc/timidity.cfg.new << EOF
 # See timidity.cfg(5) for details.
 EOF
 
+# Copy the startup script
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.timidity > $PKG/etc/rc.d/rc.timidity.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -98,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/TiMidity++/TiMidity++.info b/audio/TiMidity++/TiMidity++.info
index 8c9c21892f..10fedc1970 100644
--- a/audio/TiMidity++/TiMidity++.info
+++ b/audio/TiMidity++/TiMidity++.info
@@ -2,7 +2,9 @@ PRGNAM="TiMidity++"
 VERSION="2.13.2"
 HOMEPAGE="http://timidity.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/timidity/TiMidity%2B%2B-2.13.2.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="a82ceeb2245e22f4de2b41da21eaee32"
+MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="rworkman,Michiel"
+APPROVED="Erik Hanson"
diff --git a/audio/TiMidity++/doinst.sh b/audio/TiMidity++/doinst.sh
index 874ebd4efc..359c5a3f8b 100644
--- a/audio/TiMidity++/doinst.sh
+++ b/audio/TiMidity++/doinst.sh
@@ -11,4 +11,5 @@ config() {
 }
 
 config etc/timidity.cfg.new
+config etc/rc.d/rc.timidity.new
 
diff --git a/audio/TiMidity++/rc.timidity b/audio/TiMidity++/rc.timidity
new file mode 100644
index 0000000000..37d9c1d8a2
--- /dev/null
+++ b/audio/TiMidity++/rc.timidity
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Start/stop/restart the TiMidity++ ALSA sequencer client
+# Have a look at README.alsaseq in the TiMidity++ docs for more info.
+
+TIMIDITY_OPTIONS="-iAD -Os -B2,8"
+
+# If CPU usage is too high, try disabling the reverb and chorus effects.
+#TIMIDITY_OPTIONS="$TIMIDITY_OPTIONS -EFreverb=0 -EFchorus=0"
+
+case "$1" in
+  'start')
+    timidity $TIMIDITY_OPTIONS
+  ;;
+  'stop')
+    killall timidity
+  ;;
+  'restart')
+    killall timidity
+    sleep 1
+    timidity $TIMIDITY_OPTIONS
+  ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+  ;;
+esac