aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/blobby2/blobby2.SlackBuild19
-rw-r--r--games/blobby2/blobby2.info8
-rw-r--r--games/blobby2/ostream-include.patch10
3 files changed, 28 insertions, 9 deletions
diff --git a/games/blobby2/blobby2.SlackBuild b/games/blobby2/blobby2.SlackBuild
index c525c2a51ded4..a73d3c483f427 100644
--- a/games/blobby2/blobby2.SlackBuild
+++ b/games/blobby2/blobby2.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for blobby2
-# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2017 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=blobby2
-VERSION=1.0rc3
+VERSION=1.0
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
@@ -40,8 +40,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"
@@ -69,6 +69,13 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# upstream revision 1542
+patch -p2 -i $CWD/ostream-include.patch
+
+# fix paths - thanks to Arch Linux
+sed -i "s|data|/usr/share/blobby|g" src/main.cpp
+sed -i "s|file\(filename\)|file(\"/usr/share/blobby\" + filename|g" src/main.cpp
+
mkdir -p build
cd build
cmake \
@@ -81,6 +88,8 @@ cd build
make install DESTDIR=$PKG
cd -
+install -m 0644 data/Icon.bmp ${PKG}/usr/share/blobby/Icon.bmp
+
mkdir -p $PKG/usr/share/{applications,pixmaps}
install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
diff --git a/games/blobby2/blobby2.info b/games/blobby2/blobby2.info
index e6c73a245665b..365f9140cedb5 100644
--- a/games/blobby2/blobby2.info
+++ b/games/blobby2/blobby2.info
@@ -1,10 +1,10 @@
PRGNAM="blobby2"
-VERSION="1.0rc3"
+VERSION="1.0"
HOMEPAGE="http://blobby.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/blobby/blobby2-linux-1.0rc3.tar.gz"
-MD5SUM="c4b7d3133e99806dc8b60a59da296906"
+DOWNLOAD="http://downloads.sourceforge.net/blobby/blobby2-linux-1.0.tar.gz"
+MD5SUM="a6c89ae64693490385fa05c0a01b0a3b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="physfs"
+REQUIRES="physfs SDL2"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@liwjatan.at"
diff --git a/games/blobby2/ostream-include.patch b/games/blobby2/ostream-include.patch
new file mode 100644
index 0000000000000..55cb60e0b3d9d
--- /dev/null
+++ b/games/blobby2/ostream-include.patch
@@ -0,0 +1,10 @@
+--- a/trunk/src/NetworkMessage.cpp
++++ b/trunk/src/NetworkMessage.cpp
+@@ -23,6 +23,7 @@
+
+ /* includes */
+ #include <cstring>
++#include <ostream>
+
+ #include "UserConfig.h"
+ #include "SpeedController.h"