From 4ef8aa3c658088889eae38d5c70ab86f0c50c9cf Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Wed, 3 Nov 2021 01:48:33 -0400 Subject: [PATCH] games/ds-models: Remove gzdoom support since it was broken. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/ds-models/README | 36 +++++++++++----------------- games/ds-models/ds-models.SlackBuild | 35 ++++++++++++++------------- games/ds-models/slack-desc | 10 ++++---- 3 files changed, 38 insertions(+), 43 deletions(-) diff --git a/games/ds-models/README b/games/ds-models/README index ce09d97619..2d2050728d 100644 --- a/games/ds-models/README +++ b/games/ds-models/README @@ -1,33 +1,25 @@ -ds-models (3D model packs for gzdoom and skulltag) +ds-models (3D model packs for skulltag) -ds-models allows playing Doom, Heretic, and Hexen with OpenGL and 3D -models, which gives it a much more modern look. +ds-models allows Skulltag to play Doom, Heretic, and Hexen with OpenGL +and 3D models, which gives it a much more modern look. -This model set is released by -=Dark-Assassin=- on the -SkullTag forum. For more information, see the forum thread at -http://www.skulltag.com/forum/viewtopic.php?f=13&t=24238 - -If you never plan to use models with skulltag, passing SKULLTAG=no to -the build script will omit the skulltag-specific models. The resulting -package with be approximately 30% smaller. There's also a GZDOOM=no -option, but it won't make the package smaller (skulltag still requires -the gzdoom models, so they'll still be included). +This model set was released by -=Dark-Assassin=- on the SkullTag +forum. As of r15, ds-models supports Zandronum, but there's no SlackBuild for Zandronum yet, so no support for it here (yet). -This includes scripts "ds-gzdoom" and "ds-skulltag" for starting gzdoom -or skulltag with the models preloaded. +This includes a script called "ds-skulltag" for starting skulltag with +the models preloaded. -To make gzdoom or skulltag always use the models, edit -~/.config/gzdoom/zdoom.ini and/or ~/.skulltag/skulltag.ini and add the -following lines under the [Global.Autoload] marker: +To make skulltag always use the models, edit and/or +~/.skulltag/skulltag.ini and add the following lines under the +[Global.Autoload] marker: -# for both gzdoom and skulltag: Path=/usr/share/games/doom/GZ-Models.pk3 - -# for skulltag only, also add: Path=/usr/share/games/doom/ST-Models.pk3 -Note that the models will only be displayed if gzdoom/skulltag is using -the OpenGL renderer (Options | Display Options in the in-game menu). +Note that the models will only be displayed if skulltag is using the +OpenGL renderer (Options | Display Options in the in-game menu). + +Note: gzdoom doesn't display these models properly. diff --git a/games/ds-models/ds-models.SlackBuild b/games/ds-models/ds-models.SlackBuild index 8e048ee7b6..8426d2e603 100644 --- a/games/ds-models/ds-models.SlackBuild +++ b/games/ds-models/ds-models.SlackBuild @@ -6,26 +6,32 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. -# 20140324 bkw: -# Updated for version r15 -# fixed typos in README -# fixed .def files for recent gzdoom +# Note to self: find and package a decent model pack that works +# properly with current gzdoom versions. If such a thing exists. +# Initial searching and testing indicates maybe not... + +# 20211103 bkw: BUILD=4 +# - fix script being installed to nonexistant /usr/games. +# - remove gzdoom support, since neither gzdoom nor gzdoom-legacy +# works with these models. # 20160810 bkw: # - bump BUILD because: # - install scripts in /usr/games, not /usr/bin +# 20140324 bkw: +# Updated for version r15 +# fixed typos in README +# fixed .def files for recent gzdoom + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ds-models VERSION=${VERSION:-r15} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} 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 @@ -40,8 +46,8 @@ ARCH=noarch # Which game(s) to support? # As of r15, Zandronum is also supported, but as there's no SBo build for # it, I won't bother. -SKULLTAG=${SKULLTAG:-yes} -GZDOOM=${GZDOOM:-yes} +SKULLTAG=yes +GZDOOM=no if [ "$SKULLTAG" != "yes" -a "$GZDOOM" != "yes" ]; then echo "You've set both SKULLTAG=no and GZDOOM=no; nothing to package." @@ -51,17 +57,14 @@ fi set -e rm -rf $PKG -mkdir -p $TMP $PKG/usr/{share/games/doom,bin,doc/$PRGNAM-$VERSION} $OUTPUT +mkdir -p $TMP $PKG/usr/{share/games/doom,games,doc/$PRGNAM-$VERSION} $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION 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 -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # The only script provided upstream is for skulltag + gzdoom in one pk3, which # will only work with skulltag. So we build our own individual skulltag and diff --git a/games/ds-models/slack-desc b/games/ds-models/slack-desc index d3a732ba63..2201269041 100644 --- a/games/ds-models/slack-desc +++ b/games/ds-models/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -ds-models: ds-models (3D model packs for gzdoom and skulltag) +ds-models: ds-models (3D model packs for skulltag) ds-models: ds-models: ds-models allows playing Doom, Heretic, and Hexen with OpenGL and 3D ds-models: models, which gives it a much more modern look. ds-models: -ds-models: This model set is released by -=Dark-Assassin=- on the -ds-models: SkullTag forum. For more information, see the forum thread at -ds-models: http://www.skulltag.com/forum/viewtopic.php?f=13&t=24238 +ds-models: This model set was released by -=Dark-Assassin=- on the +ds-models: SkullTag forum. +ds-models: +ds-models: ds-models: -ds-models: This package built with support for @GAME@. ds-models: