aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2012-09-12 19:55:07 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-12 14:19:24 -0500
commitf32d7f9e74fa07435c90ffc027b29712735ac27f (patch)
tree6a28014c79029a77e9cbe9cf73e98fc6574459f8
parentd6d80624818587c213fded920731af9c1bf6561d (diff)
games/blobby2: Updated for version 1.0rc1.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
-rw-r--r--games/blobby2/blobby2-gcc47.patch66
-rw-r--r--games/blobby2/blobby2.SlackBuild11
-rw-r--r--games/blobby2/blobby2.info6
3 files changed, 76 insertions, 7 deletions
diff --git a/games/blobby2/blobby2-gcc47.patch b/games/blobby2/blobby2-gcc47.patch
new file mode 100644
index 0000000000000..7fbed48d9632d
--- /dev/null
+++ b/games/blobby2/blobby2-gcc47.patch
@@ -0,0 +1,66 @@
+--- trunk/src/raknet/BinarySearchTree.h 2012/08/18 23:13:49 954
++++ trunk/src/raknet/BinarySearchTree.h 2012/08/18 23:21:00 955
+@@ -338,12 +338,12 @@
+ if ( current->left == 0 )
+ left_height = 0;
+ else
+- left_height = height( current->left );
++ left_height = this->height( current->left );
+
+ if ( current->right == 0 )
+ right_height = 0;
+ else
+- right_height = height( current->right );
++ right_height = this->height( current->right );
+
+ if ( right_height - left_height == 2 )
+ {
+@@ -371,7 +371,7 @@
+ if ( current == this->root )
+ break;
+
+- current = find_parent( *( current->item ) );
++ current = this->find_parent( *( current->item ) );
+
+ }
+ }
+@@ -400,7 +400,7 @@
+ if ( A == 0 )
+ return false;
+
+- return height( A->right ) > height( A->left );
++ return this->height( A->right ) > this->height( A->left );
+ }
+
+ template <class BinarySearchTreeType>
+@@ -409,7 +409,7 @@
+ if ( A == 0 )
+ return false;
+
+- return height( A->left ) > height( A->right );
++ return this->height( A->left ) > this->height( A->right );
+ }
+
+ template <class BinarySearchTreeType>
+@@ -446,8 +446,8 @@
+
+ */
+
+- B = find_parent( *( C->item ) );
+- A = find_parent( *( B->item ) );
++ B = this->find_parent( *( C->item ) );
++ A = this->find_parent( *( B->item ) );
+ D = C->right;
+
+ if ( A )
+@@ -510,8 +510,8 @@
+
+ */
+
+- B = find_parent( *( C->item ) );
+- A = find_parent( *( B->item ) );
++ B = this->find_parent( *( C->item ) );
++ A = this->find_parent( *( B->item ) );
+ D = C->left;
+
+ if ( A )
diff --git a/games/blobby2/blobby2.SlackBuild b/games/blobby2/blobby2.SlackBuild
index 5e94be9e807cd..0b4be14987d34 100644
--- a/games/blobby2/blobby2.SlackBuild
+++ b/games/blobby2/blobby2.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for blobby2
-# Copyright 2010 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2012 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=blobby2
-VERSION=0.9b
+VERSION=1.0rc1
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -59,12 +59,15 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf blobby-beta-$VERSION
+rm -rf blobby-$VERSION
tar xvf $CWD/$PRGNAM-linux-$VERSION.tar.gz
-cd blobby-beta-$VERSION
+cd blobby-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+# Fix compatibility with gcc 4.7 (svn revision 955)
+patch -p1 -i $CWD/blobby2-gcc47.patch
+
mkdir -p build
cd build
cmake \
diff --git a/games/blobby2/blobby2.info b/games/blobby2/blobby2.info
index e72cbe6a195f7..2abf8578c6674 100644
--- a/games/blobby2/blobby2.info
+++ b/games/blobby2/blobby2.info
@@ -1,8 +1,8 @@
PRGNAM="blobby2"
-VERSION="0.9b"
+VERSION="1.0rc1"
HOMEPAGE="http://blobby.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/blobby/blobby2-linux-0.9b.tar.gz"
-MD5SUM="40ee9f34ee8187c6910f489e4fa4a76d"
+DOWNLOAD="http://downloads.sourceforge.net/blobby/blobby2-linux-1.0rc1.tar.gz"
+MD5SUM="f56472cee041ef3d3c7def604e71b248"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="physfs"