mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
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.
This commit is contained in:
parent
23b483f917
commit
d7ef5c4e1c
@ -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
|
||||
|
||||
|
11
audio/harp/files/patch-plugins_aac_aac.c
Normal file
11
audio/harp/files/patch-plugins_aac_aac.c
Normal file
@ -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;
|
11
audio/harp/files/patch-plugins_mp3_mp3.c
Normal file
11
audio/harp/files/patch-plugins_mp3_mp3.c
Normal file
@ -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;
|
11
audio/harp/files/patch-plugins_stream_stream.c
Normal file
11
audio/harp/files/patch-plugins_stream_stream.c
Normal file
@ -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;
|
11
audio/harp/files/patch-plugins_vorbis_vorbis.c
Normal file
11
audio/harp/files/patch-plugins_vorbis_vorbis.c
Normal file
@ -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;
|
Loading…
Reference in New Issue
Block a user