diff --git a/games/jumpnbump/Makefile b/games/jumpnbump/Makefile index da974691a5b..54bf91945df 100644 --- a/games/jumpnbump/Makefile +++ b/games/jumpnbump/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2019/09/14 19:13:16 bcallah Exp $ +# $OpenBSD: Makefile,v 1.6 2021/02/05 22:58:10 bcallah Exp $ V = 1.61 COMMENT = game of cute bunnies jumping on each other's heads DISTNAME = jumpnbump-${V} +REVISION = 0 CATEGORIES = games x11 HOMEPAGE = https://gitlab.com/LibreGames/jumpnbump diff --git a/games/jumpnbump/patches/patch-globals_pre b/games/jumpnbump/patches/patch-globals_pre new file mode 100644 index 00000000000..9a3af878e1f --- /dev/null +++ b/games/jumpnbump/patches/patch-globals_pre @@ -0,0 +1,17 @@ +$OpenBSD: patch-globals_pre,v 1.1 2021/02/05 22:58:10 bcallah Exp $ + +Fix for -fno-common +https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff + +Index: globals.pre +--- globals.pre.orig ++++ globals.pre +@@ -267,7 +267,7 @@ extern gob_t number_gobs; + + /* main.c */ + +-int endscore_reached; ++extern int endscore_reached; + + void steer_players(void); + void position_player(int player_num); diff --git a/games/jumpnbump/patches/patch-main_c b/games/jumpnbump/patches/patch-main_c new file mode 100644 index 00000000000..3172075f164 --- /dev/null +++ b/games/jumpnbump/patches/patch-main_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-main_c,v 1.1 2021/02/05 22:58:10 bcallah Exp $ + +Fix for -fno-common +https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff + +Index: main.c +--- main.c.orig ++++ main.c +@@ -67,6 +67,8 @@ char cur_pal[768]; + + int ai[JNB_MAX_PLAYERS]; + ++int endscore_reached = 0; ++ + unsigned int ban_map[17][22] = { + {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0}, diff --git a/games/jumpnbump/patches/patch-network_c b/games/jumpnbump/patches/patch-network_c new file mode 100644 index 00000000000..b67280f4713 --- /dev/null +++ b/games/jumpnbump/patches/patch-network_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-network_c,v 1.1 2021/02/05 22:58:10 bcallah Exp $ + +Fix for -fno-common +https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff + +Index: network.c +--- network.c.orig ++++ network.c +@@ -32,6 +32,10 @@ int is_server = 1; + int is_net = 0; + int server_said_bye = 0; + ++#ifdef USE_NET ++NetInfo net_info[JNB_MAX_PLAYERS]; ++#endif ++ + void processMovePacket(NetPacket *pkt) + { + int playerid = pkt->arg; diff --git a/games/jumpnbump/patches/patch-network_h b/games/jumpnbump/patches/patch-network_h new file mode 100644 index 00000000000..02310c719ce --- /dev/null +++ b/games/jumpnbump/patches/patch-network_h @@ -0,0 +1,17 @@ +$OpenBSD: patch-network_h,v 1.1 2021/02/05 22:58:10 bcallah Exp $ + +Fix for -fno-common +https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff + +Index: network.h +--- network.h.orig ++++ network.h +@@ -74,7 +74,7 @@ typedef struct + SDLNet_SocketSet socketset; + } NetInfo; + +-NetInfo net_info[JNB_MAX_PLAYERS]; ++extern NetInfo net_info[JNB_MAX_PLAYERS]; + + void bufToPacket(const char *buf, NetPacket *pkt); +