diff options
| -rw-r--r-- | games/xonotic/slack-desc | 8 | ||||
| -rw-r--r-- | games/xonotic/xonotic.SlackBuild | 53 | ||||
| -rw-r--r-- | games/xonotic/xonotic.info | 8 |
3 files changed, 44 insertions, 25 deletions
diff --git a/games/xonotic/slack-desc b/games/xonotic/slack-desc index 55c4f5eeed..2c2d0d1939 100644 --- a/games/xonotic/slack-desc +++ b/games/xonotic/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| diff --git a/games/xonotic/xonotic.SlackBuild b/games/xonotic/xonotic.SlackBuild index fdabcde0d8..b40f426135 100644 --- a/games/xonotic/xonotic.SlackBuild +++ b/games/xonotic/xonotic.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xonotic -# Copyright 2012 James Geboski <jgeboski@gmail.com> +# Copyright 2012-2013 James Geboski <jgeboski@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=xonotic VERSION=${VERSION:-0.6.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,32 +71,47 @@ 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/data \ + $PKG/usr/share/xonotic \ $PKG/usr/share/{applications,pixmaps} -cd source/fteqcc - make CFLAGS="-Wall $SLKCFLAGS" - FTEQCC=$(pwd)/fteqcc.bin -cd - +cd source/d0_blind_id + CFLAGS="$SLKCFLAGS" \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --build=$ARCH-slackware-linux \ + --disable-static -cd source/qcsrc - make FTEQCCFLAGS_WATERMARK="" FTEQCC="$FTEQCC" + make + make install DESTDIR=$PKG cd - -cd source/darkplaces - make release \ - CFLAGS_EXTRA="$SLKCFLAGS" \ - DP_FS_BASEDIR="/usr/share/xonotic" - install -m 755 darkplaces-sdl $PKG/usr/bin/xonotic-glx - install -m 755 darkplaces-glx $PKG/usr/bin/xonotic-sdl -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_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" \ + LIB_CRYPTO_RIJNDAEL="-L$PKG/usr/lib${LIBDIRSUFFIX} -ld0_rijndael" -cp data/* $PKG/usr/share/xonotic/data +install -m 755 source/darkplaces/darkplaces-sdl $PKG/usr/bin/xonotic-glx +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 -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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/games/xonotic/xonotic.info b/games/xonotic/xonotic.info index 8cc6b1c884..14e32eecef 100644 --- a/games/xonotic/xonotic.info +++ b/games/xonotic/xonotic.info @@ -1,8 +1,12 @@ PRGNAM="xonotic" VERSION="0.6.0" HOMEPAGE="http://www.xonotic.org/" -DOWNLOAD="http://dl.xonotic.org/xonotic-0.6.0.zip" -MD5SUM="2dac2c1ad4388255d3ad4d038dea3f77" +DOWNLOAD=" \ + http://dl.xonotic.org/xonotic-0.6.0.zip \ + https://gist.github.com/jgeboski/5315092/raw/d0_rijndael.c" +MD5SUM=" \ + 2dac2c1ad4388255d3ad4d038dea3f77 \ + bb59b1fc4b59caedad87da19c2193144" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |