diff options
| -rw-r--r-- | games/doomretro/doomretro.SlackBuild | 24 | ||||
| -rw-r--r-- | games/doomretro/doomretro.info | 6 | ||||
| -rw-r--r-- | games/doomretro/doomretro.sh | 51 |
3 files changed, 10 insertions, 71 deletions
diff --git a/games/doomretro/doomretro.SlackBuild b/games/doomretro/doomretro.SlackBuild index fa832a3ce2b3..8b8e2ceb5712 100644 --- a/games/doomretro/doomretro.SlackBuild +++ b/games/doomretro/doomretro.SlackBuild @@ -23,6 +23,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20211006 bkw: +# - update for v4.2.3. +# - get rid of wrapper script; game now picks an IWAD itself. # 20210224 bkw: update for v4.0.3 # 20200927 bkw: update for v3.6.1, reformat README to 72 chars # 20200804 bkw: update for v3.5.10 @@ -32,19 +35,10 @@ # - move binary to /usr/games # - include wrapper script -# *** RANT MODE ON*** -# Every Doom engine on the planet besides this one attempts to load *some* -# IWAD file, if you don't give it one on the command line. But this one is -# supposed to pop up a file dialog to let you choose one. Only the dialog -# code hasn't been ported to Linux. So for us, unlike *all other* Doom -# source ports, we *must* specify the IWAD file on the command line. So I -# have to use a wrapper script to make it act like a normal Doom engine... -# *** RANT MODE OFF*** - cd $(dirname $0) ; CWD=$(pwd) PRGNAM=doomretro -VERSION=${VERSION:-4.0.3} +VERSION=${VERSION:-4.2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,9 +51,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 @@ -113,10 +104,7 @@ cd build make install/strip DESTDIR=$PKG cd .. -mkdir -p $PKG/usr/games -mv $PKG/usr/bin/$PRGNAM $PKG/usr/games/$PRGNAM.bin -rm -rf $PKG/usr/bin -install -m0755 -oroot -groot $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM +mv $PKG/usr/bin $PKG/usr/games mkdir -p $PKG/usr/share/applications cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop @@ -126,6 +114,8 @@ convert res/$PRGNAM.ico[0] $PKG/usr/share/icons/hicolor/256x256/apps/$PRGNAM.png convert res/$PRGNAM.ico[1] $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png convert res/$PRGNAM.ico[2] $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png convert res/$PRGNAM.ico[3] $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png +mkdir -p $PKG/usr/share/pixmaps +ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CODEOWNERS LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/games/doomretro/doomretro.info b/games/doomretro/doomretro.info index 3795f10a7410..e8221179362d 100644 --- a/games/doomretro/doomretro.info +++ b/games/doomretro/doomretro.info @@ -1,8 +1,8 @@ PRGNAM="doomretro" -VERSION="4.0.3" +VERSION="4.2.3" HOMEPAGE="https://www.doomretro.com" -DOWNLOAD="https://github.com/bradharding/doomretro/archive/v4.0.3/doomretro-4.0.3.tar.gz" -MD5SUM="5277a9aa632f31d68729f5fa5ce9318f" +DOWNLOAD="https://github.com/bradharding/doomretro/archive/v4.2.3/doomretro-4.2.3.tar.gz" +MD5SUM="809a9f73b7892dca8e4103867fe85c93" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/doomretro/doomretro.sh b/games/doomretro/doomretro.sh deleted file mode 100644 index 71b6a0b4f82d..000000000000 --- a/games/doomretro/doomretro.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -# doomretro.sh by B. Watson. Part of the SlackBuilds.org doomretro build. -# Licensed under the WTFPL. - -# 20200414 bkw: doomretro on Linux doesn't open any IWAD file by default, -# and doesn't offer a file-chooser dialog. So this wrapper script tries -# to pick a suitable IWAD to use, if it can find one. Notice that this -# only happens if we're run with no arguments. - -# Can't use an absolute path for this, or else the engine expects to -# read doomretro.wad and write doomretro.cfg to the same directory as -# the binary. -realbin=doomretro.bin - -if [ "$1" ]; then - # we got arguments, just use them as-is - exec $realbin "$@" -fi - -# no args, so try to find an IWAD and pass it as an arg to the real exe. -wadpath="$DOOMWADDIR:\ -$DOOMWADPATH:\ -.:\ -/usr/share/games/doom:\ -/usr/local/share/games/doom:\ -/usr/share/doomretro:\ -/usr/share/doom:\ -/usr/local/doom:\ -$HOME:\ -$HOME/doom:\ -$HOME/.doom:\ -$HOME/.doomwads" - -iwads="doom2.wad:doom.wad:doom1.wad" - -IFS=: -for dir in $wadpath; do - if [ -d "$dir" ]; then - for wad in $iwads; do - wad="$dir/$wad" - if [ -e "$wad" ]; then - echo "$( basename $0 ): Using $wad" 1>&2 - exec $realbin "$wad" - fi - done - fi -done - -# if we get, no wads found, let the real binary complain about it -exec $realbin |