diff options
author | Martin Väth <martin@mvath.de> | 2022-02-06 18:49:54 +0100 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2022-02-06 18:49:54 +0100 |
commit | 63eee3dbbd4b8ec61eeb57c1ab3d4476eab5b92c (patch) | |
tree | 00746efb70ef430d7bfdd3cbdcabbf4d8f1a0bc4 /media-video | |
parent | sys-kernel/kconfig-hardened-check: Version bump (diff) | |
download | mv-63eee3dbbd4b8ec61eeb57c1ab3d4476eab5b92c.tar.gz mv-63eee3dbbd4b8ec61eeb57c1ab3d4476eab5b92c.tar.bz2 mv-63eee3dbbd4b8ec61eeb57c1ab3d4476eab5b92c.zip |
media-video/pipewire: Version bump. Remove old
Signed-off-by: Martin Väth <martin@mvath.de>
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/pipewire/Manifest | 3 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch | 17 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch | 30 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch | 38 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch | 20 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch | 36 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.36-fix-version.patch | 25 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch | 30 | ||||
-rw-r--r-- | media-video/pipewire/files/pipewire.desktop | 12 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.36.ebuild | 280 | ||||
-rw-r--r-- | media-video/pipewire/pipewire-0.3.45_p20220205.ebuild (renamed from media-video/pipewire/pipewire-0.3.43-r3.ebuild) | 51 |
11 files changed, 45 insertions, 497 deletions
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 26d81a02..08c5750e 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -1,2 +1 @@ -DIST pipewire-0.3.36.tar.gz 1708209 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 -DIST pipewire-0.3.43.tar.gz 1713131 SHA512 d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0 +DIST pipewire-0.3.45_p20220205.tar.bz2 1296767 SHA512 eae64ccf484c051a10a7a7ac11522de6cd3760c87414febe4868b76f22a8651b1bf94c04cd305fbacd1c6e7233fedb8008933c0dbd6809d4507eb27e633c3930 diff --git a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch deleted file mode 100644 index ccc89f13..00000000 --- a/media-video/pipewire/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-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch deleted file mode 100644 index d8496bc5..00000000 --- a/media-video/pipewire/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-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch deleted file mode 100644 index 94d4b7dc..00000000 --- a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit f405a4e6069725934f9ae0f1b978497a34197d8d -Author: Thomas Deutschmann <whissi@gentoo.org> -AuthorDate: Tue Aug 24 14:22:36 2021 +0200 -Commit: Thomas Deutschmann <whissi@gentoo.org> -CommitDate: Tue Aug 24 14:22:43 2021 +0200 - - Revert "bluez5: Use libfreeaptx instead of libopenaptx" - - This reverts commit 1216371f8c06f548f8ade6468b66612f43df1436. - - Delay decision for now since both aptx libs haven't diverged yet. - -diff --git a/spa/meson.build b/spa/meson.build -index 483536b54..e13802e94 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('libfreeaptx', required : get_option('bluez5-codec-aptx')) -+ aptx_dep = dependency('libopenaptx', version : '< 0.2.1', 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') -diff --git a/spa/plugins/bluez5/a2dp-codec-aptx.c b/spa/plugins/bluez5/a2dp-codec-aptx.c -index f8d7d6dd8..62ecde348 100644 ---- a/spa/plugins/bluez5/a2dp-codec-aptx.c -+++ b/spa/plugins/bluez5/a2dp-codec-aptx.c -@@ -32,7 +32,7 @@ - - #include <sbc/sbc.h> - --#include <freeaptx.h> -+#include <openaptx.h> - - #include "defs.h" - #include "rtp.h" diff --git a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch deleted file mode 100644 index 3edab5b9..00000000 --- a/media-video/pipewire/files/pipewire-0.3.35-non-systemd-integration.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -235,12 +235,12 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_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). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } - ] --- -2.33.0 - diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch deleted file mode 100644 index 6080ff4f..00000000 --- a/media-video/pipewire/files/pipewire-0.3.36-fix-crash-uaf-media-session.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/39c8ed4f62172026036281691cd3b67b469a8629 - -From 39c8ed4f62172026036281691cd3b67b469a8629 Mon Sep 17 00:00:00 2001 -From: Pauli Virtanen <pav@iki.fi> -Date: Thu, 16 Sep 2021 19:18:52 +0300 -Subject: [PATCH] media-session: don't use-after-free if linking node removed - -Should fix an ASAN crash. ---- - src/examples/media-session/policy-node.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c -index d83613d0b..e273434fa 100644 ---- a/src/examples/media-session/policy-node.c -+++ b/src/examples/media-session/policy-node.c -@@ -869,6 +869,7 @@ static int link_nodes(struct node *node, struct node *peer) - struct pw_properties *props; - struct node *output, *input; - int res; -+ uint32_t node_id = node->id; - - pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl, - node->id, peer->id, !node->dont_remix); -@@ -902,7 +903,7 @@ static int link_nodes(struct node *node, struct node *peer) - - if (impl->linking_node_removed) { - impl->linking_node_removed = false; -- pw_log_info("linking node %d was removed", node->id); -+ pw_log_info("linking node %d was removed", node_id); - return -ENOENT; - } - node->linking = false; --- -GitLab - diff --git a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch b/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch deleted file mode 100644 index ace05b9e..00000000 --- a/media-video/pipewire/files/pipewire-0.3.36-fix-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 - -From 10abcd92d76ddd02b690ff06d67c013bfc5fa5c2 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Thu, 16 Sep 2021 17:57:47 +0200 -Subject: [PATCH] update version number as well - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c9b98c8ba..ea35ac674 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project('pipewire', ['c' ], -- version : '0.3.35', -+ version : '0.3.36', - license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ], - meson_version : '>= 0.54.0', - default_options : [ 'warning_level=3', --- -GitLab - diff --git a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch b/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch deleted file mode 100644 index 93c3ffe3..00000000 --- a/media-video/pipewire/files/pipewire-0.3.43-systemd-user-unit-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-video/pipewire/files/pipewire.desktop b/media-video/pipewire/files/pipewire.desktop deleted file mode 100644 index d3786e74..00000000 --- a/media-video/pipewire/files/pipewire.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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/libexec/pipewire-launcher -Terminal=false -Type=Application -X-GNOME-HiddenUnderSystemd=true -X-KDE-HiddenUnderSystemd=true -X-systemd-skip=true diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild deleted file mode 100644 index 16a7d009..00000000 --- a/media-video/pipewire/pipewire-0.3.36.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit meson-multilib optfeature python-any-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -SLOT="0/0.3" -IUSE="alsa bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" - -# 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/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - virtual/libudev[${MULTILIB_USEDEP}] - bluetooth? ( - media-libs/fdk-aac - media-libs/libldac - media-libs/libfreeaptx - media-libs/sbc - >=net-wireless/bluez-4.101:= - ) - echo-cancel? ( media-libs/webrtc-audio-processing ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - pipewire-alsa? ( - >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] - ) - !pipewire-alsa? ( alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) ) - systemd? ( sys-apps/systemd ) - v4l? ( media-libs/libv4l ) -" - -DEPEND="${RDEPEND}" - -# 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 - -DOCS=( {README,INSTALL}.md NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - "${FILESDIR}"/${P}-fix-crash-uaf-media-session.patch - "${FILESDIR}"/${P}-fix-version.patch -) - -# 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 - # This can be applied non-conditionally but would make for a - # significantly worse user experience on systemd then. - eapply "${FILESDIR}"/${PN}-0.3.35-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 doc docs) - $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session - # Replaced upstream by -Dsession-managers=..., needs more work, bug #812809 - # but default is same as before and right now, this is fatal with unreleased Meson. - #$(meson_native_enabled media-session) - $(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 - $(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) - -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) - $(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 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_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 v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - -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) - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - ) - - meson_src_configure -} - -multilib_src_install() { - # Our customs DOCS do not exist in multilib source directory - DOCS= meson_src_install -} - -multilib_src_install_all() { - einstalldocs - - insinto /etc/security/limits.d - doins ${limitsdfile} - - if use pipewire-alsa; then - dodir /etc/alsa/conf.d - # These will break if someone has /etc that is a symbol 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.conf /etc/alsa/conf.d/99-pipewire-default.conf - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop pipewire.desktop - - exeinto /usr/libexec - newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher - fi -} - -pkg_postinst() { - elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" - elog "using PipeWire. Do it either manually or add yourself" - elog "to the 'audio' group:" - elog - elog " usermod -aG audio <youruser>" - elog - - if ! use jack-sdk; then - 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 - elog "To use PipeWire for audio, the user units must be manually enabled:" - elog - elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" - elog - elog "When switching from PulseAudio, do not forget to disable PulseAudio:" - elog - elog " systemctl --user disable pulseaudio.service pulseaudio.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 pipewire-media-session:" - elog - elog " systemctl --user enable pipewire-media-session.service" - elog - else - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable " - elog "autospawn'ing 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}/etc/pipewire/pipewire.conf by commenting out the relevant" - elog "command near the end of the file:" - elog - elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }" - elog - elog "NOTE:" - elog "Starting with PipeWire-0.3.30, package is no longer installing config" - elog "into ${EROOT}/etc/pipewire by default. In case you need to change" - elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire" - elog "and just override sections you want to change." - 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 - # Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here! - if use bluetooth; then - optfeature "better BT headset support (daemon startup required)" net-misc/ofono - #optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd - fi -} diff --git a/media-video/pipewire/pipewire-0.3.43-r3.ebuild b/media-video/pipewire/pipewire-0.3.45_p20220205.ebuild index af8fe3c5..00e1a8ff 100644 --- a/media-video/pipewire/pipewire-0.3.43-r3.ebuild +++ b/media-video/pipewire/pipewire-0.3.45_p20220205.ebuild @@ -11,7 +11,14 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" inherit git-r3 else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="d1784cfd861bb3179903b07ab87a16e929c0909f" + 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.gz" + fi + KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86" fi @@ -21,7 +28,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="alsa bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l zeroconf" +IUSE="alsa bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service 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 @@ -29,7 +36,10 @@ IUSE="alsa bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pi # 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 )" +REQUIRED_USE=" + jack-sdk? ( !jack-client ) + system-service? ( systemd ) +" RESTRICT="!test? ( test )" @@ -81,7 +91,15 @@ RDEPEND=" !pipewire-alsa? ( alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + ) zeroconf? ( net-dns/avahi ) " @@ -105,9 +123,6 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - - # Upstream patches/backports - "${FILESDIR}"/${P}-systemd-user-unit-dir.patch ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1 @@ -127,6 +142,12 @@ src_prepare() { @audio - memlock 256 + $(use system-service && { + echo @pipewire - rtprio 95 + echo @pipewire - priority -19 + echo @pipewire - memlock 4194304 + }) + # End of ${limitsdfile} from ${P} EOF } @@ -134,6 +155,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 @@ -144,7 +166,7 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature systemd) - -Dsystemd-system-service=disabled # Matches upstream + $(meson_native_use_feature system-service systemd-system-service) -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" @@ -188,6 +210,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 @@ -310,4 +336,15 @@ pkg_postinst() { fi ewarn fi + + if use system-service; then + ewarn + ewarn "WARNING: 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" + ewarn "box, and you are on your own with configuration." + ewarn + fi } |