From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE0C1158064 for ; Mon, 6 May 2024 07:26:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D434E2A28; Mon, 6 May 2024 07:26:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC7FEE2A28 for ; Mon, 6 May 2024 07:26:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCFA033BEE8 for ; Mon, 6 May 2024 07:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5477B1779 for ; Mon, 6 May 2024 07:26:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714980234.8f2c2d8d543dbf3cc060b82d060b699e8575dd49.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/pipewire-1.0.5-r1.ebuild media-video/pipewire/pipewire-1.0.5.ebuild media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8f2c2d8d543dbf3cc060b82d060b699e8575dd49 X-VCS-Branch: master Date: Mon, 6 May 2024 07:26:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a7a217c-db06-4680-a77f-4c24e30d84a1 X-Archives-Hash: fbd353ba34aa2b3550aa912af07c5c25 commit: 8f2c2d8d543dbf3cc060b82d060b699e8575dd49 Author: James Calligeros gmail com> AuthorDate: Wed May 1 08:09:41 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 6 07:23:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2c2d8d media-video/pipewire: revbump for media-video/wireplumber-0.5.2 WirePlumber 0.5 has completely changed the way its configuration and scripting are managed. Thus, we can no longer insert Lua scripts into /etc/{pipewire,wireplumber}/ for sound-server handling. Furthermore, /etc/pipewire/ is not a valid or checked location for the new-style WirePlumber config, so we need to install the new-style sound-server handling to /etc/wireplumber/wireplumber.conf.d instead. Bug: https://bugs.gentoo.org/921393 Signed-off-by: James Calligeros gmail.com> Signed-off-by: Sam James gentoo.org> .../{pipewire-1.0.5.ebuild => pipewire-1.0.5-r1.ebuild} | 16 +++------------- media-video/pipewire/pipewire-9999.ebuild | 16 +++------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/media-video/pipewire/pipewire-1.0.5.ebuild b/media-video/pipewire/pipewire-1.0.5-r1.ebuild similarity index 95% rename from media-video/pipewire/pipewire-1.0.5.ebuild rename to media-video/pipewire/pipewire-1.0.5-r1.ebuild index 88312367a689..1373789d2b11 100644 --- a/media-video/pipewire/pipewire-1.0.5.ebuild +++ b/media-video/pipewire/pipewire-1.0.5-r1.ebuild @@ -162,9 +162,7 @@ RDEPEND=" DEPEND="${RDEPEND}" -# TODO: Consider use cases where pipewire is not used for driving audio -# Doing so with WirePlumber currently involves editing Lua scripts -PDEPEND=">=media-video/wireplumber-0.4.8-r3" +PDEPEND=">=media-video/wireplumber-0.5.2" # Present RDEPEND that are currently always disabled due to the PW # code using them being required to be disabled by Gentoo guidelines @@ -313,16 +311,8 @@ multilib_src_install_all() { # Enable required wireplumber alsa and bluez monitors if use sound-server; then - # Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - dodir /etc/wireplumber/main.lua.d - echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die - - # Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - dodir /etc/wireplumber/bluetooth.lua.d - echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die - - # Install sound-server enabler for wireplumber 0.4.81+ conf syntax - insinto /etc/pipewire/wireplumber.conf.d + # Install sound-server enabler for wireplumber 0.5.0+ conf syntax + insinto /etc/wireplumber/wireplumber.conf.d doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf fi diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index b792e5bf1639..0e1cb10820aa 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -162,9 +162,7 @@ RDEPEND=" DEPEND="${RDEPEND}" -# TODO: Consider use cases where pipewire is not used for driving audio -# Doing so with WirePlumber currently involves editing Lua scripts -PDEPEND=">=media-video/wireplumber-0.4.8-r3" +PDEPEND=">=media-video/wireplumber-0.5.2" # Present RDEPEND that are currently always disabled due to the PW # code using them being required to be disabled by Gentoo guidelines @@ -313,16 +311,8 @@ multilib_src_install_all() { # Enable required wireplumber alsa and bluez monitors if use sound-server; then - # Install sound-server enabler, alsa part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - dodir /etc/wireplumber/main.lua.d - echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die - - # Install sound-server enabler, bluetooth part, wireplumber 0.4.15 syntax, clean this up with wireplumber dep bump - dodir /etc/wireplumber/bluetooth.lua.d - echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die - - # Install sound-server enabler for wireplumber 0.4.81+ conf syntax - insinto /etc/pipewire/wireplumber.conf.d + # Install sound-server enabler for wireplumber 0.5.0+ conf syntax + insinto /etc/wireplumber/wireplumber.conf.d doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf fi