games/eduke32_hires_pack: Updated for version 5.4.

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

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

3 files changed, 42 insertions, 34 deletions

diff --git a/games/eduke32_hires_pack/README b/games/eduke32_hires_pack/README
index 8c2d47cc4ec04..1b94e2aaedeea 100644
--- a/games/eduke32_hires_pack/README
+++ b/games/eduke32_hires_pack/README
@@ -1,3 +1,5 @@
+eduke32_hires_pack (Duke3D High Resolution Pack)
+
 The Duke3D High Resolution Pack allows you to use much better looking
 textures than the original game (released back in 1996) had to offer
 in the first place. It also introduces 3D model replacements for the
@@ -6,16 +8,31 @@ like JFDuke3D or EDuke32, this gives Duke Nukem 3D a modernized, more
 appealing look and even motivates Duke veterans to play through the
 original episodes once again.
 
+You'll need a high-end video card to use this at a decent framerate.
+
+The SC-55 Music Pack used to be optional; it's now always included.
+
 This package is intended for use with the eduke32 package from
 slackbuilds.org, but may also be used with other Duke3D source ports.
 
-Optionally, this package can include the EDuke32 Music Pack, which
-provides better-sounding music than the default MIDI soundtrack. To
-include the music pack, download the file from:
+To enable the HRP in the eduke32 launcher:
+
+- Enable the "Enable autoload folder" option.
+
+- Select an OpenGL video mode.
+
+- Enable the "Polymer" option.
+
+- In the "Game" tab, make sure you're playing either Duke Nukem 3D
+  Atomic Edition or Duke Nukem 3D Shareware.
+
+- Click "Start".
 
-http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip
+If you don't see the launcher (if eduke32 goes straight to the game),
+run "eduke32 -setup".
 
-...and save it in the same directory as the SlackBuild.
+These instructions also work for rednukem (from the nblood package),
+except that it requires symlinks to be created first:
 
-If you've installed this package, but for some reason want to run
-eduke32 without it, run "eduke32 -noautoload".
+  mkdir -p ~/.config/rednukem/autoload
+  ln -s /usr/share/games/eduke32/autoload/* ~/.config/rednukem/autoload
diff --git a/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild b/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild
index 633ba906730ad..d57c6a0321634 100644
--- a/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild
+++ b/games/eduke32_hires_pack/eduke32_hires_pack.SlackBuild
@@ -6,18 +6,22 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# Note: the SlackBuild maintainer (B. Watson) has now upgraded this
+# build past his hardware's ability to use it properly. I can't afford
+# to buy new hardware, so this runs at slide-show framerates on my
+# system. Consequently I haven't played much of the game with the HRP
+# enabled. If there are major issues, I can downgrade this back to the
+# previous version (4.0_321) version. Email me.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=eduke32_hires_pack
-VERSION=${VERSION:-4.0_321}
+VERSION=${VERSION:-5.4}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-# 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
@@ -27,9 +31,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-VERMAJOR=$( echo $VERSION | cut -d_ -f1 )
-VERMINOR=$( echo $VERSION | cut -d_ -f2 )
-ZIPFILE="dn3d_hrp-${VERMAJOR}(${VERMINOR}).zip"
+ZIPFILE="dn3d_hrp${VERSION/./}-sfx.exe"
 
 set -e
 
@@ -39,34 +41,23 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/$ZIPFILE
+7za x $CWD/$ZIPFILE autoload/\* \*.txt
 chown -R root:root .
 find . -type d | xargs chmod 755
 find . -type f | xargs chmod 644
 
 mkdir -p $PKG/usr/share/games/eduke32
-mv autoload $PKG/usr/share/games/eduke32/autoload
+mv autoload $PKG/usr/share/games/eduke32
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
-# If they have the music pack, include that too
-if [ -r $CWD/duke3d_music-sc55.zip ]; then
-  unzip -j $CWD/duke3d_music-sc55.zip readme/music_readme.txt
-  cat music_readme.txt > $PKG/usr/doc/$PRGNAM-$VERSION/music_readme.txt
-  cat $CWD/duke3d_music-sc55.zip > \
-    $PKG/usr/share/games/eduke32/autoload/duke3d.grp/duke3d_music-sc55.zip
-fi
-
+# De-windows-ize the docs
+sed -i 's,\r,,' *.txt
 cp *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 
-# De-windows-ize the docs
-sed -i -s -e "s/\\x92/'/g" \
-          -e 's/\x96/-/g' \
-          -e 's/\r//g' \
-          $PKG/usr/doc/$PRGNAM-$VERSION/*.txt
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/games/eduke32_hires_pack/eduke32_hires_pack.info b/games/eduke32_hires_pack/eduke32_hires_pack.info
index 858eabb6e594b..db69efd870439 100644
--- a/games/eduke32_hires_pack/eduke32_hires_pack.info
+++ b/games/eduke32_hires_pack/eduke32_hires_pack.info
@@ -1,10 +1,10 @@
 PRGNAM="eduke32_hires_pack"
-VERSION="4.0_321"
+VERSION="5.4"
 HOMEPAGE="http://hrp.duke4.net/"
-DOWNLOAD="http://www.duke4.org/files/hrp/dn3d_hrp-4.0(321).zip"
-MD5SUM="01ec2c1d9be94bcb556c910814f2b85f"
+DOWNLOAD="http://www.duke4.org/files/nightfright/hrp/dn3d_hrp54-sfx.exe"
+MD5SUM="2acf16b0c6113a69ab9194ae2bd21cbb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="p7zip"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"