From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1415740-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 656BC158094
for <garchives@archives.gentoo.org>; Wed, 6 Jul 2022 03:47:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9BC43E09A2;
Wed, 6 Jul 2022 03:47:22 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 79094E09A2
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 03:47:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 805553419D9
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 03:47:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AF7B4FA
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 03:47:20 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1657079231.003c47c5b969885b16b7a34ad182c8419c3e4656.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild media-video/pipewire/pipewire-0.3.53_p20220704.ebuild media-video/pipewire/pipewire-9999.ebuild
X-VCS-Directories: media-video/pipewire/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 003c47c5b969885b16b7a34ad182c8419c3e4656
X-VCS-Branch: master
Date: Wed, 6 Jul 2022 03:47:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a87af8b4-e8e0-43b1-9d99-b9d283e0ccd8
X-Archives-Hash: 939a24aa7a011bcc09efc719deec60c3
commit: 003c47c5b969885b16b7a34ad182c8419c3e4656
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 18:20:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 03:47:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=003c47c5
media-video/pipewire: drop dep on media-plugins/alsa-plugins[pulseaudio]
Instead, emit an optfeature message if sound-server is enabled and
pipewire-alsa is disabled.
This allows users to use pipewire without installing any ALSA plugins.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26235
Signed-off-by: Sam James <sam <AT> gentoo.org>
...e-0.3.53_p20220704.ebuild => pipewire-0.3.53_p20220704-r1.ebuild} | 5 ++++-
media-video/pipewire/pipewire-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild
similarity index 98%
rename from media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
rename to media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild
index 8c5648e7fe72..bd99803c14b4 100644
--- a/media-video/pipewire/pipewire-0.3.53_p20220704.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53_p20220704-r1.ebuild
@@ -93,7 +93,6 @@ RDEPEND="
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
)
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
sound-server? (
!media-sound/pulseaudio[daemon(+)]
!media-sound/pulseaudio-daemon
@@ -381,6 +380,10 @@ pkg_postinst() {
optfeature_header "The following can be installed for optional runtime features:"
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+ if use sound-server && ! use pipewire-alsa; then
+ optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+ fi
+
if has_version 'net-misc/ofono' ; then
ewarn "Native backend has become default. Please disable oFono via:"
if systemd_is_booted ; then
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 1c8969b1cff1..3e9252539cbb 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -93,7 +93,6 @@ RDEPEND="
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
)
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
sound-server? (
!media-sound/pulseaudio[daemon(+)]
!media-sound/pulseaudio-daemon
@@ -381,6 +380,10 @@ pkg_postinst() {
optfeature_header "The following can be installed for optional runtime features:"
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+ if use sound-server && ! use pipewire-alsa; then
+ optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+ fi
+
if has_version 'net-misc/ofono' ; then
ewarn "Native backend has become default. Please disable oFono via:"
if systemd_is_booted ; then