diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2020-09-04 18:46:05 +0800 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2020-09-04 18:46:05 +0800 |
| commit | a1d8046ed58edd679e03d116cd26f69c77dcb5f5 (patch) | |
| tree | c4e2d410664e34b2289b2df87fe262d1ed9d715a /audio | |
| parent | c052efb248bd6cc69206595737028ed53b35c562 (diff) | |
| download | freebsd-ports-gnome-a1d8046ed58edd679e03d116cd26f69c77dcb5f5.tar.gz freebsd-ports-gnome-a1d8046ed58edd679e03d116cd26f69c77dcb5f5.tar.zst freebsd-ports-gnome-a1d8046ed58edd679e03d116cd26f69c77dcb5f5.zip | |
Fix build with llvm11 (duplicate symbol errors)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gnaural/files/patch-src-BinauralBeat.h | 11 | ||||
| -rw-r--r-- | audio/gnaural/files/patch-src-gnauralnet.h | 11 | ||||
| -rw-r--r-- | audio/gnaural/files/patch-src-net-MakeLand.h | 22 |
3 files changed, 44 insertions, 0 deletions
diff --git a/audio/gnaural/files/patch-src-BinauralBeat.h b/audio/gnaural/files/patch-src-BinauralBeat.h new file mode 100644 index 000000000000..71386cb54c73 --- /dev/null +++ b/audio/gnaural/files/patch-src-BinauralBeat.h @@ -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); diff --git a/audio/gnaural/files/patch-src-gnauralnet.h b/audio/gnaural/files/patch-src-gnauralnet.h new file mode 100644 index 000000000000..ec8bdc5fe21f --- /dev/null +++ b/audio/gnaural/files/patch-src-gnauralnet.h @@ -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 diff --git a/audio/gnaural/files/patch-src-net-MakeLand.h b/audio/gnaural/files/patch-src-net-MakeLand.h new file mode 100644 index 000000000000..3f604f6051dd --- /dev/null +++ b/audio/gnaural/files/patch-src-net-MakeLand.h @@ -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: |