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, 27 Jan 2022 21:53:25
Message-Id: 1643320386.91451003a61390f65b4eca23a1960c0d158c84ce.sam@gentoo
1 commit: 91451003a61390f65b4eca23a1960c0d158c84ce
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 27 20:26:43 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 27 21:53:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91451003
7
8 media-video/pipewire: add X bell support
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-video/pipewire/metadata.xml | 1 +
13 .../{pipewire-0.3.44.ebuild => pipewire-0.3.44-r1.ebuild} | 11 ++++++++++-
14 media-video/pipewire/pipewire-9999.ebuild | 11 ++++++++++-
15 3 files changed, 21 insertions(+), 2 deletions(-)
16
17 diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
18 index ca29532fdfbe..5fb3fecf9135 100644
19 --- a/media-video/pipewire/metadata.xml
20 +++ b/media-video/pipewire/metadata.xml
21 @@ -30,5 +30,6 @@
22 <flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag>
23 <flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag>
24 <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag>
25 + <flag name="X">Enable audible bell for X11</pkg>
26 </use>
27 </pkgmetadata>
28
29 diff --git a/media-video/pipewire/pipewire-0.3.44.ebuild b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
30 similarity index 98%
31 rename from media-video/pipewire/pipewire-0.3.44.ebuild
32 rename to media-video/pipewire/pipewire-0.3.44-r1.ebuild
33 index de92d3ebfb8e..033d3614a241 100644
34 --- a/media-video/pipewire/pipewire-0.3.44.ebuild
35 +++ b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
36 @@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/"
37 LICENSE="MIT LGPL-2.1+ GPL-2"
38 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
39 SLOT="0/0.4"
40 -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l zeroconf"
41 +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l X zeroconf"
42
43 # Once replacing system JACK libraries is possible, it's likely that
44 # jack-client IUSE will need blocking to avoid users accidentally
45 @@ -82,6 +82,10 @@ RDEPEND="
46 ssl? ( dev-libs/openssl:= )
47 systemd? ( sys-apps/systemd )
48 v4l? ( media-libs/libv4l )
49 + X? (
50 + media-libs/libcanberra
51 + x11-libs/libX11
52 + )
53 zeroconf? ( net-dns/avahi )
54 "
55
56 @@ -131,6 +135,7 @@ src_prepare() {
57 multilib_src_configure() {
58 local emesonargs=(
59 -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
60 +
61 $(meson_native_use_feature zeroconf avahi)
62 $(meson_native_use_feature doc docs)
63 $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
64 @@ -185,6 +190,10 @@ multilib_src_configure() {
65 -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
66 $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
67 -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
68 +
69 + # Just for bell sounds in X11 right now.
70 + $(meson_native_use_feature X x11)
71 + $(meson_native_use_feature X libcanberra)
72 )
73
74 meson_src_configure
75
76 diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
77 index de92d3ebfb8e..033d3614a241 100644
78 --- a/media-video/pipewire/pipewire-9999.ebuild
79 +++ b/media-video/pipewire/pipewire-9999.ebuild
80 @@ -21,7 +21,7 @@ HOMEPAGE="https://pipewire.org/"
81 LICENSE="MIT LGPL-2.1+ GPL-2"
82 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
83 SLOT="0/0.4"
84 -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l zeroconf"
85 +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l X zeroconf"
86
87 # Once replacing system JACK libraries is possible, it's likely that
88 # jack-client IUSE will need blocking to avoid users accidentally
89 @@ -82,6 +82,10 @@ RDEPEND="
90 ssl? ( dev-libs/openssl:= )
91 systemd? ( sys-apps/systemd )
92 v4l? ( media-libs/libv4l )
93 + X? (
94 + media-libs/libcanberra
95 + x11-libs/libX11
96 + )
97 zeroconf? ( net-dns/avahi )
98 "
99
100 @@ -131,6 +135,7 @@ src_prepare() {
101 multilib_src_configure() {
102 local emesonargs=(
103 -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
104 +
105 $(meson_native_use_feature zeroconf avahi)
106 $(meson_native_use_feature doc docs)
107 $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
108 @@ -185,6 +190,10 @@ multilib_src_configure() {
109 -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
110 $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
111 -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
112 +
113 + # Just for bell sounds in X11 right now.
114 + $(meson_native_use_feature X x11)
115 + $(meson_native_use_feature X libcanberra)
116 )
117
118 meson_src_configure