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 A62C315ACFC for ; Fri, 5 May 2023 08:35:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94EE7E0934; Fri, 5 May 2023 08:35:50 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D08AE0934 for ; Fri, 5 May 2023 08:35:50 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24559340970 for ; Fri, 5 May 2023 08:35:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 750C08E4 for ; Fri, 5 May 2023 08:35:47 +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: <1683275736.460a8f68d767b8a634aed94cd7478e384b456f1c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 media-video/pipewire/pipewire-0.3.70-r1.ebuild media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/files/ media-video/pipewire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 460a8f68d767b8a634aed94cd7478e384b456f1c X-VCS-Branch: master Date: Fri, 5 May 2023 08:35:47 +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: 7fb93d17-7846-466d-8d74-adcdcb07c761 X-Archives-Hash: 1a7ca9786faa902db0ef9cfdc012f0b0 commit: 460a8f68d767b8a634aed94cd7478e384b456f1c Author: Alexis gmail com> AuthorDate: Fri May 5 08:03:57 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 5 08:35:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460a8f68 media-video/pipewire: gentoo-pipewire-launcher.in: Add restart functionality. Closes: https://bugs.gentoo.org/904851 Signed-off-by: Alexis gmail.com> Signed-off-by: Sam James gentoo.org> .../pipewire/files/gentoo-pipewire-launcher.in-r1 | 52 ++++++++++++++++++++++ ...ewire-9999.ebuild => pipewire-0.3.70-r1.ebuild} | 2 +- media-video/pipewire/pipewire-9999.ebuild | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 new file mode 100644 index 000000000000..345298c0b6ae --- /dev/null +++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 @@ -0,0 +1,52 @@ +#!/bin/sh + +# PipeWire launcher script for XDG compliant desktops on OpenRC. +# +# systemd users are very _STRONGLY_ advised to use the much +# more reliable and predictable user units instead. + +# WARNING: This script assumes being run inside XDG compliant session, +# which means D-Bus session instance is expected to be correctly set up +# prior to this script starting. If that is not true, things may break! + +restart () { + echo "Terminating PipeWire processes ..." + pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 + pwait -u "${USER}" -x pipewire\|wireplumber + echo "PipeWire terminated." +} + +if [ "${#}" -gt 0 ] +then + if [ "${1}" = 'restart' ] + then + restart + else + echo "Unrecognised argument." + echo "Usage: gentoo-pipewire-launcher [restart]" + exit 1 + fi +fi + +if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 +then + echo "PipeWire already running, exiting." + echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" + exit 1 +fi + +# The core daemon which by itself does probably nothing. +@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire & + +# The so called pipewire-pulse daemon used for PulseAudio compatibility. +# Commenting this out will stop the PA proxying daemon from starting, +# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using +# clients will still have access to audio and may end up clashing with +# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon). +@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf & + +# Hack for bug #822498 +sleep 1 + +# Finally a session manager is required for PipeWire to do anything. +exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-0.3.70-r1.ebuild similarity index 99% copy from media-video/pipewire/pipewire-9999.ebuild copy to media-video/pipewire/pipewire-0.3.70-r1.ebuild index a54b5c2d65dd..bfad8bec183e 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-0.3.70-r1.ebuild @@ -310,7 +310,7 @@ multilib_src_install_all() { newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop exeinto /usr/bin - newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 gentoo-pipewire-launcher # Disable pipewire-pulse if sound-server is disabled. if ! use sound-server ; then diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index a54b5c2d65dd..bfad8bec183e 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -310,7 +310,7 @@ multilib_src_install_all() { newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop exeinto /usr/bin - newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r1 gentoo-pipewire-launcher # Disable pipewire-pulse if sound-server is disabled. if ! use sound-server ; then