Gentoo Archives: gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/
Date:	Mon, 04 Jul 2022 21:40:55
Message-Id:	`1656970533.18fb28ad4e21657a6e40691ca3bb32fae572dbf9.sam@gentoo`

1	commit: 18fb28ad4e21657a6e40691ca3bb32fae572dbf9
2	Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
3	AuthorDate: Sat Jul 2 06:13:32 2022 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Mon Jul 4 21:35:33 2022 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fb28ad
7
8	media-video/pipewire: Add conflict with pulseaudio sound server
9
10	Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
11	Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13	media-video/pipewire/pipewire-0.3.53.ebuild \| 4 ++++
14	1 file changed, 4 insertions(+)
15
16	diff --git a/media-video/pipewire/pipewire-0.3.53.ebuild b/media-video/pipewire/pipewire-0.3.53.ebuild
17	index a2f1daf3b80c..75e304738b78 100644
18	--- a/media-video/pipewire/pipewire-0.3.53.ebuild
19	+++ b/media-video/pipewire/pipewire-0.3.53.ebuild
20	@@ -89,6 +89,10 @@ RDEPEND="
21	>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
22	)
23	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
24	+ sound-server? (
25	+ !media-sound/pulseaudio[daemon(+)]
26	+ !media-sound/pulseaudio-daemon
27	+ )
28	ssl? ( dev-libs/openssl:= )
29	systemd? ( sys-apps/systemd )
30	system-service? (