games/xmoto: Updated for version 0.6.1.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 38 insertions, 57 deletions

diff --git a/games/xmoto/README b/games/xmoto/README
index c77dd2395580..f14f3cbb0610 100644
--- a/games/xmoto/README
+++ b/games/xmoto/README
@@ -1,4 +1,7 @@
-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.
+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.
+
+On first run, if you see an error "Unable to get xmDb version",
+remove the file $HOME/.local/share/xmoto/xm.db
diff --git a/games/xmoto/gcc-4.7.patch b/games/xmoto/gcc-4.7.patch
deleted file mode 100644
index 59a6d8d9741d..000000000000
--- a/games/xmoto/gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
-+++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "Log.h"
- #include "VExcept.h"
- #include <sstream>
-+#include <unistd.h>
-
- std::vector<std::string>* System::getDisplayModes(int windowed) {
-     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild
index 539df636d7cc..2c17ab0795f5 100644
--- a/games/xmoto/xmoto.SlackBuild
+++ b/games/xmoto/xmoto.SlackBuild
@@ -4,13 +4,13 @@
 # Maintained by Alex Word <alex_word86@yahoo.com>
 
 PRGNAM=xmoto
-VERSION=${VERSION:-0.5.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.6.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -21,8 +21,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -37,46 +37,36 @@ fi
 
 set -e
 
-rm -rf $PKG $TMP/$PRGNAM-$VERSION
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 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 {} \;
-
-patch -p1 < $CWD/gcc-4.7.patch
-
-CFLAGS="$SLKCFLAGS -DdDOUBLE" \
-CXXFLAGS="$SLKCFLAGS -DdDOUBLE" \
-LDFLAGS="-ldl" \
-./configure \
-  --prefix=/usr \
-  --bindir=/usr/games \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --localedir=/usr/share/locale \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-localesdir=/usr/share/locale \
-  --disable-dependency-tracking \
-  --enable-threads=posix \
-  --with-asian-ttf-file="/usr/share/fonts/TTF/wqy-zenhei.ttc" \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  /opt/cmake-202x/bin/cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+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/{pixmaps,applications}
-install -m 0644 extra/$PRGNAM.xpm $PKG/usr/share/pixmaps
-install -m 0644 extra/$PRGNAM.desktop $PKG/usr/share/applications
-
+mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # Don't include fonts that are already shipped with Slackware.
@@ -86,9 +76,7 @@ for i in $PKG/usr/share/$PRGNAM/Textures/Fonts/*.ttf; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README TODO ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog ChangeLog.SDL_gfx README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -96,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.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/xmoto/xmoto.info b/games/xmoto/xmoto.info
index f10ea5df192f..ac1bb84b5646 100644
--- a/games/xmoto/xmoto.info
+++ b/games/xmoto/xmoto.info
@@ -1,10 +1,10 @@
 PRGNAM="xmoto"
-VERSION="0.5.10"
+VERSION="0.6.1"
 HOMEPAGE="http://xmoto.tuxfamily.org/"
-DOWNLOAD="http://download.tuxfamily.org/xmoto/xmoto/0.5.10/xmoto-0.5.10-src.tar.gz"
-MD5SUM="d15f1c4e498d937b943db0b6aea437f1"
+DOWNLOAD="https://github.com/xmoto/xmoto/archive/0.6.1/xmoto-0.6.1.tar.gz"
+MD5SUM="88725490243e69d5ab5cde349fa5fa3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua ode libxdg-basedir"
+REQUIRES="lua ode libxdg-basedir cmake-202x"
 MAINTAINER="Alex Word"
 EMAIL="alex_word86@yahoo.com"