| 1 |
commit: 9a91eb2714cc058b6baa9bf8c5e8bb6f6cb318d6 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 21:55:06 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 21:55:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a91eb27 |
| 7 |
|
| 8 |
media-video/pipewire: throw libusb in with bluetooth support |
| 9 |
|
| 10 |
It's only used right now for quirk detection of different |
| 11 |
Bluetooth adapters. |
| 12 |
|
| 13 |
Thanks-to: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com> |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{pipewire-0.3.43-r1.ebuild => pipewire-0.3.43-r2.ebuild} | 6 +++--- |
| 17 |
media-video/pipewire/pipewire-9999.ebuild | 6 +++--- |
| 18 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-video/pipewire/pipewire-0.3.43-r1.ebuild b/media-video/pipewire/pipewire-0.3.43-r2.ebuild |
| 21 |
similarity index 98% |
| 22 |
rename from media-video/pipewire/pipewire-0.3.43-r1.ebuild |
| 23 |
rename to media-video/pipewire/pipewire-0.3.43-r2.ebuild |
| 24 |
index 984f1ef55dcd..65a0e6a60d2d 100644 |
| 25 |
--- a/media-video/pipewire/pipewire-0.3.43-r1.ebuild |
| 26 |
+++ b/media-video/pipewire/pipewire-0.3.43-r2.ebuild |
| 27 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/" |
| 28 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 29 |
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 |
| 30 |
SLOT="0/0.4" |
| 31 |
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test usb v4l zeroconf" |
| 32 |
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l zeroconf" |
| 33 |
|
| 34 |
# Once replacing system JACK libraries is possible, it's likely that |
| 35 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 36 |
@@ -57,6 +57,7 @@ RDEPEND=" |
| 37 |
media-libs/libfreeaptx |
| 38 |
media-libs/sbc |
| 39 |
>=net-wireless/bluez-4.101:= |
| 40 |
+ virtual/libusb:1 |
| 41 |
) |
| 42 |
echo-cancel? ( media-libs/webrtc-audio-processing:0 ) |
| 43 |
extra? ( |
| 44 |
@@ -80,7 +81,6 @@ RDEPEND=" |
| 45 |
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
| 46 |
ssl? ( dev-libs/openssl:= ) |
| 47 |
systemd? ( sys-apps/systemd ) |
| 48 |
- usb? ( virtual/libusb:1 ) |
| 49 |
v4l? ( media-libs/libv4l ) |
| 50 |
zeroconf? ( net-dns/avahi ) |
| 51 |
" |
| 52 |
@@ -162,6 +162,7 @@ multilib_src_configure() { |
| 53 |
$(meson_native_use_feature bluetooth bluez5-codec-aac) |
| 54 |
$(meson_native_use_feature bluetooth bluez5-codec-aptx) |
| 55 |
$(meson_native_use_feature bluetooth bluez5-codec-ldac) |
| 56 |
+ $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) |
| 57 |
$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 |
| 58 |
-Dcontrol=enabled # Matches upstream |
| 59 |
-Daudiotestsrc=enabled # Matches upstream |
| 60 |
@@ -177,7 +178,6 @@ multilib_src_configure() { |
| 61 |
$(meson_native_use_feature v4l v4l2) |
| 62 |
-Dlibcamera=disabled # libcamera is not in Portage tree |
| 63 |
$(meson_native_use_feature ssl raop) |
| 64 |
- $(meson_native_use_feature usb libusb) |
| 65 |
-Dvideoconvert=enabled # Matches upstream |
| 66 |
-Dvideotestsrc=enabled # Matches upstream |
| 67 |
-Dvolume=enabled # Matches upstream |
| 68 |
|
| 69 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 70 |
index 984f1ef55dcd..65a0e6a60d2d 100644 |
| 71 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 72 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 73 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/" |
| 74 |
LICENSE="MIT LGPL-2.1+ GPL-2" |
| 75 |
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 |
| 76 |
SLOT="0/0.4" |
| 77 |
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test usb v4l zeroconf" |
| 78 |
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l zeroconf" |
| 79 |
|
| 80 |
# Once replacing system JACK libraries is possible, it's likely that |
| 81 |
# jack-client IUSE will need blocking to avoid users accidentally |
| 82 |
@@ -57,6 +57,7 @@ RDEPEND=" |
| 83 |
media-libs/libfreeaptx |
| 84 |
media-libs/sbc |
| 85 |
>=net-wireless/bluez-4.101:= |
| 86 |
+ virtual/libusb:1 |
| 87 |
) |
| 88 |
echo-cancel? ( media-libs/webrtc-audio-processing:0 ) |
| 89 |
extra? ( |
| 90 |
@@ -80,7 +81,6 @@ RDEPEND=" |
| 91 |
!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) |
| 92 |
ssl? ( dev-libs/openssl:= ) |
| 93 |
systemd? ( sys-apps/systemd ) |
| 94 |
- usb? ( virtual/libusb:1 ) |
| 95 |
v4l? ( media-libs/libv4l ) |
| 96 |
zeroconf? ( net-dns/avahi ) |
| 97 |
" |
| 98 |
@@ -162,6 +162,7 @@ multilib_src_configure() { |
| 99 |
$(meson_native_use_feature bluetooth bluez5-codec-aac) |
| 100 |
$(meson_native_use_feature bluetooth bluez5-codec-aptx) |
| 101 |
$(meson_native_use_feature bluetooth bluez5-codec-ldac) |
| 102 |
+ $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) |
| 103 |
$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 |
| 104 |
-Dcontrol=enabled # Matches upstream |
| 105 |
-Daudiotestsrc=enabled # Matches upstream |
| 106 |
@@ -177,7 +178,6 @@ multilib_src_configure() { |
| 107 |
$(meson_native_use_feature v4l v4l2) |
| 108 |
-Dlibcamera=disabled # libcamera is not in Portage tree |
| 109 |
$(meson_native_use_feature ssl raop) |
| 110 |
- $(meson_native_use_feature usb libusb) |
| 111 |
-Dvideoconvert=enabled # Matches upstream |
| 112 |
-Dvideotestsrc=enabled # Matches upstream |
| 113 |
-Dvolume=enabled # Matches upstream |
Archives