Date: Fri, 4 Sep 2020 10:46:05 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547527 - head/audio/gnaural/files Message-ID: <202009041046.084Ak5dG017082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Fri Sep 4 10:46:05 2020 New Revision: 547527 URL: https://svnweb.freebsd.org/changeset/ports/547527 Log: Fix build with llvm11 (duplicate symbol errors) Added: head/audio/gnaural/files/patch-src-BinauralBeat.h (contents, props changed) head/audio/gnaural/files/patch-src-gnauralnet.h (contents, props changed) head/audio/gnaural/files/patch-src-net-MakeLand.h (contents, props changed) Added: head/audio/gnaural/files/patch-src-BinauralBeat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gnaural/files/patch-src-BinauralBeat.h Fri Sep 4 10:46:05 2020 (r547527) @@ -0,0 +1,11 @@ +--- src/BinauralBeat.h.orig 2011-05-22 22:38:45 UTC ++++ src/BinauralBeat.h +@@ -166,7 +166,7 @@ int BB_SetupVoice (int VoiceID, // Array index for a B + int mute, //TRUE or FALSE + int mono, //TRUE or FALSE [added 20100614] + int NumberOfEvents); //how many events in your array +-void (*BB_UserFunc) (int voice); ++extern void (*BB_UserFunc) (int voice); + void BB_Water (int voice, short *array, int arraylen, float Lowcut); + short *BB_WaterInit (int arraylen, float pitch); + void BB_WaterVoiceInit (int voice); Added: head/audio/gnaural/files/patch-src-gnauralnet.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gnaural/files/patch-src-gnauralnet.h Fri Sep 4 10:46:05 2020 (r547527) @@ -0,0 +1,11 @@ +--- src/gnauralnet.h.orig 2011-02-21 22:28:39 UTC ++++ src/gnauralnet.h +@@ -230,7 +230,7 @@ void GN_Time_ProcessOutgoingData (GN_Friend * curFrien + void GN_ShowInfo (); + + //Global variables: +-unsigned short GN_ScheduleFingerprint; ++extern unsigned short GN_ScheduleFingerprint; + typedef struct GN_Globals_type + { + int State; //DO NOT MOVE THIS; it gets initialized in gnauralnet_main Added: head/audio/gnaural/files/patch-src-net-MakeLand.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gnaural/files/patch-src-net-MakeLand.h Fri Sep 4 10:46:05 2020 (r547527) @@ -0,0 +1,22 @@ +--- src/net/MakeLand.h.orig 2010-12-20 21:12:31 UTC ++++ src/net/MakeLand.h +@@ -31,13 +31,13 @@ + //regardless of mask. 021102 + + #define ML_SHIFT 10 +-int *MakeLand_bmpHeights; +-int *MakeLand_bmpColors; +-int MakeLand_Width; +-int MakeLand_Height; +-int MakeLand_InternallyGeneratedBitapsFlag; ++extern int *MakeLand_bmpHeights; ++extern int *MakeLand_bmpColors; ++extern int MakeLand_Width; ++extern int MakeLand_Height; ++extern int MakeLand_InternallyGeneratedBitapsFlag; + typedef int (*MAKELAND_USER_CALLBACK) (int message); //declaration usage: USER_CALLBACK pUserCallback; +-MAKELAND_USER_CALLBACK MakeLand_UserCallback; ++extern MAKELAND_USER_CALLBACK MakeLand_UserCallback; + + ///////////////////////////// + //creates the color and heights bitmap:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009041046.084Ak5dG017082>