diff options
| -rw-r--r-- | games/xmoto/README | 2 | ||||
| -rw-r--r-- | games/xmoto/doinst.sh | 1 | ||||
| -rw-r--r-- | games/xmoto/patches/xmoto-amd64_gcc441.diff | 35 | ||||
| -rw-r--r-- | games/xmoto/slack-desc | 2 | ||||
| -rw-r--r-- | games/xmoto/xmoto.SlackBuild | 20 | ||||
| -rw-r--r-- | games/xmoto/xmoto.info | 10 |
6 files changed, 56 insertions, 14 deletions
diff --git a/games/xmoto/README b/games/xmoto/README index 030f7a59085aa..8dc45b2e71b16 100644 --- a/games/xmoto/README +++ b/games/xmoto/README @@ -2,4 +2,4 @@ X-Moto is a challenging 2D motocross platform game, where physics play an all important role in the gameplay. You need to control your bike to its limit, if you want to have a chance finishing the more difficult of the challenges. -Requires lua and ode.
\ No newline at end of file +This requires lua and ode. diff --git a/games/xmoto/doinst.sh b/games/xmoto/doinst.sh index 301399ba37c77..4e8ba7071dea7 100644 --- a/games/xmoto/doinst.sh +++ b/games/xmoto/doinst.sh @@ -1,4 +1,3 @@ - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/games/xmoto/patches/xmoto-amd64_gcc441.diff b/games/xmoto/patches/xmoto-amd64_gcc441.diff new file mode 100644 index 0000000000000..bc0f47e693b42 --- /dev/null +++ b/games/xmoto/patches/xmoto-amd64_gcc441.diff @@ -0,0 +1,35 @@ +http://bugs.gentoo.org/284464 + +--- src/DBuffer.h.org 2009-09-10 11:58:28.000000000 +0200 ++++ src/DBuffer.h 2009-09-10 12:07:30.000000000 +0200 +@@ -69,6 +69,8 @@ + void operator >>(unsigned char &c); + void operator <<(unsigned int n); + void operator >>(unsigned int &n); ++ void operator <<(unsigned long n); ++ void operator >>(unsigned long &n); + void operator <<(float n); + void operator >>(float &n); + void operator <<(std::string s); + +--- src/DBuffer.cpp.org 2009-09-10 11:58:38.000000000 +0200 ++++ src/DBuffer.cpp 2009-09-10 12:08:18.000000000 +0200 +@@ -210,6 +210,18 @@ + n = (unsigned int) sn; + } + ++ void DBuffer::operator <<(unsigned long n) { ++ int sn; ++ sn = (int) (n); ++ *this << sn; ++ } ++ ++ void DBuffer::operator >>(unsigned long &n) { ++ int sn; ++ *this >> sn; ++ n = (unsigned long) sn; ++ } ++ + void DBuffer::operator <<(float n) { + writeBuf_LE((char *)&n, sizeof(float)); + } diff --git a/games/xmoto/slack-desc b/games/xmoto/slack-desc index aec63ce524220..72b3768d766e1 100644 --- a/games/xmoto/slack-desc +++ b/games/xmoto/slack-desc @@ -12,7 +12,7 @@ xmoto: X-Moto is a challenging 2D motocross platform game, where physics xmoto: playan all important role in the gameplay. You need to control your xmoto: bike to its limit, if you want to have a chance finishing the more xmoto: difficult of the challenges. -xmoto: +xmoto: xmoto: Homepage: http://xmoto.tuxfamily.org/ xmoto: xmoto: diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild index 114c921c36d0a..2ae4d15b573e3 100644 --- a/games/xmoto/xmoto.SlackBuild +++ b/games/xmoto/xmoto.SlackBuild @@ -10,10 +10,8 @@ # Modified by the SlackBuilds.org project # Updated by Alex Word <alex_word86@yahoo.com> -set -e - PRGNAM=xmoto -VERSION=0.5.1 +VERSION=0.5.2 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -25,12 +23,17 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi +set -e + rm -rf $PKG $TMP/$PRGNAM-$VERSION mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -41,11 +44,13 @@ chmod -R u+w,go+r-w,a-s . patch -p1 < $CWD/patches/sqlite3.diff patch -p1 < $CWD/patches/localedir.diff +patch -p0 < $CWD/patches/xmoto-amd64_gcc441.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --mandir=/usr/man \ --localedir=/usr/share/locale \ @@ -64,13 +69,14 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/share/{pixmaps,applications} install -m 0644 extra/$PRGNAM.xpm $PKG/usr/share/pixmaps/ -install -m 0644 extra/$PRGNAM.desktop $PKG/usr/share/applications/ +install -m 0644 extra/$PRGNAM.desktop $PKG/usr/share/applications/ gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS COPYING INSTALL NEWS README TODO ChangeLog \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + ABOUT-NLS AUTHORS COPYING INSTALL NEWS README TODO ChangeLog \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -78,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/games/xmoto/xmoto.info b/games/xmoto/xmoto.info index 2a7ad48ab6e50..67e6e6b91bd9e 100644 --- a/games/xmoto/xmoto.info +++ b/games/xmoto/xmoto.info @@ -1,8 +1,10 @@ PRGNAM="xmoto" -VERSION="0.5.1" +VERSION="0.5.2" HOMEPAGE="http://xmoto.tuxfamily.org/" -DOWNLOAD="http://download.tuxfamily.org/xmoto/xmoto/0.5.1/xmoto-0.5.1-src.tar.gz" -MD5SUM="10cb822ec8c2c7e9466806633e69be1f" +DOWNLOAD="http://download.tuxfamily.org/xmoto/xmoto/0.5.2/xmoto-0.5.2-src.tar.gz" +MD5SUM="1e3678ebceca21d61844efb53c140227" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Alex Word" EMAIL="alex_word86@yahoo.com" -APPROVED="dsomero" +APPROVED="rworkman" |