games/wargus: Updated for version 2.3.0.

5 files changed, 33 insertions, 14 deletions

diff --git a/games/wargus/README b/games/wargus/README
index 92c53e38bba0..f521a2595563 100644
--- a/games/wargus/README
+++ b/games/wargus/README
@@ -6,3 +6,6 @@ You need the original Warcraft II for DOS or the Beyond the Dark
 Portal expansion pack to extract the game data files. See the file
 README_Slackware.txt for full instructions. If you don't read the
 instructions, you won't get a playable game.
+
+Upgrade note: dependencies have changed. Read wargus.info and
+README_Slackware.txt even if you don't think you need to!
diff --git a/games/wargus/README_Slackware.txt b/games/wargus/README_Slackware.txt
index 21dde23718a6..98667a3ab71c 100644
--- a/games/wargus/README_Slackware.txt
+++ b/games/wargus/README_Slackware.txt
@@ -9,6 +9,18 @@ installed stratagus package. In practice this won't be a problem if
 you use SlackBuilds.org for both (because both will get updated at the
 same time).
 
+Upgrade Notes
+-------------
+
+The dependencies for in-game music have changed. wargus 2.2.x
+used TiMidity++ and eawpats. Starting with 2.3.0, fluidsynth and
+fluid-soundfont are used instead.
+
+If you're upgrading from a previous version of wargus, you may have
+to delete your old preferences directory:
+
+  rm -rf ~/.stratagus/wc2
+
 Slackware Note
 --------------
 
@@ -27,9 +39,9 @@ The general consensus seems to be, changing makepkg isn't going to happen.
 SlackBuilds.org Note
 --------------------
 
-In the .info file, stratagus, ffmpeg2theora, TiMidity++, and eawpats
-are listed as requirements. Only stratagus is a runtime requirement,
-the others are only required at build time (matters if you're deploying
+In the .info file, stratagus, ffmpeg2theora, fluidsynth, and
+fluid-soundfont are listed as requirements. ffmpeg2theora is only required
+at build time; the others required at runtime (matters if you're deploying
 on a host other than the build host).
 
 Game Data
@@ -78,13 +90,10 @@ this, and later decide to remove wargus, you'll have to manually rm -rf
 
 For game data extraction to work, you will need:
 
-- a working install of TiMidity++ configured to use eawpats (check
-/etc/timidity.cfg; freepats may work instead).
-
 - ffmpeg2theora
 
 - if you're extracting from a 7zip or rar archive, you'll need p7zip
-or unrar.
+  or unrar.
 
 Extraction takes a while, depending on your CPU speed. It renders all the
 game's MIDI music as wav files, transcodes those to .ogg, then transcodes
diff --git a/games/wargus/extract-warcraft2 b/games/wargus/extract-warcraft2
index 6ede653d18f3..c99ceabc51a4 100644
--- a/games/wargus/extract-warcraft2
+++ b/games/wargus/extract-warcraft2
@@ -118,7 +118,8 @@ if [ "$FOUND" != "yes" ]; then
 fi
 
 mkdir -p $DEST
-"$WARTOOL" -m -v $ROPT "$DATADIR" "$DEST"
+# 20150510 bkw: wartool lost its -m option since last update.
+"$WARTOOL" -v $ROPT "$DATADIR" "$DEST"
 
 if [ "$MOUNTED" != "" ]; then
   umount "$MOUNTED"
diff --git a/games/wargus/wargus.SlackBuild b/games/wargus/wargus.SlackBuild
index ffe80c1a8013..60f39df407e9 100644
--- a/games/wargus/wargus.SlackBuild
+++ b/games/wargus/wargus.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=wargus
-VERSION=${VERSION:-2.2.7}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,6 +53,12 @@ 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 {} \;
 
+# 20150511 bkw: upstream hardcodes a particular soundfont but
+# doesn't ship it. We'll use the one from fluid-soundfont.
+sed -i \
+  's,music/TimGM6mb.sf2,/usr/share/sounds/sf2/FluidR3_GM.sf2,' \
+  scripts/stratagus.lua
+
 mkdir -p build
 cd build
   cmake \
@@ -74,7 +80,7 @@ CONTAINS="does not contain"
 REDIST="This binary package may be redistributed."
 if [ -n "$GAMEDATA" ]; then
   WARTOOL=$PKG/usr/bin/wartool \
-    $CWD/extract-warcraft2 \
+    sh $CWD/extract-warcraft2 \
       "$GAMEDATA" \
       $PKG/usr/share/games/stratagus/$PRGNAM
   if [ "$?" = "0" ]; then
diff --git a/games/wargus/wargus.info b/games/wargus/wargus.info
index bb89d83b3df8..40760b1f53b7 100644
--- a/games/wargus/wargus.info
+++ b/games/wargus/wargus.info
@@ -1,10 +1,10 @@
 PRGNAM="wargus"
-VERSION="2.2.7"
+VERSION="2.3.0"
 HOMEPAGE="http://wargus.sourceforge.net/index.shtml"
-DOWNLOAD="https://launchpad.net/wargus/trunk/2.2.7/+download/wargus_2.2.7.orig.tar.gz"
-MD5SUM="115ad5f85d6e6e2078bafb2f95599d6b"
+DOWNLOAD="https://launchpad.net/wargus/trunk/2.3/+download/wargus_2.3.0.orig.tar.gz"
+MD5SUM="46d5d1b64d78efc3ddaab119e4a2ea33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="stratagus ffmpeg2theora TiMidity++ eawpats"
+REQUIRES="stratagus ffmpeg2theora fluidsynth fluid-soundfont"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"