From nobody Thu Jun 15 22:12:06 2023 X-Original-To: dev-commits-ports-main@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 4QhxNQ307pz4dJNW; Thu, 15 Jun 2023 22:12:06 +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 4QhxNQ2Zj6z3D46; Thu, 15 Jun 2023 22:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686867126; 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=hd1NIvSuleg5fnyX720F3H+HUIESMjEb08/upPGxawg=; b=Jr0mYK6rIczYLE0+dmtCzuJob8/QsVcMtHJ96N67gbMngfxmUJaCyXelnGBZj1Tm/POWnw 60XWEX6mcGAPV59gunVOk0I9KN5ohtIoN/Q98ssNaFinv4wu0Klj+esOASk8NdQRENs+lg xIH4AQSYgc1n5sxwAzMlIP7JsJ8YGb/eWuD2aeL4itih7UMvlHKNoL9u//0JipOH8qflT9 EBWyn7oJGosSYgYMaVFbLk5zJez+/SURcqAnaEsBXQRJdBz0lcfoVM/UDY1UEi2Aiq4VrK 4PICYWLuvB9ORNtCJp07uwpQLOvA3zNxcmxpUlzzmwIgnMv9JpPT6WBzUtvqRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686867126; 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=hd1NIvSuleg5fnyX720F3H+HUIESMjEb08/upPGxawg=; b=N0bg2ioWADh0zms1T1Xzw8qWOKKnGWdLqFtMv6gLAr/Bcwc2f+W1zeh3jdN5YhIBja5FkF 32Kv73XBEUT3Ta8YaHIeNoSuVtIOLK0CxpmQXPjm3dhKOYksdw7vHGS7Dy5wwrWoFmNkBU pRbH0dCElHwjoEuMst0fBwg0ho4+4EQxtQDbct2gKj6mKwuj+KTFG39OX1pp/IyGsLA6kt Lknnw/w8kS9lasSm0ZjF8N/f2aSyRPywvjHw4mOXH0Ortu2wAmvtLmu0rLY3KWQdGIf2s0 KBHKAyqJc4jEusiPn0/VYWKANx8z37QkFKIrmp8DeSQ6XoYPZXdRYNLh8n2ujA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686867126; a=rsa-sha256; cv=none; b=Sg08ylqywqV5eXMCwZmRaMZe4/GV1AfGj7Ki5aGmnRyvGnZmn8KUJE9fkv9xTRLpBhM9cg +L8AJ6fnsHYsR80SgL+t6xGgUcYgOTL/R7dLZc2YfjjxvY2eLuR07Wvyfn2MtnQAcXwZdf SpwxT1DSYJLqPi3WNvRQoo4ImZ69jpfR/FAPW1zXge1ep1BHgjNg0ZVsDV59GxhzpPhDjd yesd60oqq3CQtGAQt0Yy9c2tTNI9FBtWCoqAvMEOl/8nilcUK5Kh6xxFBjXxiTtkkazALk mtUG6JNxuYfJHrIGmt4tKOnQuRa3E2QZfVC7NtIZHFRZFm8XrWLWfFE6G/YBoQ== 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 4QhxNQ1frwz1389; Thu, 15 Jun 2023 22:12:06 +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 35FMC6Lr044010; Thu, 15 Jun 2023 22:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35FMC6sO044009; Thu, 15 Jun 2023 22:12:06 GMT (envelope-from git) Date: Thu, 15 Jun 2023 22:12:06 GMT Message-Id: <202306152212.35FMC6sO044009@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: a7aaffb08b16 - main - multimedia/pipewire: unbreak audio with default config List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a7aaffb08b1688f28121d1f12e8012fd40bf75e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7aaffb08b1688f28121d1f12e8012fd40bf75e7 commit a7aaffb08b1688f28121d1f12e8012fd40bf75e7 Author: Jan Beich AuthorDate: 2023-06-15 03:28:16 +0000 Commit: Jan Beich CommitDate: 2023-06-15 22:10:49 +0000 multimedia/pipewire: unbreak audio with default config $ pw-play foo.wav stream node 35 error: no node available remote error: id=2 seq:5 res:-2 (No such file or directory): no node available PR: 272004 Approved by: arrowd (maintainer) --- multimedia/pipewire/Makefile | 13 ++++++++++--- multimedia/pipewire/files/10-alsa-default.conf.in | 23 +++++++++++++++++++++++ multimedia/pipewire/pkg-plist | 1 + 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 0a2d4365a1be..02682a6e2498 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,6 +1,6 @@ PORTNAME= pipewire DISTVERSION= 0.3.62 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session DISTFILES= media-session-${MEDIA_SESSION_VERSION}${EXTRACT_SUFX}:media_session @@ -13,8 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libdbus-1.so:devel/dbus \ +LIB_DEPENDS= libdbus-1.so:devel/dbus \ libinotify.so:devel/libinotify \ libepoll-shim.so:devel/libepoll-shim \ libsndfile.so:audio/libsndfile \ @@ -43,9 +42,12 @@ MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= man MEDIASESSION_DESC= Session manager support +MEDIASESSION_LIB_DEPENDS= libasound.so:audio/alsa-lib +MEDIASESSION_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins MEDIASESSION_MESON_ENABLED= alsa pipewire-alsa MEDIASESSION_MESON_ON= -Dsession-managers=media-session MEDIASESSION_MESON_OFF= -Dsession-managers='' +MEDIASESSION_SUB_FILES= 10-alsa-default.conf PULSEAUDIO_MESON_ENABLED= avahi libpulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio \ @@ -97,4 +99,9 @@ post-patch-MEDIASESSION-on: @${REINPLACE_CMD} '/manager_args/ s/@sm_comment@//g' \ ${WRKSRC}/src/daemon/pipewire.conf.in +post-install-MEDIASESSION-on: + @${MKDIR} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.d + ${INSTALL_DATA} ${WRKDIR}/10-alsa-default.conf \ + ${STAGEDIR}${ETCDIR}/${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..5a3878ff3cf8 --- /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 = "PCM Sink" + media.class = "Audio/Sink" + api.alsa.path = "pcm.default" + } + } + { factory = adapter + args = { + factory.name = api.alsa.pcm.source + node.name = "alsa-source" + node.description = "PCM Source" + media.class = "Audio/Source" + api.alsa.path = "pcm.default" + } + } +] diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 9be512014740..58a537a2afa1 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -25,6 +25,7 @@ bin/spa-inspect bin/spa-json-dump bin/spa-monitor bin/spa-resample +%%MEDIASESSION%%%%ETCDIR%%/pipewire.conf.d/10-alsa-default.conf include/pipewire-0.3/pipewire/array.h include/pipewire-0.3/pipewire/buffers.h include/pipewire-0.3/pipewire/client.h