diff options
-rw-r--r-- | games/xonotic/xonotic.SlackBuild | 31 | ||||
-rw-r--r-- | games/xonotic/xonotic.info | 10 |
2 files changed, 17 insertions, 24 deletions
diff --git a/games/xonotic/xonotic.SlackBuild b/games/xonotic/xonotic.SlackBuild index b40f426135..d0528b264d 100644 --- a/games/xonotic/xonotic.SlackBuild +++ b/games/xonotic/xonotic.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xonotic -VERSION=${VERSION:-0.6.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.7.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -59,11 +59,11 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $TMP/$PRGNAM-$VERSION -cd $TMP/$PRGNAM-$VERSION +rm -rf $PRGNAM-$VERSION Xonotic unzip $CWD/$PRGNAM-$VERSION.zip -cd Xonotic +unzip $CWD/$PRGNAM-$VERSION-crypto.zip Xonotic/source/d0_blind_id/d0_rijndael.c +mv Xonotic $PRGNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -71,14 +71,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -cp $CWD/d0_rijndael.c source/d0_blind_id - mkdir -p \ $PKG/usr/bin \ - $PKG/usr/share/xonotic \ + $PKG/usr/share/$PRGNAM \ $PKG/usr/share/{applications,pixmaps} cd source/d0_blind_id + autoreconf -fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -90,17 +90,10 @@ cd source/d0_blind_id make install DESTDIR=$PKG cd - -make -C source/fteqcc \ - CFLAGS="$SLKCFLAGS" - -make -C source/qcsrc \ - FTEQCC="$(pwd)/source/fteqcc/fteqcc.bin" \ - FTEQCCFLAGS_WATERMARK="" - # Rather than using libdl, link libd0_blind_id and libd0_rijndael make -C source/darkplaces release \ - CFLAGS_EXTRA="$SLKCFLAGS" \ - DP_FS_BASEDIR="/usr/share/xonotic" \ + CFLAGS_EXTRA="$SLKCFLAGS -DSUPPORTIPV6" \ + DP_FS_BASEDIR="/usr/share/$PRGNAM" \ CFLAGS_CRYPTO="-I$PKG/usr/include -DCRYPTO_STATIC" \ LIB_CRYPTO="-L$PKG/usr/lib${LIBDIRSUFFIX} -ld0_blind_id" \ CFLAGS_CRYPTO_RIJNDAEL="-I$PKG/usr/include -DCRYPTO_RIJNDAEL_STATIC" \ @@ -111,7 +104,7 @@ install -m 755 source/darkplaces/darkplaces-glx $PKG/usr/bin/xonotic-sdl install -m 644 $CWD/xonotic.desktop $PKG/usr/share/applications install -m 644 misc/logos/xonotic_icon.svg $PKG/usr/share/pixmaps/xonotic.svg -cp -a data key_0.d0pk $PKG/usr/share/xonotic +cp -a data key_0.d0pk $PKG/usr/share/$PRGNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/games/xonotic/xonotic.info b/games/xonotic/xonotic.info index 14e32eecef..7440912732 100644 --- a/games/xonotic/xonotic.info +++ b/games/xonotic/xonotic.info @@ -1,12 +1,12 @@ PRGNAM="xonotic" -VERSION="0.6.0" +VERSION="0.7.0" HOMEPAGE="http://www.xonotic.org/" DOWNLOAD=" \ - http://dl.xonotic.org/xonotic-0.6.0.zip \ - https://gist.github.com/jgeboski/5315092/raw/d0_rijndael.c" + http://dl.xonotic.org/xonotic-0.7.0.zip \ + http://dl.xonotic.org/xonotic-0.7.0-crypto.zip" MD5SUM=" \ - 2dac2c1ad4388255d3ad4d038dea3f77 \ - bb59b1fc4b59caedad87da19c2193144" + eda7e8acadbefaf4b2efcfb70bbe98e2 \ + 9ec88281a9edcc17eee3476eb1064cff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |