diff options
-rw-r--r-- | games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch | 49 | ||||
-rw-r--r-- | games/openspades/downloader.patch | 16 | ||||
-rw-r--r-- | games/openspades/openspades.SlackBuild | 13 | ||||
-rw-r--r-- | games/openspades/openspades.info | 12 |
4 files changed, 22 insertions, 68 deletions
diff --git a/games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch b/games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch deleted file mode 100644 index 41e456fd51..0000000000 --- a/games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0ac59fdbae2c6e496b28b4fc01b52a02622e8146 Mon Sep 17 00:00:00 2001 -From: Samuel Walladge <samuel@swalladge.id.au> -Date: Mon, 7 Mar 2016 09:37:15 +1030 -Subject: [PATCH] fixed isnan not declared - ---- - Sources/Client/Client_Input.cpp | 1 + - Sources/Client/Corpse.cpp | 2 ++ - Sources/Draw/SWMapRenderer.cpp | 2 ++ - 3 files changed, 5 insertions(+) - -diff --git a/Sources/Client/Client_Input.cpp b/Sources/Client/Client_Input.cpp -index d30861b..917719e 100644 ---- a/Sources/Client/Client_Input.cpp -+++ b/Sources/Client/Client_Input.cpp -@@ -38,6 +38,7 @@ - - #include "NetClient.h" - -+using namespace std; - - SPADES_SETTING(cg_mouseSensitivity, "1"); - SPADES_SETTING(cg_zoomedMouseSensScale, "0.6"); -diff --git a/Sources/Client/Corpse.cpp b/Sources/Client/Corpse.cpp -index 1376926..b3eb455 100644 ---- a/Sources/Client/Corpse.cpp -+++ b/Sources/Client/Corpse.cpp -@@ -27,6 +27,8 @@ - #include "../Core/Debug.h" - #include "../Core/Settings.h" - -+using namespace std; -+ - SPADES_SETTING(r_corpseLineCollision, "1"); - - namespace spades { -diff --git a/Sources/Draw/SWMapRenderer.cpp b/Sources/Draw/SWMapRenderer.cpp -index c2e310b..0e47b7b 100644 ---- a/Sources/Draw/SWMapRenderer.cpp -+++ b/Sources/Draw/SWMapRenderer.cpp -@@ -31,6 +31,8 @@ - #include "SWUtils.h" - #include <cstdint> - -+using namespace std; -+ - SPADES_SETTING(r_swUndersampling, "0"); - - namespace spades { diff --git a/games/openspades/downloader.patch b/games/openspades/downloader.patch index 0c136ff4e8..c16f5b112b 100644 --- a/games/openspades/downloader.patch +++ b/games/openspades/downloader.patch @@ -1,12 +1,18 @@ ---- openspades-0.0.12/Resources/downloadpak.orig.sh 2015-03-18 04:27:00.876700540 +0200 -+++ openspades-0.0.12/Resources/downloadpak.sh 2015-03-18 04:27:37.619241195 +0200 -@@ -6,9 +6,4 @@ +--- openspades-0.1.0/Resources/downloadpak.orig.sh 2017-01-29 09:46:23.949368286 +0200 ++++ openspades-0.1.0/Resources/downloadpak.sh 2017-01-29 09:47:17.585697740 +0200 +@@ -24,11 +24,11 @@ PAK_NAME=$(basename "$PAK_URL") - OUTPUT_DIR="DevPak" + OUTPUT_DIR="." -if [ -f "$PAK_NAME" ]; then - exit 0 -fi -- ++# if [ -f "$PAK_NAME" ]; then ++# exit 0 ++# fi + -wget "$PAK_URL" -O "$PAK_NAME" ++# wget "$PAK_URL" -O "$PAK_NAME" unzip -u -o "$PAK_NAME" -d "$OUTPUT_DIR" + + # relocate paks to the proper location diff --git a/games/openspades/openspades.SlackBuild b/games/openspades/openspades.SlackBuild index c734018e5a..0df9fc4200 100644 --- a/games/openspades/openspades.SlackBuild +++ b/games/openspades/openspades.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for openspades -# Copyright 2015-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-2017 Dimitris Zlatanidis Orestiada, Greece # 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=openspades -VERSION=${VERSION:-0.0.12} +VERSION=${VERSION:-0.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,14 +67,11 @@ 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 {} \; - -# https://github.com/yvt/openspades/pull/388 -patch -p1 < $CWD/86de4031c6c647b4d74196181f6754486ad1c340.patch + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # copy develompent packs mkdir -p build/Resources -cp $CWD/DevPaks27.zip build/Resources +cp $CWD/OpenSpadesDevPackage-r32.zip build/Resources # avoid download automatically development packs patch -p1 < $CWD/downloader.patch @@ -107,7 +104,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr rm -rf $PKG/usr/share/menu $PKG/usr/doc/openspades mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/openspades/openspades.info b/games/openspades/openspades.info index 96c0527ae7..660883a306 100644 --- a/games/openspades/openspades.info +++ b/games/openspades/openspades.info @@ -1,12 +1,12 @@ PRGNAM="openspades" -VERSION="0.0.12" +VERSION="0.1.0" HOMEPAGE="http://openspades.yvt.jp/" -DOWNLOAD="https://github.com/yvt/openspades/archive/v0.0.12.tar.gz \ - http://yvt.jp/files/programs/osppaks/DevPaks27.zip" -MD5SUM="4f459b9e6c6243d2dd8983eb3752b4e4 \ - e193e1a1285268a54bd39216a3a6fcae" +DOWNLOAD="https://github.com/yvt/openspades/archive/v0.1.0.tar.gz \ + https://github.com/yvt/openspades-paks/releases/download/r32/OpenSpadesDevPackage-r32.zip" +MD5SUM="a13cc11f0903c26e95df16370781e4c8 \ + 03627d8a8e1daa54304f4260e97559db" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SDL2_image OpenAL" +REQUIRES="SDL2_image OpenAL opusfile" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" |