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

games/oolite: fix build with -fno-common; from Martin Vahlensieck

Browse Source 
Drop maintainer nicm@ at his request.
Regen patches.
This commit is contained in:
naddy 2021-03-11 16:52:46 +00:00
parent 22690c96e2
commit 53bf5e18c7
13 changed files with 173 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
games/oolite/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.24 2021/02/26 18:20:33 naddy Exp $
# $OpenBSD: Makefile,v 1.25 2021/03/11 16:52:46 naddy Exp $
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
HOMEPAGE= http://www.oolite.org/
MAINTAINER= Nicholas Marriott <nicm@openbsd.org>
# GPLv2
PERMIT_PACKAGE= Yes
@ -33,6 +31,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 \

36
games/oolite/patches/patch-src_Cocoa_JoystickHandler_h Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_Cocoa_JoystickHandler_h,v 1.1 2021/03/11 16:52:46 naddy Exp $
Index: src/Cocoa/JoystickHandler.h
--- src/Cocoa/JoystickHandler.h.orig
+++ src/Cocoa/JoystickHandler.h
@@ -57,7 +57,7 @@ SOFTWARE.
// these are required very frequently (once per frame) so must be light
// on CPU cycles (try and avoid too many objc sendmsgs).
// Controls that can be an axis
-enum {
+enum axfn {
AXIS_ROLL,
AXIS_PITCH,
AXIS_YAW,
@@ -66,10 +66,10 @@ enum {
AXIS_VIEWX,
AXIS_VIEWY,
AXIS_end
-} axfn;
+};
// Controls that can be a button
-enum {
+enum butfn {
BUTTON_INCTHRUST,
BUTTON_DECTHRUST,
BUTTON_SCANNERZOOM,
@@ -102,7 +102,7 @@ enum {
BUTTON_VIEWPORT,
BUTTON_VIEWSTARBOARD,
BUTTON_end
-} butfn;
+};
// Stick constants
#define MAX_STICKS 4

13
games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h
View File

@ -1,14 +1,15 @@
$OpenBSD: patch-src_Core_Entities_PlanetEntity_h,v 1.1 2013/10/22 16:52:09 sebastia Exp $
--- src/Core/Entities/PlanetEntity.h.orig Tue Oct 22 07:36:42 2013
+++ src/Core/Entities/PlanetEntity.h Tue Oct 22 07:37:19 2013
$OpenBSD: patch-src_Core_Entities_PlanetEntity_h,v 1.2 2021/03/11 16:52:46 naddy Exp $
Index: src/Core/Entities/PlanetEntity.h
--- src/Core/Entities/PlanetEntity.h.orig
+++ src/Core/Entities/PlanetEntity.h
@@ -65,6 +65,12 @@ typedef struct
GLuint index_array[MAX_TRI_INDICES];
} 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

16
games/oolite/patches/patch-src_Core_Entities_PlanetEntity_m Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_Core_Entities_PlanetEntity_m,v 1.1 2021/03/11 16:52:46 naddy Exp $
Index: src/Core/Entities/PlanetEntity.m
--- src/Core/Entities/PlanetEntity.m.orig
+++ src/Core/Entities/PlanetEntity.m
@@ -46,6 +46,10 @@ MA 02110-1301, USA.
// straight c
+double corona_speed_factor;
+double corona_stage;
+GLfloat rvalue[729];
+
static Vector base_vertex_array[10400];
static int base_terrain_array[10400];
static int next_free_vertex;

20
games/oolite/patches/patch-src_Core_Materials_OOPNGTextureLoader_m
View File

@ -1,25 +1,21 @@
$OpenBSD: patch-src_Core_Materials_OOPNGTextureLoader_m,v 1.4 2021/02/26 18:20:33 naddy Exp $
$OpenBSD: patch-src_Core_Materials_OOPNGTextureLoader_m,v 1.5 2021/03/11 16:52:46 naddy Exp $
* Missing header.
* Fix build with png-1.6; __attribute__((noreturn)) already set in <png.h>.
--- src/Core/Materials/OOPNGTextureLoader.m.orig Mon Sep 21 20:53:30 2009
+++ src/Core/Materials/OOPNGTextureLoader.m Fri Jun 7 22:33:31 2013
@@ -50,11 +50,11 @@ SOFTWARE.
#import "OOFunctionAttributes.h"
Index: src/Core/Materials/OOPNGTextureLoader.m
--- src/Core/Materials/OOPNGTextureLoader.m.orig
+++ src/Core/Materials/OOPNGTextureLoader.m
@@ -51,8 +51,8 @@ SOFTWARE.
#import "OOLogging.h"
#import "OOCPUInfo.h"
+
+#include <assert.h>
+
+#include <assert.h>
-void png_error(png_structp, png_const_charp) NO_RETURN_FUNC;
-
-
static void PNGError(png_structp png, png_const_charp message);
static void PNGWarning(png_structp png, png_const_charp message);
static void PNGRead(png_structp png, png_bytep bytes, png_size_t size);
@@ -242,7 +242,7 @@ static void PNGError(png_structp png, png_const_charp
{
OOPNGTextureLoader *loader = nil;

15
games/oolite/patches/patch-src_Core_OOAsyncQueue_m
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-src_Core_OOAsyncQueue_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
$OpenBSD: patch-src_Core_OOAsyncQueue_m,v 1.3 2021/03/11 16:52:46 naddy Exp $
missing header
--- src/Core/OOAsyncQueue.m.orig Fri Jan 14 13:19:13 2011
+++ src/Core/OOAsyncQueue.m Fri Jan 14 13:19:29 2011
@@ -52,6 +52,9 @@ SOFTWARE.
#import "OOLogging.h"
Index: src/Core/OOAsyncQueue.m
--- src/Core/OOAsyncQueue.m.orig
+++ src/Core/OOAsyncQueue.m
@@ -53,6 +53,9 @@ SOFTWARE.
#import "NSThreadOOExtensions.h"
#import <stdlib.h>
+
+#include <assert.h>
+
+
enum
{

15
games/oolite/patches/patch-src_Core_OOPriorityQueue_m
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-src_Core_OOPriorityQueue_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
$OpenBSD: patch-src_Core_OOPriorityQueue_m,v 1.3 2021/03/11 16:52:46 naddy Exp $
missing header
--- src/Core/OOPriorityQueue.m.orig Fri Jan 14 13:03:08 2011
+++ src/Core/OOPriorityQueue.m Fri Jan 14 13:03:25 2011
@@ -28,6 +28,9 @@ SOFTWARE.
Index: src/Core/OOPriorityQueue.m
--- src/Core/OOPriorityQueue.m.orig
+++ src/Core/OOPriorityQueue.m
@@ -29,6 +29,9 @@ SOFTWARE.
#import "OOPriorityQueue.h"
#import "OOFunctionAttributes.h"
+
+#include <assert.h>
+
+
/* Capacity grows by 50% each time. kMinCapacity must be at least 2 or Bad
Things will happen. Some examples of growth patterns based on kMinCapacity:

14
games/oolite/patches/patch-src_Core_OOTrumble_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_Core_OOTrumble_h,v 1.1 2021/03/11 16:52:46 naddy Exp $
Index: src/Core/OOTrumble.h
--- src/Core/OOTrumble.h.orig
+++ src/Core/OOTrumble.h
@@ -66,7 +66,7 @@ enum trumble_mouth
TRUMBLE_MOUTH_NORMAL
};
-float trumbleAppetiteAccumulator;
+extern float trumbleAppetiteAccumulator;
@interface OOTrumble : NSObject
{

13
games/oolite/patches/patch-src_Core_OOTrumble_m Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_Core_OOTrumble_m,v 1.1 2021/03/11 16:52:46 naddy Exp $
Index: src/Core/OOTrumble.m
--- src/Core/OOTrumble.m.orig
+++ src/Core/OOTrumble.m
@@ -30,6 +30,7 @@ MA 02110-1301, USA.
#import "OOSound.h"
#import "OOStringParsing.h"
+float trumbleAppetiteAccumulator;
static void InitTrumbleSounds(void);
static void PlayTrumbleIdle(void);

15
games/oolite/patches/patch-src_Core_OXPVerifier_OOOXPVerifierStage_m
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-src_Core_OXPVerifier_OOOXPVerifierStage_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
$OpenBSD: patch-src_Core_OXPVerifier_OOOXPVerifierStage_m,v 1.3 2021/03/11 16:52:46 naddy Exp $
missing header
--- src/Core/OXPVerifier/OOOXPVerifierStage.m.orig Fri Jan 14 12:59:57 2011
+++ src/Core/OXPVerifier/OOOXPVerifierStage.m Fri Jan 14 13:00:15 2011
@@ -47,6 +47,9 @@ SOFTWARE.
*/
Index: src/Core/OXPVerifier/OOOXPVerifierStage.m
--- src/Core/OXPVerifier/OOOXPVerifierStage.m.orig
+++ src/Core/OXPVerifier/OOOXPVerifierStage.m
@@ -48,6 +48,9 @@ SOFTWARE.
#import "OOOXPVerifierStageInternal.h"
+
+#include <assert.h>
+
+
#if OO_OXP_VERIFIER_ENABLED
@interface OOOXPVerifierStage (OOPrivate)

15
games/oolite/patches/patch-src_Core_OldSchoolPropertyListWriting_m
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-src_Core_OldSchoolPropertyListWriting_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
$OpenBSD: patch-src_Core_OldSchoolPropertyListWriting_m,v 1.3 2021/03/11 16:52:46 naddy Exp $
missing header
--- src/Core/OldSchoolPropertyListWriting.m.orig Fri Jan 14 13:01:11 2011
+++ src/Core/OldSchoolPropertyListWriting.m Fri Jan 14 13:01:26 2011
@@ -19,6 +19,9 @@
*/
Index: src/Core/OldSchoolPropertyListWriting.m
--- src/Core/OldSchoolPropertyListWriting.m.orig
+++ src/Core/OldSchoolPropertyListWriting.m
@@ -20,6 +20,9 @@
#import "OldSchoolPropertyListWriting.h"
+
+#include <assert.h>
+
+
static BOOL IsFloatingPoint(NSNumber *number);
static void AppendNewLineAndIndent(NSMutableString *ioString, unsigned indentDepth);

36
games/oolite/patches/patch-src_SDL_JoystickHandler_h Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_SDL_JoystickHandler_h,v 1.1 2021/03/11 16:52:46 naddy Exp $
Index: src/SDL/JoystickHandler.h
--- src/SDL/JoystickHandler.h.orig
+++ src/SDL/JoystickHandler.h
@@ -37,7 +37,7 @@ MA 02110-1301, USA.
// these are required very frequently (once per frame) so must be light
// on CPU cycles (try and avoid too many objc sendmsgs).
// Controls that can be an axis
-enum {
+enum axfn {
AXIS_ROLL,
AXIS_PITCH,
AXIS_YAW,
@@ -46,10 +46,10 @@ enum {
AXIS_VIEWX,
AXIS_VIEWY,
AXIS_end
-} axfn;
+};
// Controls that can be a button
-enum {
+enum butfn {
BUTTON_INCTHRUST,
BUTTON_DECTHRUST,
BUTTON_SCANNERZOOM,
@@ -82,7 +82,7 @@ enum {
BUTTON_VIEWPORT,
BUTTON_VIEWSTARBOARD,
BUTTON_end
-} butfn;
+};
// Stick constants
#define MAX_STICKS 2

15
games/oolite/patches/patch-src_SDL_OOSDLSoundMixer_m
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-src_SDL_OOSDLSoundMixer_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
$OpenBSD: patch-src_SDL_OOSDLSoundMixer_m,v 1.3 2021/03/11 16:52:46 naddy Exp $
missing header
--- src/SDL/OOSDLSoundMixer.m.orig Fri Jan 14 13:02:04 2011
+++ src/SDL/OOSDLSoundMixer.m Fri Jan 14 13:02:16 2011
@@ -48,6 +48,9 @@ SOFTWARE.
Index: src/SDL/OOSDLSoundMixer.m
--- src/SDL/OOSDLSoundMixer.m.orig
+++ src/SDL/OOSDLSoundMixer.m
@@ -49,6 +49,9 @@ SOFTWARE.
#import "OOCocoa.h"
#import "OOSDLSoundInternal.h"
+
+#include <assert.h>
+
+
static OOSoundMixer *sSingleton = nil;