summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <urchlay@slackware.uk>2023-07-07 03:30:32 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2023-07-08 16:42:09 +0700
commit42c0df690d87a7fd10e6ac4ffbcaccc020eab531 (patch)
treea4808c693d00551d88444f33c44779c112d36b67
parentd0241d651895a3ae86f43e9d5b3924e6df1dd7c5 (diff)
downloadslackbuilds-42c0df690d87a7fd10e6ac4ffbcaccc020eab531.tar.gz
slackbuilds-42c0df690d87a7fd10e6ac4ffbcaccc020eab531.tar.xz
games/odamex: Fix conflict with agar.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/odamex/odamex.SlackBuild5
1 files changed, 5 insertions, 0 deletions
diff --git a/games/odamex/odamex.SlackBuild b/games/odamex/odamex.SlackBuild
index 2d44a6f503..f73ef605d4 100644
--- a/games/odamex/odamex.SlackBuild
+++ b/games/odamex/odamex.SlackBuild
@@ -6,6 +6,10 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20230707 bkw: FTBFS, when agar is installed. our agar is 1.7.0,
+# apparently too new for odamex-10.3.0. agar was added to SBo
+# in May 2023; until then, odamex didn't have ag-odalaunch and
+# it wasn't a problem. so just disable agar completely.
# 20230110 bkw: update for v10.3.0. SDL2 builds are still broken,
# game segfaults after picking an IWAD. SDL 1.2 builds are OK.
# 20220319 bkw: fix build on 32-bit.
@@ -123,6 +127,7 @@ cd build
-DCMAKE_INSTALL_BINDIR=games \
-DwxWidgets_CONFIG_EXECUTABLE=$WXCONFIG \
-DUSE_SDL12=$SDL12ARG \
+ -DNO_AG-ODALAUNCH_TARGET=ON \
-DCMAKE_BUILD_TYPE=Release ..
make VERBOSE=1
cd ..