5 files changed, 81 insertions, 43 deletions
diff --git a/games/gzdoom/README b/games/gzdoom/README
index f39aa56fb1..9e7b2ff387 100644
--- a/games/gzdoom/README
+++ b/games/gzdoom/README
@@ -1,37 +1,12 @@
 Enhanced OpenGL port of the official DOOM source code that also supports
 Heretic, Hexen, and Strife.
 
-fluidsynth is an optional (autodetected) compile-time dependency.
-See below for optional runtime dependencies.
+Optional compile-time dependency: fluidsynth (autodetected).
 
-gzdoom is only a game engine. To actually play the game, you'll need
-the game data (IWAD file) from one of the supported games. These include
-Doom, Ultimate Doom, Final Doom, FreeDoom, Heretic, Hexen, and Strife.
-Place the .wad file(s) in /usr/share/games/doom.
+See README_SBo.txt for optional runtime dependencies.
 
-If you don't own any of the supported games, you can install one or more
-of these slackbuilds.org packages to get a playable game:
+*Note: if you're upgrading from gzdoom-1.5.x, the config file location
+has changed. To keep your old settings:
 
-freedoom, doom_shareware_data, heretic_shareware_data, hexen_demo_data
-
-To hear the in-game music, there are several options. In the game menu,
-select "Options | Sound Options" and set "MIDI Device" to one of the
-below:
-
-FMOD (the default) - Install ff8dls and set the console variable
-snd_midipatchset to "/usr/share/sounds/dls/ff8.dls" (from the in-game
-console or by editing ~/.gzdoom/zdoom.ini). Alternatively,
-if you dual-boot with Windows, use something like
-/dosC/windows/system32/drivers/gm.dls (replace dosC with the mountpoint
-of your C: drive in Windows).
-
-FluidSynth - Install fluidsynth (before building gzdoom) and fluid-soundfont.
-
-Timidity - Install TiMidity++ and either eawpats or freepats, and set up
-/etc/timidity/timidity.cfg to use it.
-
-GUS or OPL - Nothing extra required; these are software emulations of
-classic soundcards from the early 1990s.
-
-While you're in the Sound Options menu, it's probably a good idea to set
-"Output System" to "ALSA" (otherwise, the default will use OSS emulation).
+  mkdir -p ~/.config/gzdoom
+  cp ~/.gzdoom/zdoom.ini ~/.config/gzdoom
diff --git a/games/gzdoom/README_SBo.txt b/games/gzdoom/README_SBo.txt
new file mode 100644
index 0000000000..97055257e0
--- /dev/null
+++ b/games/gzdoom/README_SBo.txt
@@ -0,0 +1,40 @@
+Game Data
+---------
+gzdoom is only a game engine. To actually play the game, you'll need the
+game data (IWAD file) from one or more of the supported games. These
+include Doom, Ultimate Doom, Final Doom, FreeDoom, Heretic, Hexen,
+and Strife.  Place the .wad file(s) in /usr/share/games/doom.
+
+If you don't own any of the supported games, you can install one or more
+of these slackbuilds.org packages to get a playable game:
+
+freedoom, doom_shareware_data, heretic_shareware_data, hexen_demo_data
+
+Music Support
+-------------
+To hear the in-game music, there are several options. In the game menu,
+select "Options | Sound Options" and set "MIDI Device" to one of the
+below:
+
+1. FMOD (the default) - Install ff8dls and set the console variable
+snd_midipatchset to "/usr/share/sounds/dls/ff8.dls" (from the in-game
+console or by editing ~/.config/gzdoom/zdoom.ini). Alternatively,
+if you dual-boot with Windows, use something like
+/dosC/windows/system32/drivers/gm.dls (replace dosC with the mountpoint
+of your C: drive in Windows).
+
+2. FluidSynth - Install fluidsynth (before building gzdoom) and
+fluid-soundfont.
+
+3. Timidity - Install TiMidity++ and either eawpats or freepats, and
+set up /etc/timidity/timidity.cfg to use it.
+
+4. GUS or OPL - Nothing extra required; these are software emulations
+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 8a2787134e..98d93b1ebe 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,8 +6,27 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 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
+
+# A note about the source: upstream doesn't do release tarballs. The source
+# is only available via SVN. Every release before 1.7.01 has a tag in the
+# SVN tree, but 1.7.01 does not. What I did to get the 1.7.01 source was
+# to download the windows exe for 1.7.01 and use strings on it, to find its
+# SVN revision, then checked out that revision and made a tarball of it.
+# gzdoom's build process requires it to be built from an SVN checkout: It
+# uses the .svn stuff to define a SVN_REVISION variable, and if you use
+# 'svn export' instead, you end up with a gzdoom that announces itself as
+# revision 0 (shows up in the console and titlebar of the window). Also the
+# SVN revision is used to check savegame compatibility, so it's not just
+# cosmetic.
+
 PRGNAM=gzdoom
-VERSION=${VERSION:-1.5.06}
+VERSION=${VERSION:-1.7.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,8 +80,8 @@ sed -i \
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
+    -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 \
@@ -90,6 +109,10 @@ cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README_SBo.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
+
+# Fix DOS CRLF line endings
+sed -i 's/\r//' $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index fa9751b190..dfde1700dd 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,8 +1,8 @@
 PRGNAM="gzdoom"
-VERSION="1.5.06"
+VERSION="1.7.01"
 HOMEPAGE="http://www.osnanet.de/c.oelckers/gzdoom/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gzdoom-1.5.06.tar.gz"
-MD5SUM="6ac9218975bdd2dca7c2859344d96cb9"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gzdoom-1.7.01.tar.gz"
+MD5SUM="532295da51529326154ed70517dae1eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fmodapi"
diff --git a/games/gzdoom/slack-desc b/games/gzdoom/slack-desc
index 74461f2714..11f9366952 100644
--- a/games/gzdoom/slack-desc
+++ b/games/gzdoom/slack-desc
@@ -1,15 +1,15 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
 gzdoom: gzdoom (OpenGL port of DOOM)
 gzdoom:
 gzdoom: Enhanced OpenGL port of the official DOOM source code that also
-gzdoom: supports Heretic, Hexen, and Strife
+gzdoom: supports Heretic, Hexen, and Strife.
 gzdoom:
 gzdoom:
 gzdoom: