diff options
| author | Chess Griffin <chess@chessgriffin.com> | 2010-05-22 10:34:59 -0400 |
|---|---|---|
| committer | Chess Griffin <chess@chessgriffin.com> | 2010-05-23 23:13:06 -0500 |
| commit | 4716923d35be4ea65be3b3e0654f6f1c050b11a7 (patch) | |
| tree | 5ec8fbc187e9e309da28e6142c3c54da4aa02c7c | |
| parent | 37d6a2681251a9bdd94a9508df3493a12c16cfcd (diff) | |
| download | slackbuilds-4716923d35be4ea65be3b3e0654f6f1c050b11a7.tar.gz | |
games/wesnoth: Patched to build with libpng on 13.1
Also miscellaneous SlackBuild script cleanups
| -rw-r--r-- | games/wesnoth/wesnoth-libpng-1.4.0.patch | 14 | ||||
| -rw-r--r-- | games/wesnoth/wesnoth.SlackBuild | 22 |
2 files changed, 31 insertions, 5 deletions
diff --git a/games/wesnoth/wesnoth-libpng-1.4.0.patch b/games/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 0000000000..be8adfcaac --- /dev/null +++ b/games/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,14 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild index 1649e33b85..ed88088c72 100644 --- a/games/wesnoth/wesnoth.SlackBuild +++ b/games/wesnoth/wesnoth.SlackBuild @@ -26,10 +26,19 @@ PRGNAM=wesnoth VERSION=${VERSION:-1.8} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -46,6 +55,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi if [ "$SERVER" = "yes" ]; then @@ -68,6 +80,7 @@ rm -rf $TMP/$PRGNAM-$VERSION cd $TMP tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION +patch -p1 < $CWD/wesnoth-libpng-1.4.0.patch chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -103,10 +116,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz + $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ABOUT-NLS COPYING INSTALL README changelog copyright \ |