| 1 |
commit: 1078f2a85b1b3f256d04db4ff165d98a3dce309f |
| 2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
| 3 |
AuthorDate: Wed Jun 30 20:28:39 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 30 20:40:01 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1078f2a8 |
| 7 |
|
| 8 |
media-video/pipewire: Rebased non-systemd integration patch. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/799353 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
| 12 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/21491 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/pipewire-0.3.31-non-systemd-integration.patch | 17 +++++++++++++++++ |
| 17 |
media-video/pipewire/pipewire-9999.ebuild | 2 +- |
| 18 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..ccc89f1310b |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch |
| 25 |
@@ -0,0 +1,17 @@ |
| 26 |
+--- a/src/daemon/pipewire.conf.in 2021-06-30 22:22:09.520402459 +0200 |
| 27 |
++++ b/src/daemon/pipewire.conf.in 2021-06-30 22:22:30.620404999 +0200 |
| 28 |
+@@ -234,12 +234,12 @@ |
| 29 |
+ # but it is better to start it as a systemd service. |
| 30 |
+ # Run the session manager with -h for options. |
| 31 |
+ # |
| 32 |
+- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } |
| 33 |
++ { path = "@session_manager_path@" args = "@session_manager_args@" } |
| 34 |
+ # |
| 35 |
+ # You can optionally start the pulseaudio-server here as well |
| 36 |
+ # but it is better to start it as a systemd service. |
| 37 |
+ # It can be interesting to start another daemon here that listens |
| 38 |
+ # on another address with the -a option (eg. -a tcp:4713). |
| 39 |
+ # |
| 40 |
+- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } |
| 41 |
++ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } |
| 42 |
+ ] |
| 43 |
|
| 44 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 45 |
index acb7e554b78..4520c807491 100644 |
| 46 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 47 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 48 |
@@ -114,7 +114,7 @@ src_prepare() { |
| 49 |
if ! use systemd; then |
| 50 |
# This can be applied non-conditionally but would make for a |
| 51 |
# significantly worse user experience on systemd then. |
| 52 |
- eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch |
| 53 |
+ eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch |
| 54 |
fi |
| 55 |
|
| 56 |
einfo "Generating ${limitsdfile}" |
Archives