games/wargus: Fix -current build.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 43 insertions, 27 deletions

diff --git a/games/wargus/README b/games/wargus/README
index e2da4ac6fd..5502062db7 100644
--- a/games/wargus/README
+++ b/games/wargus/README
@@ -2,7 +2,13 @@ wargus (Warcraft II data game set for the Stratagus engine)
 
 Wargus can be used to play Warcraft II from Blizzard Entertainment.
 
-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_SBo.txt
-for full instructions. If you don't read the instructions, you won't
-get a playable game.
+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_SBo.txt for full instructions. If you don't read the
+instructions, you won't get a playable game.
+
+Note: I am aware that this is not the latest version of wargus.
+However, it's the latest version I was able to actually play Warcraft
+II with, using either the MS-DOS original or expansion CDs. Later
+versions complain that the game data is missing/corrupt, right after
+extraction. At some point I will try to find out what the issue is.
diff --git a/games/wargus/README_SBo.txt b/games/wargus/README_SBo.txt
index 98667a3ab7..0ff13fb841 100644
--- a/games/wargus/README_SBo.txt
+++ b/games/wargus/README_SBo.txt
@@ -36,14 +36,6 @@ http://www.linuxquestions.org/questions/slackware-14/bug-in-makepkg-and-symlinks
 
 The general consensus seems to be, changing makepkg isn't going to happen.
 
-SlackBuilds.org Note
---------------------
-
-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
 ---------
 
@@ -72,6 +64,9 @@ export GAMEDATA=/tmp/warcraft2.iso       # image of CD
 
 ...then run ./wargus.SlackBuild
 
+Note: For game data extraction to work from a 7zip or rar archive,
+you'll need p7zip or unrar.
+
 If GAMEDATA isn't set, or if the extraction process fails, your wargus
 package won't include the game data. You'll be unable to play the game
 until you've extracted the data yourself.
@@ -85,15 +80,9 @@ If you build a package without the data:
 The extraction script used by the SlackBuild is installed as
 /usr/bin/extract-warcraft2 (run with no arguments for usage) and can
 be run any time without reinstalling the wargus package. If you do
-this, and later decide to remove wargus, you'll have to manually rm -rf
-/usr/share/games/stratagus/wargus after package removal.
-
-For game data extraction to work, you will need:
-
-- ffmpeg2theora
-
-- if you're extracting from a 7zip or rar archive, you'll need p7zip
-  or unrar.
+this, and later decide to remove wargus, you'll have to manually rm
+-rf /usr/share/games/stratagus/wargus after package removal... or you
+can extract the game data to ~/.stratagus/data.Wargus/ instead.
 
 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
@@ -101,4 +90,3 @@ all the game's videos to ogg theora.
 
 extract-warcraft2 is a wrapper for wartool, supplied with wargus. See
 the wartool man page for more information.
-
diff --git a/games/wargus/doinst.sh b/games/wargus/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/wargus/doinst.sh
+++ b/games/wargus/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/games/wargus/wargus.SlackBuild b/games/wargus/wargus.SlackBuild
index 0a4d71bc1e..b00cfe1e5d 100644
--- a/games/wargus/wargus.SlackBuild
+++ b/games/wargus/wargus.SlackBuild
@@ -6,13 +6,18 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211119 bkw: BUILD=2
+# - fix -current build.
+# - remove ffmpeg2theora dep.
+# - new-style icons.
+# - add README note about why this is stuck at an old version.
 # 20180915 bkw: updated for v2.4.1
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wargus
 VERSION=${VERSION:-2.4.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -24,9 +29,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -62,12 +64,16 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# 20211119 bkw: get rid of ffmpeg2theora dep, just call ffmpeg directly.
+patch -p1 < $CWD/wartool.ffmpeg.diff
+
 # 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
 
+SLKCFLAGS+=" -I/usr/include/harfbuzz"
 mkdir -p build
 cd build
   cmake \
@@ -84,6 +90,16 @@ for i in doc/*.6; do
   gzip -9c < $i > $PKG/usr/man/man6/$( basename $i ).gz
 done
 
+for px in 16 32 48 64; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $PRGNAM.png $dir/$PRGNAM.png
+done
+
+rm $PKG/usr/share/pixmaps/*
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
 # attempt to extract the game data files
 CONTAINS="does not contain"
 REDIST="This binary package may be redistributed."
diff --git a/games/wargus/wargus.info b/games/wargus/wargus.info
index 0d3daa3628..816c322418 100644
--- a/games/wargus/wargus.info
+++ b/games/wargus/wargus.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Wargus/wargus/archive/v2.4.1/wargus-2.4.1.tar.gz"
 MD5SUM="4a387868da26df4a4aebff19b6b7b6b1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="stratagus ffmpeg2theora fluid-soundfont"
+REQUIRES="stratagus fluid-soundfont"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"