games/gzdoom: Updated for version 2.3.2.

4 files changed, 80 insertions, 12 deletions

diff --git a/games/gzdoom/README b/games/gzdoom/README
index 97118b21e64f..7ddc5bb1339b 100644
--- a/games/gzdoom/README
+++ b/games/gzdoom/README
@@ -1,7 +1,8 @@
 Enhanced OpenGL port of the official DOOM source code that also supports
 Heretic, Hexen, and Strife.
 
-Optional compile-time dependency: fluidsynth (autodetected).
+Optional compile-time dependencies: fluidsynth and OpenAL. These are
+auto-detected.
 
 See README_SBo.txt for optional runtime dependencies.
 
diff --git a/games/gzdoom/README_SBo.txt b/games/gzdoom/README_SBo.txt
index 97055257e058..9841cc83c522 100644
--- a/games/gzdoom/README_SBo.txt
+++ b/games/gzdoom/README_SBo.txt
@@ -10,6 +10,22 @@ of these slackbuilds.org packages to get a playable game:
 
 freedoom, doom_shareware_data, heretic_shareware_data, hexen_demo_data
 
+Sound Backend
+-------------
+The default sound backend is FMOD. If OpenAL was found when the package
+was built, it can be used instead of FMOD. From the main menu:
+
+Options -> Sound Options -> Sound Backend.
+
+If you have issues with positional audio, try switching to OpenAL. However,
+some mods (notably Brutal Doom) require FMOD for correct audio support.
+Unfortunately there are probably some other mods that only work with
+OpenAL :(
+
+If you use FMOD, set "FMOD Options -> Output System" to either "ALSA"
+or "PulseAudio". Otherwise, the default is OSS emulation, which doesn't
+share the soundcard nicely with other apps.
+
 Music Support
 -------------
 To hear the in-game music, there are several options. In the game menu,
@@ -33,8 +49,3 @@ set up /etc/timidity/timidity.cfg to use it.
 of classic soundcards from the early 1990s. They may sound "clunky" to
 modern ears, but they may also bring back fond memories for long-time
 Doom players.
-
-While you're in the Sound Options menu, it's probably a good idea to
-set "Output System" to "ALSA" (otherwise, the default is OSS emulation,
-which doesn't share the soundcard nicely with other apps).
-
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index a9a5738295fd..2976aa808b34 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170113 bkw:
+# - Updated for 2.3.2. 1.9.1 and 1.8.09 still work, too.
+# - Use newer version of fmodapi. Due to licensing confusion, the
+#   fmodapi version on SBo hasn't been upgraded in forever. So this
+#   build now uses its own dedicated fmodapi, which installs to
+#   a private directory (won't conflict with system fmodapi, if present).
+
 # 20160928 bkw:
 # - Updated for 2.2.0. 1.9.1 and 1.8.09 still work, too.
 
@@ -36,7 +43,7 @@
 # - Add WTFPL
 
 PRGNAM=gzdoom
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,6 +85,20 @@ tar xvf $CWD/$PRGNAM-g$VERSION.tar.gz || \
   tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
   tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-g$VERSION || cd $PRGNAM-$VERSION
+
+# See if fmodapi tarball is in script dir. If so, use it. We
+# currently support 2 versions of it: 4.44.50 and 4.44.61. These
+# are newer than the SBo fmodapi package, which is 4.28.17. You
+# could try a different fmodapi here (by editing the 'for' args),
+# but only for recent-ish fmodapi versions because this stuff
+# depends on both x86 and x86_64 being included in the fmodapi
+# tarball (which wasn't the case for 4.28.17 and earlier).
+for i in 44450 44461; do
+  [ -e $CWD/fmodapi${i}linux.tar.gz ] && fmodver=$i
+done
+
+[ -n "$fmodver" ] && tar xvf $CWD/fmodapi${fmodver}linux.tar.gz
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -85,6 +106,34 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Set up fmodapi, if present.
+if [ -n "$fmodver" ]; then
+  fmoddir=fmodapi${fmodver}linux
+
+  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM $PKG/usr/include/tmp
+
+  mv $fmoddir/api/lib/libfmodex$LIBDIRSUFFIX-*.so \
+     $fmoddir/api/lib/libfmodexL$LIBDIRSUFFIX-*.so \
+     $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+
+  mv $fmoddir/api/inc/* $PKG/usr/include/tmp
+
+  cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+    ln -s libfmodex$LIBDIRSUFFIX-*.so libfmodex$LIBDIRSUFFIX.so
+    ln -s libfmodexL$LIBDIRSUFFIX-*.so libfmodexL$LIBDIRSUFFIX.so
+  cd -
+
+  # These cmake args will cause cmake to ignore any fmodapi installed in
+  # the standard system locations. The -Wl,-rpath stuff is needed to get
+  # gzdoom to use the fmod we include here (at runtime), instead of the
+  # system-wide one in /usr/lib$LIBDIRSUFFIX.
+  fmod_cmake="\
+    -DFMOD_INCLUDE_DIR=$PKG/usr/include/tmp \
+    -DFMOD_LIBRARY=$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/libfmodex$LIBDIRSUFFIX.so \
+    -DCMAKE_EXE_LINKER_FLAGS='-Wl,-rpath=/usr/lib$LIBDIRSUFFIX/$PRGNAM'
+    -DCMAKE_MODULE_LINKER_FLAGS='-Wl,-rpath=/usr/lib$LIBDIRSUFFIX/$PRGNAM'"
+fi
+
 # fmodapi MIDI support tries to find its lib in the current dir, fix it:
 sed -i \
   "s,setPluginPath(progdir),setPluginPath(\"/usr/lib$LIBDIRSUFFIX/$PRGNAM\")," \
@@ -101,19 +150,21 @@ patch -p1 < $CWD/window_title_version.diff
 # title will read 1.8.08 for version 1.8.09, eg.
 sed -i "/#define *VERSIONSTR/s,\"[^\"]*\",\"$VERSION\"," src/version.h
 
+# This isn't currently used, but was in the past, and will be again I'm sure.
 [ -e $CWD/compilefix.$VERSION.diff ] && \
   patch -p1 < $CWD/compilefix.$VERSION.diff
 
 mkdir -p build
 cd build
   cmake \
+    $fmod_cmake \
     -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
     -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
-  make
+  make VERBOSE=1
   mkdir -p $PKG/usr/games $PKG/usr/share/games/doom
   install -m0755 -s $PRGNAM $PKG/usr/games/$PRGNAM
   install -m0644 *.pk3 $PKG/usr/share/games/doom/
@@ -125,6 +176,9 @@ cd build
   fi
 cd ..
 
+# gzdoom doesn't install any headers; this is for the fmod hackery.
+rm -rf $PKG/usr/include
+
 # .desktop written for this SlackBuild
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index d572d5506140..e1047f41ea49 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,10 +1,12 @@
 PRGNAM="gzdoom"
-VERSION="2.2.0"
+VERSION="2.3.2"
 HOMEPAGE="http://gzdoom.drdteam.org/"
-DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g2.2.0.tar.gz"
-MD5SUM="4415ed80f30ba53ad525cbe6b39804e4"
+DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g2.3.2.tar.gz \
+          http://ponce.cc/slackware/sources/repo/fmodapi44461linux.tar.gz"
+MD5SUM="5e270c82c4e3f7b1620199aee41f7b56 \
+        9f770e797c39192ff6cdb88dc05dd028"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2 fmodapi"
+REQUIRES="SDL2"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"