svn commit: r547523 - head/games/jfsw/files
Ganael LAPLANCHE
martymac at FreeBSD.org
Fri Sep 4 10:35:01 UTC 2020
Author: martymac
Date: Fri Sep 4 10:34:58 2020
New Revision: 547523
URL: https://svnweb.freebsd.org/changeset/ports/547523
Log:
Fix build with llvm11 (duplicate symbol errors)
While here, re-generate patches using 'makepatch' target.
Added:
head/games/jfsw/files/patch-src-grpscan.h (contents, props changed)
Modified:
head/games/jfsw/files/patch-Makefile
head/games/jfsw/files/patch-jfaudiolib-Makefile
head/games/jfsw/files/patch-jfaudiolib-Makefile.shared
head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c
head/games/jfsw/files/patch-jfbuild-Makefile
head/games/jfsw/files/patch-jfbuild-src-kplib.c
head/games/jfsw/files/patch-jfbuild-src-sdlayer.c
head/games/jfsw/files/patch-src-game.c
head/games/jfsw/files/patch-src-gamedefs.h
head/games/jfsw/files/patch-src-jnstub.c
Modified: head/games/jfsw/files/patch-Makefile
==============================================================================
--- head/games/jfsw/files/patch-Makefile Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-Makefile Fri Sep 4 10:34:58 2020 (r547523)
@@ -2,8 +2,8 @@ Rename PREFIX to DATADIR as its purpose is only to fin
conflicts with our PREFIX, which has another meaning).
Do not enforce compilers.
---- Makefile.orig 2014-01-07 08:52:28.000000000 +0100
-+++ Makefile 2014-11-17 19:05:21.738720856 +0100
+--- Makefile.orig 2020-09-03 06:19:21 UTC
++++ Makefile
@@ -14,7 +14,7 @@
RELEASE ?= 1
@@ -13,7 +13,7 @@ Do not enforce compilers.
# DirectX SDK location
DXROOT ?= $(USERPROFILE)/sdks/directx/dx81
-@@ -61,8 +61,8 @@
+@@ -61,8 +61,8 @@ endif
include $(AUDIOLIBROOT)/Makefile.shared
@@ -24,7 +24,7 @@ Do not enforce compilers.
OURCFLAGS=$(debug) -W -Wall -Wimplicit -Wno-unused \
-fno-pic -fno-strict-aliasing -DNO_GCC_BUILTINS \
-I$(INC) -I$(EINC) -I$(MACTROOT) -I$(AUDIOLIBROOT)/include
-@@ -165,6 +165,10 @@
+@@ -165,6 +165,10 @@ ifeq ($(PLATFORM),LINUX)
NASMFLAGS+= -f elf
GAMELIBS+= $(JFAUDIOLIB_LDFLAGS)
endif
@@ -35,7 +35,7 @@ Do not enforce compilers.
ifeq ($(PLATFORM),WINDOWS)
OURCFLAGS+= -I$(DXROOT)/include
NASMFLAGS+= -f win32 --prefix _
-@@ -192,7 +196,7 @@
+@@ -192,7 +196,7 @@ endif
OURCFLAGS+= $(BUILDCFLAGS)
ifneq ($(PLATFORM),WINDOWS)
Modified: head/games/jfsw/files/patch-jfaudiolib-Makefile
==============================================================================
--- head/games/jfsw/files/patch-jfaudiolib-Makefile Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-jfaudiolib-Makefile Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,8 +1,8 @@
Do not enforce compilers / flags
---- jfaudiolib/Makefile.orig 2014-11-13 09:26:16.821946185 +0100
-+++ jfaudiolib/Makefile 2014-11-13 09:42:05.999047069 +0100
-@@ -8,9 +8,9 @@
+--- jfaudiolib/Makefile.orig 2020-09-03 06:19:21 UTC
++++ jfaudiolib/Makefile
+@@ -8,9 +8,9 @@ else
OPTLEVEL=-O2
endif
Modified: head/games/jfsw/files/patch-jfaudiolib-Makefile.shared
==============================================================================
--- head/games/jfsw/files/patch-jfaudiolib-Makefile.shared Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-jfaudiolib-Makefile.shared Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,9 +1,9 @@
Disable ALSA and FluidSynth (MIDI) support : use SDL for PCM/CD/Music support.
See jfaudiolib/src/drivers.c for the exact role of each driver.
---- jfaudiolib/Makefile.shared.orig 2013-06-01 02:16:56.000000000 +0200
-+++ jfaudiolib/Makefile.shared 2014-11-25 06:23:00.693738002 +0100
-@@ -18,12 +18,12 @@
+--- jfaudiolib/Makefile.shared.orig 2013-06-01 00:16:56 UTC
++++ jfaudiolib/Makefile.shared
+@@ -18,12 +18,12 @@ else
JFAUDIOLIB_HAVE_SDL=1
JFAUDIOLIB_LDFLAGS+= $(shell pkg-config --libs sdl)
endif
Modified: head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c
==============================================================================
--- head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,7 +1,7 @@
Allow definition of clockid_t from within time.h, included by pthread.h
---- jfaudiolib/src/driver_fluidsynth.c.orig 2014-11-17 09:33:38.377936840 +0100
-+++ jfaudiolib/src/driver_fluidsynth.c 2014-11-17 18:56:05.694804967 +0100
+--- jfaudiolib/src/driver_fluidsynth.c.orig 2020-09-03 06:19:21 UTC
++++ jfaudiolib/src/driver_fluidsynth.c
@@ -29,7 +29,10 @@
#include <string.h>
#include <stdio.h>
Modified: head/games/jfsw/files/patch-jfbuild-Makefile
==============================================================================
--- head/games/jfsw/files/patch-jfbuild-Makefile Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-jfbuild-Makefile Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,8 +1,8 @@
Do not enforce compilers
---- jfbuild/Makefile.orig 2014-11-13 08:43:00.382215199 +0100
-+++ jfbuild/Makefile 2014-11-13 08:43:23.230777638 +0100
-@@ -55,8 +55,8 @@
+--- jfbuild/Makefile.orig 2020-09-03 06:19:21 UTC
++++ jfbuild/Makefile
+@@ -55,8 +55,8 @@ else
debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE
endif
Modified: head/games/jfsw/files/patch-jfbuild-src-kplib.c
==============================================================================
--- head/games/jfsw/files/patch-jfbuild-src-kplib.c Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-jfbuild-src-kplib.c Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,8 +1,8 @@
Make return-free function void
---- jfbuild/src/kplib.c.orig 2014-11-13 08:27:09.882066653 +0100
-+++ jfbuild/src/kplib.c 2014-11-13 08:27:25.864964483 +0100
-@@ -2495,7 +2495,7 @@
+--- jfbuild/src/kplib.c.orig 2020-09-03 06:19:21 UTC
++++ jfbuild/src/kplib.c
+@@ -2495,7 +2495,7 @@ static int kddsrend (const char *buf, int leng,
//=============================== DDS ends ==================================
//=================== External picture interface begins ======================
Modified: head/games/jfsw/files/patch-jfbuild-src-sdlayer.c
==============================================================================
--- head/games/jfsw/files/patch-jfbuild-src-sdlayer.c Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-jfbuild-src-sdlayer.c Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,8 +1,8 @@
Ensure jfsw and build files get created within $HOME/.jfsw
---- jfbuild/src/sdlayer.c.orig 2014-11-19 11:24:19.905905262 +0100
-+++ jfbuild/src/sdlayer.c 2014-11-19 11:36:43.045765953 +0100
-@@ -152,6 +152,16 @@
+--- jfbuild/src/sdlayer.c.orig 2020-09-03 06:19:21 UTC
++++ jfbuild/src/sdlayer.c
+@@ -152,6 +152,16 @@ int main(int argc, char *argv[])
{
int r;
Modified: head/games/jfsw/files/patch-src-game.c
==============================================================================
--- head/games/jfsw/files/patch-src-game.c Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-src-game.c Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,8 +1,8 @@
Rename PREFIX to DATADIR as its purpose is only to find data files.
---- src/game.c.orig 2014-11-17 19:06:17.227366945 +0100
-+++ src/game.c 2014-11-17 19:06:27.493911819 +0100
-@@ -3470,9 +3470,9 @@
+--- src/game.c.orig 2020-09-03 06:19:21 UTC
++++ src/game.c
+@@ -3470,9 +3470,9 @@ int app_main(int argc, char const * const argv[])
}
#endif
Modified: head/games/jfsw/files/patch-src-gamedefs.h
==============================================================================
--- head/games/jfsw/files/patch-src-gamedefs.h Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-src-gamedefs.h Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,9 +1,9 @@
Avoid buffer overflow @src/config.c:255 where JoystickDigitalAxes[6] overrides
RTSName.
---- src/gamedefs.h.orig 2014-11-19 08:03:04.589718681 +0100
-+++ src/gamedefs.h 2014-11-19 08:03:37.128424065 +0100
-@@ -125,7 +125,7 @@
+--- src/gamedefs.h.orig 2020-09-03 06:19:21 UTC
++++ src/gamedefs.h
+@@ -125,7 +125,7 @@ extern "C" {
// Number of JOY axes
Added: head/games/jfsw/files/patch-src-grpscan.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-src-grpscan.h Fri Sep 4 10:34:58 2020 (r547523)
@@ -0,0 +1,13 @@
+--- src/grpscan.h.orig 2020-09-03 06:19:21 UTC
++++ src/grpscan.h
+@@ -31,7 +31,9 @@ struct grpfile {
+ int crcval;
+ int size;
+ struct grpfile *next;
+-} grpfiles[numgrpfiles], *foundgrps;
++};
++
++extern struct grpfile grpfiles[numgrpfiles], *foundgrps;
+
+ int ScanGroups(void);
+ void FreeGroups(void);
Modified: head/games/jfsw/files/patch-src-jnstub.c
==============================================================================
--- head/games/jfsw/files/patch-src-jnstub.c Fri Sep 4 10:18:05 2020 (r547522)
+++ head/games/jfsw/files/patch-src-jnstub.c Fri Sep 4 10:34:58 2020 (r547523)
@@ -1,8 +1,8 @@
Do not hardcode data directory (available as DATADIR)
---- src/jnstub.c.orig 2014-11-17 19:10:37.306944907 +0100
-+++ src/jnstub.c 2014-11-17 19:12:27.694272007 +0100
-@@ -699,7 +699,9 @@
+--- src/jnstub.c.orig 2020-09-03 06:19:21 UTC
++++ src/jnstub.c
+@@ -699,7 +699,9 @@ ExtInit(void)
#if defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
addsearchpath("/usr/share/games/jfsw");
More information about the svn-ports-all
mailing list