Re: oolite: fix -fno-common
Antoine Jacoutot writes: > > I gave it a try, but got stuck at link time. > > > > undefined reference to `__stack_chk_fail'? > > undefined reference to `__errno_location'?? > > undefined reference to `stdin'??? > > Probably due to -no-undefined I think the problem is that it's trying to link against a precompiled Linux libmozjs. Need to figure out how to get it to build that from source. I'm not going to try any more though.
Re: oolite: fix -fno-common
On Sun, Mar 07, 2021 at 01:37:19AM -0700, Anthony J. Bentley wrote:
> Christian Weisgerber writes:
> > Martin Vahlensieck:
> >
> > > Rather mechanical fix for -fno-common.
> >
> > This would be a great opportunity to update the port to the latest
> > release 1.90 instead of letting the obsolete version sit there.
>
> I gave it a try, but got stuck at link time.
>
> undefined reference to `__stack_chk_fail'?
> undefined reference to `__errno_location'??
> undefined reference to `stdin'???
Probably due to -no-undefined
> I have no idea.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/oolite/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 26 Feb 2021 18:20:33 - 1.24
> +++ Makefile 7 Mar 2021 08:31:15 -
> @@ -1,21 +1,20 @@
> -# $OpenBSD: Makefile,v 1.24 2021/02/26 18:20:33 naddy Exp $
> +# $OpenBSD: Makefile.template,v 1.90 2021/02/25 21:59:27 sthen Exp $
>
> COMMENT= space combat and trading game in the style of Elite
>
> -VERSION= 1.73.4
> -REVISION = 16
> -DISTNAME=oolite-dev-source-${VERSION}
> +VERSION =1.90
> +DISTNAME = oolite-source-${VERSION}
> PKGNAME= oolite-${VERSION}
> CATEGORIES= games
>
> HOMEPAGE=http://www.oolite.org/
>
> -MAINTAINER= Nicholas Marriott
> -
> # GPLv2
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=oolite-linux.berlios/}
> +FIX_EXTRACT_PERMISSIONS =Yes
> +
> +MASTER_SITES =
> https://github.com/OoliteProject/oolite/releases/download/$V/
> EXTRACT_SUFX=.tar.bz2
>
> MODULES= x11/gnustep
> @@ -27,26 +26,9 @@ LIB_DEPENDS= devel/sdl-mixer \
> WANTLIB += c GL GLU SDL SDL_mixer png
> WANTLIB += ${COMPILER_LIBCXX}
>
> -MAKE_FILE = Makefile
> MAKE_FLAGS = LD="${CC}"
> -ALL_TARGET= release
>
> -FIX_CRLF_FILES = GNUmakefile.postamble \
> - Makefile \
> - src/Core/Debug/OODebugTCPConsoleClient.m \
> - src/Core/Materials/OOPNGTextureLoader.m \
> - src/Core/OOAsyncQueue.m \
> - src/Core/OOCPUInfo.h \
> - src/Core/OOCacheManager.m \
> - src/Core/OOLogHeader.m \
> - src/Core/OOLogOutputHandler.m \
> - src/Core/OOMaths.h \
> - src/Core/OOPriorityQueue.m \
> - src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m \
> - src/Core/OXPVerifier/OOOXPVerifierStage.m \
> - src/Core/OldSchoolPropertyListWriting.m \
> - src/Core/Scripting/OOJSOolite.m \
> - src/SDL/OOSDLSoundMixer.m
> +USE_GMAKE = Yes
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/oolite.app/oolite ${PREFIX}/bin
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/oolite/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 25 Apr 2013 16:40:44 - 1.2
> +++ distinfo 7 Mar 2021 08:31:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (oolite-dev-source-1.73.4.tar.bz2) =
> na/9vog5IHJSIvI+wqoQGSa97ygc/mLEE7PP9KEMMAc=
> -SIZE (oolite-dev-source-1.73.4.tar.bz2) = 37486680
> +SHA256 (oolite-source-1.90.tar.bz2) =
> dJAjlL5fbbFUQM5M9FSfQAnFDX4zUS+MmhV9lX/ay5E=
> +SIZE (oolite-source-1.90.tar.bz2) = 151686958
> Index: patches/patch-GNUmakefile
> ===
> RCS file: /cvs/ports/games/oolite/patches/patch-GNUmakefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-GNUmakefile
> --- patches/patch-GNUmakefile 4 Jun 2013 15:41:19 - 1.3
> +++ patches/patch-GNUmakefile 7 Mar 2021 08:31:15 -
> @@ -1,17 +1,14 @@
> -$OpenBSD: patch-GNUmakefile,v 1.3 2013/06/04 15:41:19 naddy Exp $
> GNUmakefile.orig Sun Aug 30 13:46:42 2009
> -+++ GNUmakefile Fri Jan 14 11:12:36 2011
> -@@ -20,10 +20,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
> - else
> - LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
> - LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
> --ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
> -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting
> -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier
> -Isrc/Core/Debug
> -+LIBJS_XCODE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/xcode
> -+ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
> -I$(LIBJS_XCODE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat
> -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities
> -Isrc/Core/OXPVerifier -Isrc/Core/Debug
> - ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL
> -lSDL_mixer -lgnustep-base
> - ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
> --ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
> -Wno-import `sdl-config --cflags`
> -+ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
>
Re: oolite: fix -fno-common
Christian Weisgerber writes:
> Martin Vahlensieck:
>
> > Rather mechanical fix for -fno-common.
>
> This would be a great opportunity to update the port to the latest
> release 1.90 instead of letting the obsolete version sit there.
I gave it a try, but got stuck at link time.
undefined reference to `__stack_chk_fail'?
undefined reference to `__errno_location'??
undefined reference to `stdin'???
I have no idea.
Index: Makefile
===
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile26 Feb 2021 18:20:33 - 1.24
+++ Makefile7 Mar 2021 08:31:15 -
@@ -1,21 +1,20 @@
-# $OpenBSD: Makefile,v 1.24 2021/02/26 18:20:33 naddy Exp $
+# $OpenBSD: Makefile.template,v 1.90 2021/02/25 21:59:27 sthen Exp $
COMMENT= space combat and trading game in the style of Elite
-VERSION= 1.73.4
-REVISION = 16
-DISTNAME= oolite-dev-source-${VERSION}
+VERSION = 1.90
+DISTNAME = oolite-source-${VERSION}
PKGNAME= oolite-${VERSION}
CATEGORIES=games
HOMEPAGE= http://www.oolite.org/
-MAINTAINER=Nicholas Marriott
-
# GPLv2
PERMIT_PACKAGE=Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oolite-linux.berlios/}
+FIX_EXTRACT_PERMISSIONS = Yes
+
+MASTER_SITES = https://github.com/OoliteProject/oolite/releases/download/$V/
EXTRACT_SUFX= .tar.bz2
MODULES= x11/gnustep
@@ -27,26 +26,9 @@ LIB_DEPENDS= devel/sdl-mixer \
WANTLIB += c GL GLU SDL SDL_mixer png
WANTLIB += ${COMPILER_LIBCXX}
-MAKE_FILE =Makefile
MAKE_FLAGS = LD="${CC}"
-ALL_TARGET=release
-FIX_CRLF_FILES = GNUmakefile.postamble \
- Makefile \
- src/Core/Debug/OODebugTCPConsoleClient.m \
- src/Core/Materials/OOPNGTextureLoader.m \
- src/Core/OOAsyncQueue.m \
- src/Core/OOCPUInfo.h \
- src/Core/OOCacheManager.m \
- src/Core/OOLogHeader.m \
- src/Core/OOLogOutputHandler.m \
- src/Core/OOMaths.h \
- src/Core/OOPriorityQueue.m \
- src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m \
- src/Core/OXPVerifier/OOOXPVerifierStage.m \
- src/Core/OldSchoolPropertyListWriting.m \
- src/Core/Scripting/OOJSOolite.m \
- src/SDL/OOSDLSoundMixer.m
+USE_GMAKE =Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/oolite.app/oolite ${PREFIX}/bin
Index: distinfo
===
RCS file: /cvs/ports/games/oolite/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo25 Apr 2013 16:40:44 - 1.2
+++ distinfo7 Mar 2021 08:31:15 -
@@ -1,2 +1,2 @@
-SHA256 (oolite-dev-source-1.73.4.tar.bz2) =
na/9vog5IHJSIvI+wqoQGSa97ygc/mLEE7PP9KEMMAc=
-SIZE (oolite-dev-source-1.73.4.tar.bz2) = 37486680
+SHA256 (oolite-source-1.90.tar.bz2) =
dJAjlL5fbbFUQM5M9FSfQAnFDX4zUS+MmhV9lX/ay5E=
+SIZE (oolite-source-1.90.tar.bz2) = 151686958
Index: patches/patch-GNUmakefile
===
RCS file: /cvs/ports/games/oolite/patches/patch-GNUmakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-GNUmakefile
--- patches/patch-GNUmakefile 4 Jun 2013 15:41:19 - 1.3
+++ patches/patch-GNUmakefile 7 Mar 2021 08:31:15 -
@@ -1,17 +1,14 @@
-$OpenBSD: patch-GNUmakefile,v 1.3 2013/06/04 15:41:19 naddy Exp $
GNUmakefile.orig Sun Aug 30 13:46:42 2009
-+++ GNUmakefileFri Jan 14 11:12:36 2011
-@@ -20,10 +20,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
- else
- LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
- LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
-- ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
-Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials
-Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
-+ LIBJS_XCODE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/xcode
-+ ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
-I$(LIBJS_XCODE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting
-Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
- ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL
-lSDL_mixer -lgnustep-base
- ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
-- ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
-Wno-import `sdl-config --cflags`
-+ ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
-Wno-import -DBUNDLE_PATH='@"$(LOCALBASE)/share/oolite"' `sdl-config --cflags`
- oolite_LIB_DIRS += -L/usr/X11R6/lib/
- endif
- ifeq ($(libespeak),yes)
+$OpenBSD$
+
+Index: GNUmakefile
+--- GNUmakefile.orig
GNUmakefile
+@@ -69,7 +69,7 @@ else
+ endif
+
+
Re: oolite: fix -fno-common
Hi
I don't have any OpenBSD machines capable of running this now so there
is not much point in me staying as maintainer.
Thanks
Index: Makefile
===
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile20 Oct 2019 08:02:59 - 1.22
+++ Makefile7 Mar 2021 07:46:55 -
@@ -10,8 +10,6 @@ CATEGORIES= games
HOMEPAGE= http://www.oolite.org/
-MAINTAINER=Nicholas Marriott
-
# GPLv2
PERMIT_PACKAGE=Yes
On Sat, Mar 06, 2021 at 11:34:28AM -0800, Greg Steuck wrote:
> Thanks Martin!
>
> Martin Vahlensieck writes:
>
> > Rather mechanical fix for -fno-common. Builds and starts, but I don't
> > know how to play it, so can't judge if that works.
>
> Makefile needs this little bit too:
>
> @@ -33,6 +33,7 @@ ALL_TARGET= release
>
> FIX_CRLF_FILES = GNUmakefile.postamble \
> Makefile \
> + src/Cocoa/JoystickHandler.h \
> src/Core/Debug/OODebugTCPConsoleClient.m \
> src/Core/Materials/OOPNGTextureLoader.m \
> src/Core/OOAsyncQueue.m \
>
> Nicholas, WDYT? OK gnezdo@ if you want to use it :)
>
> >
> > Best,
> >
> > Martin
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/oolite/Makefile,v
> > retrieving revision 1.24
> > diff -u -p -r1.24 Makefile
> > --- Makefile26 Feb 2021 18:20:33 - 1.24
> > +++ Makefile6 Mar 2021 18:01:30 -
> > @@ -3,7 +3,7 @@
> > COMMENT= space combat and trading game in the style of Elite
> >
> > VERSION= 1.73.4
> > -REVISION = 16
> > +REVISION = 17
> > DISTNAME= oolite-dev-source-${VERSION}
> > PKGNAME= oolite-${VERSION}
> > CATEGORIES=games
> > Index: patches/patch-src_Cocoa_JoystickHandler.h
> > ===
> > RCS file: patches/patch-src_Cocoa_JoystickHandler.h
> > diff -N patches/patch-src_Cocoa_JoystickHandler.h
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30
> > -
> > @@ -0,0 +1,21 @@
> > +$OpenBSD$
> > +--- src/Cocoa/JoystickHandler.hSat Mar 6 18:11:04 2021
> > src/Cocoa/JoystickHandler.hSat Mar 6 18:20:16 2021
> > +@@ -66,7 +66,7 @@
> > + AXIS_VIEWX,
> > + AXIS_VIEWY,
> > + AXIS_end
> > +-} axfn;
> > ++};
> > +
> > + // Controls that can be a button
> > + enum {
> > +@@ -102,7 +102,7 @@
> > + BUTTON_VIEWPORT,
> > + BUTTON_VIEWSTARBOARD,
> > + BUTTON_end
> > +-} butfn;
> > ++};
> > +
> > + // Stick constants
> > + #define MAX_STICKS 4
> > Index: patches/patch-src_Core_Entities_PlanetEntity_h
> > ===
> > RCS file:
> > /cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
> > --- patches/patch-src_Core_Entities_PlanetEntity_h 22 Oct 2013 16:52:09
> > - 1.1
> > +++ patches/patch-src_Core_Entities_PlanetEntity_h 6 Mar 2021 18:01:30
> > -
> > @@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
> > } VertexData;
> >
> > +// straight c
> > -+doublecorona_speed_factor;// multiply delta_t by this
> > before adding it to corona_stage
> > -+doublecorona_stage; // 0.0 -> 1.0
> > -+GLfloat rvalue[729];// stores random values
> > for adjusting colors in the corona
> > ++extern double corona_speed_factor;// multiply delta_t by
> > this before adding it to corona_stage
> > ++extern double corona_stage; // 0.0 -> 1.0
> > ++extern GLfloatrvalue[729];// stores
> > random values for adjusting colors in the corona
> > +
> > +
> > @interface PlanetEntity: OOSelfDrawingEntity
> > Index: patches/patch-src_Core_Entities_PlanetEntity_m
> > ===
> > RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
> > diff -N patches/patch-src_Core_Entities_PlanetEntity_m
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_Core_Entities_PlanetEntity_m 6 Mar 2021 18:01:30
> > -
> > @@ -0,0 +1,14 @@
> > +$OpenBSD$
> > +--- src/Core/Entities/PlanetEntity.m Sat Mar 6 18:11:04 2021
> > src/Core/Entities/PlanetEntity.m Sat Mar 6 18:34:07 2021
> > +@@ -44,6 +44,10 @@
> > + #define LIM8K 8000.0*8000.0 *
> > NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> > + #define LIM16K 16000.0*16000.0 *
> > NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> > +
> > ++// -fno-common
> > ++double corona_speed_factor;
> > ++double corona_stage;
> > ++GLfloat rvalue[729];
> > +
> > + // straight c
> > + static Vector base_vertex_array[10400];
> >
Re: oolite: fix -fno-common
Martin Vahlensieck: > Rather mechanical fix for -fno-common. This would be a great opportunity to update the port to the latest release 1.90 instead of letting the obsolete version sit there. > Builds and starts, but I don't > know how to play it, so can't judge if that works. Yes, that's a problem. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: oolite: fix -fno-common
Thanks Martin!
Martin Vahlensieck writes:
> Rather mechanical fix for -fno-common. Builds and starts, but I don't
> know how to play it, so can't judge if that works.
Makefile needs this little bit too:
@@ -33,6 +33,7 @@ ALL_TARGET= release
FIX_CRLF_FILES = GNUmakefile.postamble \
Makefile \
+ src/Cocoa/JoystickHandler.h \
src/Core/Debug/OODebugTCPConsoleClient.m \
src/Core/Materials/OOPNGTextureLoader.m \
src/Core/OOAsyncQueue.m \
Nicholas, WDYT? OK gnezdo@ if you want to use it :)
>
> Best,
>
> Martin
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/oolite/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 26 Feb 2021 18:20:33 - 1.24
> +++ Makefile 6 Mar 2021 18:01:30 -
> @@ -3,7 +3,7 @@
> COMMENT= space combat and trading game in the style of Elite
>
> VERSION= 1.73.4
> -REVISION = 16
> +REVISION = 17
> DISTNAME=oolite-dev-source-${VERSION}
> PKGNAME= oolite-${VERSION}
> CATEGORIES= games
> Index: patches/patch-src_Cocoa_JoystickHandler.h
> ===
> RCS file: patches/patch-src_Cocoa_JoystickHandler.h
> diff -N patches/patch-src_Cocoa_JoystickHandler.h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +--- src/Cocoa/JoystickHandler.h Sat Mar 6 18:11:04 2021
> src/Cocoa/JoystickHandler.h Sat Mar 6 18:20:16 2021
> +@@ -66,7 +66,7 @@
> + AXIS_VIEWX,
> + AXIS_VIEWY,
> + AXIS_end
> +-} axfn;
> ++};
> +
> + // Controls that can be a button
> + enum {
> +@@ -102,7 +102,7 @@
> + BUTTON_VIEWPORT,
> + BUTTON_VIEWSTARBOARD,
> + BUTTON_end
> +-} butfn;
> ++};
> +
> + // Stick constants
> + #define MAX_STICKS 4
> Index: patches/patch-src_Core_Entities_PlanetEntity_h
> ===
> RCS file:
> /cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
> --- patches/patch-src_Core_Entities_PlanetEntity_h22 Oct 2013 16:52:09
> - 1.1
> +++ patches/patch-src_Core_Entities_PlanetEntity_h6 Mar 2021 18:01:30
> -
> @@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
> } VertexData;
>
> +// straight c
> -+double corona_speed_factor;// multiply delta_t by this
> before adding it to corona_stage
> -+double corona_stage; // 0.0 -> 1.0
> -+GLfloat rvalue[729];// stores random values
> for adjusting colors in the corona
> ++extern double corona_speed_factor;// multiply delta_t by
> this before adding it to corona_stage
> ++extern double corona_stage; // 0.0 -> 1.0
> ++extern GLfloat rvalue[729];// stores
> random values for adjusting colors in the corona
> +
> +
> @interface PlanetEntity: OOSelfDrawingEntity
> Index: patches/patch-src_Core_Entities_PlanetEntity_m
> ===
> RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
> diff -N patches/patch-src_Core_Entities_PlanetEntity_m
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Core_Entities_PlanetEntity_m6 Mar 2021 18:01:30
> -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- src/Core/Entities/PlanetEntity.m Sat Mar 6 18:11:04 2021
> src/Core/Entities/PlanetEntity.m Sat Mar 6 18:34:07 2021
> +@@ -44,6 +44,10 @@
> + #define LIM8K 8000.0*8000.0 *
> NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> + #define LIM16K 16000.0*16000.0 *
> NO_DRAW_DISTANCE_FACTOR*NO_DRAW_DISTANCE_FACTOR
> +
> ++// -fno-common
> ++double corona_speed_factor;
> ++double corona_stage;
> ++GLfloat rvalue[729];
> +
> + // straight c
> + static Vector base_vertex_array[10400];
> Index: patches/patch-src_Core_OOTrumble_h
> ===
> RCS file: patches/patch-src_Core_OOTrumble_h
> diff -N patches/patch-src_Core_OOTrumble_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_Core_OOTrumble_h6 Mar 2021 18:01:30 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- src/Core/OOTrumble.h Sat Mar 6 18:11:04 2021
> src/Core/OOTrumble.h Sat Mar 6 18:30:37 2021
> +@@ -66,7 +66,7 @@
> + TRUMBLE_MOUTH_NORMAL
> + };
> +
> +-float trumbleAppetiteAccumulator;
> ++extern floattrumbleAppetiteAccumulator;
> +
> + @interface OOTrumble : NSObject
> + {
> Index: patches/patch-src_Core_OOTrumble_m
> ===
> RCS file: patches/patch-src_Core_OOTrumble_m
> diff -N patches/patch-src_Core_OOTrumble_m
>
