4 files changed, 29 insertions, 28 deletions
diff --git a/audio/alsamodularsynth/README b/audio/alsamodularsynth/README
index 074697ec01..0ca1a4a19f 100644
--- a/audio/alsamodularsynth/README
+++ b/audio/alsamodularsynth/README
@@ -1,5 +1,5 @@
-AlsaModularSynth is a realtime modular synthesizer and effect processor. It
-features MIDI controlled modular software synthesis, Realtime effect processing
-with capture from e.g. "Line In" or "Mic In", Full control of all synthesis and
-effect parameters via MIDI, Integrated LADSPA Browser with search capability
-and JACK Support.
+AlsaModularSynth is a realtime modular synthesizer and effect
+processor. It features MIDI controlled modular software synthesis,
+Realtime effect processing with capture from e.g. "Line In" or "Mic
+In", Full control of all synthesis and effect parameters via MIDI,
+Integrated LADSPA Browser with search capability and JACK Support.
diff --git a/audio/alsamodularsynth/alsamodularsynth.SlackBuild b/audio/alsamodularsynth/alsamodularsynth.SlackBuild
index 60c79fccb5..566d97e216 100644
--- a/audio/alsamodularsynth/alsamodularsynth.SlackBuild
+++ b/audio/alsamodularsynth/alsamodularsynth.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ALSA Modular Synth
 
@@ -22,28 +22,38 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=alsamodularsynth
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 TARNAM=ams
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,7 +73,6 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TARNAM-$VERSION
 tar xvf $CWD/$TARNAM-$VERSION.tar.bz2
-patch -p0 < $CWD/configure.patch
 cd $TARNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -72,6 +81,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export CC=clang
+export CXX=clang++
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LIBS="-ldl" \
@@ -102,4 +114,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/alsamodularsynth/alsamodularsynth.info b/audio/alsamodularsynth/alsamodularsynth.info
index c747d0e582..2ec88a76b4 100644
--- a/audio/alsamodularsynth/alsamodularsynth.info
+++ b/audio/alsamodularsynth/alsamodularsynth.info
@@ -1,10 +1,10 @@
 PRGNAM="alsamodularsynth"
-VERSION="2.1.2"
+VERSION="2.2.0"
 HOMEPAGE="http://alsamodular.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/alsamodular/files/alsamodular/2.1.2/ams-2.1.2.tar.bz2"
-MD5SUM="dfab2bb64da98558273c46675ea9a43f"
+DOWNLOAD="https://sourceforge.net/projects/alsamodular/files/alsamodular/2.2.0/ams-2.2.0.tar.bz2"
+MD5SUM="bebfd56543bdbdccaeb9e9be65589472"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit clalsadrv ladspa_sdk"
+REQUIRES="jack clalsadrv ladspa_sdk"
 MAINTAINER="fuzzix"
 EMAIL="fuzzix@gmail.com"
diff --git a/audio/alsamodularsynth/configure.patch b/audio/alsamodularsynth/configure.patch
deleted file mode 100644
index 5eb932b67a..0000000000
--- a/audio/alsamodularsynth/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ams-2.1.2/configure.old	2016-11-05 22:20:32.871586260 +0000
-+++ ams-2.1.2/configure	2016-11-05 22:20:46.776496504 +0000
-@@ -6360,7 +6360,7 @@
- #define HAVE_LIBQTOPENGL 1
- _ACEOF
- 
--  LIBS="-lQtOpenGL $LIBS"
-+  LIBS=" -lQtOpenGL $LIBS"
- 
- else
-   as_fn_error $? "QtOpenGL is required" "$LINENO" 5