commit: eafa284430635de9084ff2e4486e0f2b9d7bf899 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 26 00:23:19 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 26 00:27:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eafa2844
media-video/pipewire: make udev unconditional It was missing REQUIRED_USE logic (which is messy and not particularly user friendly) and it's needed for alsa or v4l. It's easier to just hard-require it, especially given the things needing it increased. Bug: https://bugs.gentoo.org/841647 Closes: https://bugs.gentoo.org/877769 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{pipewire-0.3.64-r1.ebuild => pipewire-0.3.64-r2.ebuild} | 12 +++++++----- media-video/pipewire/pipewire-9999.ebuild | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/media-video/pipewire/pipewire-0.3.64-r1.ebuild b/media-video/pipewire/pipewire-0.3.64-r2.ebuild similarity index 98% rename from media-video/pipewire/pipewire-0.3.64-r1.ebuild rename to media-video/pipewire/pipewire-0.3.64-r2.ebuild index 67d0679def54..8de21fdb95cc 100644 --- a/media-video/pipewire/pipewire-0.3.64-r1.ebuild +++ b/media-video/pipewire/pipewire-0.3.64-r2.ebuild @@ -39,7 +39,7 @@ 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 dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2 -modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf" +modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -72,11 +72,14 @@ BDEPEND=" media-gfx/graphviz ) " +# While udev could technically be optional, it's needed for a numebr of options, +# and not really worth it, bug #877769. RDEPEND=" acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] + virtual/libudev[${MULTILIB_USEDEP}] bluetooth? ( media-libs/fdk-aac media-libs/libldac @@ -123,7 +126,6 @@ RDEPEND=" acct-user/pipewire acct-group/pipewire ) - udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra @@ -251,7 +253,7 @@ multilib_src_configure() { -Dvolume=enabled # Matches upstream -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) $(meson_native_use_feature extra pw-cat) - $(meson_feature udev) + -Dudev=enabled -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) @@ -317,11 +319,11 @@ multilib_src_install_all() { } pkg_postrm() { - use udev && udev_reload + udev_reload } pkg_postinst() { - use udev && udev_reload + udev_reload elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" elog "using PipeWire. Do it either manually or add yourself" diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 67d0679def54..8de21fdb95cc 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -39,7 +39,7 @@ 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 dbus doc echo-cancel extra flatpak gstreamer gsettings jack-client jack-sdk lv2 -modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf" +modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -72,11 +72,14 @@ BDEPEND=" media-gfx/graphviz ) " +# While udev could technically be optional, it's needed for a numebr of options, +# and not really worth it, bug #877769. RDEPEND=" acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] + virtual/libudev[${MULTILIB_USEDEP}] bluetooth? ( media-libs/fdk-aac media-libs/libldac @@ -123,7 +126,6 @@ RDEPEND=" acct-user/pipewire acct-group/pipewire ) - udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra @@ -251,7 +253,7 @@ multilib_src_configure() { -Dvolume=enabled # Matches upstream -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) $(meson_native_use_feature extra pw-cat) - $(meson_feature udev) + -Dudev=enabled -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) @@ -317,11 +319,11 @@ multilib_src_install_all() { } pkg_postrm() { - use udev && udev_reload + udev_reload } pkg_postinst() { - use udev && udev_reload + udev_reload elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" elog "using PipeWire. Do it either manually or add yourself"
