commit: 9a91eb2714cc058b6baa9bf8c5e8bb6f6cb318d6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 6 21:55:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 21:55:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a91eb27
media-video/pipewire: throw libusb in with bluetooth support
It's only used right now for quirk detection of different
Bluetooth adapters.
Thanks-to: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{pipewire-0.3.43-r1.ebuild => pipewire-0.3.43-r2.ebuild} | 6 +++---
media-video/pipewire/pipewire-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-video/pipewire/pipewire-0.3.43-r1.ebuild
b/media-video/pipewire/pipewire-0.3.43-r2.ebuild
similarity index 98%
rename from media-video/pipewire/pipewire-0.3.43-r1.ebuild
rename to media-video/pipewire/pipewire-0.3.43-r2.ebuild
index 984f1ef55dcd..65a0e6a60d2d 100644
--- a/media-video/pipewire/pipewire-0.3.43-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.43-r2.ebuild
@@ -21,7 +21,7 @@ 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 ssl systemd test usb v4l zeroconf"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2
pipewire-alsa ssl systemd test v4l zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -57,6 +57,7 @@ RDEPEND="
media-libs/libfreeaptx
media-libs/sbc
>=net-wireless/bluez-4.101:=
+ virtual/libusb:1
)
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
@@ -80,7 +81,6 @@ RDEPEND="
!pipewire-alsa? (
media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
- usb? ( virtual/libusb:1 )
v4l? ( media-libs/libv4l )
zeroconf? ( net-dns/avahi )
"
@@ -162,6 +162,7 @@ multilib_src_configure() {
$(meson_native_use_feature bluetooth bluez5-codec-aac)
$(meson_native_use_feature bluetooth bluez5-codec-aptx)
$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+ $(meson_native_use_feature bluetooth libusb) # At least for now
only used by bluez5 native (quirk detection of adapters)
$(meson_native_use_feature echo-cancel echo-cancel-webrtc)
#807889
-Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream
@@ -177,7 +178,6 @@ multilib_src_configure() {
$(meson_native_use_feature v4l v4l2)
-Dlibcamera=disabled # libcamera is not in Portage tree
$(meson_native_use_feature ssl raop)
- $(meson_native_use_feature usb libusb)
-Dvideoconvert=enabled # Matches upstream
-Dvideotestsrc=enabled # Matches upstream
-Dvolume=enabled # Matches upstream
diff --git a/media-video/pipewire/pipewire-9999.ebuild
b/media-video/pipewire/pipewire-9999.ebuild
index 984f1ef55dcd..65a0e6a60d2d 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -21,7 +21,7 @@ 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 ssl systemd test usb v4l zeroconf"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2
pipewire-alsa ssl systemd test v4l zeroconf"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
@@ -57,6 +57,7 @@ RDEPEND="
media-libs/libfreeaptx
media-libs/sbc
>=net-wireless/bluez-4.101:=
+ virtual/libusb:1
)
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
@@ -80,7 +81,6 @@ RDEPEND="
!pipewire-alsa? (
media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
- usb? ( virtual/libusb:1 )
v4l? ( media-libs/libv4l )
zeroconf? ( net-dns/avahi )
"
@@ -162,6 +162,7 @@ multilib_src_configure() {
$(meson_native_use_feature bluetooth bluez5-codec-aac)
$(meson_native_use_feature bluetooth bluez5-codec-aptx)
$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+ $(meson_native_use_feature bluetooth libusb) # At least for now
only used by bluez5 native (quirk detection of adapters)
$(meson_native_use_feature echo-cancel echo-cancel-webrtc)
#807889
-Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream
@@ -177,7 +178,6 @@ multilib_src_configure() {
$(meson_native_use_feature v4l v4l2)
-Dlibcamera=disabled # libcamera is not in Portage tree
$(meson_native_use_feature ssl raop)
- $(meson_native_use_feature usb libusb)
-Dvideoconvert=enabled # Matches upstream
-Dvideotestsrc=enabled # Matches upstream
-Dvolume=enabled # Matches upstream
