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
