Attachment 250506 Details for Bug 278831 – Add AVAHI option for PULSEAUDIO

[patch] Add AVAHI option for PULSEAUDIO

multimedia_pipewire-AVAHIPULSE.patch (text/plain), 3.32 KB, created by Harald Schmalzbauer on 2024-05-07 09:45:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Schmalzbauer

Created: 2024-05-07 09:45:17 UTC

Size: 3.32 KB

patch

obsolete

>diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
>index 2d42d72416a1..76e148662315 100644
>--- a/multimedia/pipewire/Makefile
>+++ b/multimedia/pipewire/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	pipewire
> DISTVERSION=	1.0.4
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	arrowd@FreeBSD.org
>@@ -29,8 +30,8 @@ GL_SITE=	https://gitlab.freedesktop.org
> SHEBANG_FILES=	doc/*.py
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=		DOCS DOXYGEN GSTREAMER JACK LV2 PULSEAUDIO SDL VULKAN X11_BELL
>-OPTIONS_DEFAULT=	GSTREAMER JACK
>+OPTIONS_DEFINE=		DOCS DOXYGEN GSTREAMER JACK LV2 PULSEAUDIO AVAHIPULSE SDL VULKAN X11_BELL
>+OPTIONS_DEFAULT=	GSTREAMER PULSEAUDIO
> OPTIONS_SUB=		yes
> 
> DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
>@@ -47,11 +48,15 @@ LV2_DESC=		Support lv2-based audio plugins via lilv
> LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv
> LV2_MESON_ENABLED=	lv2
> 
>-PULSEAUDIO_MESON_ENABLED=	avahi libpulse
>-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio \
>-				libavahi-common.so:net/avahi-app \
>+AVAHIPULSE_DESC=	Add module-avahi-zeroconf for PULSEAUDIO (implicit) 
>+AVAHIPULSE_IMPLIES=	PULSEAUDIO
>+AVAHIPULSE_MESON_ENABLED=	avahi
>+AVAHIPULSE_LIB_DEPENDS=		libavahi-common.so:net/avahi-app \
> 				libavahi-client.so:net/avahi-app
> 
>+PULSEAUDIO_MESON_ENABLED=	libpulse
>+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
>+
> SDL_MESON_ENABLED=	sdl2
> SDL_USES=		sdl
> SDL_USE=		sdl=sdl2
>@@ -85,6 +90,12 @@ MESON_ARGS=	-D pw-cat=enabled \
> 		-D libffado=disabled \
> 		-D udevrulesdir="${LOCALBASE}/lib/udev/rules.d"
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MPULSEAUDIO} && empty(PORT_OPTIONS:MAVAHIPULSE)
>+MESON_ARGS+=	-D avahi=disabled
>+.endif
>+
> # Fake pkg-config support before https://cgit.freebsd.org/src/commit/?id=396851c20aeb
> # but only if devel/ncurses isn't installed
> .if !exists(/usr/libdata/pkgconfig/ncursesw.pc)
>diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
>index 82b2175ce53d..cf94105533bf 100644
>--- a/multimedia/pipewire/pkg-plist
>+++ b/multimedia/pipewire/pkg-plist
>@@ -267,12 +267,12 @@ lib/pipewire-0.3/libpipewire-module-protocol-native.so
> lib/pipewire-0.3/libpipewire-module-protocol-pulse.so
> lib/pipewire-0.3/libpipewire-module-protocol-simple.so
> %%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-pulse-tunnel.so
>-%%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-raop-discover.so
>+%%AVAHIPULSE%%lib/pipewire-0.3/libpipewire-module-raop-discover.so
> lib/pipewire-0.3/libpipewire-module-raop-sink.so
> lib/pipewire-0.3/libpipewire-module-rt.so
> lib/pipewire-0.3/libpipewire-module-rtkit.so
> lib/pipewire-0.3/libpipewire-module-rtp-sap.so
>-%%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-rtp-session.so
>+%%AVAHIPULSE%%lib/pipewire-0.3/libpipewire-module-rtp-session.so
> lib/pipewire-0.3/libpipewire-module-rtp-sink.so
> lib/pipewire-0.3/libpipewire-module-rtp-source.so
> lib/pipewire-0.3/libpipewire-module-session-manager.so
>@@ -283,7 +283,7 @@ lib/pipewire-0.3/libpipewire-module-spa-node.so
> lib/pipewire-0.3/libpipewire-module-vban-recv.so
> lib/pipewire-0.3/libpipewire-module-vban-send.so
> %%X11_BELL%%lib/pipewire-0.3/libpipewire-module-x11-bell.so
>-%%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-zeroconf-discover.so
>+%%AVAHIPULSE%%lib/pipewire-0.3/libpipewire-module-zeroconf-discover.so
> lib/spa-0.2/aec/libspa-aec-null.so
> lib/spa-0.2/aec/libspa-aec-webrtc.so
> lib/spa-0.2/audioconvert/libspa-audioconvert.so

Actions: View | Diff

Attachments on bug 278831: 250506