games/speed-dreams: Updated for version 2.0.0_rc1_r4420

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

4 files changed, 60 insertions, 17 deletions

diff --git a/games/speed-dreams/README b/games/speed-dreams/README
index 7b56aea201..ad55a61014 100644
--- a/games/speed-dreams/README
+++ b/games/speed-dreams/README
@@ -3,4 +3,4 @@ aiming to implement exciting new features, cars, tracks and AI opponents
 to make a more enjoyable game for the player, as well as constantly
 improving visual and physics realism.
 
-This requires p7zip, plib, OpenAL and enet.
+This requires plib, OpenAL and enet.
diff --git a/games/speed-dreams/gcc47.patch b/games/speed-dreams/gcc47.patch
new file mode 100644
index 0000000000..ee5e3d5842
--- /dev/null
+++ b/games/speed-dreams/gcc47.patch
@@ -0,0 +1,28 @@
+Fixes #645 & #646 (GCC 4.7 compatibility)
+
+--- src/libs/math/v3_t.h.orig	2012-03-30 18:09:00.697957753 -0500
++++ src/libs/math/v3_t.h	2012-03-30 18:09:15.421679640 -0500
+@@ -28,6 +28,7 @@
+ #ifndef _LINALG_V3_T_H_
+ #define _LINALG_V3_T_H_
+ 
++#include <cmath>
+ 
+ template<class T> class v3t;
+ #ifndef _MSC_VER
+--- src/libs/portability/portability.h.orig	2012-03-30 18:03:35.047110686 -0500
++++ src/libs/portability/portability.h	2012-03-30 18:10:19.171475549 -0500
+@@ -22,10 +22,13 @@
+ 
+ #include <cstdlib>
+ #include <cstring>
++
+ #ifdef _MSC_VER
+ #include <direct.h>
+ #include <process.h>
+ #define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */
++#else
++#include <unistd.h>
+ #endif
+ 
+ #ifdef _MSC_VER
diff --git a/games/speed-dreams/speed-dreams.SlackBuild b/games/speed-dreams/speed-dreams.SlackBuild
index 749df1c36b..2fee78fa89 100644
--- a/games/speed-dreams/speed-dreams.SlackBuild
+++ b/games/speed-dreams/speed-dreams.SlackBuild
@@ -4,7 +4,7 @@
 # written by powtrix (@gmail.com)
 
 PRGNAM=speed-dreams
-VERSION=2.0.0_b1_r3937
+VERSION=2.0.0_rc1_r4420
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,12 +42,19 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION-src
-7z x -so $CWD/$PRGNAM-$SRCVERSION-src.tar.7z | tar xfv -
-cd $PRGNAM-$SRCVERSION-src
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-src-base-$SRCVERSION.tar.xz
+tar xvf $CWD/$PRGNAM-src-hq-cars-and-tracks-$SRCVERSION.tar.xz
+tar xvf $CWD/$PRGNAM-src-more-hq-cars-and-tracks-$SRCVERSION.tar.xz
+tar xvf $CWD/$PRGNAM-src-wip-cars-and-tracks-$SRCVERSION.tar.xz
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+patch -p0 < $CWD/gcc47.patch
+
 cmake \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -56,22 +63,24 @@ cmake \
   -DCMAKE_PREFIX_PATH:STRING=/usr \
   -DOPTION_OFFICIAL_ONLY:BOOL=ON \
   -DOPTION_DEBUG:BOOL=OFF .
-make VERBOSE=1
+make
 make install DESTDIR=$PKG
 
+mkdir -p $PKG/usr/share/pixmaps
+cp -a $CWD/$PRGNAM.xpm $PKG/usr/share/pixmaps
+
+mkdir -p $PKG/usr/share/applications
+cp -a $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv \
-  $PKG/usr/share/games/speed-dreams-2/{CHANGES,COPYING,INSTALL,README,TODO}.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+$PKG/usr/share/games/speed-dreams-2/{CHANGES,COPYING,INSTALL,README,TODO}.txt \
+$PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/{pixmaps,applications}
-cp -a $CWD/$PRGNAM.xpm $PKG/usr/share/pixmaps
-cp -a $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n  $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/speed-dreams/speed-dreams.info b/games/speed-dreams/speed-dreams.info
index 659d81d3df..b2b27b73b4 100644
--- a/games/speed-dreams/speed-dreams.info
+++ b/games/speed-dreams/speed-dreams.info
@@ -1,10 +1,16 @@
 PRGNAM="speed-dreams"
-VERSION="2.0.0_b1_r3937"
+VERSION="2.0.0_rc1_r4420"
 HOMEPAGE="http://www.speed-dreams.org/"
-DOWNLOAD="http://sourceforge.net/projects/speed-dreams/files/2.0.0/speed-dreams-2.0.0-b1-r3937-src.tar.7z"
-MD5SUM="5299fe23aec3641827039ae3c69de460"
+DOWNLOAD="http://sourceforge.net/projects/speed-dreams/files/2.0.0/speed-dreams-src-base-2.0.0-rc1-r4420.tar.xz \
+http://sourceforge.net/projects/speed-dreams/files/2.0.0/speed-dreams-src-wip-cars-and-tracks-2.0.0-rc1-r4420.tar.xz \
+http://sourceforge.net/projects/speed-dreams/files/2.0.0/speed-dreams-src-hq-cars-and-tracks-2.0.0-rc1-r4420.tar.xz \
+http://sourceforge.net/projects/speed-dreams/files/2.0.0/speed-dreams-src-more-hq-cars-and-tracks-2.0.0-rc1-r4420.tar.xz"
+MD5SUM="bce029b4519d590dfa35ed83348475cd \
+ f4d155ff8463c61860f767823ae314ad \
+ 9f7bbb22fbc1c18548ae616dfc06f0b0 \
+ ca6edc5a2f420214e826e8d112967495"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="powtrix"
 EMAIL="powtrix@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="Erik Hanson"