Version bump

This commit is contained in:
Gerben Jan Dijkman 2023-06-27 13:18:16 +02:00
parent 2140b6c8ce
commit e528a4fa46
12 changed files with 333 additions and 583 deletions

View File

@ -1,4 +1 @@
DIST pipewire-0.3.67.tar.bz2 1531871 BLAKE2B 59ea184ae11ad2999f37f0ded785551894ce6fbf478146c53f1dc6cdfeae7aa50cf6151b1e5e9c63c4f288682e5da7fde523251096af7da9d79bf96dd9d94809 SHA512 538b8ee905760775a0522dd3883d5db9bcaafe93d80eb5b588e21e73de22637a49cd139d3ed4dcfd1a5822af85e4cede624eee899c1e51a115f1ba0a6966c7a5 DIST pipewire-0.3.72.tar.bz2 1622951 BLAKE2B e3334410b551ba155dc79baecdd85fa5f214483ab53d11cc9b59ec2a0549957b67048d621ff1881ea927ba315d41c32ba3df97435453ff68173e2c450bf216aa SHA512 f105a2afdc00a81cb8c95c57645257109fd3ac1bd0608eb59969473fd94600c8ecf1d3f51abebcf7f9d70307568b2f5f66c7480a014b3955bcb992d92ca3ff43
DIST pipewire-0.3.69.tar.bz2 1567927 BLAKE2B 1b62e7cd359a4b1ee75793939026eef2c09d87cf7f0537fe77c081cd1b029463681b8838c9e4c0b82686ba628d74316e38d6471dbfab21ebb4d159fd052f2d6d SHA512 95e91006928b9596b47a1becfcd975dfa6bcfb2286fc6007a5bed4f127d2fd2b7477573facdb73f3ebd5cb6b77b8e9ef714e5c0c2aec97ef9d3a768b477b6477
DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 3824106cba9c1b0a82c6d8889b2b1473f4bfc5d0994ee9dd8b46a454c287bbd4e0ad5dc508df5d4a9b7c5f683898ed756947788e561f2bf51a3116b12e46d075 SHA512 8b25d90232d07d5b1e210bd8f24240438a7dcece23a5be59a4e49fc3daf51ebf659f2cc343a0d913310a4659792590ef981ab7a59890506557f9510d902a0cff
DIST pipewire-0.3.71.tar.bz2 1592332 BLAKE2B ff6483a040285cd7a7cc10878cc88b61a0e01c0376ab64ef84f753b300b61da23211bc1b50208da7f1054d6ddf08092e81cbf29df508aad3bc93f20742a2f735 SHA512 465388faaf0f7fcce21fdbcd7a1705ef524c35e267c3f123b1025c34133fc418194abb9e22d89e60c9acc1417b25d655112fd9ef342e26ca9b8bc26013b09cb3

View File

@ -1,21 +0,0 @@
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705
From fba7083f8ceb210c7c20aceafeb5c9a8767cf705 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 26 Jan 2023 11:57:45 +0100
Subject: [PATCH] modules: also install module-combine-stream
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -139,7 +139,7 @@ pipewire_module_echo_cancel_sources = [
pipewire_module_combine_stream = shared_library('pipewire-module-combine-stream',
[ 'module-combine-stream.c' ],
include_directories : [configinc],
- install : false,
+ install : true,
install_dir : modules_install_dir,
install_rpath: modules_install_dir,
dependencies : [spa_dep, dl_lib, pipewire_dep],
--
2.39.1

View File

@ -1,28 +0,0 @@
https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1511
From 18fa7a555cc43c7219a53d836d9561faec6d6310 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 28 Jan 2023 11:04:48 +0000
Subject: [PATCH] spa: bluez5: fix dependency on glib in bluez5_deps
In de595a78ff958b8314d853f6266d5832529d9729, we started to require glib
for building bluez and introduced dependencies for the needed gio* bits,
but we only ever check for glib itself for gstreamer or flatpak.
Drop glib from the dep list to match the summary() & subsequent bluez_deps_found
logic in spa/meson.build.
Fixes: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2999
--- a/spa/plugins/bluez5/meson.build
+++ b/spa/plugins/bluez5/meson.build
@@ -1,6 +1,6 @@
gnome = import('gnome')
-bluez5_deps = [ mathlib, dbus_dep, glib2_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
+bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, gio_dep, gio_unix_dep ]
foreach dep: bluez5_deps
if not dep.found()
subdir_done()
--
2.39.1

View File

@ -1,21 +0,0 @@
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/83d2e85f490ea97e4ae94b95f20dd06566a14c31
From 83d2e85f490ea97e4ae94b95f20dd06566a14c31 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 20 Apr 2023 12:32:07 +0200
Subject: [PATCH] parser: add extra check to make coverity happy
Fixes !1473
--- a/spa/include/spa/pod/parser.h
+++ b/spa/include/spa/pod/parser.h
@@ -455,7 +455,7 @@ static inline int spa_pod_parser_getv(struct spa_pod_parser *parser, va_list arg
const struct spa_pod *pod = NULL;
const char *format;
- if (ftype == SPA_TYPE_Object) {
+ if (f && ftype == SPA_TYPE_Object) {
uint32_t key = va_arg(args, uint32_t);
const struct spa_pod_object *object;
--
GitLab

View File

@ -0,0 +1,95 @@
From 14ebb9a568f3d8e1351181300dda93099b52742c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
<89q1r14hd@relay.firefox.com>
Date: Mon, 26 Jun 2023 17:07:04 +0300
Subject: [PATCH 1/2] spa/plugins/bluez5/meson: removed some unneeded redefines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As far as I can tell, the code in question was not doing anything there
and was also breaking the new code elsewhere, so it was put on the
chopping block. Don't mind the squirming tentacles.
Signed-off-by: NiklÄvs Koļesņikovs <89q1r14hd@relay.firefox.com>
---
spa/plugins/bluez5/meson.build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
index e6c52ccc57..80493cfe61 100644
--- a/spa/plugins/bluez5/meson.build
+++ b/spa/plugins/bluez5/meson.build
@@ -118,16 +118,14 @@ endif
if ldac_dep.found()
ldac_args = codec_args
- ldac_dep = [ ldac_dep ]
if ldac_abr_dep.found()
ldac_args += [ '-DENABLE_LDAC_ABR' ]
- ldac_dep += ldac_abr_dep
endif
bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
[ 'a2dp-codec-ldac.c', 'media-codecs.c' ],
include_directories : [ configinc ],
c_args : ldac_args,
- dependencies : [ spa_dep, ldac_dep ],
+ dependencies : [ spa_dep, ldac_dep, ldac_abr_dep ],
install : true,
install_dir : spa_plugindir / 'bluez5')
endif
@@ -144,7 +142,6 @@ endif
if get_option('bluez5-codec-opus').allowed() and opus_dep.found()
opus_args = codec_args
- opus_dep = [ opus_dep ]
bluez_codec_opus = shared_library('spa-codec-bluez5-opus',
[ 'a2dp-codec-opus.c', 'media-codecs.c' ],
include_directories : [ configinc ],
--
GitLab
From 23a10a8abb324809d1ebc5d33e36cdfa570390ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?=
<89q1r14hd@relay.firefox.com>
Date: Mon, 26 Jun 2023 16:35:01 +0300
Subject: [PATCH 2/2] src/modules/meson: ensure Opus libs were actually found,
too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The old way fails, if a distro has the header but not the library,
which can happen on at least Gentoo with multilib deployments,
where the shared header is present but non-native libraries might not.
This could still fail, if a distro had some but not all libraries for
some architectures but hopefully no one did that. In that case, a compile
test would likely be required via cc.check_header() instead but let's try
the faster fix first.
Reported-by: Sam James <sam@gentoo.org>
Thanks-to: Barnabás PÅcze <pobrn@protonmail.com>
Thanks-to: Xavier Claessens <xavier.claessens@collabora.com>
Signed-off-by: NiklÄvs Koļesņikovs <89q1r14hd@relay.firefox.com>
---
src/modules/meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 342bd697b1..970e04db98 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -203,7 +203,8 @@ endif
summary({'ffado-driver': build_module_ffado_driver}, bool_yn: true, section: 'Optional Modules')
opus_custom_h = cc.has_header('opus/opus_custom.h', dependencies: opus_dep)
-if opus_custom_h
+# One would imagine that opus_dep is a requirement but for some reason it's not, so we need to manually check that
+if opus_dep.found() and opus_custom_h
opus_custom_dep = declare_dependency(compile_args: ['-DHAVE_OPUS_CUSTOM'], dependencies: opus_dep)
else
opus_custom_dep = dependency('', required: false)
--
GitLab

View File

@ -0,0 +1,32 @@
https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4df753d0d7af7e68ab16ee90b94c4ddd44506074
From 4df753d0d7af7e68ab16ee90b94c4ddd44506074 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 26 Jun 2023 16:11:33 +0200
Subject: [PATCH] context: avoid segfault when no fallback driver
In some cases, there might not be a fallback driver. Handle this without
segfaulting.
---
src/pipewire/context.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pipewire/context.c b/src/pipewire/context.c
index daf13c16b..5fd0cdec9 100644
--- a/src/pipewire/context.c
+++ b/src/pipewire/context.c
@@ -1327,11 +1327,11 @@ again:
if ((t->want_driver && t->active && t->runnable) ||
t->always_process) {
driver = target;
- driver->runnable = true;
break;
}
}
if (driver != NULL) {
+ driver->runnable = true;
/* driver needed for this group */
move_to_driver(context, &collect, driver);
} else {
--
GitLab

View File

@ -0,0 +1,43 @@
.TH "gentoo-pipewire-launcher" "1" "2023-06-15"
.SH "NAME"
gentoo\-pipewire\-launcher \- start instances of PipeWire, PipeWire-Pulse and WirePlumber
.SH "SYNOPSIS"
.BR gentoo\-pipewire\-launcher
[restart]
.SH "DESCRIPTION"
\fIgentoo\-pipewire\-launcher\fR starts instances of PipeWire and
WirePlumber.
Two instances of PipeWire are started: one as the core sound-server, and
one for PulseAudio emulation (cf.\&
.BR pipewire-pulse (1)\fR).
.PP
It must be run in an environment with an active D-Bus session bus,
i.e. one in which the
.B DBUS_SESSION_BUS_ADDRESS
environment variable is set appropriately.
.PP
\fIgentoo\-pipewire\-launcher\fR
tries to avoid restarting, in order to avoid audio dropouts.
However, a restart can be forced by calling
\fIgentoo\-pipewire\-launcher\fR
with an argument of \(oqrestart\(cq.
.PP
.B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
can be used to specify absolute paths of files to which log output
should be sent, by specifying values for one or more of the
.B GENTOO_PIPEWIRE_LOG\fR,
.B GENTOO_PIPEWIRE_PULSE_LOG\fR,
and
.B GENTOO_WIREPLUMBER_LOG
variables, one per line.
.SH "REPORTING BUGS"
Please report bugs via https://bugs.gentoo.org/
.SH "FILES"
.TP
.B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf
configures locations of files for log output.
.SH "SEE ALSO"
.BR pipewire (1),
.BR pipewire-pulse (1),
.BR wireplumber (1),
.BR pipewire.conf (5)

View File

@ -0,0 +1,52 @@
#!/bin/sh
# PipeWire launcher script for XDG compliant desktops on OpenRC.
#
# systemd users are very _STRONGLY_ advised to use the much
# more reliable and predictable user units instead.
# WARNING: This script assumes being run inside XDG compliant session,
# which means D-Bus session instance is expected to be correctly set up
# prior to this script starting. If that is not true, things may break!
restart () {
echo "Terminating PipeWire processes ..."
pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
pwait -u "${USER}" -x pipewire\|wireplumber
echo "PipeWire terminated."
}
if [ "${#}" -gt 0 ]
then
if [ "${1}" = 'restart' ]
then
restart
else
echo "Unrecognised argument." >&2
echo "Usage: gentoo-pipewire-launcher [restart]" >&2
exit 1
fi
fi
if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
then
echo "PipeWire already running, exiting." >&2
echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2
exit 1
fi
# The core daemon which by itself does probably nothing.
@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
# The so called pipewire-pulse daemon used for PulseAudio compatibility.
# Commenting this out will stop the PA proxying daemon from starting,
# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
# clients will still have access to audio and may end up clashing with
# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
# Hack for bug #822498
sleep 1
# Finally a session manager is required for PipeWire to do anything.
exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber

View File

@ -0,0 +1,77 @@
#!/bin/sh
# PipeWire launcher script for XDG compliant desktops on OpenRC.
#
# systemd users are very _STRONGLY_ advised to use the much
# more reliable and predictable user units instead.
# WARNING: This script assumes being run inside XDG compliant session,
# which means D-Bus session instance is expected to be correctly set up
# prior to this script starting. If that is not true, things may break!
DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z'
CONF="${XDG_CONFIG_HOME}/gentoo-pipewire-launcher.conf"
if [ -f "${CONF}" ]
then
. "${CONF}"
else
GENTOO_PIPEWIRE_LOG='/dev/null'
GENTOO_PIPEWIRE_PULSE_LOG='/dev/null'
GENTOO_WIREPLUMBER_LOG='/dev/null'
fi
for L in \
"${GENTOO_PIPEWIRE_LOG}" \
"${GENTOO_PIPEWIRE_PULSE_LOG}" \
"${GENTOO_WIREPLUMBER_LOG}"
do
if [ ! -e "${L}" ]
then
touch "${L}"
fi
done
restart () {
echo "Terminating PipeWire processes ..."
pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
pwait -u "${USER}" -x pipewire\|wireplumber
echo "PipeWire terminated."
}
if [ "${#}" -gt 0 ]
then
if [ "${1}" = 'restart' ]
then
restart
else
echo "Unrecognised argument." >&2
echo "Usage: gentoo-pipewire-launcher [restart]" >&2
exit 1
fi
fi
if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
then
echo "PipeWire already running, exiting." >&2
echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2
exit 1
fi
# The core daemon which by itself does probably nothing.
echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting PipeWire." 1>>"${GENTOO_PIPEWIRE_LOG}"
@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire 1>>"${GENTOO_PIPEWIRE_LOG}" 2>&1 &
# The so called pipewire-pulse daemon used for PulseAudio compatibility.
# Commenting this out will stop the PA proxying daemon from starting,
# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
# clients will still have access to audio and may end up clashing with
# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting PipeWire-Pulse." 1>>"${GENTOO_PIPEWIRE_PULSE_LOG}"
@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf 1>>"${GENTOO_PIPEWIRE_PULSE_LOG}" 2>&1 &
# Hack for bug #822498
sleep 1
# Finally a session manager is required for PipeWire to do anything.
echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting WirePlumber." 1>>"${GENTOO_WIREPLUMBER_LOG}"
exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber 1>>"${GENTOO_WIREPLUMBER_LOG}" 2>&1

View File

@ -0,0 +1,12 @@
[Desktop Entry]
Version=1.0
Name[de]=PipeWire Mediensystem
Name=PipeWire Media System
Comment[de]=Das PipeWire Mediensystem starten
Comment=Start the PipeWire Media System
Exec=/usr/bin/gentoo-pipewire-launcher restart
Terminal=false
Type=Application
X-GNOME-HiddenUnderSystemd=true
X-KDE-HiddenUnderSystemd=true
X-systemd-skip=true

View File

@ -1,477 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# 1. Please regularly check (even at the point of bumping) Fedora's packaging
# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
#
# 2. Upstream also sometimes amend release notes for the previous release to mention
# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
#
# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
# continue to move quickly. It's not uncommon for fixes to be made shortly
# after releases.
PYTHON_COMPAT=( python3_{9..11} )
inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
inherit git-r3
else
if [[ ${PV} == *_p* ]] ; then
MY_COMMIT=""
SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
S="${WORKDIR}"/${PN}-${MY_COMMIT}
else
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
fi
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="Multimedia processing graphs"
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 dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2
modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf libcamera"
# Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally
# configuring their systems to send PW sink output to the emulated
# JACK's sink - doing so is likely to yield no audio, cause a CPU
# cycles consuming loop (and may even cause GUI crashes)!
# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
# which provides adequate guarantee that alsa-lib will be able to provide audio services.
# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
REQUIRED_USE="
ffmpeg? ( extra )
bluetooth? ( dbus )
jack-sdk? ( !jack-client )
modemmanager? ( bluetooth )
system-service? ( systemd )
!sound-server? ( !pipewire-alsa )
jack-client? ( dbus )
"
RESTRICT="!test? ( test )"
BDEPEND="
>=dev-util/meson-0.59
virtual/pkgconfig
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
dbus? ( dev-util/gdbus-codegen )
doc? (
app-doc/doxygen
media-gfx/graphviz
)
"
# While udev could technically be optional, it's needed for a numebr of options,
# and not really worth it, bug #877769.
RDEPEND="
acct-group/audio
acct-group/pipewire
media-libs/alsa-lib
sys-libs/ncurses:=[unicode(+)]
virtual/libintl[${MULTILIB_USEDEP}]
virtual/libudev[${MULTILIB_USEDEP}]
bluetooth? (
dev-libs/glib
media-libs/fdk-aac
media-libs/libldac
media-libs/libfreeaptx
media-libs/opus
media-libs/sbc
>=net-wireless/bluez-4.101:=
virtual/libusb:1
)
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? (
>=media-libs/libsndfile-1.0.20
)
ffmpeg? ( media-video/ffmpeg:= )
flatpak? (
dev-libs/glib
)
libcamera? (
media-libs/libcamera
)
gstreamer? (
>=dev-libs/glib-2.32.0:2
>=media-libs/gstreamer-1.10.0:1.0
media-libs/gst-plugins-base:1.0
)
gsettings? (
>=dev-libs/glib-2.26.0:2
)
jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
jack-sdk? (
!media-sound/jack-audio-connection-kit
!media-sound/jack2
)
lv2? ( media-libs/lilv )
modemmanager? ( >=net-misc/modemmanager-1.10.0 )
pipewire-alsa? (
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
)
sound-server? (
!media-sound/pulseaudio[daemon(+)]
!media-sound/pulseaudio-daemon
)
readline? ( sys-libs/readline:= )
ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd )
system-service? (
acct-user/pipewire
)
v4l? ( media-libs/libv4l )
X? (
media-libs/libcanberra
x11-libs/libX11
x11-libs/libXfixes
)
zeroconf? ( net-dns/avahi )
"
DEPEND="${RDEPEND}"
# TODO: Consider use cases where pipewire is not used for driving audio
# Doing so with WirePlumber currently involves editing Lua scripts
PDEPEND=">=media-video/wireplumber-0.4.8-r3"
# Present RDEPEND that are currently always disabled due to the PW
# code using them being required to be disabled by Gentoo guidelines
# (i.e. developer binaries not meant for users) and unready code
# media-libs/libsdl2
# >=media-libs/vulkan-loader-1.1.69
#
# Ditto for DEPEND
# >=dev-util/vulkan-headers-1.1.69
DOCS=( {README,INSTALL}.md NEWS )
PATCHES=(
"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
)
python_check_deps() {
python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
}
src_prepare() {
default
# Used for upstream backports
[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
}
multilib_src_configure() {
# https://bugs.gentoo.org/838301
filter-flags -fno-semantic-interposition
local emesonargs=(
-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
$(meson_feature dbus)
$(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
$(meson_native_enabled man)
$(meson_feature test tests)
-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
$(meson_native_use_feature gstreamer)
$(meson_native_use_feature gstreamer gstreamer-device-provider)
$(meson_native_use_feature gsettings)
$(meson_native_use_feature systemd)
$(meson_native_use_feature system-service systemd-system-service)
-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
$(meson_native_use_feature systemd systemd-user-service)
$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-Dspa-plugins=enabled
-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-Dcompress-offload=disabled # TODO: tinycompress unpackaged
-Daudiomixer=enabled # Matches upstream
-Daudioconvert=enabled # Matches upstream
$(meson_native_use_feature bluetooth bluez5)
$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
$(meson_native_use_feature bluetooth bluez5-backend-ofono)
$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
$(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 opus)
$(meson_native_use_feature bluetooth bluez5-codec-opus)
$(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
# Not yet packaged.
# http://www.bluez.org/le-audio-support-in-pipewire/
-Dbluez5-codec-lc3=disabled
-Dbluez5-codec-lc3plus=disabled
-Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream
-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
$(meson_native_use_feature flatpak)
-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
$(meson_use jack-sdk jack-devel)
$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-Devl=disabled # Matches upstream
-Dtest=disabled # fakesink and fakesource plugins
$(meson_native_use_feature lv2)
$(meson_native_use_feature v4l v4l2)
$(meson_native_use_feature libcamera)
$(meson_native_use_feature readline)
$(meson_native_use_feature ssl raop)
-Dvideoconvert=enabled # Matches upstream
-Dvideotestsrc=enabled # Matches upstream
-Dvolume=enabled # Matches upstream
-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
$(meson_native_use_feature extra pw-cat)
-Dudev=enabled
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-Dlibmysofa=disabled # libmysofa is unpackaged
$(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
# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
# just became stable, with 5.15 being the previous LTS. Many people
# are still on it.
-Dpam-defaults-install=true
# Just for bell sounds in X11 right now.
$(meson_native_use_feature X x11)
$(meson_native_use_feature X x11-xfixes)
$(meson_native_use_feature X libcanberra)
)
meson_src_configure
}
multilib_src_test() {
meson_src_test --timeout-multiplier 10
}
multilib_src_install() {
# Our custom DOCS do not exist in multilib source directory
DOCS= meson_src_install
}
multilib_src_install_all() {
einstalldocs
if use pipewire-alsa; then
dodir /etc/alsa/conf.d
# Install pipewire conf loader hook
insinto /usr/share/alsa/alsa.conf.d
doins "${FILESDIR}"/99-pipewire-default-hook.conf
eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
# And the current dosym8 -r implementation is likely affected by the same issue, too.
dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
fi
# Enable required wireplumber alsa and bluez monitors
if use sound-server; then
dodir /etc/wireplumber/main.lua.d
echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
dodir /etc/wireplumber/bluetooth.lua.d
echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
fi
if use system-service; then
newtmpfiles - pipewire.conf <<-EOF || die
d /run/pipewire 0755 pipewire pipewire - -
EOF
fi
if ! use systemd; then
insinto /etc/xdg/autostart
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
# Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then
sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
fi
eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
fi
}
pkg_postrm() {
udev_reload
}
pkg_preinst() {
HAD_SOUND_SERVER=0
HAD_SYSTEM_SERVICE=0
if has_version "media-video/pipewire[sound-server(-)]" ; then
HAD_SOUND_SERVER=1
fi
if has_version "media-video/pipewire[system-service(-)]" ; then
HAD_SYSTEM_SERVICE=1
fi
}
pkg_postinst() {
udev_reload
use system-service && tmpfiles_process pipewire.conf
local ver
for ver in ${REPLACING_VERSIONS} ; do
if ver_test ${ver} -le 0.3.66-r1 ; then
elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
elog "and limits needed to function smoothly:"
elog
elog "1. Please make sure your user is in the 'pipewire' group for"
elog "the best experience with realtime scheduling (PAM limits behavior)!"
elog "You can add your account with:"
elog " usermod -aG pipewire <youruser>"
elog
elog "2. For the best experience with fast user switching, it is recommended"
elog "that you remove your user from the 'audio' group unless you rely on the"
elog "audio group for device access control or ACLs.:"
elog " usermod -rG audio <youruser>"
elog
if ! use jack-sdk ; then
elog
elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
elog "alternative libraries have been installed to a non-default location."
elog "To use them, put pw-jack <application> before every JACK application."
elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
elog "provider is still needed to compile the JACK applications themselves."
elog
fi
if use systemd ; then
ewarn
ewarn "PipeWire daemon startup has been moved to a launcher script!"
ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
ewarn
ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
ewarn "advised that a D-Bus user session is set up before starting the script."
ewarn
fi
if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
elog
elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
elog "are recommended to edit pulseaudio client configuration files:"
elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
elog "if it exists, and disable autospawning of the original daemon by setting:"
elog
elog " autospawn = no"
elog
elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
elog
elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
elog "command:"
elog
elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
elog
fi
if has_version 'net-misc/ofono' ; then
ewarn "Native backend has become default. Please disable oFono via:"
if systemd_is_booted ; then
ewarn "systemctl disable ofono"
else
ewarn "rc-update delete ofono"
fi
fi
fi
done
if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
# TODO: We could drop most of this if we set up systemd presets?
if use sound-server && use systemd ; then
elog
elog "When switching from PulseAudio, you may need to disable PulseAudio:"
elog
elog " systemctl --user disable pulseaudio.service pulseaudio.socket"
elog
elog "To use PipeWire, the user units must be manually enabled"
elog "by running this command as each user you use for desktop activities:"
elog
elog " systemctl --user enable pipewire.socket pipewire-pulse.socket"
elog
elog "A reboot is recommended to avoid interferences from still running"
elog "PulseAudio daemon."
elog
elog "Both new users and those upgrading need to enable WirePlumber"
elog "for relevant users:"
elog
elog " systemctl --user disable pipewire-media-session.service"
elog " systemctl --user --force enable wireplumber.service"
elog
elog "Root user may replace --user with --global to change system default"
elog "configuration for all of the above commands."
elog
fi
if ! use sound-server ; then
ewarn
ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
ewarn "your sound, please enable it. See the wiki at"
ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
ewarn "for more details."
ewarn
fi
fi
if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
ewarn
ewarn "You have enabled the system-service USE flag, which installs"
ewarn "the system-wide systemd units that enable PipeWire to run as a system"
ewarn "service. This is more than likely NOT what you want. You are strongly"
ewarn "advised not to enable this mode and instead stick with systemd user"
ewarn "units. The default configuration files will likely not work out of the"
ewarn "box, and you are on your own with configuration."
ewarn
fi
elog "For latest tips and tricks, troubleshooting information, and documentation"
elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
elog
optfeature_header "The following can be installed for optional runtime features:"
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
if use sound-server && ! use pipewire-alsa; then
optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
fi
}

View File

@ -13,7 +13,7 @@ EAPI=8
# continue to move quickly. It's not uncommon for fixes to be made shortly # continue to move quickly. It's not uncommon for fixes to be made shortly
# after releases. # after releases.
PYTHON_COMPAT=( python3_{9..11} ) PYTHON_COMPAT=( python3_{10..11} )
inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
@ -29,7 +29,7 @@ else
SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
fi fi
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi fi
DESCRIPTION="Multimedia processing graphs" DESCRIPTION="Multimedia processing graphs"
@ -38,8 +38,8 @@ HOMEPAGE="https://pipewire.org/"
LICENSE="MIT LGPL-2.1+ GPL-2" LICENSE="MIT LGPL-2.1+ GPL-2"
# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
SLOT="0/0.4" SLOT="0/0.4"
IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2"
modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf libcamera" IUSE+=" modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf libcamera"
# Once replacing system JACK libraries is possible, it's likely that # Once replacing system JACK libraries is possible, it's likely that
# jack-client IUSE will need blocking to avoid users accidentally # jack-client IUSE will need blocking to avoid users accidentally
@ -97,44 +97,31 @@ RDEPEND="
) )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
echo-cancel? ( media-libs/webrtc-audio-processing:0 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 )
extra? ( extra? ( >=media-libs/libsndfile-1.0.20 )
>=media-libs/libsndfile-1.0.20
)
ffmpeg? ( media-video/ffmpeg:= ) ffmpeg? ( media-video/ffmpeg:= )
flatpak? ( flatpak? ( dev-libs/glib )
dev-libs/glib libcamera? ( media-libs/libcamera )
)
libcamera? (
media-libs/libcamera
)
gstreamer? ( gstreamer? (
>=dev-libs/glib-2.32.0:2 >=dev-libs/glib-2.32.0:2
>=media-libs/gstreamer-1.10.0:1.0 >=media-libs/gstreamer-1.10.0:1.0
media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-base:1.0
) )
gsettings? ( gsettings? ( >=dev-libs/glib-2.26.0:2 )
>=dev-libs/glib-2.26.0:2 ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
)
jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
jack-sdk? ( jack-sdk? (
!media-sound/jack-audio-connection-kit !media-sound/jack-audio-connection-kit
!media-sound/jack2 !media-sound/jack2
) )
liblc3? ( media-sound/liblc3 )
lv2? ( media-libs/lilv ) lv2? ( media-libs/lilv )
modemmanager? ( >=net-misc/modemmanager-1.10.0 ) modemmanager? ( >=net-misc/modemmanager-1.10.0 )
pipewire-alsa? ( pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] )
>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] sound-server? ( !media-sound/pulseaudio-daemon )
)
sound-server? (
!media-sound/pulseaudio[daemon(+)]
!media-sound/pulseaudio-daemon
)
readline? ( sys-libs/readline:= ) readline? ( sys-libs/readline:= )
ssl? ( dev-libs/openssl:= ) ssl? ( dev-libs/openssl:= )
systemd? ( sys-apps/systemd ) systemd? ( sys-apps/systemd )
system-service? ( system-service? ( acct-user/pipewire )
acct-user/pipewire
)
v4l? ( media-libs/libv4l ) v4l? ( media-libs/libv4l )
X? ( X? (
media-libs/libcanberra media-libs/libcanberra
@ -190,6 +177,7 @@ multilib_src_configure() {
$(meson_native_enabled man) $(meson_native_enabled man)
$(meson_feature test tests) $(meson_feature test tests)
-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
$(meson_feature ieee1394 libffado)
$(meson_native_use_feature gstreamer) $(meson_native_use_feature gstreamer)
$(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gstreamer gstreamer-device-provider)
$(meson_native_use_feature gsettings) $(meson_native_use_feature gsettings)
@ -220,10 +208,6 @@ multilib_src_configure() {
$(meson_native_use_feature bluetooth bluez5-codec-opus) $(meson_native_use_feature bluetooth bluez5-codec-opus)
$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) $(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 $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
# Not yet packaged.
# http://www.bluez.org/le-audio-support-in-pipewire/
-Dbluez5-codec-lc3=disabled
-Dbluez5-codec-lc3plus=disabled
-Dcontrol=enabled # Matches upstream -Dcontrol=enabled # Matches upstream
-Daudiotestsrc=enabled # Matches upstream -Daudiotestsrc=enabled # Matches upstream
-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
@ -236,6 +220,7 @@ multilib_src_configure() {
-Dsupport=enabled # Miscellaneous/common plugins, such as null sink -Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-Devl=disabled # Matches upstream -Devl=disabled # Matches upstream
-Dtest=disabled # fakesink and fakesource plugins -Dtest=disabled # fakesink and fakesource plugins
$(meson_native_use_feature liblc3 bluez5-codec-lc3)
$(meson_native_use_feature lv2) $(meson_native_use_feature lv2)
$(meson_native_use_feature v4l v4l2) $(meson_native_use_feature v4l v4l2)
$(meson_native_use_feature libcamera) $(meson_native_use_feature libcamera)
@ -310,10 +295,12 @@ multilib_src_install_all() {
if ! use systemd; then if ! use systemd; then
insinto /etc/xdg/autostart insinto /etc/xdg/autostart
newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop
exeinto /usr/bin exeinto /usr/bin
newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 gentoo-pipewire-launcher newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r2 gentoo-pipewire-launcher
doman "${FILESDIR}"/gentoo-pipewire-launcher.1
# Disable pipewire-pulse if sound-server is disabled. # Disable pipewire-pulse if sound-server is disabled.
if ! use sound-server ; then if ! use sound-server ; then
@ -418,6 +405,8 @@ pkg_postinst() {
if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
# TODO: We could drop most of this if we set up systemd presets? # TODO: We could drop most of this if we set up systemd presets?
# They're worth looking into because right now, the out-of-the-box experience
# is automatic on OpenRC, while it needs manual intervention on systemd.
if use sound-server && use systemd ; then if use sound-server && use systemd ; then
elog elog
elog "When switching from PulseAudio, you may need to disable PulseAudio:" elog "When switching from PulseAudio, you may need to disable PulseAudio:"