Skip to content

Commit

Permalink
multimedia/pipewire: unbreak audio with default config
Browse files Browse the repository at this point in the history
$ 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)
  • Loading branch information
jbeich committed Jun 15, 2023
1 parent ea1e517 commit a7aaffb
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 3 deletions.
13 changes: 10 additions & 3 deletions 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
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 <bsd.port.mk>
23 changes: 23 additions & 0 deletions 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"
}
}
]
1 change: 1 addition & 0 deletions multimedia/pipewire/pkg-plist
Expand Up @@ -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
Expand Down

0 comments on commit a7aaffb

Please sign in to comment.