diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-20 12:04:57 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2022-02-21 14:34:27 -0600 |
| commit | f02b6d9fa723501abf73fa04dcea30042de5d9bc (patch) | |
| tree | fef28de1e6ed748ccb66edc5f2a986e7c7e7f5c1 /games/cgmadness | |
| parent | 346204ffef4d87d6631e055bac490d7a367660f2 (diff) | |
games/cgmadness: Fix 15.0 build (but this still needs attention).
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'games/cgmadness')
| -rw-r--r-- | games/cgmadness/cgmadness.SlackBuild | 36 | ||||
| -rw-r--r-- | games/cgmadness/cgmadness.desktop | 2 |
2 files changed, 26 insertions, 12 deletions
diff --git a/games/cgmadness/cgmadness.SlackBuild b/games/cgmadness/cgmadness.SlackBuild index 407695dea3ee3..01df210cbffc7 100644 --- a/games/cgmadness/cgmadness.SlackBuild +++ b/games/cgmadness/cgmadness.SlackBuild @@ -4,11 +4,17 @@ # Written by Zbigniew Baniewski <Zbigniew [dot] Baniewski [at] gmail [dot] com> +# 20220220 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix build on 15.0. +# - move executable to /usr/games. +# ! THIS IS STILL BROKEN: it now builds an OK-looking Slackware package, +# but it segfaults on startup. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cgmadness VERSION=${VERSION:-1.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -20,9 +26,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 @@ -57,22 +60,33 @@ cd $PRGNAM 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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -cat $CWD/01-Makefile.patch | patch -p1 +patch -p1 < $CWD/01-Makefile.patch patch -p1 < $CWD/cgmadness.patch -make +# 20220220 bkw: no way to see the damn compile commands without this: +sed -i 's,@\$,$,' Makefile + +# 20220220 bkw: it turns out -ansi for g++ disables -std=c+11, grr. +sed -i '/-ansi/d' Makefile + +# 20220220 bkw: linux never supported the posix streams api anyway: +sed -i '/include.*stropts\.h/d' libgrapple/socket.c + +make CC="${CC:-gcc} $SLKCFLAGS" \ + CXX="${CXX:-g++} $SLKCFLAGS -std=c++11" + mkdir -p $PKG/usr/share/games/cgmadness/data $PKG/usr/share/games/cgmadness/levels \ - $PKG/usr/bin $PKG/usr/share/pixmaps + $PKG/usr/games $PKG/usr/share/pixmaps cp -a ballshadow.frag convert-cgm ballshadow.vert golfball.frag cgmadness \ dedicated_server golfball.vert $PKG/usr/share/games/cgmadness cp -a data/* $PKG/usr/share/games/cgmadness/data cp -a levels/* $PKG/usr/share/games/cgmadness/levels -echo "cd /usr/share/games/cgmadness ; ./cgmadness" > $PKG/usr/bin/cgmadness -chmod 0755 $PKG/usr/bin/cgmadness +echo "cd /usr/share/games/cgmadness ; ./cgmadness" > $PKG/usr/games/cgmadness +chmod 0755 $PKG/usr/games/cgmadness install -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/cgmadness/cgmadness.desktop b/games/cgmadness/cgmadness.desktop index 3085f24503e99..209aa05fafdbc 100644 --- a/games/cgmadness/cgmadness.desktop +++ b/games/cgmadness/cgmadness.desktop @@ -2,7 +2,7 @@ Name=CG Madness GenericName=Marble Madness-like game Comment=Game based on the classic Marble Madness -Exec=/usr/share/games/cgmadness/cgmadness +Exec=/usr/games/cgmadness Icon=/usr/share/pixmaps/cgmadness.png Terminal=false Type=Application |