From nobody Fri Dec 06 22:02:55 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 4Y4lcb2Shkz5fyFq; Fri, 06 Dec 2024 22:02:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4lcb1vtyz46GM; Fri, 6 Dec 2024 22:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733522575; 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=tyGIE7MXq0VAiadgcV70iu0SmgNuzPCnaa94+cgQ7CY=; b=RySrJy/LYsW5qe1Hft5Trgc53SgA7cJNpi6p9yXxObUsUJa4mJt4h3Oix9t9UGih1hGYwu q/ZvtRFJPTdGL3OXOpPv/CzCOxKHkr7MZ5Jy5ZkVTYtHZuLaM0RiCkwTlUgfqVM4gOS0bI LSfwEP4tot/jRLY3DaPDKXAUTaRhNvH20Hy9ko7G8dUESbB15kvrIjGA2THLYPENLz5jyW iCnCwW8qTAeRzM3Kguoo+ytQbxWMFQCESUawQoNedj7dxBWwluC7RMah93SrAbuk1hT5Dx kGTHnbxYVGgBX8ALTt9J/gD3J8mu8B4nmgNzR1l949ykiRarJaOh2CPOQVht9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733522575; 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=tyGIE7MXq0VAiadgcV70iu0SmgNuzPCnaa94+cgQ7CY=; b=RQDjgZIycvf4dYPnIcvdsEsB6t6rsyGiQpz5biw74I6145o6ArPEYiJRBXxwAA3D/9lTWl b9OXFEahQLp4dZtJIoLQLSgS/S9rKugJxpCQf5x5tJWxFNnnGlvA23eYoEhIQVhSm6bgWA 23TnvsrbbpcOdVnNbIFR75ZKuBKsD96Lf3VJ9BKqfmR+TQ6E8+VGo1pQjJwc1pTwstVCs4 ExAVLzsNzLTDsu+TsFzXs9RBvG8WHn319LNwhKRxka/XdU3nqPKQFx4hgYmw7uTVDyjSXG MVExB0a695ouyMYHnCZdKb7TkZY7MJU/PbtPv3NYeAXmmNNEU3TzHNghxHhgAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733522575; a=rsa-sha256; cv=none; b=UBGgA3ccDJQbHh2YW2N9zvZPVFS6xUmq7pZaz5EltVu9BnFqw2/9X7ijh3FjZC+WwzGCM2 KCDq8Ee4ev3Xk1tWDUukgbWCOfxp9BxUdTx3tMFJsWkz9hUCA4ELNJYyxVDbj2PkOszcXc 9ZbpqMdV8kTbbVc1re2cWZs4+WllG0ZweH6embN0wo+DLIX/MVmEeNcawj7LTJn3ktAOxd 6PdivP9jkuYKFOqc+mxLW+NA3FDMEDmb+mc3uED2gN1F5ifypd7CuGI+vWdq4oN3twTH7g 85h9tRjb3w7vj0mVLMxmGpAdgq4rpFDxiUxyrcoyY5MqM5pWjGtVgfOffXlGLQ== 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 4Y4lcb1WLmzwJr; Fri, 6 Dec 2024 22:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6M2tNS033423; Fri, 6 Dec 2024 22:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6M2tEo033420; Fri, 6 Dec 2024 22:02:55 GMT (envelope-from git) Date: Fri, 6 Dec 2024 22:02:55 GMT Message-Id: <202412062202.4B6M2tEo033420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 49583c3a40d2 - main - multimedia/pipewire: unbreak ALSA=on with default config 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 49583c3a40d221e85ae6d35f92a95b6764064344 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=49583c3a40d221e85ae6d35f92a95b6764064344 commit 49583c3a40d221e85ae6d35f92a95b6764064344 Author: Jan Beich AuthorDate: 2023-06-15 03:28:16 +0000 Commit: Jan Beich CommitDate: 2024-12-06 22:02:45 +0000 multimedia/pipewire: unbreak ALSA=on with default config $ pw-play foo.wav stream node 42 error: no target node available remote error: id=2 seq:7 res:-2 (No such file or directory): no target node available PR: 272004 Approved by: arrowd (maintainer) (cherry picked from commit a7aaffb08b1688f28121d1f12e8012fd40bf75e7) --- multimedia/pipewire/Makefile | 9 ++++++++- multimedia/pipewire/files/10-alsa-default.conf.in | 23 +++++++++++++++++++++++ multimedia/pipewire/pkg-plist | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 53c4f91a4926..6213315458f2 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,6 +1,6 @@ PORTNAME= pipewire DISTVERSION= 1.2.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MAINTAINER= arrowd@FreeBSD.org @@ -37,6 +37,8 @@ OPTIONS_SUB= yes ALSA_MESON_ENABLED= alsa pipewire-alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins +ALSA_SUB_FILES= 10-alsa-default.conf AVAHI_DESC= Automatic service discovery for the Pulseaudio module via Avahi AVAHI_IMPLIES= PULSEAUDIO @@ -105,4 +107,9 @@ post-patch: ${REINPLACE_CMD} -e "s|find_installation('python3'|find_installation('python${PYTHON_VER}'|" \ ${WRKSRC}/meson.build +post-install-ALSA-on: + ${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME}.conf.d + ${INSTALL_DATA} ${WRKDIR}/10-alsa-default.conf \ + ${STAGEDIR}${DATADIR}/${PORTNAME}.conf.d + .include diff --git a/multimedia/pipewire/files/10-alsa-default.conf.in b/multimedia/pipewire/files/10-alsa-default.conf.in new file mode 100644 index 000000000000..8eb5c9b1ea6b --- /dev/null +++ b/multimedia/pipewire/files/10-alsa-default.conf.in @@ -0,0 +1,23 @@ +# Create sink and source for the default device +# See also %%LOCALBASE%%/etc/asound.conf + +context.objects = [ + { factory = adapter + args = { + factory.name = api.alsa.pcm.sink + node.name = "alsa-sink" + node.description = "ALSA plugins (OSS by default)" + media.class = "Audio/Sink" + api.alsa.path = "pcm.default" + } + } + { factory = adapter + args = { + factory.name = api.alsa.pcm.source + node.name = "alsa-source" + node.description = "ALSA plugins (OSS by default)" + media.class = "Audio/Source" + api.alsa.path = "pcm.default" + } + } +] diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 25f5afa59c48..d1459c4535aa 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -463,3 +463,4 @@ share/locale/zh_TW/LC_MESSAGES/pipewire.mo %%DATADIR%%/pipewire.conf %%DATADIR%%/pipewire.conf.avail/10-rates.conf %%DATADIR%%/pipewire.conf.avail/20-upmix.conf +%%ALSA%%%%DATADIR%%/pipewire.conf.d/10-alsa-default.conf