commit: 91451003a61390f65b4eca23a1960c0d158c84ce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 20:26:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 21:53:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91451003
media-video/pipewire: add X bell support
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/pipewire/metadata.xml | 1 +
.../{pipewire-0.3.44.ebuild => pipewire-0.3.44-r1.ebuild} | 11 ++++++++++-
media-video/pipewire/pipewire-9999.ebuild | 11 ++++++++++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/media-video/pipewire/metadata.xml
b/media-video/pipewire/metadata.xml
index ca29532fdfbe..5fb3fecf9135 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -30,5 +30,6 @@
<flag name="lv2">Allow loading LV2 plugins via
<pkg>media-libs/lv2</pkg></flag>
<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin
with PipeWire's plugin</flag>
<flag name="ssl">Enable raop-sink support (needs
<pkg>dev-libs/openssl</pkg>)</flag>
+ <flag name="X">Enable audible bell for X11</pkg>
</use>
</pkgmetadata>
diff --git a/media-video/pipewire/pipewire-0.3.44.ebuild
b/media-video/pipewire/pipewire-0.3.44-r1.ebuild
similarity index 98%
rename from media-video/pipewire/pipewire-0.3.44.ebuild
rename to media-video/pipewire/pipewire-0.3.44-r1.ebuild
index de92d3ebfb8e..033d3614a241 100644
--- a/media-video/pipewire/pipewire-0.3.44.ebuild
+++ b/media-video/pipewire/pipewire-0.3.44-r1.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 v4l zeroconf"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2
pipewire-alsa ssl 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
@@ -82,6 +82,10 @@ RDEPEND="
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
v4l? ( media-libs/libv4l )
+ X? (
+ media-libs/libcanberra
+ x11-libs/libX11
+ )
zeroconf? ( net-dns/avahi )
"
@@ -131,6 +135,7 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
$(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
$(meson_native_enabled examples) # TODO: Figure out if this is
still important now that media-session gone
@@ -185,6 +190,10 @@ multilib_src_configure() {
-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)
-Dsession-managers="[]" # All available session managers are
now their own projects, so there's nothing to build
+
+ # Just for bell sounds in X11 right now.
+ $(meson_native_use_feature X x11)
+ $(meson_native_use_feature X libcanberra)
)
meson_src_configure
diff --git a/media-video/pipewire/pipewire-9999.ebuild
b/media-video/pipewire/pipewire-9999.ebuild
index de92d3ebfb8e..033d3614a241 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 v4l zeroconf"
+IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2
pipewire-alsa ssl 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
@@ -82,6 +82,10 @@ RDEPEND="
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
v4l? ( media-libs/libv4l )
+ X? (
+ media-libs/libcanberra
+ x11-libs/libX11
+ )
zeroconf? ( net-dns/avahi )
"
@@ -131,6 +135,7 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
$(meson_native_use_feature zeroconf avahi)
$(meson_native_use_feature doc docs)
$(meson_native_enabled examples) # TODO: Figure out if this is
still important now that media-session gone
@@ -185,6 +190,10 @@ multilib_src_configure() {
-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)
-Dsession-managers="[]" # All available session managers are
now their own projects, so there's nothing to build
+
+ # Just for bell sounds in X11 right now.
+ $(meson_native_use_feature X x11)
+ $(meson_native_use_feature X libcanberra)
)
meson_src_configure
