| 1 |
commit: 7fbaa21982347e05996f1585ecf37b8ff18ed152 |
| 2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
| 3 |
AuthorDate: Fri Apr 22 19:31:47 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 06:17:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbaa219 |
| 7 |
|
| 8 |
media-video/pipewire: Make dbus optional |
| 9 |
|
| 10 |
Note: jack side of things is untested |
| 11 |
|
| 12 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
| 13 |
Closes: https://bugs.gentoo.org/850934 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/26077 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
..._p20220705.ebuild => pipewire-0.3.53_p20220705-r1.ebuild} | 12 +++++++++--- |
| 18 |
media-video/pipewire/pipewire-9999.ebuild | 12 +++++++++--- |
| 19 |
2 files changed, 18 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-video/pipewire/pipewire-0.3.53_p20220705.ebuild b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild |
| 22 |
similarity index 98% |
| 23 |
rename from media-video/pipewire/pipewire-0.3.53_p20220705.ebuild |
| 24 |
rename to media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild |
| 25 |
index 51c7a334c1f1..e8e364be1937 100644 |
| 26 |
--- a/media-video/pipewire/pipewire-0.3.53_p20220705.ebuild |
| 27 |
+++ b/media-video/pipewire/pipewire-0.3.53_p20220705-r1.ebuild |
| 28 |
@@ -28,8 +28,8 @@ HOMEPAGE="https://pipewire.org/" |
| 29 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 30 |
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 |
| 31 |
SLOT="0/0.4" |
| 32 |
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa |
| 33 |
-sound-server ssl system-service systemd test udev v4l X zeroconf" |
| 34 |
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 |
| 35 |
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf" |
| 36 |
|
| 37 |
# Once replacing system JACK libraries is possible, it's likely that |
| 38 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 39 |
@@ -46,6 +46,7 @@ REQUIRED_USE=" |
| 40 |
jack-sdk? ( !jack-client ) |
| 41 |
system-service? ( systemd ) |
| 42 |
!sound-server? ( !pipewire-alsa ) |
| 43 |
+ jack-client? ( dbus ) |
| 44 |
" |
| 45 |
|
| 46 |
RESTRICT="!test? ( test )" |
| 47 |
@@ -63,7 +64,6 @@ BDEPEND=" |
| 48 |
RDEPEND=" |
| 49 |
acct-group/audio |
| 50 |
media-libs/alsa-lib |
| 51 |
- sys-apps/dbus[${MULTILIB_USEDEP}] |
| 52 |
sys-libs/readline:= |
| 53 |
sys-libs/ncurses:=[unicode(+)] |
| 54 |
virtual/libintl[${MULTILIB_USEDEP}] |
| 55 |
@@ -75,6 +75,7 @@ RDEPEND=" |
| 56 |
>=net-wireless/bluez-4.101:= |
| 57 |
virtual/libusb:1 |
| 58 |
) |
| 59 |
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 60 |
echo-cancel? ( media-libs/webrtc-audio-processing:0 ) |
| 61 |
extra? ( |
| 62 |
>=media-libs/libsndfile-1.0.20 |
| 63 |
@@ -169,6 +170,7 @@ multilib_src_configure() { |
| 64 |
local emesonargs=( |
| 65 |
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF} |
| 66 |
|
| 67 |
+ $(meson_feature dbus) |
| 68 |
$(meson_native_use_feature zeroconf avahi) |
| 69 |
$(meson_native_use_feature doc docs) |
| 70 |
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone |
| 71 |
@@ -285,6 +287,10 @@ multilib_src_install_all() { |
| 72 |
fi |
| 73 |
} |
| 74 |
|
| 75 |
+pkg_postrm() { |
| 76 |
+ use udev && udev_reload |
| 77 |
+} |
| 78 |
+ |
| 79 |
pkg_postinst() { |
| 80 |
use udev && udev_reload |
| 81 |
|
| 82 |
|
| 83 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 84 |
index 3e9252539cbb..f831949d2b1c 100644 |
| 85 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 86 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 87 |
@@ -28,8 +28,8 @@ HOMEPAGE="https://pipewire.org/" |
| 88 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 89 |
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 |
| 90 |
SLOT="0/0.4" |
| 91 |
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa |
| 92 |
-sound-server ssl system-service systemd test udev v4l X zeroconf" |
| 93 |
+IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 |
| 94 |
+pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf" |
| 95 |
|
| 96 |
# Once replacing system JACK libraries is possible, it's likely that |
| 97 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 98 |
@@ -46,6 +46,7 @@ REQUIRED_USE=" |
| 99 |
jack-sdk? ( !jack-client ) |
| 100 |
system-service? ( systemd ) |
| 101 |
!sound-server? ( !pipewire-alsa ) |
| 102 |
+ jack-client? ( dbus ) |
| 103 |
" |
| 104 |
|
| 105 |
RESTRICT="!test? ( test )" |
| 106 |
@@ -63,7 +64,6 @@ BDEPEND=" |
| 107 |
RDEPEND=" |
| 108 |
acct-group/audio |
| 109 |
media-libs/alsa-lib |
| 110 |
- sys-apps/dbus[${MULTILIB_USEDEP}] |
| 111 |
sys-libs/readline:= |
| 112 |
sys-libs/ncurses:=[unicode(+)] |
| 113 |
virtual/libintl[${MULTILIB_USEDEP}] |
| 114 |
@@ -75,6 +75,7 @@ RDEPEND=" |
| 115 |
>=net-wireless/bluez-4.101:= |
| 116 |
virtual/libusb:1 |
| 117 |
) |
| 118 |
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 119 |
echo-cancel? ( media-libs/webrtc-audio-processing:0 ) |
| 120 |
extra? ( |
| 121 |
>=media-libs/libsndfile-1.0.20 |
| 122 |
@@ -169,6 +170,7 @@ multilib_src_configure() { |
| 123 |
local emesonargs=( |
| 124 |
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF} |
| 125 |
|
| 126 |
+ $(meson_feature dbus) |
| 127 |
$(meson_native_use_feature zeroconf avahi) |
| 128 |
$(meson_native_use_feature doc docs) |
| 129 |
$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone |
| 130 |
@@ -285,6 +287,10 @@ multilib_src_install_all() { |
| 131 |
fi |
| 132 |
} |
| 133 |
|
| 134 |
+pkg_postrm() { |
| 135 |
+ use udev && udev_reload |
| 136 |
+} |
| 137 |
+ |
| 138 |
pkg_postinst() { |
| 139 |
use udev && udev_reload |
Archives