summaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
author B. Watson2019-11-27 20:20:06 +0100
committer Willy Sudiarto Raharjo2019-12-15 11:06:18 +0100
commitd4e93bf15f10ea69fa3ad63ccca13bff23addd72 (patch)
tree29a5240e3b9475b805acdee1fd722c8d0e030885 /games
parent3057f2f851d34b0efba097e3141dd6953fe71334 (diff)
downloadslackbuilds-d4e93bf15f10ea69fa3ad63ccca13bff23addd72.tar.gz
games/bstone: Updated for version 1.1.14.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'games')
-rw-r--r--games/bstone/bstone.SlackBuild12
-rw-r--r--games/bstone/bstone.info6
-rw-r--r--games/bstone/datadir.diff40
3 files changed, 31 insertions, 27 deletions
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild
index da7b326267..0cd4450a5c 100644
--- a/games/bstone/bstone.SlackBuild
+++ b/games/bstone/bstone.SlackBuild
@@ -6,6 +6,9 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20191127 bkw: update for v1.1.14. datadir.diff had to change so we can't
+# build old versions any more.
+
# 20170921 bkw: update for v1.1.9.
# 20170807 bkw: update for v1.1.8, use upstream's icon instead of mine.
@@ -13,7 +16,7 @@
# 20170621 bkw: fix build on -current
PRGNAM=bstone
-VERSION=${VERSION:-1.1.9}
+VERSION=${VERSION:-1.1.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -53,11 +56,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$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 640 -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 {} \+
# look in /usr/share/games/bstone for game data files, not the
# directory the executable lives in. the --data_dir option can
diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info
index 4b770618c0..7c3384ea2d 100644
--- a/games/bstone/bstone.info
+++ b/games/bstone/bstone.info
@@ -1,9 +1,9 @@
PRGNAM="bstone"
-VERSION="1.1.9"
+VERSION="1.1.14"
HOMEPAGE="http://bibendovsky.github.io/bstone/"
-DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.1.9/bstone-1.1.9.tar.gz \
+DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.1.14/bstone-1.1.14.tar.gz \
https://archive.org/download/BlakeStoneAliensOfGold/1bs30.zip"
-MD5SUM="77ae990a9ba79ae2a355d95a052ae054 \
+MD5SUM="3da8860ffeff60e33b69d142170231e8 \
a63c88fc5b399ffb5ed42dc215321f36"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff
index 2825740952..ebb339fe27 100644
--- a/games/bstone/datadir.diff
+++ b/games/bstone/datadir.diff
@@ -1,25 +1,29 @@
-diff -Naur bstone-1.1.8/src/3d_main.cpp bstone-1.1.8.patched/src/3d_main.cpp
---- bstone-1.1.8/src/3d_main.cpp 2017-08-06 06:52:35.000000000 -0400
-+++ bstone-1.1.8.patched/src/3d_main.cpp 2017-08-07 12:33:38.268538355 -0400
-@@ -9658,20 +9658,7 @@
+diff -Naur bstone-1.1.14/src/3d_main.cpp bstone-1.1.14.patched/src/3d_main.cpp
+--- bstone-1.1.14/src/3d_main.cpp 2019-11-09 05:08:15.000000000 -0500
++++ bstone-1.1.14.patched/src/3d_main.cpp 2019-11-27 14:08:41.481084182 -0500
+@@ -10523,24 +10523,7 @@
const std::string& get_default_data_dir()
{
-- static std::string result;
-- static auto is_initialized = false;
+- static std::string result;
+- static auto is_initialized = false;
-
-- if (!is_initialized) {
-- is_initialized = true;
+- if (!is_initialized)
+- {
+- is_initialized = true;
-
-- auto sdl_dir = ::SDL_GetBasePath();
+- auto sdl_dir = ::SDL_GetBasePath();
-
-- if (sdl_dir) {
-- result = sdl_dir;
-- ::SDL_free(sdl_dir);
-- }
-- }
--
-+ static std::string result = "/usr/share/games/bstone/";
- return result;
+- if (sdl_dir)
+- {
+- result = sdl_dir;
+- ::SDL_free(sdl_dir);
+- }
+- }
+-#ifdef __vita__
+- result = "ux0:/data/bstone/";
+-#endif
++ static std::string result = "/usr/share/games/bstone/";
+ return result;
}
- // BBi
+