games/meandmyshadow: Build with lua 5.4.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 6 insertions, 45 deletions

diff --git a/games/meandmyshadow/README b/games/meandmyshadow/README
index 586fe7f3f8..5ec1f0178b 100644
--- a/games/meandmyshadow/README
+++ b/games/meandmyshadow/README
@@ -1,5 +1 @@
 A puzzle/platform game with a player and its shadow.
-
-Optional: lua53 can be used in place of lua52. If you have both
-installed, lua53 will be used unless you export LUAVER="5.2" in the
-environment.
diff --git a/games/meandmyshadow/meandmyshadow.SlackBuild b/games/meandmyshadow/meandmyshadow.SlackBuild
index c37acc6459..77b4e09295 100644
--- a/games/meandmyshadow/meandmyshadow.SlackBuild
+++ b/games/meandmyshadow/meandmyshadow.SlackBuild
@@ -22,14 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20210214 bkw: Modified by SlackBuilds.org to allow building on a
-# system that has both lua and lua52 (or lua53) installed.
+# 20241017 bkw: BUILD=2: Modified by SlackBuilds.org for lua's update to 5.4.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=meandmyshadow
 VERSION=${VERSION:-0.5a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -41,9 +40,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
@@ -55,37 +51,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
 
-# 20210214 bkw: cmake can't be told to ignore lua-5.1 when both 5.1
-# and 5.2 are installed, so help it out a little. LUAVER is used in
-# the cmake command, below.
-if [ -z "$LUAVER" ]; then
-  if [ -x /usr/bin/lua5.3 ]; then
-    LUAVER=5.3
-  elif [ -x /usr/bin/lua5.2 ]; then
-    LUAVER=5.2
-  fi
-fi
-
-case "$LUAVER" in
-  5.[23]) ;; # OK
-  *) echo "$0: No supported lua version found, install lua52 or lua53." 2>&1
-     exit 0 ;;
-esac
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -93,11 +68,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-src.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 {} +
 
 # Fix DOS file.
 sed -i 's/\r//' docs/ThemeDescription.md
@@ -105,10 +77,6 @@ sed -i 's/\r//' docs/ThemeDescription.md
 mkdir -p build
 cd build
   cmake -G "Unix Makefiles" \
-    -DLUA_FOUND=ON \
-    -DLUA_LIBRARY="/usr/lib$LIBDIRSUFFIX/liblua$LUAVER.so" \
-    -DLUA_INCLUDE_DIR="/usr/include/lua$LUAVER" \
-    -DLUA_MATH_LIBRARY="/usr/lib$LIBDIRSUFFIX/libm.so" \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DBINDIR=/usr/games \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
@@ -116,12 +84,9 @@ cd build
     -DCMAKE_BUILD_TYPE=Release ..
 
   make VERBOSE=1
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd -
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING README.md docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/meandmyshadow/meandmyshadow.info b/games/meandmyshadow/meandmyshadow.info
index 64e51c941b..2dfc380c9f 100644
--- a/games/meandmyshadow/meandmyshadow.info
+++ b/games/meandmyshadow/meandmyshadow.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/meandmyshadow/meandmyshadow-0.5a-src
 MD5SUM="314cf2df805e2d094c00eca601a05642"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua52"
+REQUIRES="lua"
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo@gmail.com"