games/gzdoom: Updated for version 3.1.0.

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

1 files changed, 16 insertions, 61 deletions

diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index c024f5d97e..b9f3a6a28d 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,53 +6,19 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# 20170324 bkw:
-# - Updated for 2.4.0.
-
-# 20170207 bkw:
-# - BUILD=2
-# - Get rid of private fmodapi, now that the SBo fmodapi has been updated
-#   to a new enough version. Re-add fmodapi to REQUIRES.
-# - Fix download link so we always get the correct filename.
-
-# 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.
-
-# 20160803 bkw:
-# - Updated for 2.1.1. Also for 1.9.1 and 1.8.09 (see README_versions.txt)
-# - Update .info for new HOMEPAGE
-# - Upstream's now doing releases on github, so README.source is
-#   no longer needed.
-# - Install executable in /usr/games, not /usr/bin
-# - Get rid of -j1 on make command (parallel builds work now)
-# - Make the game version show up in the window title, instead
-#   of <unknown version>.
-# - Fix VERSIONSTR if it's wrong.
-# - i486 => i586
-
-# 20140305 bkw:
-# - Moved giant block comments about the source to README.source,
-#   updated them to reflect upstream's change from svn to git.
-# - Updated for 1.8.2 (sort-of; see README.source)
-
-# 20130612 bkw: Updated for 1.8.00
-
-# 20130416 bkw:
-# - Updated for 1.7.01
-# - Add README note about config file location change
-# - Split up giant README
-# - Fix CRLF endings in usr/doc/gzdoom-*/*
-# - Add WTFPL
+# 20170608 bkw:
+# - Updated for 3.1.0. fmodapi support has been removed by upstream, so
+#   it's no longer a dep.
+# - Add OpenAL as a dep. Technically it's not required, as gzdoom will
+#   happily compile & run without it... but it won't be able to make
+#   any sound at all. Nobody wants this. If you disagree with my decision
+#   to make OpenAL a hard dep, I don't want to hear about it (you won't
+#   be able to make sound anyway, so I won't have to...)
+# - Stop supporting old versions of gzdoom. The old versions are now
+#   supported as "gzdoom-legacy" for those that need them.
 
 PRGNAM=gzdoom
-VERSION=${VERSION:-2.4.0}
+VERSION=${VERSION:-3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -101,26 +67,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# fmodapi support tries to find its lib in the current dir, fix it:
-sed -i \
-  "s,setPluginPath(progdir),setPluginPath(\"/usr/lib$LIBDIRSUFFIX/$PRGNAM\")," \
-  src/sound/fmodsound.cpp
-
 # gzdoom in windowed mode wants to display its git tag and hash as part
 # of the window title. For releases this shows up as "<unknown version> 0",
 # which doesn't hurt anything but is ugly.
 # This makes the window title appear as e.g. "GZDOOM 2.1.1 (Aug 3 2016)". The
 # date is the build date.
 patch -p1 < $CWD/window_title_version.diff
-
-# Sometimes upstream forgets to bump the version number, so the window
-# title will read 1.8.08 for version 1.8.09, eg.
-sed -i "/#define *VERSIONSTR/s,\"[^\"]*\",\"$VERSION\"," src/version.h
+sed -i "/#define *VERSIONSTR/s,GIT_DESCRIPTION,\"$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
 
+# 3.1.0 started needing -DNDEBUG. Using ld.gold speeds up the final link
+# enough to be worth using (saves 17+ sec on my test box).
+SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold"
+
 mkdir -p build
 cd build
   cmake \
@@ -129,18 +91,11 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
-	 -DFMOD_LIBRARY=/usr/lib${LIBDIRSUFFIX}/libfmodex${LIBDIRSUFFIX}.so \
     -DCMAKE_BUILD_TYPE=Release ..
   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/
-
-  # If fmodapi support was compiled in:
-  if [ -e liboutput_sdl.so ]; then
-    mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
-    install -m0755 -s liboutput_sdl.so $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/liboutput_sdl.so
-  fi
 cd ..
 
 # .desktop written for this SlackBuild