diff options
| -rw-r--r-- | games/jfsw_hires_pack/README | 18 | ||||
| -rw-r--r-- | games/jfsw_hires_pack/jfsw_hires_pack.SlackBuild | 53 | ||||
| -rw-r--r-- | games/jfsw_hires_pack/jfsw_hires_pack.info | 12 | ||||
| -rw-r--r-- | games/jfsw_hires_pack/slack-desc | 12 | ||||
| -rw-r--r-- | games/jfsw_hires_pack/svn2tarxz.sh | 28 |
5 files changed, 72 insertions, 51 deletions
diff --git a/games/jfsw_hires_pack/README b/games/jfsw_hires_pack/README index b606accb6d..7f7d5afcb9 100644 --- a/games/jfsw_hires_pack/README +++ b/games/jfsw_hires_pack/README @@ -1,14 +1,8 @@ -jfsw_hires_pack (graphic enhancements for jfsw) +jfsw_hires_pack (graphic enhancements for jfsw and voidsw) -This adds high resolution textures and 3D models to Shadow Warrior. For -use with slackbuilds.org jfsw package. +This adds high resolution textures and 3D models to Shadow +Warrior. For use with slackbuilds.org jfsw or eduke32 packages. -*** NOTE: -*** The data file "sw.grp" from the full retail version is *required* -*** to use this package; it will NOT work with the shareware/demo -*** version. If you get a segfault at startup, the game is using the -*** shareware sw.grp. - -If you have jfsw_demo_data installed, remove it with removepkg, and copy -sw.grp from the full version to "/usr/share/games/jfsw/sw.grp". If you -do not have the full version of the game, you can't use this package! +There is a known issue with jfsw: the sword doesn't display +properly. It looks like half a sword. This has been a known issue for +some time now. diff --git a/games/jfsw_hires_pack/jfsw_hires_pack.SlackBuild b/games/jfsw_hires_pack/jfsw_hires_pack.SlackBuild index 31798e3ce8..4efbd4ffc8 100644 --- a/games/jfsw_hires_pack/jfsw_hires_pack.SlackBuild +++ b/games/jfsw_hires_pack/jfsw_hires_pack.SlackBuild @@ -6,18 +6,22 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20211030 bkw: update for v20201205_r21. +# - source is now made from upstream SVN, see svn2tarxz.sh. +# - HRP works with shareware .grp now, get rid of warning. +# - use correct homepage. +# - fix CRLF endings in docs. +# - add README note about the truncated sword. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jfsw_hires_pack -VERSION=${VERSION:-2.1} +VERSION=${VERSION:-20201205_r21} 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,34 +31,31 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -ZIPFILE1=Sw_Hrp_v$( echo $VERSION | sed 's/\.//g' ).zip -ZIPFILE2=Swp_Users.zip - set -e rm -rf $PKG -mkdir -p $PKG/usr/share/games/jfsw $OUTPUT -cd $PKG/usr/share/games/jfsw -unzip $CWD/Sw_Hrp_v21.zip -unzip $CWD/Swp_Users.zip -unzip Sw_Hrp.zip -rm -f Sw_Hrp.zip - -# The HRP was built on Windows (non-case-sensitive filesystem). Have to -# fix a few things to get it working on a proper filesystem. -mv highres/Sw.def sw.def -mv User.def user.def -rename KVX kvx highres/sprites/voxels/*.KVX -# TODO: what about highres/skyboxes/Sky_Stars ? - +mkdir -p $PKG/usr/share/games $OUTPUT +cd $PKG/usr/share/games +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +mv $PRGNAM-$VERSION jfsw +cd jfsw chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find . -type f -exec chmod 644 {} \+ +find . -type d -exec chmod 755 {} \+ + +rm -f *.bat + +# jfsw will read <foo>.def whenever it loads <foo>.grp. it also +# always reads sw.def. so this seems to be the correct way to +# name these so they'll get auto-loaded. +mv tdragon.def td.def +mv wanton.def wd.def + +# TODO: what about highres/skyboxes/Sky_Stars? Nothing in any of the +# .def files references it. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +sed -i 's,\r,,' *.txt mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/games/jfsw_hires_pack/jfsw_hires_pack.info b/games/jfsw_hires_pack/jfsw_hires_pack.info index 10bb9ac457..9450b3ac71 100644 --- a/games/jfsw_hires_pack/jfsw_hires_pack.info +++ b/games/jfsw_hires_pack/jfsw_hires_pack.info @@ -1,12 +1,10 @@ PRGNAM="jfsw_hires_pack" -VERSION="2.1" -HOMEPAGE="http://www.proasm.com/sw/swdls.html" -DOWNLOAD="http://www.proasm.com/files/sw/Sw_Hrp_v21.zip \ - http://www.proasm.com/files/sw/Swp_Users.zip" -MD5SUM="6163810b5aae667676ebcb27c93e7584 \ - 8305574a636f091ab8f14fccc9478a5f" +VERSION="20201205_r21" +HOMEPAGE="https://forums.duke4.net/topic/3412-shadow-warrior-high-resolution-pack/" +DOWNLOAD="https://slackware.uk/~urchlay/src/jfsw_hires_pack-20201205_r21.tar.xz" +MD5SUM="ff7879eeeff77170ccd08eb07d11c051" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jfsw" +REQUIRES="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/games/jfsw_hires_pack/slack-desc b/games/jfsw_hires_pack/slack-desc index 460ac770e2..a62f2ede67 100644 --- a/games/jfsw_hires_pack/slack-desc +++ b/games/jfsw_hires_pack/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -jfsw_hires_pack: jfsw_hires_pack (graphic enhancements for jfsw) +jfsw_hires_pack: jfsw_hires_pack (graphic enhancements for jfsw and voidsw) jfsw_hires_pack: -jfsw_hires_pack: This adds high resolution textures and 3D models to Shadow Warrior. +jfsw_hires_pack: This adds high resolution textures and 3D models to Shadow +jfsw_hires_pack: Warrior. For use with slackbuilds.org jfsw or eduke32 packages. jfsw_hires_pack: -jfsw_hires_pack: *** NOTE: -jfsw_hires_pack: *** The data file "sw.grp" from the full retail version is *required* -jfsw_hires_pack: *** to use this package; it will NOT work with the shareware/demo -jfsw_hires_pack: *** version. +jfsw_hires_pack: There is a known issue with jfsw: the sword doesn't display +jfsw_hires_pack: properly. It looks like half a sword. This has been a known issue for +jfsw_hires_pack: some time now. jfsw_hires_pack: jfsw_hires_pack: jfsw_hires_pack: diff --git a/games/jfsw_hires_pack/svn2tarxz.sh b/games/jfsw_hires_pack/svn2tarxz.sh new file mode 100644 index 0000000000..a6fcf3eedb --- /dev/null +++ b/games/jfsw_hires_pack/svn2tarxz.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# create a source tarball from upstream's SVN repo. +# this would be easier, with git. + +PRGNAM=jfsw_hires_pack +URL=http://svn.eduke32.com/sw_hrp/ + +rm -rf sw_hrp +svn co $URL + +cd sw_hrp + +svn log -l 1 | grep '^r[0-9]' > logtmp + +DATE=$( grep '^r[0-9]' logtmp | cut -d'|' -f3 | cut -d' ' -f2 | sed 's,-,,g' ) +REV=$( cut -d' ' -f1 logtmp ) +VERSION="${DATE}_$REV" +DIR=$PRGNAM-$VERSION + +rm -rf .svn logtmp + +cd - +rm -rf $DIR $DIR.tar.xz +mv sw_hrp $DIR +tar cvfJ $DIR.tar.xz $DIR +echo +md5sum $DIR.tar.xz |