Date: Thu, 9 May 2024 18:47:43 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: abbf0b8912aa - main - multimedia/pipewire: Decouple avahi dependency into its own option Message-ID: <202405091847.449Ilhfu091541@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=abbf0b8912aa8eccf12778400eefcf44358c7043 commit abbf0b8912aa8eccf12778400eefcf44358c7043 Author: Harald Schmalzbauer <bugzilla.freebsd@omnilan.de> AuthorDate: 2024-05-09 18:46:39 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-05-09 18:47:13 +0000 multimedia/pipewire: Decouple avahi dependency into its own option PR: 278831 --- multimedia/pipewire/Makefile | 20 ++++++++++++-------- multimedia/pipewire/pkg-plist | 6 +++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 2d42d72416a1..c4a593d5be18 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,10 +30,15 @@ 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= AVAHI DOCS DOXYGEN GSTREAMER JACK LV2 PULSEAUDIO SDL VULKAN X11_BELL +OPTIONS_DEFAULT= GSTREAMER PULSEAUDIO OPTIONS_SUB= yes +AVAHI_DESC= Automatic service discovery for the Pulseaudio module via Avahi +AVAHI_IMPLIES= PULSEAUDIO +AVAHI_MESON_ENABLED= avahi +AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app + DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_MESON_ENABLED= docs DOXYGEN_IMPLIES= DOCS @@ -47,10 +53,8 @@ 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 \ - libavahi-client.so:net/avahi-app +PULSEAUDIO_MESON_ENABLED= libpulse +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio SDL_MESON_ENABLED= sdl2 SDL_USES= sdl @@ -70,7 +74,7 @@ X11_BELL_MESON_ENABLED= libcanberra x11 x11-xfixes MESON_ARGS= -D pw-cat=enabled \ -D v4l2=enabled \ -D raop=enabled \ - -Dsession-managers='[]' \ + -D session-managers='[]' \ -D alsa=disabled \ -D pipewire-alsa=disabled \ -D avb=disabled \ @@ -78,7 +82,7 @@ MESON_ARGS= -D pw-cat=enabled \ -D man=disabled \ -D libcamera=disabled \ -D roc=disabled \ - -Dselinux=disabled \ + -D selinux=disabled \ -D systemd=disabled \ -D pipewire-v4l2=disabled \ -D libmysofa=disabled \ diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 82b2175ce53d..bcf33cc182ab 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 +%%AVAHI%%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 +%%AVAHI%%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 +%%AVAHI%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405091847.449Ilhfu091541>