audio/fluidsynth: Updated for version 2.1.1, new maintainer.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 42 insertions, 27 deletions

diff --git a/audio/fluidsynth/README b/audio/fluidsynth/README
index 60219b06acb2..763cff5472d3 100644
--- a/audio/fluidsynth/README
+++ b/audio/fluidsynth/README
@@ -1,9 +1,19 @@
-FluidSynth is a software real-time synthesizer based on the Soundfont 2
-specifications. FluidSynth reads and handles MIDI events from the MIDI
-input device. It is the software analogue of a MIDI synthesizer.
-FluidSynth can also play midifiles using a Soundfont.
+fluidsynth (software synthesizer)
 
-If you want to build support for ladspa plugins, you can pass
-LADSPA=yes to the script. That requires ladspa_sdk.
+FluidSynth is a software real-time synthesizer based on the Soundfont
+2 specifications. FluidSynth reads and handles MIDI events from the
+MIDI input device. It is the software analogue of a MIDI synthesizer.
+FluidSynth can also play MIDI files using a Soundfont.
 
-Optional deps are lash, portaudio, and jack.
+Optional dependencies: ladspa_sdk, lash, portaudio, jack, SDL2. These
+are autodetected at build time, but can be disabled via the environment.
+
+Build options (environment variables):
+
+JACK=yes|no      - support JACK audio output, if present. Default: yes.
+LADSPA=yes|no    - support LADSPA plugins, if present. Default: yes.
+LASH=yes|no      - support LASH session management, if present. Default: yes.
+OSS=yes|no       - support old-style OSS audio output. Default: no.
+PORTAUDIO=yes|no - support PortAudio audio output, if present. Default: yes.
+PULSE=yes|no     - support PulseAudio audio output. Default: yes.
+SDL2=yes|no      - support SDL2 audio output, if present. Default: yes.
diff --git a/audio/fluidsynth/fluidsynth.SlackBuild b/audio/fluidsynth/fluidsynth.SlackBuild
index 7cf814a89d0c..0a761f2ca365 100644
--- a/audio/fluidsynth/fluidsynth.SlackBuild
+++ b/audio/fluidsynth/fluidsynth.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for fluidsynth
 
 # Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200404 bkw: take over maintenance, update for v2.1.1
+
 PRGNAM=fluidsynth
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,11 +66,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 640 -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 {} \+
 
 mkdir build
 cd build
@@ -80,21 +80,26 @@ cd build
     -DLIB_SUFFIX="$LIBDIRSUFFIX" \
     -DDOC_INSTALL_DIR="doc" \
     -DMAN_INSTALL_DIR="man/man1" \
-    -Denable-ladspa="${LADSPA:-no}" \
+    -Denable-ladspa="${LADSPA:-yes}" \
+    -Denable-pulseaudio="${PULSE:-yes}" \
+    -Denable-oss="${OSS:-no}" \
+    -Denable-jack="${JACK:-yes}" \
+    -Denable-sdl2="${SDL2:-yes}" \
+    -Denable-portaudio="${PORTAUDIO:-yes}" \
+    -Denable-systemd=no \
     ..
 
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd -
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
+DOCS="AUTHORS ChangeLog COPYING NEWS README THANKS TODO CONTRIBUTING.md LICENSE README.md"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+for i in $DOCS; do
+  [ -e "$i" ] && cp -a "$i" $PKG/usr/doc/$PRGNAM-$VERSION
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/fluidsynth/fluidsynth.info b/audio/fluidsynth/fluidsynth.info
index d3b454c60f50..1dcf2e78a253 100644
--- a/audio/fluidsynth/fluidsynth.info
+++ b/audio/fluidsynth/fluidsynth.info
@@ -1,10 +1,10 @@
 PRGNAM="fluidsynth"
-VERSION="1.1.6"
+VERSION="2.1.1"
 HOMEPAGE="http://www.fluidsynth.org/"
-DOWNLOAD="http://downloads.sourceforge.net/fluidsynth/fluidsynth-1.1.6.tar.gz"
-MD5SUM="ae5aca6de824b4173667cbd3a310b263"
+DOWNLOAD="https://github.com/FluidSynth/fluidsynth/archive/v2.1.1/fluidsynth-2.1.1.tar.gz"
+MD5SUM="165902909092c818a24517de6a4f2f83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/audio/fluidsynth/slack-desc b/audio/fluidsynth/slack-desc
index 46df5825cd38..4228b2cd1d4e 100644
--- a/audio/fluidsynth/slack-desc
+++ b/audio/fluidsynth/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-fluidsynth: fluidsynth (Software Synthesizer)
+fluidsynth: fluidsynth (software synthesizer)
 fluidsynth:
 fluidsynth: FluidSynth is a software real-time synthesizer based on the
 fluidsynth: Soundfont 2 specifications. FluidSynth reads and handles MIDI
 fluidsynth: events from the MIDI input device. It is the software analogue
-fluidsynth: of a MIDI synthesizer. FluidSynth can also play midifiles
+fluidsynth: of a MIDI synthesizer. FluidSynth can also play MIDI files
 fluidsynth: using a Soundfont.
 fluidsynth:
 fluidsynth: Homepage: http://www.fluidsynth.org/