git: d7ef5c4e1cf7 - main - audio/harp: fix build on 13- and 14-

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d7ef5c4e1cf7c952ab1b3d2113dce9a5e108820f

commit d7ef5c4e1cf7c952ab1b3d2113dce9a5e108820f
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-04-10 22:32:46 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-04-10 23:50:51 +0000

    audio/harp: fix build on 13- and 14-
    
    Multiple "plugins" defined a translation-unit global variable `h`,
    leading to linker errors. Those are supposed to be used only
    from that TU, so make them static, drop BROKEN, and bump
    PORTREVISION because there is a microscopic change in symbols
    in the package.
---
 audio/harp/Makefile                            |  4 +---
 audio/harp/files/patch-plugins_aac_aac.c       | 11 +++++++++++
 audio/harp/files/patch-plugins_mp3_mp3.c       | 11 +++++++++++
 audio/harp/files/patch-plugins_stream_stream.c | 11 +++++++++++
 audio/harp/files/patch-plugins_vorbis_vorbis.c | 11 +++++++++++
 5 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index d47afc6d2dc7..b2e55b2ea024 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	harp
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	heckendorfc at gmail.com
@@ -7,9 +8,6 @@ COMMENT=	Minimalist audio player
 
 LICENSE=	GPLv3
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: h
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: h
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	heckendorfc
 
diff --git a/audio/harp/files/patch-plugins_aac_aac.c b/audio/harp/files/patch-plugins_aac_aac.c
new file mode 100644
index 000000000000..68966db35549
--- /dev/null
+++ b/audio/harp/files/patch-plugins_aac_aac.c
@@ -0,0 +1,11 @@
+--- plugins/aac/aac.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/aac/aac.c
+@@ -25,7 +25,7 @@
+ 
+ #include "aacmeta.c"
+ 
+-struct aacHandles{
++static struct aacHandles{
+ 	volatile unsigned int *total;
+ 	volatile unsigned int *sample;
+ 	unsigned int *rate;
diff --git a/audio/harp/files/patch-plugins_mp3_mp3.c b/audio/harp/files/patch-plugins_mp3_mp3.c
new file mode 100644
index 000000000000..94361d803407
--- /dev/null
+++ b/audio/harp/files/patch-plugins_mp3_mp3.c
@@ -0,0 +1,11 @@
+--- plugins/mp3/mp3.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/mp3/mp3.c
+@@ -22,7 +22,7 @@
+ 
+ pthread_mutex_t dechandle_lock;
+ 
+-struct mp3Handles{
++static struct mp3Handles{
+ 	mpg123_handle *m;
+ 	long total;
+ 	long tcarry;
diff --git a/audio/harp/files/patch-plugins_stream_stream.c b/audio/harp/files/patch-plugins_stream_stream.c
new file mode 100644
index 000000000000..c54db68520a2
--- /dev/null
+++ b/audio/harp/files/patch-plugins_stream_stream.c
@@ -0,0 +1,11 @@
+--- plugins/stream/stream.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/stream/stream.c
+@@ -23,7 +23,7 @@
+ 
+ #define S_DEF_PORT_STR "80"
+ 
+-struct streamHandles{
++static struct streamHandles{
+ 	FILE *rfd;
+ 	FILE *wfd;
+ 	int sfd;
diff --git a/audio/harp/files/patch-plugins_vorbis_vorbis.c b/audio/harp/files/patch-plugins_vorbis_vorbis.c
new file mode 100644
index 000000000000..673a245720de
--- /dev/null
+++ b/audio/harp/files/patch-plugins_vorbis_vorbis.c
@@ -0,0 +1,11 @@
+--- plugins/vorbis/vorbis.c.orig	2021-04-10 21:47:11 UTC
++++ plugins/vorbis/vorbis.c
+@@ -21,7 +21,7 @@
+ 
+ #define VORB_CONTINUE (-50)
+ 
+-struct vorbisHandles{
++static struct vorbisHandles{
+ 	OggVorbis_File *vf;
+ 	unsigned int *total;
+ 	int rate;