From nobody Thu May 9 18:47:43 2024 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 4Vb1Gl55Sbz5KHM0; Thu, 09 May 2024 18:47:43 +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 4Vb1Gl4Y2Kz4dZF; Thu, 9 May 2024 18:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715280463; 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=0IElaJjiU6xmp+eOLJeQQZ3GM997t1/rfvcg8KvSUj8=; b=L3ThdOPrkZZK63IMErVGsuvACe0mvlwX/pnV8r9WqF8tKV/rglhQaoWoquoehMhUoOw/Kc aIzHDpVWIpuneiddJ8DDBw8PmP7Z1wnCxyCLVVN0v9VMIg5iQW6bO/1L9Zi270DSigW9WU ER0KnWlMGs4UVyrQY0WnjWweQmi42U897/wjnAAIxO3UcsR7d+IstHm7GdjdJUrU6ZnX1u ZKB9jeyShRhM92U6hpBTstp1peZSiA4kka3CSoNFCZrLpMvbrw+mJAPwY0Zs12/XOWCdAX QyWr2C7xE5WaT53044NbOHLKHp28lbR3BlLpfC+7vbX9IGEJ8Q4YubUq2s/6wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715280463; a=rsa-sha256; cv=none; b=CylAbtdn6Fm/SYwTFoGlH8MSd1YuD3wdisKtsBt45FAtLFpywNnHtYN28SZPsdDuynxTdm BrCdIipJouZ5ELAGSd1C+PzzGekfUgK2tAE3LoWp2ajwmzXAkFn7v4zCMxa7H6D8j0hzf3 zgj+rRTqSO3KjA/ZnRoC3nZpR1QP10Fb6ZlJsXJdMhfugxsAhHyIX6yJrK2912i1yGskmK tqqikIUs8uCwMh+H9yVC7ZkG9gw0gEUIRukSwFF+bt1D69QnE4bDiwChJ0N8FICXwCPzjZ qDn0rsA6awAtY9XeTn0L5nikmkzezIhT6IazW58teu72ENvuCwE7hjdiyt5hCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715280463; 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=0IElaJjiU6xmp+eOLJeQQZ3GM997t1/rfvcg8KvSUj8=; b=AbEwmmRz+6u6Cc5fQGp6blHeKusThcQWKOgfdEcJbRgMR2rDyok1MqR5f8xcQk7OBUMPKi SDDcSTNrOJkj8v2zVjQNkyLnm40nzh6qClL9MUCb0bdoo1boLm774gZhyYJuAfkUaQjPO4 9nbq9Gmd15OuNi8JeGnJ559jU3P2Vv6/1TI1uuDMHjUVUpS01i1QXcTXdLYh//uViTV+3N veO7+HLc/PvTZ32i1a0ERzjPOutFEke/jdmXBihhT+lNcEcBcYHSpjvJfYYLIRzvQfRKB9 7KyYBNerhgTnRGEMVHacWFx+K+G0kswnII/8layq0/zcsGxP2Ji1w3LP1asY0w== 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 4Vb1Gl449Nz1KRW; Thu, 9 May 2024 18:47:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 449Ilhor091544; Thu, 9 May 2024 18:47:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 449Ilhfu091541; Thu, 9 May 2024 18:47:43 GMT (envelope-from git) Date: Thu, 9 May 2024 18:47:43 GMT Message-Id: <202405091847.449Ilhfu091541@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: abbf0b8912aa - main - multimedia/pipewire: Decouple avahi dependency into its own option 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abbf0b8912aa8eccf12778400eefcf44358c7043 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=abbf0b8912aa8eccf12778400eefcf44358c7043 commit abbf0b8912aa8eccf12778400eefcf44358c7043 Author: Harald Schmalzbauer AuthorDate: 2024-05-09 18:46:39 +0000 Commit: Gleb Popov 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