sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-13 07:41:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

games/openbor: update to 7610

Browse source 
Changes:	87ea891e...f4510854
This commit is contained in:
Jan Beich 2024-01-31 19:34:10 +01:00
parent 84cf50e4d3
commit b49fedd5dc
4 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
games/openbor/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= openbor PORTNAME= openbor
# Hint: svn revision is git rev-list --count ${GH_TAGNAME} # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
PORTVERSION?= 7586 PORTVERSION?= 7610
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= games CATEGORIES= games
@ -35,7 +35,7 @@ PORTSCOUT= ignore:1
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= DCurrent GH_ACCOUNT= DCurrent
GH_TAGNAME?= 87ea891e GH_TAGNAME?= f4510854
USES+= cpe gmake pkgconfig sdl USES+= cpe gmake pkgconfig sdl
.if ${PORTVERSION} < 4433 .if ${PORTVERSION} < 4433

6
games/openbor/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1706209104 TIMESTAMP = 1707519600
SHA256 (DCurrent-openbor-7586-87ea891e_GH0.tar.gz) = 14693862178fd4eb1e36fb9f9ac3122b77740a0755942fcc5823fe3165a047bd SHA256 (DCurrent-openbor-7610-f4510854_GH0.tar.gz) = 0fe777b69a23e2913a37260dbf9c9c680a0376acfe0f2402a7b7fe6281bcfe0b
SIZE (DCurrent-openbor-7586-87ea891e_GH0.tar.gz) = 89138596 SIZE (DCurrent-openbor-7610-f4510854_GH0.tar.gz) = 212696672

32
games/openbor/files/patch-revert Normal file
View file

@ -0,0 +1,32 @@
Partially revert https://github.com/DCurrent/openbor/commit/16939d70c3af
due to breaking fonts with old games (e.g., Rocket Viper v2.41)
--- openbor.c.orig 2024-02-09 23:00:00 UTC
+++ openbor.c
@@ -46507,10 +46507,6 @@ void startup()
// init. input recorder
init_input_recorder();
- printf("Loading fonts................\t");
- load_all_fonts();
- printf("Done!\n");
-
printf("Loading sprites..............\t");
load_special_sprites();
printf("Done!\n");
@@ -46545,9 +46541,13 @@ void startup()
load_menu_txt();
printf("Done!\n");
+ printf("Loading fonts................\t");
+ load_all_fonts();
+ printf("Done!\n");
+
/*
- Kratus (01-2024) Moved the translation and menu functions to the end of the engine "startup" function,
- but before the "control init" function (reverted the font function to load before scripts)
+ Kratus (10-2021) Moved the translation, menu and font functions to the end of the engine "startup" function,
+ but before the "control init" function
*/
printf("Loading translation..........\t");
ob_inittrans();

16
games/openbor/files/patch-source_utils.c
View file

@ -1,3 +1,6 @@
source/utils.c:18:10: fatal error: 'features.h' file not found
18 | #include <features.h>
| ^~~~~~~~~~~~
source/utils.c:303:54: error: implicit declaration of function 'mallinfo' is invalid in C99 source/utils.c:303:54: error: implicit declaration of function 'mallinfo' is invalid in C99
[-Werror,-Wimplicit-function-declaration] [-Werror,-Wimplicit-function-declaration]
writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena);
@ -6,9 +9,18 @@ source/utils.c:303:64: error: member reference base type 'int' is not a structur
writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena);
~~~~~~~~~~^~~~~~ ~~~~~~~~~~^~~~~~
--- source/utils.c.orig 2024-01-02 00:04:19 UTC --- source/utils.c.orig 2024-02-01 15:55:11 UTC
+++ source/utils.c +++ source/utils.c
@@ -303,9 +303,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f @@ -14,7 +14,7 @@
#include <locale.h>
#include <math.h>
-#ifdef LINUX
+#if defined(__linux__)
#include <features.h>
#endif
@@ -307,9 +307,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f
"\n* Shutting Down *\n\n"); "\n* Shutting Down *\n\n");
writeToLogFile("Out of memory!\n"); writeToLogFile("Out of memory!\n");
writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line); writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line);