summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaco Kroon <jaco@uls.co.za>2021-06-30 22:28:39 +0200
committerLars Wendler <polynomial-c@gentoo.org>2021-06-30 22:40:01 +0200
commit1078f2a85b1b3f256d04db4ff165d98a3dce309f (patch)
tree3ead243df8c71c76e4887a530200bae8a8ac714d /media-video
parentmedia-video/pipewire: Fixed openaptx revert patch again (diff)
downloadgentoo-1078f2a85b1b3f256d04db4ff165d98a3dce309f.tar.gz
gentoo-1078f2a85b1b3f256d04db4ff165d98a3dce309f.tar.bz2
gentoo-1078f2a85b1b3f256d04db4ff165d98a3dce309f.zip
media-video/pipewire: Rebased non-systemd integration patch.
Closes: https://bugs.gentoo.org/799353 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Jaco Kroon <jaco@uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/21491 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch17
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild2
2 files changed, 18 insertions, 1 deletions
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
new file mode 100644
index 000000000000..ccc89f1310b7
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
@@ -0,0 +1,17 @@
+--- 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/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index acb7e554b78a..4520c8074913 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -114,7 +114,7 @@ src_prepare() {
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.25-non-systemd-integration.patch
+ eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
fi
einfo "Generating ${limitsdfile}"