From owner-dev-commits-ports-main@freebsd.org Sat Apr 10 23:51:18 2021
Return-Path: <owner-dev-commits-ports-main@freebsd.org>
Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id F02D55DB8DE;
Sat, 10 Apr 2021 23:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4FHsGG6XYSz4Ymq;
Sat, 10 Apr 2021 23:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D34D41A2C0;
Sat, 10 Apr 2021 23:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13ANpIbn030668;
Sat, 10 Apr 2021 23:51:18 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13ANpIPj030667;
Sat, 10 Apr 2021 23:51:18 GMT (envelope-from git)
Date: Sat, 10 Apr 2021 23:51:18 GMT
Message-Id: <202104102351.13ANpIPj030667@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Adriaan de Groot <adridg@FreeBSD.org>
Subject: git: d7ef5c4e1cf7 - main - audio/harp: fix build on 13- and 14-
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: adridg
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: d7ef5c4e1cf7c952ab1b3d2113dce9a5e108820f
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the main branch of the FreeBSD ports repository
<dev-commits-ports-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-main>,
<mailto:dev-commits-ports-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-main/>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Help: <mailto:dev-commits-ports-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-main>,
<mailto:dev-commits-ports-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Apr 2021 23:51:19 -0000
The branch main has been updated by adridg:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d7ef5c4e1cf7c952ab1b3d2113dce9a5e108820f
commit d7ef5c4e1cf7c952ab1b3d2113dce9a5e108820f
Author: Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2021-04-10 22:32:46 +0000
Commit: Adriaan de Groot <adridg@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@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;