Index: Makefile
===================================================================
RCS file: /cvs/ports/games/jumpnbump/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 14 Sep 2019 19:13:16 -0000 1.5
+++ Makefile 29 Jan 2021 23:59:28 -0000
@@ -3,6 +3,7 @@
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
Index: patches/patch-globals_pre
===================================================================
RCS file: patches/patch-globals_pre
diff -N patches/patch-globals_pre
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-globals_pre 29 Jan 2021 23:59:28 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+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);
Index: patches/patch-main_c
===================================================================
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-main_c 29 Jan 2021 23:59:28 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+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},
Index: patches/patch-network_c
===================================================================
RCS file: patches/patch-network_c
diff -N patches/patch-network_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-network_c 29 Jan 2021 23:59:28 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+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;
Index: patches/patch-network_h
===================================================================
RCS file: patches/patch-network_h
diff -N patches/patch-network_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-network_h 29 Jan 2021 23:59:28 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+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);
+
Hello ports --
Attached is a fix for games/jumpnbump for -fno-common.
Taken from upstream (no new release since this commit):
https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff
Left off the Makefile portion, since it is a no-op for us.
OK?
~Brian
No comments:
Post a Comment