summaryrefslogtreecommitdiffstats
path: root/games/odamex
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2020-10-24 17:39:54 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2020-10-31 11:15:35 +0700
commitdc3c47b63a459131189c3bc7c3c19f9344f5d7ff (patch)
treebab0e0423010501ba43d27f56bcd33c7571e0700 /games/odamex
parentae3417f3723eea2cb473ba7fc2fd9d020fd0ec75 (diff)
downloadslackbuilds-dc3c47b63a459131189c3bc7c3c19f9344f5d7ff.tar.gz
slackbuilds-dc3c47b63a459131189c3bc7c3c19f9344f5d7ff.tar.xz
games/odamex: Updated for version 0.8.3.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games/odamex')
-rw-r--r--games/odamex/odamex.SlackBuild15
-rw-r--r--games/odamex/odamex.info6
2 files changed, 15 insertions, 6 deletions
diff --git a/games/odamex/odamex.SlackBuild b/games/odamex/odamex.SlackBuild
index 343e24968b..539ae20d6a 100644
--- a/games/odamex/odamex.SlackBuild
+++ b/games/odamex/odamex.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20201024 bkw: update for v0.8.3.
# 20191201 bkw: update for v0.8.1.
# 20140910 bkw:
@@ -21,7 +22,7 @@
# - include sample orasrv.cfg from 0.6.4 source (it's gone from 0.7.0)
PRGNAM=odamex
-VERSION=${VERSION:-0.8.1}
+VERSION=${VERSION:-0.8.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -79,6 +80,9 @@ sed -i \
'/launchercfg_s.odamex_directory *= */s,wxGetCwd(),wxString::FromAscii("/usr/games"),' \
odalaunch/src/dlg_main.cpp
+# 20201024 bkw: Not sure why make is exiting with nonzero status after
+# linking odalaunch. There are no error messages. Adding "-i" to the
+# make command line is a band-aid for this.
mkdir -p build
cd build
cmake \
@@ -87,17 +91,22 @@ cd build
-DCMAKE_INSTALL_PREFIX=/usr \
-DwxWidgets_CONFIG_EXECUTABLE=$WXCONFIG \
-DCMAKE_BUILD_TYPE=Release ..
- make VERBOSE=1
+ make -i VERBOSE=1
cd ..
# cmake-based odamex lacks a 'make install' target, do it manually.
+# Actually, there is one in 0.8.3, but it doesn't work.
mkdir -p $PKG/usr/games
install -s -m0755 build/client/$PRGNAM $PKG/usr/games
install -s -m0755 build/server/odasrv $PKG/usr/games
install -s -m0755 build/odalaunch/odalaunch $PKG/usr/games
mkdir -p $PKG/usr/share/games/doom
-install -m0644 $PRGNAM.wad $PKG/usr/share/games/doom
+
+# wad file has moved in the source tree, accomodate either version
+WAD="$PRGNAM.wad"
+[ -e "wad/$PRGNAM.wad" ] && WAD="wad/$PRGNAM.wad"
+install -m0644 $WAD $PKG/usr/share/games/doom
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/tech
cp -a CHANGELOG LICENSE MAINTAINERS README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/odamex/odamex.info b/games/odamex/odamex.info
index e5a89c4968..2da96d07f2 100644
--- a/games/odamex/odamex.info
+++ b/games/odamex/odamex.info
@@ -1,8 +1,8 @@
PRGNAM="odamex"
-VERSION="0.8.1"
+VERSION="0.8.3"
HOMEPAGE="http://odamex.net/"
-DOWNLOAD="http://downloads.sourceforge.net/odamex/odamex-src-0.8.1.tar.bz2"
-MD5SUM="5fcc9549a595af5a1a3a9f8b21d0a033"
+DOWNLOAD="http://downloads.sourceforge.net/odamex/odamex-src-0.8.3.tar.bz2"
+MD5SUM="c096604173a0d48946f877483520dec1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxGTK3"