git: 609ec25809c7 - main - audio/alsa-plugins: unbreak JACK=on build after 6cd91556d4b8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 30 Jan 2024 16:52:47 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=609ec25809c7d1571a758ad09832fd6f6e1bc188
commit 609ec25809c7d1571a758ad09832fd6f6e1bc188
Author: Florian Walpen <dev@submerge.ch>
AuthorDate: 2023-11-03 22:48:48 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-01-30 16:50:58 +0000
audio/alsa-plugins: unbreak JACK=on build after 6cd91556d4b8
pcm_jack.c:606:23: error: use of undeclared identifier 'program_invocation_short_name'
const char *pname = program_invocation_short_name;
^
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: etc/alsa/conf.d/50-jack.conf
Error: Orphaned: share/alsa/alsa.conf.d/50-jack.conf
PR: 274792
---
audio/alsa-plugins/files/patch-jack_pcm__jack.c | 11 +++++++++++
audio/alsa-plugins/pkg-plist | 2 ++
2 files changed, 13 insertions(+)
diff --git a/audio/alsa-plugins/files/patch-jack_pcm__jack.c b/audio/alsa-plugins/files/patch-jack_pcm__jack.c
new file mode 100644
index 000000000000..12ad92846719
--- /dev/null
+++ b/audio/alsa-plugins/files/patch-jack_pcm__jack.c
@@ -0,0 +1,11 @@
+--- jack/pcm_jack.c.orig 2023-11-03 22:31:39 UTC
++++ jack/pcm_jack.c
+@@ -603,7 +603,7 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const c
+ }
+
+ if (client_name == NULL) {
+- const char *pname = program_invocation_short_name;
++ const char *pname = getprogname();
+ if (!pname[0]) {
+ pname = "alsa-jack";
+ }
diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist
index d93a5bad2821..1428c962f8aa 100644
--- a/audio/alsa-plugins/pkg-plist
+++ b/audio/alsa-plugins/pkg-plist
@@ -1,5 +1,6 @@
%%FFMPEG%%etc/alsa/conf.d/10-rate-lav.conf
%%SAMPLERATE%%etc/alsa/conf.d/10-samplerate.conf
+%%JACK%%etc/alsa/conf.d/50-jack.conf
%%FFMPEG%%etc/alsa/conf.d/60-a52-encoder.conf
@comment etc/alsa/conf.d/50-arcam-av-ctl.conf
@comment etc/alsa/conf.d/50-oss.conf
@@ -52,6 +53,7 @@ lib/alsa-lib/libasound_module_pcm_vdownmix.so
%%FFMPEG%%share/alsa/alsa.conf.d/10-rate-lav.conf
%%SAMPLERATE%%share/alsa/alsa.conf.d/10-samplerate.conf
@comment share/alsa/alsa.conf.d/50-arcam-av-ctl.conf
+%%JACK%%share/alsa/alsa.conf.d/50-jack.conf
@comment share/alsa/alsa.conf.d/50-oss.conf
%%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf
%%FFMPEG%%share/alsa/alsa.conf.d/60-a52-encoder.conf