From nobody Tue Jan 30 16:53:13 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPWSn2ml9z599Zd; Tue, 30 Jan 2024 16:53:13 +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 4TPWSn2DFcz49Vg; Tue, 30 Jan 2024 16:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706633593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2u7vr106zI5MJFKUpYHrU1nPVeRX0UYHECywZsvOS5w=; b=iGaEDZg8LGU0Qk8nT4Kb4pFs8aoVnkjjxpx9ncNKpP0zJ8H82j0kxvADVV7t3W4lsuCbSy 11sgEmBIqrojdAW772AgNlTYkq6BugBUesUVoOfyd1jXW+rvvpMJLmijLbKMXIWaXSw3ul yFvw0rRWu2QDGFJ2/CioFbtkeqotRJkIm2UFuwVisGDuWieXMOdP+A/N4em5j4VonnoCcK tJApSDMywgYblxloWfYZzDToQisPKa/+32NJ246Q0nV/oxL1c8ZJutPv4duBVd8jLT3h+G ds1KfVN6aeOQwkupgcjOoe1XqZaT0h5gcTmpyhXrvJ6yAc/yfAh0x3LVsmFL1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706633593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2u7vr106zI5MJFKUpYHrU1nPVeRX0UYHECywZsvOS5w=; b=J6kK286sgR3IM/K1WGECFKnhrp88r5bE0BzV45YIXeK0OZsUjNaBQ0wd3LuifxXkyGNiUW 4kQRl0z2T/avkjf1n3rtDchKovcHlyDQubOESbmWLEXbPzbN22wqYPpDrsGrBAf3jJ6N3o oknQewW0IgHvkPzrGZgpJ75bmqMUB7k7wWqhUbpMKE4uzlfjh6Z3+f/AJa7Bnzc5ZqCBbU okbRnHjA4hOm55sp/tIfS39Nxughk+GcyiCrJBmubdcCby8bWhK1irYy1usaRbkQWSDJlk Wi5SXlW+IrwPWXmHW9TgXkoSvvUmskMyPSMRozPafk3h1UtjlH/regbB8oD/8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706633593; a=rsa-sha256; cv=none; b=G8oEGGD8UaOgfZTfK1oAF6+sRE0CORzRt/74HrLnNzLDm0cgxCOEWKYWRmaTtRQR6JVQHC vNhv3ZZ6PwZhRXg985ucq4AD/vtzNNx8RDdivoRq9p7hzQt4TcYtY+OvmjtQx7AhWnGgLe suJOQA84lmaZqz17TFZeFlfr7iqrQICDCOmqnqPFt7BkY+LWS3jvB2yamionL9bx3XUQYJ iPw5IFjqFX3W24/kanPVYSg1sC++EdpnqBOrm1FECS69+9jbrTsdCoX2Bca91qZvZaVSRM VhBpag3jEbgJbLJjj+HxLphgT6BukvfuztWeZ3uNO8EtRL3tSxvalmlAPi243g== 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 4TPWSn0gDNzkWG; Tue, 30 Jan 2024 16:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40UGrDHR063973; Tue, 30 Jan 2024 16:53:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UGrDiu063970; Tue, 30 Jan 2024 16:53:13 GMT (envelope-from git) Date: Tue, 30 Jan 2024 16:53:13 GMT Message-Id: <202401301653.40UGrDiu063970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 48f6692e42a4 - 2024Q1 - audio/alsa-plugins: unbreak JACK=on build after 6cd91556d4b8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 48f6692e42a4d755db5cd8122a18e3bcb4e086b7 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=48f6692e42a4d755db5cd8122a18e3bcb4e086b7 commit 48f6692e42a4d755db5cd8122a18e3bcb4e086b7 Author: Florian Walpen AuthorDate: 2023-11-03 22:48:48 +0000 Commit: Jan Beich CommitDate: 2024-01-30 16:53:04 +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 (cherry picked from commit 609ec25809c7d1571a758ad09832fd6f6e1bc188) --- 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