cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update blobby to 1.0.20200209

Browse Source 
Sync with the latest developments of the game, this fixes the runtime
on all archs, and colors issues on big endian archs.

Versioning tweak by Mikolaj Kucharski, and HOMEPAGE one by solene@,
thanks a lot!

OK solene@
This commit is contained in:
cwen 2020-02-11 22:32:16 +00:00
parent cfcdd2a461
commit 60f1246f4f
10 changed files with 23 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
games/blobby/Makefile
View File

@ -1,31 +1,30 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:46:15 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2020/02/11 22:32:16 cwen Exp $
COMMENT = volleyball game with online play
V = 1.0rc3
DISTNAME = blobby2-linux-${V}
PKGNAME = blobby-${V}
REVISION = 2
GH_ACCOUNT = danielknobe
GH_PROJECT = blobbyvolley2
GH_COMMIT = 5a03dd0a47800b590097f7a5dd3cb3dcda1ccd91
DISTNAME = blobby-1.0.20200209
CATEGORIES = games
HOMEPAGE = http://blobby.sourceforge.net/
HOMEPAGE = http://blobbyvolley.de/
# GPLv2+
PERMIT_PACKAGE = Yes
PERMIT_PACKAGE = Yes
WANTLIB += GL GLU ICE SDL SM X11 Xext c m physfs pthread ${COMPILER_LIBCXX}
WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 c m physfs
COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=blobby/}
# C++11
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
BUILD_DEPENDS = devel/boost \
archivers/zip
LIB_DEPENDS = devel/sdl \
BUILD_DEPENDS = devel/boost
LIB_DEPENDS = devel/sdl2 \
devel/physfs
WRKDIST = ${WRKDIR}/blobby-${V}
DEBUG_PACKAGES = ${BUILD_PACKAGES}
.include <bsd.port.mk>

4
games/blobby/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (blobby2-linux-1.0rc3.tar.gz) = Rb2yUwt+sbUIaT0wTjEIjJqbNm+Xj3FrWgzx58UCxYE=
SIZE (blobby2-linux-1.0rc3.tar.gz) = 2323776
SHA256 (blobby-1.0.20200209-5a03dd0a.tar.gz) = KHp9ds8tY1PG2VAezwFbA1iVZ8u9VdX56SVh92267HQ=
SIZE (blobby-1.0.20200209-5a03dd0a.tar.gz) = 2363457

12
games/blobby/patches/patch-src_InputManager_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_InputManager_cpp,v 1.1.1.1 2012/10/27 07:12:45 bentley Exp $
Remove byte-order mark.
--- src/InputManager.cpp.orig Sat Oct 27 00:24:44 2012
+++ src/InputManager.cpp Sat Oct 27 00:24:49 2012
@@ -1,4 +1,4 @@
-/*=============================================================================
+/*=============================================================================
Blobby Volley 2
Copyright (C) 2006 Jonathan Sieber (jonathan_sieber@yahoo.de)
Copyright (C) 2006 Daniel Knobe (daniel-knobe@web.de)

11
games/blobby/patches/patch-src_LagDetectionSystem_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_LagDetectionSystem_cpp,v 1.1 2014/11/07 10:06:09 landry Exp $
--- src/LagDetectionSystem.cpp.orig Thu Nov 6 23:41:34 2014
+++ src/LagDetectionSystem.cpp Thu Nov 6 23:42:18 2014
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
#include "LagDetectionSystem.h"
/* includes */
+#include <cassert>
#include "CrossCorrelation.h"
/* implementation */

14
games/blobby/patches/patch-src_RenderManagerGL2D_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_RenderManagerGL2D_cpp,v 1.1 2018/04/16 10:59:17 jasper Exp $
Index: src/RenderManagerGL2D.cpp
--- src/RenderManagerGL2D.cpp.orig
+++ src/RenderManagerGL2D.cpp
@@ -286,7 +286,7 @@ void RenderManagerGL2D::init(int xResolution, int yRes
fontSurface = loadSurface(filename);
fontSurface2 = loadSurface(filename2);
- SDL_Rect r = {(short)x, 0, (short)fontSurface->w, (short)fontSurface->h};
+ SDL_Rect r = {(Sint16)x, 0, (Uint16)fontSurface->w, (Uint16)fontSurface->h};
SDL_BlitSurface(fontSurface, 0, textbase, &r);
SDL_BlitSurface(highlight, 0, hltextbase, &r);
r.x = sx;

36
games/blobby/patches/patch-src_RenderManagerSDL_cpp
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_RenderManagerSDL_cpp,v 1.1 2018/04/16 10:59:17 jasper Exp $
Index: src/RenderManagerSDL.cpp
--- src/RenderManagerSDL.cpp.orig
+++ src/RenderManagerSDL.cpp
@@ -112,7 +112,7 @@ void RenderManagerSDL::init(int xResolution, int yReso
mScreen->w, mScreen->h, mScreen->format->BitsPerPixel,
mScreen->format->Rmask, mScreen->format->Gmask,
mScreen->format->Bmask, mScreen->format->Amask);
- SDL_Rect screenRect = {0, 0, (short)xResolution, (short)yResolution};
+ SDL_Rect screenRect = {0, 0, (Uint16)xResolution, (Uint16)yResolution};
SDL_FillRect(mOverlaySurface, &screenRect, SDL_MapRGB(mScreen->format, 0, 0, 0));
@@ -578,8 +578,8 @@ void RenderManagerSDL::drawImage(const std::string& fi
SDL_Rect blitRect = {
(short)lround(position.x - float(imageBuffer->sdlImage->w) / 2.0),
(short)lround(position.y - float(imageBuffer->sdlImage->h) / 2.0),
- (short)lround(position.x + float(imageBuffer->sdlImage->w) / 2.0),
- (short)lround(position.y + float(imageBuffer->sdlImage->h) / 2.0),
+ static_cast<Uint16>(lround(position.x + float(imageBuffer->sdlImage->w) / 2.0)),
+ static_cast<Uint16>(lround(position.y + float(imageBuffer->sdlImage->h) / 2.0)),
};
SDL_BlitSurface(imageBuffer->sdlImage, 0, mScreen, &blitRect);
@@ -641,8 +641,8 @@ void RenderManagerSDL::drawParticle(const Vector2& pos
SDL_Rect blitRect = {
(short)lround(pos.x - float(9) / 2.0),
(short)lround(pos.y - float(9) / 2.0),
- (short)lround(pos.x + float(9) / 2.0),
- (short)lround(pos.y + float(9) / 2.0),
+ static_cast<Uint16>(lround(pos.x + float(9) / 2.0)),
+ static_cast<Uint16>(lround(pos.y + float(9) / 2.0)),
};
SDL_Surface* blood = player == LEFT_PLAYER ? mLeftBlobBlood : mRightBlobBlood;

12
games/blobby/patches/patch-src_RenderManager_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_RenderManager_cpp,v 1.1.1.1 2012/10/27 07:12:45 bentley Exp $
Remove byte-order mark.
--- src/RenderManager.cpp.orig Sat Oct 27 00:25:13 2012
+++ src/RenderManager.cpp Sat Oct 27 00:25:15 2012
@@ -1,4 +1,4 @@
-/*=============================================================================
+/*=============================================================================
Blobby Volley 2
Copyright (C) 2006 Jonathan Sieber (jonathan_sieber@yahoo.de)
Copyright (C) 2006 Daniel Knobe (daniel-knobe@web.de)

17
games/blobby/patches/patch-src_raknet_RakPeer_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_raknet_RakPeer_cpp,v 1.1 2017/05/24 15:37:35 espie Exp $
I don't even get how this could ever compile (banList is a list of pointers,
and IP is an array inside the struct)
Index: src/raknet/RakPeer.cpp
--- src/raknet/RakPeer.cpp.orig
+++ src/raknet/RakPeer.cpp
@@ -1060,8 +1060,7 @@ void RakPeer::ClearBanList( void )
for ( ; index < banList.size(); index++ )
{
- delete [] banList[ index ]->IP;
- delete [] banList[ index ];
+ delete banList[ index ];
}
banList.clear();

22
games/blobby/patches/patch-src_raknet_Types_h
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_raknet_Types_h,v 1.1 2017/12/26 06:27:55 jca Exp $
Index: src/raknet/Types.h
--- src/raknet/Types.h.orig
+++ src/raknet/Types.h
@@ -100,12 +100,12 @@
#include <stdlib.h>
-#if defined(__GLIBC__) && !defined(HOST_ENDIAN_IS_BIG) && !defined(HOST_ENDIAN_IS_LITTLE)
+#if !defined(HOST_ENDIAN_IS_BIG) && !defined(HOST_ENDIAN_IS_LITTLE)
#include <endian.h>
-
- #if (__BYTE_ORDER == __LITTLE_ENDIAN)
+
+ #if (BYTE_ORDER == LITTLE_ENDIAN)
#define HOST_ENDIAN_IS_LITTLE
- #elif (__BYTE_ORDER == __BIG_ENDIAN)
+ #elif (BYTE_ORDER == BIG_ENDIAN)
#define HOST_ENDIAN_IS_BIG
#endif
#endif

9
games/blobby/pkg/PLIST
View File

@ -1,15 +1,20 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/10/27 07:12:45 bentley Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/02/11 22:32:16 cwen Exp $
@bin bin/blobby
@bin bin/blobby-server
share/blobby/
share/blobby/Icon.bmp
share/blobby/api.lua
share/blobby/backgrounds.zip
share/blobby/bot_api.lua
share/blobby/config.xml
share/blobby/gfx.zip
share/blobby/inputconfig.xml
share/blobby/lang_de.xml
share/blobby/lang_en.xml
share/blobby/lang_fr.xml
share/blobby/rules.lua
share/blobby/lang_it.xml
share/blobby/rules.zip
share/blobby/rules_api.lua
share/blobby/scripts.zip
share/blobby/server.xml
share/blobby/sounds.zip