summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson2021-02-15 19:17:56 +0100
committer Willy Sudiarto Raharjo2021-02-20 18:05:07 +0100
commit9b948dd5af9bd63ee1da8e6ba96cd940114f7fca (patch)
treee0fe441d34254f58d886f93487f02367b5332c7d
parente2072c21c8c038f3e9a5585516552a31c06e71a5 (diff)
downloadslackbuilds-9b948dd5af9bd63ee1da8e6ba96cd940114f7fca.tar.gz
games/frotz: Fix non-libmodplug build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/frotz/README9
-rw-r--r--games/frotz/frotz.SlackBuild10
2 files changed, 14 insertions, 5 deletions
diff --git a/games/frotz/README b/games/frotz/README
index 11b9f1eeec..20f3a359e6 100644
--- a/games/frotz/README
+++ b/games/frotz/README
@@ -4,5 +4,10 @@ Frotz is an interpreter for Infocom games and other Z-machine games. It
complies with standard 1.0 of Graham Nelson's specification. Games can
be found at: http://www.ifarchive.org/
-Optional dependencies: SDL2 and SDL2_mixer. If these are installed,
-the SDL build of frotz (sfrotz) will be included in the package.
+Optional dependencies:
+
+libmodplug - If this is installed, the curses build (frotz) will
+support sound.
+
+SDL2_mixer - If this is installed, the SDL build of frotz (sfrotz) will
+be included in the package. sfrotz always supports sound.
diff --git a/games/frotz/frotz.SlackBuild b/games/frotz/frotz.SlackBuild
index 06f5ac9b81..52fc0d334a 100644
--- a/games/frotz/frotz.SlackBuild
+++ b/games/frotz/frotz.SlackBuild
@@ -9,6 +9,8 @@
# Original had no license. This modified version is released under the
# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210215 bkw: fix building without libmodplug. BUILD=2.
+
# 20201212 bkw: too many changes, can't build older versions.
# - updated for v2.52.
# - new homepage.
@@ -25,7 +27,7 @@
PRGNAM=frotz
VERSION=${VERSION:-2.52}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -103,11 +105,13 @@ run_make() {
$1
}
-# No autodetection for SDL2, help it out.
+# No autodetection for libmodplug or SDL2_mixer, help it out.
+maintarg="nosound"
+pkg-config --exists libmodplug && maintarg="$PRGNAM"
pkg-config --exists sdl2 SDL2_mixer && extra="clean sdl install_sdl"
sed -i "s,-O3.*,$SLKCFLAGS," Makefile
-for target in $PRGNAM install clean dumb install_dumb $extra; do
+for target in $maintarg install clean dumb install_dumb $extra; do
run_make $target
done