From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1415774-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) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E6829158094
for <garchives@archives.gentoo.org>; Wed, 6 Jul 2022 06:17:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 39F8BE0FAB;
Wed, 6 Jul 2022 06:17:17 +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 F2F05E0FAB
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 06:17:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 14CBC341941
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 06:17:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 62E58480
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 06:17:14 +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: <1657088226.7fbaa21982347e05996f1585ecf37b8ff18ed152.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_p20220705-r1.ebuild media-video/pipewire/pipewire-0.3.53_p20220705.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: 7fbaa21982347e05996f1585ecf37b8ff18ed152
X-VCS-Branch: master
Date: Wed, 6 Jul 2022 06:17:14 +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: 45b2a37b-5d5a-457c-84f8-e8e837382d67
X-Archives-Hash: c5efe8a3d7b201d624d3d8e5b0a3e8c8
commit: 7fbaa21982347e05996f1585ecf37b8ff18ed152
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Fri Apr 22 19:31:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 06:17:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbaa219
media-video/pipewire: Make dbus optional
Note: jack side of things is untested
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://bugs.gentoo.org/850934
Closes: https://github.com/gentoo/gentoo/pull/26077
Signed-off-by: Sam James <sam <AT> gentoo.org>
..._p20220705.ebuild => pipewire-0.3.53_p20220705-r1.ebuild} | 12 +++++++++---
media-video/pipewire/pipewire-9999.ebuild | 12 +++++++++---
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/media-video/pipewire/pipewire-0.3.53_p20220705.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild
similarity index 98%
rename from media-video/pipewire/pipewire-0.3.53_p20220705.ebuild
rename to media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild
index 51c7a334c1f1..e8e364be1937 100644
--- a/media-video/pipewire/pipewire-0.3.53_p20220705.ebuild
+++ b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild
@@ -28,8 +28,8 @@ HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2"
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa
-sound-server ssl system-service systemd test udev v4l X zeroconf"
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -46,6 +46,7 @@ REQUIRED_USE="
jack-sdk? ( !jack-client )
system-service? ( systemd )
!sound-server? ( !pipewire-alsa )
+ jack-client? ( dbus )
"
RESTRICT="!test? ( test )"
@@ -63,7 +64,6 @@ BDEPEND="
RDEPEND="
acct-group/audio
media-libs/alsa-lib
- sys-apps/dbus[${MULTILIB_USEDEP}]
sys-libs/readline:=
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
@@ -75,6 +75,7 @@ RDEPEND="
>=net-wireless/bluez-4.101:=
virtual/libusb:1
)
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
>=media-libs/libsndfile-1.0.20
@@ -169,6 +170,7 @@ multilib_src_configure() {
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(meson_feature dbus)
$(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
@@ -285,6 +287,10 @@ multilib_src_install_all() {
fi
}
+pkg_postrm() {
+ use udev && udev_reload
+}
+
pkg_postinst() {
use udev && udev_reload
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 3e9252539cbb..f831949d2b1c 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -28,8 +28,8 @@ HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2"
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa
-sound-server ssl system-service systemd test udev v4l X zeroconf"
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -46,6 +46,7 @@ REQUIRED_USE="
jack-sdk? ( !jack-client )
system-service? ( systemd )
!sound-server? ( !pipewire-alsa )
+ jack-client? ( dbus )
"
RESTRICT="!test? ( test )"
@@ -63,7 +64,6 @@ BDEPEND="
RDEPEND="
acct-group/audio
media-libs/alsa-lib
- sys-apps/dbus[${MULTILIB_USEDEP}]
sys-libs/readline:=
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
@@ -75,6 +75,7 @@ RDEPEND="
>=net-wireless/bluez-4.101:=
virtual/libusb:1
)
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
>=media-libs/libsndfile-1.0.20
@@ -169,6 +170,7 @@ multilib_src_configure() {
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(meson_feature dbus)
$(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
@@ -285,6 +287,10 @@ multilib_src_install_all() {
fi
}
+pkg_postrm() {
+ use udev && udev_reload
+}
+
pkg_postinst() {
use udev && udev_reload