[gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/

["Sam James" <sam@gentoo.org>]

commit:     a3dae46c9bd761c7e9a6b95f3e2185db4a8aa4a7
Author:     Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com>
AuthorDate: Thu Nov 11 19:04:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 22:09:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3dae46c

media-video/wireplumber: bump to 0.4.5 and update post-install text

This commit replaces the old elog with a new ewarn since rather than
being an alternative to media-session, it's the only replacement, so
instructions should be updated to reflect on that change.

Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com>
Closes: https://github.com/gentoo/gentoo/pull/22906
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/wireplumber/Manifest                    |  2 +-
 ...lumber-0.4.4.ebuild => wireplumber-0.4.5.ebuild} | 21 ++++++++++++---------
 media-video/wireplumber/wireplumber-9999.ebuild     | 21 ++++++++++++---------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index bd84bd1a92c..16e6431c7e3 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,2 +1,2 @@
 DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c
-DIST wireplumber-0.4.4.tar.gz 346770 BLAKE2B cc2768db3a4f6f26a176c9fff759384fedb020c98540ecbe1e02e28a7f16fa3ecc4ec25de50a65021cabb4e5746c41c683b714e0bc5cf5003f2a7d9c9414516c SHA512 f8d764c1728c2e550fc41044a8ebbbeba27157540077648431796d7de5a04281df00d9742b04c6f76b50e446b2a723f2555520cb953d432f90b05148967de4ef
+DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a

diff --git a/media-video/wireplumber/wireplumber-0.4.4.ebuild b/media-video/wireplumber/wireplumber-0.4.5.ebuild
similarity index 71%
rename from media-video/wireplumber/wireplumber-0.4.4.ebuild
rename to media-video/wireplumber/wireplumber-0.4.5.ebuild
index bcb971cdf84..8bac4b02475 100644
--- a/media-video/wireplumber/wireplumber-0.4.4.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.5.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.37
+	>=media-video/pipewire-0.3.39
 	virtual/libc
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -73,14 +73,17 @@ src_configure() {
 
 pkg_postinst() {
 	if systemd_is_booted ; then
-		elog "To replace media-session with WirePlumber immediately:"
-		elog "systemctl --user disable --now pipewire-media-session.service"
-		elog "systemctl --user enable --now wireplumber.service"
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable --now pipewire-media-session.service"
+		ewarn "systemctl --user enable --now wireplumber.service"
 	else
-		elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf"
-		elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace"
-		elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber"
-		elog "The switch to WirePlumber will happen the next time pipewire is started."
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
-	elog
+	ewarn
 }

diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index bcb971cdf84..8bac4b02475 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.37
+	>=media-video/pipewire-0.3.39
 	virtual/libc
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
@@ -73,14 +73,17 @@ src_configure() {
 
 pkg_postinst() {
 	if systemd_is_booted ; then
-		elog "To replace media-session with WirePlumber immediately:"
-		elog "systemctl --user disable --now pipewire-media-session.service"
-		elog "systemctl --user enable --now wireplumber.service"
+		ewarn "pipewire-media-session.service is no longer installed. You must switch"
+		ewarn "to wireplumber.service user unit before your next logout/reboot:"
+		ewarn "systemctl --user disable --now pipewire-media-session.service"
+		ewarn "systemctl --user enable --now wireplumber.service"
 	else
-		elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf"
-		elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace"
-		elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber"
-		elog "The switch to WirePlumber will happen the next time pipewire is started."
+		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
+		ewarn "is started (a replacement for directly calling pipewire binary)."
+		ewarn
+		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
+		ewarn "or, if it does exist, that any reference to"
+		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
 	fi
-	elog
+	ewarn
 }