| 1 |
commit: 22477bc0642af3bdb07957201a221fada7728293 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 20 02:35:54 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 20 02:35:54 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22477bc0 |
| 7 |
|
| 8 |
media-video/pipewire: tweak postinst messages |
| 9 |
|
| 10 |
Acked-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/pipewire/pipewire-0.3.36.ebuild | 25 ++++++++++++++----------- |
| 14 |
media-video/pipewire/pipewire-9999.ebuild | 25 ++++++++++++++----------- |
| 15 |
2 files changed, 28 insertions(+), 22 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild |
| 18 |
index 255220766c0..4ee9a00e2b6 100644 |
| 19 |
--- a/media-video/pipewire/pipewire-0.3.36.ebuild |
| 20 |
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild |
| 21 |
@@ -230,25 +230,27 @@ pkg_postinst() { |
| 22 |
fi |
| 23 |
|
| 24 |
if use systemd; then |
| 25 |
- elog "To use PipeWire for audio, the user units must be manually enabled:" |
| 26 |
+ elog "To use PipeWire for audio, the user units must be manually enabled" |
| 27 |
+ elog "by running this command as each user you use for desktop activities:" |
| 28 |
elog |
| 29 |
- elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" |
| 30 |
+ elog " systemctl --user enable --now pipewire.socket pipewire-pulse.socket" |
| 31 |
elog |
| 32 |
- elog "When switching from PulseAudio, do not forget to disable PulseAudio:" |
| 33 |
+ elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:" |
| 34 |
elog |
| 35 |
- elog " systemctl --user disable pulseaudio.service pulseaudio.socket" |
| 36 |
+ elog " systemctl --user disable --now pulseaudio.service pulseaudio.socket" |
| 37 |
elog |
| 38 |
elog "A reboot is recommended to avoid interferences from still running" |
| 39 |
elog "PulseAudio daemon." |
| 40 |
elog |
| 41 |
- elog "Both, new users and those upgrading, need to enable pipewire-media-session:" |
| 42 |
+ elog "Both, new users and those upgrading, need to enable pipewire-media-session" |
| 43 |
+ elog "for relevant users:" |
| 44 |
elog |
| 45 |
- elog " systemctl --user enable pipewire-media-session.service" |
| 46 |
+ elog " systemctl --user enable --now pipewire-media-session.service" |
| 47 |
elog |
| 48 |
else |
| 49 |
elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" |
| 50 |
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable " |
| 51 |
- elog "autospawn'ing of the original daemon by setting:" |
| 52 |
+ elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" |
| 53 |
+ elog "autospawning of the original daemon by setting:" |
| 54 |
elog |
| 55 |
elog " autospawn = no" |
| 56 |
elog |
| 57 |
@@ -261,10 +263,10 @@ pkg_postinst() { |
| 58 |
elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }" |
| 59 |
elog |
| 60 |
elog "NOTE:" |
| 61 |
- elog "Starting with PipeWire-0.3.30, package is no longer installing config" |
| 62 |
+ elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" |
| 63 |
elog "into ${EROOT}/etc/pipewire by default. In case you need to change" |
| 64 |
- elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire" |
| 65 |
- elog "and just override sections you want to change." |
| 66 |
+ elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" |
| 67 |
+ elog "and just override the sections you want to change." |
| 68 |
fi |
| 69 |
|
| 70 |
elog "For latest tips and tricks, troubleshooting information and documentation" |
| 71 |
@@ -273,6 +275,7 @@ pkg_postinst() { |
| 72 |
|
| 73 |
optfeature_header "The following can be installed for optional runtime features:" |
| 74 |
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit |
| 75 |
+ |
| 76 |
# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here! |
| 77 |
if use bluetooth; then |
| 78 |
optfeature "better BT headset support (daemon startup required)" net-misc/ofono |
| 79 |
|
| 80 |
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild |
| 81 |
index 0fa096afe77..cb74826ef0c 100644 |
| 82 |
--- a/media-video/pipewire/pipewire-9999.ebuild |
| 83 |
+++ b/media-video/pipewire/pipewire-9999.ebuild |
| 84 |
@@ -227,25 +227,27 @@ pkg_postinst() { |
| 85 |
fi |
| 86 |
|
| 87 |
if use systemd; then |
| 88 |
- elog "To use PipeWire for audio, the user units must be manually enabled:" |
| 89 |
+ elog "To use PipeWire for audio, the user units must be manually enabled" |
| 90 |
+ elog "by running this command as each user you use for desktop activities:" |
| 91 |
elog |
| 92 |
- elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" |
| 93 |
+ elog " systemctl --user enable --now pipewire.socket pipewire-pulse.socket" |
| 94 |
elog |
| 95 |
- elog "When switching from PulseAudio, do not forget to disable PulseAudio:" |
| 96 |
+ elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:" |
| 97 |
elog |
| 98 |
- elog " systemctl --user disable pulseaudio.service pulseaudio.socket" |
| 99 |
+ elog " systemctl --user disable --now pulseaudio.service pulseaudio.socket" |
| 100 |
elog |
| 101 |
elog "A reboot is recommended to avoid interferences from still running" |
| 102 |
elog "PulseAudio daemon." |
| 103 |
elog |
| 104 |
- elog "Both, new users and those upgrading, need to enable pipewire-media-session:" |
| 105 |
+ elog "Both, new users and those upgrading, need to enable pipewire-media-session" |
| 106 |
+ elog "for relevant users:" |
| 107 |
elog |
| 108 |
- elog " systemctl --user enable pipewire-media-session.service" |
| 109 |
+ elog " systemctl --user enable --now pipewire-media-session.service" |
| 110 |
elog |
| 111 |
else |
| 112 |
elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" |
| 113 |
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable " |
| 114 |
- elog "autospawn'ing of the original daemon by setting:" |
| 115 |
+ elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" |
| 116 |
+ elog "autospawning of the original daemon by setting:" |
| 117 |
elog |
| 118 |
elog " autospawn = no" |
| 119 |
elog |
| 120 |
@@ -258,10 +260,10 @@ pkg_postinst() { |
| 121 |
elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }" |
| 122 |
elog |
| 123 |
elog "NOTE:" |
| 124 |
- elog "Starting with PipeWire-0.3.30, package is no longer installing config" |
| 125 |
+ elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" |
| 126 |
elog "into ${EROOT}/etc/pipewire by default. In case you need to change" |
| 127 |
- elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire" |
| 128 |
- elog "and just override sections you want to change." |
| 129 |
+ elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" |
| 130 |
+ elog "and just override the sections you want to change." |
| 131 |
fi |
| 132 |
|
| 133 |
elog "For latest tips and tricks, troubleshooting information and documentation" |
| 134 |
@@ -270,6 +272,7 @@ pkg_postinst() { |
| 135 |
|
| 136 |
optfeature_header "The following can be installed for optional runtime features:" |
| 137 |
optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit |
| 138 |
+ |
| 139 |
# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here! |
| 140 |
if use bluetooth; then |
| 141 |
optfeature "better BT headset support (daemon startup required)" net-misc/ofono |
Archives