4 files changed, 56 insertions, 40 deletions
diff --git a/libraries/fmodapi/README b/libraries/fmodapi/README
index 459c70a300abc..92fc2ea79639a 100644
--- a/libraries/fmodapi/README
+++ b/libraries/fmodapi/README
@@ -1,7 +1,8 @@
-fmodapi (FMODex: a cross platform audio library)
+fmodapi (a cross platform audio library)
 
-It let you easily implement the latest audio technologies into your
-title. No other  audio  library has such comprehensive, up  to date
-platform support. FMOD now  supports 12 platforms! FMOD is not only
-the best cross platform audio  engine for your needs, but it is the
-best audio engine available on each platform.
+Audio library, primarily intended for games, also known as FMODEX.
+Supports at least 12 platforms, including Linux, Windows, and OSX.
+
+fmodapi is proprietary software. Make sure you read the terms in
+/usr/doc/fmodapi-$VERSION/LICENSE.TXT before incorporating fmodapi into
+your project.
diff --git a/libraries/fmodapi/fmodapi.SlackBuild b/libraries/fmodapi/fmodapi.SlackBuild
index 7fa72ecfd1031..7a59e28d33b98 100644
--- a/libraries/fmodapi/fmodapi.SlackBuild
+++ b/libraries/fmodapi/fmodapi.SlackBuild
@@ -2,17 +2,36 @@
 
 # Slackware build script for fmodapi
 
-# Written by Pablo Santamaria (pablosantamaria@gmail.com)
+# Originally written by Pablo Santamaria (email removed)
+
+# Modified and now maintained by B. Watson <yalhcru@gmail.com>.
+# Original version had no license. Modified version released under
+# the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20170207 bkw:
+# - Take over maintenance, update for v4.44.61.
+# - Upstream's packaging has changed: 32-bit and 64-bit libs are now
+#   distributed in the same tarball. So this script can no longer
+#   build the old 4.28.17 version.
+# - Include examples in /usr/doc.
+# - Rewrite README and slack-desc so it reads less like the manufacturer's
+#   advertising and more like a factual description.
+
+# Newer versions also include something called the FMOD Designer API.
+# I'm not including it in this build because I'm not sure how it should
+# be packaged, and because none of the SBo builds that depend on fmodapi
+# use the designer API. If you need it, please let me know and I'll
+# revisit it.
 
 PRGNAM=fmodapi
-VERSION=${VERSION:-4.28.17}
+VERSION=${VERSION:-4.44.61}
 SRCVER=$( echo $VERSION | sed 's/\.//g' )
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,14 +42,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -39,9 +53,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}${SRCVER}linux${LIBDIRSUFFIX}
-tar xvf $CWD/${PRGNAM}${SRCVER}linux${LIBDIRSUFFIX}.tar.gz
-cd ${PRGNAM}${SRCVER}linux${LIBDIRSUFFIX}
+rm -rf ${PRGNAM}${SRCVER}linux
+tar xvf $CWD/${PRGNAM}${SRCVER}linux.tar.gz
+cd ${PRGNAM}${SRCVER}linux
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -49,19 +63,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-mkdir -p $PKG/usr/include/fmodex
+PKGLIB=$PKG/usr/lib${LIBDIRSUFFIX}
+LIBNAM=libfmodex$LIBDIRSUFFIX
+LIBNAML=libfmodexL$LIBDIRSUFFIX
+mkdir -p $PKGLIB
 
-( cd api/lib
-  cp -a libfmodex*.so* $PKG/usr/lib${LIBDIRSUFFIX}
-)
+cp -a api/lib/$LIBNAM-$VERSION.so api/lib/$LIBNAML-$VERSION.so $PKGLIB
+ln -s $LIBNAM-$VERSION.so $PKGLIB/$LIBNAM.so
+ln -s $LIBNAML-$VERSION.so $PKGLIB/$LIBNAML.so
 
-( cd api/inc
-  cp -a * $PKG/usr/include/fmodex
-)
+mkdir -p $PKG/usr/include/fmodex
+cp -a api/inc/* $PKG/usr/include/fmodex
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a documentation/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a documentation/* examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/fmodapi/fmodapi.info b/libraries/fmodapi/fmodapi.info
index 630a7bfd2116f..f6efdf7ee4ee7 100644
--- a/libraries/fmodapi/fmodapi.info
+++ b/libraries/fmodapi/fmodapi.info
@@ -1,10 +1,10 @@
 PRGNAM="fmodapi"
-VERSION="4.28.17"
+VERSION="4.44.61"
 HOMEPAGE="http://www.fmod.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/fmodapi42817linux.tar.gz"
-MD5SUM="4829a0d512e3637a239c669f3c51037e"
-DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/fmodapi42817linux64.tar.gz"
-MD5SUM_x86_64="d6d62b5392c3196a3365c8e9ecbd6ad4"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/fmodapi44461linux.tar.gz"
+MD5SUM="9f770e797c39192ff6cdb88dc05dd028"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Pablo Santamaria"
-EMAIL="pablosantamaria@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/fmodapi/slack-desc b/libraries/fmodapi/slack-desc
index 81500d78fd276..a8380b9ca6b96 100644
--- a/libraries/fmodapi/slack-desc
+++ b/libraries/fmodapi/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-fmodapi: fmodapi (FMODex: a cross platform audio library)
+fmodapi: fmodapi (a cross platform audio library)
+fmodapi:
+fmodapi: Audio library, primarily intended for games, also known as FMODEX.
+fmodapi: Supports at least 12 platforms, including Linux, Windows, and OSX.
+fmodapi:
+fmodapi:
 fmodapi:
-fmodapi: It let you easily implement the latest audio technologies into your
-fmodapi: title. No other  audio  library has such comprehensive, up  to date
-fmodapi: platform support. FMOD now  supports 12 platforms! FMOD is not only
-fmodapi: the best cross platform audio  engine for your needs, but it is the
-fmodapi: best audio engine available on each platform.
 fmodapi:
 fmodapi:
 fmodapi: