diff options
Diffstat (limited to 'media-libs/libpipewire')
| -rw-r--r-- | media-libs/libpipewire/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch | 17 | ||||
| -rw-r--r-- | media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch | 30 | ||||
| -rw-r--r-- | media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch | 30 | ||||
| -rw-r--r-- | media-libs/libpipewire/libpipewire-0.3.43-r10.ebuild (renamed from media-libs/libpipewire/libpipewire-0.3.32-r1.ebuild) | 97 |
5 files changed, 104 insertions, 72 deletions
diff --git a/media-libs/libpipewire/Manifest b/media-libs/libpipewire/Manifest index f9fd7cea..46910cd9 100644 --- a/media-libs/libpipewire/Manifest +++ b/media-libs/libpipewire/Manifest @@ -1 +1 @@ -DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d SHA512 8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7 +DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 3fa167d74e6104685760a9eac721bc359f1245897e1a5f9b09b4b9591fc459d19549e209990ca478a10ad6c2a4dfaecc3546d996ab7f7d64fe880fb0c1c1dfca SHA512 d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0 diff --git a/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch deleted file mode 100644 index ccc89f13..00000000 --- a/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/daemon/pipewire.conf.in 2021-06-30 22:22:09.520402459 +0200 -+++ b/src/daemon/pipewire.conf.in 2021-06-30 22:22:30.620404999 +0200 -@@ -234,12 +234,12 @@ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ { path = "@session_manager_path@" args = "@session_manager_args@" } - # - # You can optionally start the pulseaudio-server here as well - # but it is better to start it as a systemd service. - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } - ] diff --git a/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch deleted file mode 100644 index d8496bc5..00000000 --- a/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Fri, 21 May 2021 10:32:52 +0200 -Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change" - -This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe. - -Doesn't apply to us. - -Bug: https://bugs.gentoo.org/785634 ---- - spa/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/meson.build b/spa/meson.build -index e13802e94..885b25405 100644 ---- a/spa/meson.build -+++ b/spa/meson.build -@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled() - summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') - ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac')) - summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') -- aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx')) -+ aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx')) - summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') - fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac')) - summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') --- -2.32.0 - diff --git a/media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch b/media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch new file mode 100644 index 00000000..93c3ffe3 --- /dev/null +++ b/media-libs/libpipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch @@ -0,0 +1,30 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/814d409501aca3e044ad53063eb3f433b8aff6f9.patch + +From 814d409501aca3e044ad53063eb3f433b8aff6f9 Mon Sep 17 00:00:00 2001 +From: Timo Gurr <timo.gurr@gmail.com> +Date: Thu, 6 Jan 2022 12:17:10 +0000 +Subject: [PATCH] systemd: Add systemd-system-unit-dir override + +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -179,6 +179,9 @@ option('udev', + option('udevrulesdir', + type : 'string', + description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') ++option('systemd-system-unit-dir', ++ type : 'string', ++ description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') + option('systemd-user-unit-dir', + type : 'string', + description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') +--- a/src/daemon/systemd/system/meson.build ++++ b/src/daemon/systemd/system/meson.build +@@ -1,4 +1,7 @@ + systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix]) ++if get_option('systemd-system-unit-dir') != '' ++ systemd_system_services_dir = get_option('systemd-system-unit-dir') ++endif + + install_data(sources : 'pipewire.socket', + install_dir : systemd_system_services_dir) +GitLab diff --git a/media-libs/libpipewire/libpipewire-0.3.32-r1.ebuild b/media-libs/libpipewire/libpipewire-0.3.43-r10.ebuild index d830b6ac..d91bbf29 100644 --- a/media-libs/libpipewire/libpipewire-0.3.32-r1.ebuild +++ b/media-libs/libpipewire/libpipewire-0.3.43-r10.ebuild @@ -1,50 +1,62 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit meson-multilib optfeature python-any-r1 udev +inherit meson-multilib optfeature prefix python-any-r1 systemd udev MY_PN="pipewire" SRC_URI="https://gitlab.freedesktop.org/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_PN}-${PV}.tar.gz" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -DESCRIPTION="Pipewire client libraries" +DESCRIPTION="Multimedia processing graphs" HOMEPAGE="https://pipewire.org/" LICENSE="MIT LGPL-2.1+ GPL-2" -SLOT="0/0.3" -IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" +# 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" + +# 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)! REQUIRED_USE="jack-sdk? ( !jack-client )" RESTRICT="!test? ( test )" BDEPEND=" - app-doc/xmltoman + >=dev-util/meson-0.59 virtual/pkgconfig ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') doc? ( app-doc/doxygen media-gfx/graphviz ) " RDEPEND=" + acct-group/audio media-libs/alsa-lib sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] virtual/libudev[${MULTILIB_USEDEP}] bluetooth? ( media-libs/fdk-aac media-libs/libldac - media-libs/libopenaptx + media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= + virtual/libusb:1 ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) @@ -58,53 +70,85 @@ RDEPEND=" !media-sound/jack-audio-connection-kit !media-sound/jack2 ) + lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - || ( - media-plugins/alsa-plugins[-pulseaudio] - !media-plugins/alsa-plugins - ) + !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l ) - !!media-video/pipewire + 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" + +# 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-video/ffmpeg:= +# media-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +S="${WORKDIR}/${MY_PN}-${PV}" + PATCHES=( "${FILESDIR}"/${MY_PN}-0.3.25-enable-failed-mlock-warning.patch - "${FILESDIR}"/${MY_PN}-0.3.31-revert-openaptx-restriction.patch + + # Upstream patches/backports + "${FILESDIR}"/${MY_PN}-${PV}-systemd-user-unit-dir.patch ) -S="${WORKDIR}/${MY_PN}-${PV}" +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} src_prepare() { default - if ! use systemd; then - eapply "${FILESDIR}"/${MY_PN}-0.3.31-non-systemd-integration.patch - fi + einfo "Generating ${limitsdfile}" + cat > ${limitsdfile} <<- EOF || die + # Start of ${limitsdfile} from ${P} + + @audio - memlock 256 + + # End of ${limitsdfile} from ${P} + EOF } 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) # Disabling this implicitly disables -Dmedia-session - $(meson_native_enabled media-session) + $(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 systemd) + -Dsystemd-system-service=disabled # Matches upstream + -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 (-Dmedia-session depends on this) + -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) -Daudiomixer=enabled # Matches upstream -Daudioconvert=enabled # Matches upstream $(meson_native_use_feature bluetooth bluez5) @@ -115,18 +159,22 @@ multilib_src_configure() { $(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 libusb) # At least for now only used by bluez5 native (quirk detection of adapters) + $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 -Dcontrol=enabled # Matches upstream -Daudiotestsrc=enabled # Matches upstream -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 -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_feature jack-sdk jack-devel) + $(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) -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature ssl raop) -Dvideoconvert=enabled # Matches upstream -Dvideotestsrc=enabled # Matches upstream -Dvolume=enabled # Matches upstream @@ -136,6 +184,7 @@ multilib_src_configure() { -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" -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 ) meson_src_configure |