diff options
-rw-r--r-- | games/bitfighter/bitfighter.SlackBuild | 16 | ||||
-rw-r--r-- | games/bitfighter/bitfighter.info | 6 | ||||
-rw-r--r-- | games/bitfighter/gcc-5.X.patch | 12 |
3 files changed, 8 insertions, 26 deletions
diff --git a/games/bitfighter/bitfighter.SlackBuild b/games/bitfighter/bitfighter.SlackBuild index 7d22218910..bb4960bddb 100644 --- a/games/bitfighter/bitfighter.SlackBuild +++ b/games/bitfighter/bitfighter.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bitfighter -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bitfighter -VERSION=${VERSION:-019e} -BUILD=${BUILD:-2} +VERSION=${VERSION:-019f} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -67,17 +67,13 @@ 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 {} \; - -# Fix for gcc-5 thanks to Arch Linux -patch -p1 < $CWD/gcc-5.X.patch + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DUSE_SDL2:BOOL=YES \ -DCMAKE_DATA_PATH=/usr/share/games \ -DCMAKE_BUILD_TYPE=Release .. make @@ -86,9 +82,7 @@ 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/share/games/$PRGNAM/resource/levels \ - $PKG/usr/bin -cp -rf exe/*.ini $PKG/usr/share/games/$PRGNAM +mkdir -p $PKG/usr/share/games/$PRGNAM $PKG/usr/bin cp -r resource/* $PKG/usr/share/games/$PRGNAM install -m0755 exe/$PRGNAM $PKG/usr/bin diff --git a/games/bitfighter/bitfighter.info b/games/bitfighter/bitfighter.info index 332d538af6..0892cca398 100644 --- a/games/bitfighter/bitfighter.info +++ b/games/bitfighter/bitfighter.info @@ -1,8 +1,8 @@ PRGNAM="bitfighter" -VERSION="019e" +VERSION="019f" HOMEPAGE="http://bitfighter.org/" -DOWNLOAD="http://bitfighter.org/files/bitfighter-019e.tar.gz" -MD5SUM="66ff2a80f4ffd7cd354667e906323759" +DOWNLOAD="http://bitfighter.org/files/bitfighter-019f.tar.gz" +MD5SUM="6090eda5f569097993788595a70a7b2c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL SDL2 speex libmodplug" diff --git a/games/bitfighter/gcc-5.X.patch b/games/bitfighter/gcc-5.X.patch deleted file mode 100644 index a6cecd987f..0000000000 --- a/games/bitfighter/gcc-5.X.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bitfighter-019e.orig/tnl/tnlTypes.h bitfighter-019e/tnl/tnlTypes.h ---- bitfighter-019e.orig/tnl/tnlTypes.h 2015-05-12 00:58:58.656019389 +0000 -+++ bitfighter-019e/tnl/tnlTypes.h 2015-11-15 05:41:54.353333331 +0000 -@@ -333,6 +333,8 @@ - # define TNL_GCC_3 - # elif __GNUC__ == 4 - # define TNL_GCC_4 -+# elif __GNUC__ == 5 -+# define TNL_GCC_5 - # else - # error "TNL: Unsupported version of GCC (see tnlMethodDispatch.cpp)" - # endif |