Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/
Date: Thu, 06 Jan 2022 20:54:06
Message-Id: 1641502432.8a46d6fabc4485d4c22c208518d13605c7ee8d72.sam@gentoo
1 commit: 8a46d6fabc4485d4c22c208518d13605c7ee8d72
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 6 20:53:52 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 20:53:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a46d6fa
7
8 media-video/pipewire: sync live
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-video/pipewire/pipewire-9999.ebuild | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
16 index 321e1eecdb7d..35187723a20e 100644
17 --- a/media-video/pipewire/pipewire-9999.ebuild
18 +++ b/media-video/pipewire/pipewire-9999.ebuild
19 @@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/"
20 LICENSE="MIT LGPL-2.1+ GPL-2"
21 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
22 SLOT="0/0.4"
23 -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk libusb pipewire-alsa ssl systemd test v4l zeroconf"
24 +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa ssl systemd test usb v4l zeroconf"
25
26 # Once replacing system JACK libraries is possible, it's likely that
27 # jack-client IUSE will need blocking to avoid users accidentally
28 @@ -72,7 +72,6 @@ RDEPEND="
29 !media-sound/jack-audio-connection-kit
30 !media-sound/jack2
31 )
32 - libusb? ( virtual/libusb:1 )
33 pipewire-alsa? (
34 >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
35 !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
36 @@ -80,6 +79,7 @@ RDEPEND="
37 !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
38 ssl? ( dev-libs/openssl:= )
39 systemd? ( sys-apps/systemd )
40 + usb? ( virtual/libusb:1 )
41 v4l? ( media-libs/libv4l )
42 zeroconf? ( net-dns/avahi )
43 "
44 @@ -175,7 +175,7 @@ multilib_src_configure() {
45 $(meson_native_use_feature v4l v4l2)
46 -Dlibcamera=disabled # libcamera is not in Portage tree
47 $(meson_native_use_feature ssl raop)
48 - $(meson_native_use_feature libusb)
49 + $(meson_native_use_feature usb libusb)
50 -Dvideoconvert=enabled # Matches upstream
51 -Dvideotestsrc=enabled # Matches upstream
52 -Dvolume=enabled # Matches upstream