public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/
Date: Thu, 23 Feb 2023 13:23:28 +0000 (UTC)	[thread overview]
Message-ID: <1677158596.619021553a64bbdd01bda58dbd0858d40b147977.sam@gentoo> (raw)

commit:     619021553a64bbdd01bda58dbd0858d40b147977
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 23:13:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 13:23:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61902155

media-video/pipewire: cleanup elogs, drop obsolete limits file

1. Try to only show messages when they're specifically relevant, either:
- new install or relevant USE flag changed, or
- upgrading from before a version which introduced changes

This reduces noise and makes it easier to see new messages.

2. Drop the manually (ebuild-generated) limits file. This is now handled
by the build system. I should've done this last night but overlooked it
before bed.

Closes: https://bugs.gentoo.org/791847
Fixes: 18d85ef89d55d7337b463ff6a04e74b173283589
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ire-0.3.66.ebuild => pipewire-0.3.66-r1.ebuild} | 233 ++++++++++-----------
 media-video/pipewire/pipewire-9999.ebuild          | 233 ++++++++++-----------
 2 files changed, 232 insertions(+), 234 deletions(-)

diff --git a/media-video/pipewire/pipewire-0.3.66.ebuild b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
similarity index 73%
rename from media-video/pipewire/pipewire-0.3.66.ebuild
rename to media-video/pipewire/pipewire-0.3.66-r1.ebuild
index 33281c0531ba..b5a7f3a8ef16 100644
--- a/media-video/pipewire/pipewire-0.3.66.ebuild
+++ b/media-video/pipewire/pipewire-0.3.66-r1.ebuild
@@ -161,10 +161,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
 )
 
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
 python_check_deps() {
 	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
 }
@@ -174,21 +170,6 @@ src_prepare() {
 
 	# Used for upstream backports
 	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
 }
 
 multilib_src_configure() {
@@ -289,9 +270,6 @@ multilib_src_install() {
 multilib_src_install_all() {
 	einstalldocs
 
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
 	if use pipewire-alsa; then
 		dodir /etc/alsa/conf.d
 
@@ -341,126 +319,147 @@ pkg_postrm() {
 	udev_reload
 }
 
+pkg_preinst() {
+	HAD_SOUND_SERVER=0
+	HAD_SYSTEM_SERVICE=0
+
+	if has_version "media-video/pipewire[sound-server(-)]" ; then
+		HAD_SOUND_SERVER=0
+	fi
+
+	if has_version "media-video/pipewire[system-service(-)]" ; then
+		HAD_SYSTEM_SERVICE=1
+	fi
+}
+
 pkg_postinst() {
 	udev_reload
-	use system-service && tmpfiles_process pipewire.conf
 
-	elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
-	elog "and limits needed to function smoothly."
-	elog "1. Please make sure your user is in the 'pipewire' group for correct"
-	elog "PAM limits behavior! You can add your account with:"
-	elog " usermod -aG pipewire <youruser>"
-	elog "2. It is recommended that you remove your user from the 'audio' group"
-	elog "as it can interfere with fast user switching:"
-	elog " usermod -rG audio <youruser>"
+	use system-service && tmpfiles_process pipewire.conf
 
 	local ver
 	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
+		if ver_test ${ver} -le 0.3.66-r1 ; then
+			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
+			elog "and limits needed to function smoothly."
+			elog "1. Please make sure your user is in the 'pipewire' group for correct"
+			elog "PAM limits behavior! You can add your account with:"
+			elog " usermod -aG pipewire <youruser>"
+			elog
+			elog "2. It is recommended that you remove your user from the 'audio' group"
+			elog "as it can interfere with fast user switching:"
+			elog " usermod -rG audio <youruser>"
+			elog
 
-			break
+			if ! use jack-sdk ; then
+				elog
+				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
+				ewarn
+				ewarn "PipeWire daemon startup has been moved to a launcher script!"
+				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+				ewarn
+				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+				ewarn "advised that a D-Bus user session is set up before starting the script."
+				ewarn
+			fi
+
+			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+				elog
+				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+				elog "are recommended to edit pulseaudio client configuration files:"
+				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+				elog "if it exists, and disable autospawning 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}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+				elog "command:"
+				elog
+				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+				elog
+			fi
+
+			if has_version 'net-misc/ofono' ; then
+				ewarn "Native backend has become default. Please disable oFono via:"
+				if systemd_is_booted ; then
+					ewarn "systemctl disable ofono"
+				else
+					ewarn "rc-update delete ofono"
+				fi
+			fi
 		fi
 	done
 
-	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 "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.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 WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
+	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		# TODO: We could drop most of this if we set up systemd presets?
+		if use sound-server && use systemd ; then
+			elog
+			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+			elog
+			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+			elog
+			elog "To use PipeWire, the user units must be manually enabled"
+			elog "by running this command as each user you use for desktop activities:"
+			elog
+			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
 			elog
-			elog "  autospawn = no"
+			elog "A reboot is recommended to avoid interferences from still running"
+			elog "PulseAudio daemon."
 			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog "Both new users and those upgrading need to enable WirePlumber"
+			elog "for relevant users:"
 			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
+			elog "  systemctl --user disable pipewire-media-session.service"
+			elog "  systemctl --user --force enable wireplumber.service"
 			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog "Root user may replace --user with --global to change system default"
+			elog "configuration for all of the above commands."
 			elog
 		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	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
 
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
+		if ! use sound-server ; then
+			ewarn
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+			ewarn
 		fi
-		ewarn
 	fi
 
-	if use system-service; then
+	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
 		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "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 "units. The default configuration files will likely not work out of the"
 		ewarn "box, and you are on your own with configuration."
 		ewarn
 	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
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
 }

diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 33281c0531ba..b5a7f3a8ef16 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -161,10 +161,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
 )
 
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
 python_check_deps() {
 	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
 }
@@ -174,21 +170,6 @@ src_prepare() {
 
 	# Used for upstream backports
 	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
 }
 
 multilib_src_configure() {
@@ -289,9 +270,6 @@ multilib_src_install() {
 multilib_src_install_all() {
 	einstalldocs
 
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
 	if use pipewire-alsa; then
 		dodir /etc/alsa/conf.d
 
@@ -341,126 +319,147 @@ pkg_postrm() {
 	udev_reload
 }
 
+pkg_preinst() {
+	HAD_SOUND_SERVER=0
+	HAD_SYSTEM_SERVICE=0
+
+	if has_version "media-video/pipewire[sound-server(-)]" ; then
+		HAD_SOUND_SERVER=0
+	fi
+
+	if has_version "media-video/pipewire[system-service(-)]" ; then
+		HAD_SYSTEM_SERVICE=1
+	fi
+}
+
 pkg_postinst() {
 	udev_reload
-	use system-service && tmpfiles_process pipewire.conf
 
-	elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
-	elog "and limits needed to function smoothly."
-	elog "1. Please make sure your user is in the 'pipewire' group for correct"
-	elog "PAM limits behavior! You can add your account with:"
-	elog " usermod -aG pipewire <youruser>"
-	elog "2. It is recommended that you remove your user from the 'audio' group"
-	elog "as it can interfere with fast user switching:"
-	elog " usermod -rG audio <youruser>"
+	use system-service && tmpfiles_process pipewire.conf
 
 	local ver
 	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
+		if ver_test ${ver} -le 0.3.66-r1 ; then
+			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
+			elog "and limits needed to function smoothly."
+			elog "1. Please make sure your user is in the 'pipewire' group for correct"
+			elog "PAM limits behavior! You can add your account with:"
+			elog " usermod -aG pipewire <youruser>"
+			elog
+			elog "2. It is recommended that you remove your user from the 'audio' group"
+			elog "as it can interfere with fast user switching:"
+			elog " usermod -rG audio <youruser>"
+			elog
 
-			break
+			if ! use jack-sdk ; then
+				elog
+				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
+				ewarn
+				ewarn "PipeWire daemon startup has been moved to a launcher script!"
+				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+				ewarn
+				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+				ewarn "advised that a D-Bus user session is set up before starting the script."
+				ewarn
+			fi
+
+			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+				elog
+				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+				elog "are recommended to edit pulseaudio client configuration files:"
+				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+				elog "if it exists, and disable autospawning 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}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+				elog "command:"
+				elog
+				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+				elog
+			fi
+
+			if has_version 'net-misc/ofono' ; then
+				ewarn "Native backend has become default. Please disable oFono via:"
+				if systemd_is_booted ; then
+					ewarn "systemctl disable ofono"
+				else
+					ewarn "rc-update delete ofono"
+				fi
+			fi
 		fi
 	done
 
-	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 "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.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 WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
+	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		# TODO: We could drop most of this if we set up systemd presets?
+		if use sound-server && use systemd ; then
+			elog
+			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+			elog
+			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+			elog
+			elog "To use PipeWire, the user units must be manually enabled"
+			elog "by running this command as each user you use for desktop activities:"
+			elog
+			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
 			elog
-			elog "  autospawn = no"
+			elog "A reboot is recommended to avoid interferences from still running"
+			elog "PulseAudio daemon."
 			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+			elog "Both new users and those upgrading need to enable WirePlumber"
+			elog "for relevant users:"
 			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
+			elog "  systemctl --user disable pipewire-media-session.service"
+			elog "  systemctl --user --force enable wireplumber.service"
 			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+			elog "Root user may replace --user with --global to change system default"
+			elog "configuration for all of the above commands."
 			elog
 		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	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
 
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
+		if ! use sound-server ; then
+			ewarn
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+			ewarn
 		fi
-		ewarn
 	fi
 
-	if use system-service; then
+	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
 		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
+		ewarn "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 "units. The default configuration files will likely not work out of the"
 		ewarn "box, and you are on your own with configuration."
 		ewarn
 	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
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
 }


             reply	other threads:[~2023-02-23 13:23 UTC|newest]

Thread overview: 381+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-23 13:23 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-20  8:35 [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/ Arthur Zamarin
2025-03-20  8:35 Arthur Zamarin
2025-03-20  8:35 Arthur Zamarin
2025-03-20  8:35 Arthur Zamarin
2025-03-20  8:35 Arthur Zamarin
2025-03-20  8:35 Arthur Zamarin
2025-02-28 12:08 Sam James
2025-02-22  9:38 Ulrich Müller
2025-01-18 17:54 Sam James
2025-01-18 17:54 Sam James
2025-01-18 17:54 Sam James
2025-01-18 17:36 Sam James
2025-01-18 17:35 Sam James
2025-01-18 17:35 Sam James
2025-01-12 13:00 Sam James
2024-11-23  8:12 Arthur Zamarin
2024-11-22 10:20 Sam James
2024-11-21 21:08 Arthur Zamarin
2024-11-21 21:08 Arthur Zamarin
2024-11-21 16:41 Sam James
2024-11-21 16:37 Sam James
2024-10-23 16:28 Sam James
2024-10-12  7:52 Michał Górny
2024-10-11  3:39 Sam James
2024-10-11  2:50 Sam James
2024-10-11  2:50 Sam James
2024-10-11  2:50 Sam James
2024-10-08  7:09 Sam James
2024-09-28 13:57 Sam James
2024-09-28 12:40 Sam James
2024-09-28 11:34 Sam James
2024-09-19 19:35 Sam James
2024-09-18  6:36 Arthur Zamarin
2024-09-18  6:36 Arthur Zamarin
2024-09-17 20:00 Andreas Sturmlechner
2024-09-17 18:08 Sam James
2024-09-17 18:08 Sam James
2024-09-17 17:49 Sam James
2024-09-17 17:49 Sam James
2024-08-24 18:09 Sam James
2024-08-07 13:06 Sam James
2024-07-12 10:29 Sam James
2024-07-03 21:25 Eli Schwartz
2024-07-01  8:19 Sam James
2024-06-28 17:00 Sam James
2024-06-28 17:00 Sam James
2024-06-28 16:04 Sam James
2024-06-28 16:02 Sam James
2024-06-28 16:01 Sam James
2024-06-28 16:01 Sam James
2024-06-28 15:38 Sam James
2024-06-01  3:53 Sam James
2024-05-28  0:51 Sam James
2024-05-09 13:12 Sam James
2024-05-09 13:12 Sam James
2024-05-09 13:12 Sam James
2024-05-09 13:12 Sam James
2024-05-09 13:12 Sam James
2024-05-09 13:12 Sam James
2024-05-09 12:32 Sam James
2024-05-06  7:26 Sam James
2024-05-06  7:26 Sam James
2024-04-29 13:42 Sam James
2024-04-29 13:42 Sam James
2024-04-29  8:05 Arthur Zamarin
2024-04-29  8:05 Arthur Zamarin
2024-04-29  8:05 Arthur Zamarin
2024-04-15 23:08 Sam James
2024-03-14  7:42 Arthur Zamarin
2024-03-13 23:57 Sam James
2024-03-02 22:07 Sam James
2024-03-02 12:05 Arthur Zamarin
2024-03-02 12:05 Arthur Zamarin
2024-02-25  2:52 Jakov Smolić
2024-02-24 20:02 Arthur Zamarin
2024-02-02 22:46 Sam James
2024-01-31 20:35 Sam James
2024-01-24  4:57 Ionen Wolkens
2024-01-18 17:48 Sam James
2024-01-13 18:34 Sam James
2024-01-12  8:30 Arthur Zamarin
2024-01-11 12:03 Sam James
2024-01-11 10:32 Sam James
2024-01-11 10:32 Sam James
2024-01-02  8:13 Sam James
2023-12-05 19:56 Arthur Zamarin
2023-12-04 12:38 Sam James
2023-11-27 23:28 Sam James
2023-11-27 11:25 Sam James
2023-11-27 11:23 Sam James
2023-11-27  1:28 Sam James
2023-11-26 23:18 Sam James
2023-11-24  9:31 Sam James
2023-11-17 12:07 Sam James
2023-11-03 15:39 Sam James
2023-10-19 14:58 Sam James
2023-10-13  9:50 Sam James
2023-10-06 12:09 Sam James
2023-09-27  3:32 Sam James
2023-09-27  3:32 Sam James
2023-09-27  3:30 Sam James
2023-09-27  3:18 Sam James
2023-08-29 19:21 Sam James
2023-08-22 13:58 Sam James
2023-08-22 13:58 Sam James
2023-08-15  5:44 Sam James
2023-08-13 15:33 Arthur Zamarin
2023-08-13  5:26 Sam James
2023-08-13  5:18 Sam James
2023-08-13  5:18 Sam James
2023-08-13  4:58 Sam James
2023-07-28 12:02 Arthur Zamarin
2023-07-28 12:02 Arthur Zamarin
2023-07-28 12:01 Arthur Zamarin
2023-07-28  9:38 Sam James
2023-07-28  9:37 Sam James
2023-07-28  9:37 Sam James
2023-07-21 12:58 Sam James
2023-07-13  9:49 Sam James
2023-07-13  9:49 Sam James
2023-07-12 10:55 Sam James
2023-07-12  8:47 Sam James
2023-07-06 22:07 Sam James
2023-07-04  5:46 WANG Xuerui
2023-06-27 11:33 Sam James
2023-06-27  5:20 Jakov Smolić
2023-06-26 18:39 Arthur Zamarin
2023-06-26 18:39 Arthur Zamarin
2023-06-26 18:39 Arthur Zamarin
2023-06-26 18:39 Arthur Zamarin
2023-06-26 18:26 Arthur Zamarin
2023-06-26 17:19 Sam James
2023-06-26 16:47 Sam James
2023-06-14 12:31 Arthur Zamarin
2023-06-14  5:30 Sam James
2023-06-14  5:30 Sam James
2023-06-14  5:30 Sam James
2023-06-14  5:24 Sam James
2023-06-10 17:05 Sam James
2023-06-10 17:05 Sam James
2023-06-10 17:03 Sam James
2023-06-07  9:52 Sam James
2023-05-29 13:11 Andreas Sturmlechner
2023-05-17 13:00 Sam James
2023-05-16 19:29 Jakov Smolić
2023-05-15  4:10 Sam James
2023-05-14 17:22 Arthur Zamarin
2023-05-14  1:21 Sam James
2023-05-14  1:21 Sam James
2023-05-13 22:52 Sam James
2023-04-13 19:27 Sam James
2023-04-13 19:14 Sam James
2023-04-13 19:07 Sam James
2023-04-07 11:12 Sam James
2023-03-31  9:28 Jakov Smolić
2023-03-30 19:53 Sam James
2023-03-30 17:31 Arthur Zamarin
2023-03-29 21:35 Sam James
2023-03-29 14:36 Sam James
2023-03-29 14:33 Sam James
2023-03-29 14:33 Sam James
2023-03-16  0:44 Maciej Mrozowski
2023-03-15  6:48 Sam James
2023-03-15  2:07 Sam James
2023-03-15  2:05 Sam James
2023-03-15  2:05 Sam James
2023-03-15  2:05 Sam James
2023-03-15  2:05 Sam James
2023-03-10  6:21 Sam James
2023-03-09 23:46 Sam James
2023-02-28 19:09 Sam James
2023-02-23 20:59 Arthur Zamarin
2023-02-23 20:59 Arthur Zamarin
2023-02-23 20:45 Arthur Zamarin
2023-02-23 13:41 Sam James
2023-02-23 13:41 Sam James
2023-02-22 22:55 Sam James
2023-02-04  9:45 Sam James
2023-01-28  5:57 Sam James
2023-01-27  6:09 Sam James
2023-01-27  5:42 Sam James
2023-01-26  1:34 Sam James
2023-01-26  0:28 Sam James
2023-01-13 12:37 Arthur Zamarin
2023-01-13  4:40 Sam James
2023-01-07  8:12 Sam James
2023-01-03  6:23 Sam James
2023-01-01 22:47 Sam James
2023-01-01 22:47 Sam James
2023-01-01 22:47 Sam James
2023-01-01 22:47 Sam James
2022-12-10 17:38 Sam James
2022-12-10  8:50 Arthur Zamarin
2022-12-10  8:50 Arthur Zamarin
2022-12-10  8:50 Arthur Zamarin
2022-12-10  4:51 Sam James
2022-12-10  4:51 Sam James
2022-12-09 22:13 Sam James
2022-11-25  4:43 Sam James
2022-11-24  9:50 Sam James
2022-11-24  9:50 Sam James
2022-11-11  4:25 Sam James
2022-10-29 21:32 Sam James
2022-10-29 12:42 Arthur Zamarin
2022-10-29 10:34 Jakov Smolić
2022-10-29 10:34 Jakov Smolić
2022-10-29  5:45 Arthur Zamarin
2022-10-29  5:45 Arthur Zamarin
2022-10-28 20:53 Sam James
2022-10-28 20:09 Sam James
2022-10-28 19:56 Sam James
2022-10-28 19:53 Sam James
2022-10-01  2:07 Sam James
2022-10-01  2:07 Sam James
2022-09-15 22:16 Sam James
2022-09-02 21:45 Sam James
2022-08-08  6:08 Sam James
2022-07-31  3:29 Sam James
2022-07-31  3:29 Sam James
2022-07-31  3:29 Sam James
2022-07-31  3:29 Sam James
2022-07-29  3:18 Sam James
2022-07-29  1:56 Sam James
2022-07-29  1:53 Sam James
2022-07-17  8:26 Andreas Sturmlechner
2022-07-12 10:44 Sam James
2022-07-06  6:17 Sam James
2022-07-06  3:47 Sam James
2022-07-06  3:47 Sam James
2022-07-04 23:52 Sam James
2022-07-04 23:36 Sam James
2022-07-04 23:19 Sam James
2022-07-04 23:19 Sam James
2022-07-04 23:19 Sam James
2022-07-04 21:40 Sam James
2022-07-04 21:40 Sam James
2022-07-04 21:40 Sam James
2022-07-01  4:36 Sam James
2022-06-21 18:35 Arthur Zamarin
2022-06-16 23:05 Jakov Smolić
2022-06-16 23:05 Jakov Smolić
2022-06-16  6:11 Agostino Sarubbo
2022-06-16  6:08 Agostino Sarubbo
2022-06-15 22:07 Sam James
2022-06-15 21:56 Sam James
2022-05-13 20:04 Sam James
2022-04-29 10:01 Sam James
2022-04-29  6:42 Sam James
2022-04-29  6:02 Sam James
2022-04-29  5:38 Sam James
2022-04-28 16:08 Sam James
2022-04-28 16:06 Sam James
2022-04-25 19:43 Arthur Zamarin
2022-04-24 17:47 Arthur Zamarin
2022-04-24  6:34 Agostino Sarubbo
2022-04-20  6:41 Jakov Smolić
2022-04-15  5:35 Sam James
2022-04-14  6:55 Sam James
2022-04-01  4:30 Sam James
2022-03-05 22:02 John Helmert III
2022-03-03 15:23 Sam James
2022-02-18 18:34 Sam James
2022-02-18 18:34 Sam James
2022-02-12  5:17 Sam James
2022-02-06  2:22 Sam James
2022-02-05 23:47 Sam James
2022-01-27 21:57 Sam James
2022-01-27 21:53 Sam James
2022-01-27 19:30 Sam James
2022-01-15 22:06 Sam James
2022-01-09  9:17 Sam James
2022-01-06 21:56 Sam James
2022-01-06 21:37 Sam James
2022-01-06 20:54 Sam James
2021-12-18  6:18 Sam James
2021-12-18  6:17 Georgy Yakovlev
2021-12-18  6:14 Georgy Yakovlev
2021-12-18  4:49 Sam James
2021-12-18  4:49 Sam James
2021-12-16 22:24 Sam James
2021-12-13 22:41 Sam James
2021-11-17  6:59 Joonas Niilola
2021-11-15  1:12 Sam James
2021-11-14 19:53 Andreas Sturmlechner
2021-11-14  7:02 Georgy Yakovlev
2021-11-14  7:02 Georgy Yakovlev
2021-11-11 23:05 Sam James
2021-10-27  7:06 Sam James
2021-10-27  6:43 Sam James
2021-10-24  4:32 Sam James
2021-10-24  1:58 Sam James
2021-10-24  1:58 Sam James
2021-10-12  0:10 Sam James
2021-10-10 20:38 Sam James
2021-09-27 14:51 Agostino Sarubbo
2021-09-27  8:26 Agostino Sarubbo
2021-09-27  8:26 Agostino Sarubbo
2021-09-23 23:04 Sam James
     [not found] <1632438142.ff521b5b8ddc11fe0fe516cf3764f1b93592ad2f.sam@gentoo>
2021-09-23 23:04 ` Sam James
2021-09-23 22:45 Sam James
2021-09-23 14:10 Mart Raudsepp
2021-09-20  2:39 Sam James
2021-09-20  2:39 Sam James
2021-09-16 21:51 Sam James
2021-09-15  9:36 Yixun Lan
2021-09-15  2:32 Sam James
2021-09-14  6:24 Sam James
2021-09-14  6:20 Sam James
2021-09-12 20:59 Sam James
2021-08-30 16:03 Thomas Deutschmann
2021-08-27 13:16 Thomas Deutschmann
2021-08-27 10:50 Lars Wendler
2021-08-27 10:50 Lars Wendler
2021-07-23 23:10 Thomas Deutschmann
2021-07-17 21:30 David Seifert
2021-07-11 20:48 Sam James
2021-07-11  2:31 Sam James
2021-07-10 15:40 Sam James
2021-07-06 15:56 Thomas Deutschmann
2021-07-06 15:56 Thomas Deutschmann
2021-07-06 15:56 Thomas Deutschmann
2021-06-12 20:48 Lars Wendler
2021-06-11 14:51 Thomas Deutschmann
2021-06-11 12:47 Thomas Deutschmann
2021-06-09  8:33 Lars Wendler
2021-06-04  1:14 Matt Turner
2021-05-21  2:12 Thomas Deutschmann
2021-05-09 14:03 Thomas Deutschmann
2021-05-08 18:27 Thomas Deutschmann
2021-05-08 18:27 Thomas Deutschmann
2021-05-08 18:27 Thomas Deutschmann
2021-05-08 18:27 Thomas Deutschmann
2021-05-08 18:27 Thomas Deutschmann
2021-05-08 18:27 Thomas Deutschmann
2021-04-28 13:29 Thomas Deutschmann
2021-04-24 21:15 Thomas Deutschmann
2021-04-13 16:12 Matt Turner
2021-04-12 23:11 Sam James
2021-04-12 16:02 Sam James
2021-04-01 16:44 Thomas Deutschmann
2021-03-22 23:27 Thomas Deutschmann
2021-03-17 10:49 Andreas Sturmlechner
2021-03-17  9:00 Sam James
2021-03-12  8:01 Mikle Kolyada
2021-02-19 22:05 Matthew Thode
2021-02-19 21:59 Matthew Thode
2021-02-18  8:50 Sam James
2021-02-09  0:14 Thomas Deutschmann
2021-01-31 19:07 Andreas Sturmlechner
2021-01-31 18:48 Sam James
2021-01-27  3:06 Sam James
2021-01-25  2:11 Sam James
2021-01-24  0:50 Thomas Deutschmann
2020-12-24 23:42 Andreas Sturmlechner
2020-12-22 20:09 Thomas Deutschmann
2020-11-28 14:01 Thomas Deutschmann
2020-11-13 19:25 Thomas Deutschmann
2020-11-13 19:25 Thomas Deutschmann
2020-10-11 13:55 Thomas Deutschmann
2020-10-08  2:22 Sam James
2020-10-07 11:05 Agostino Sarubbo
2020-10-07 10:44 Agostino Sarubbo
2020-09-04 13:45 Andreas Sturmlechner
2020-08-25 21:51 Matthew Thode
2020-07-30  0:00 Sam James
2020-07-29 23:27 Sam James
2020-07-29 22:37 Sam James
2020-07-29 21:14 Mart Raudsepp
2020-07-27 13:54 Sam James
2020-07-26 10:05 Andreas Sturmlechner
2020-07-26  9:59 Andreas Sturmlechner
2020-07-26  9:59 Andreas Sturmlechner
2020-06-28 16:18 Andreas Sturmlechner
2020-06-28 15:36 Andreas Sturmlechner
2020-04-26  9:25 Mikle Kolyada
2019-11-01 10:55 Mikle Kolyada
2019-10-13 15:50 Andreas Sturmlechner
2019-09-16 22:40 Andreas Sturmlechner
2019-09-14  3:14 Aaron Bauman
2019-09-13  0:00 Thomas Deutschmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1677158596.619021553a64bbdd01bda58dbd0858d40b147977.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox