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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BBE0013933E for ; Wed, 30 Jun 2021 20:40:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 592ABE0828; Wed, 30 Jun 2021 20:40:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DC6DE0828 for ; Wed, 30 Jun 2021 20:40:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9ED9F335C8E for ; Wed, 30 Jun 2021 20:40:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D51367BA for ; Wed, 30 Jun 2021 20:40:10 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1625085601.1078f2a85b1b3f256d04db4ff165d98a3dce309f.polynomial-c@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/pipewire-0.3.31-non-systemd-integration.patch media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/ media-video/pipewire/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 1078f2a85b1b3f256d04db4ff165d98a3dce309f X-VCS-Branch: master Date: Wed, 30 Jun 2021 20:40:10 +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: 7d1f97d9-ab6e-4fb2-9fe7-dd2bd7c7a75d X-Archives-Hash: dd09796fa7bb1a3ab395b510fd336a53 commit: 1078f2a85b1b3f256d04db4ff165d98a3dce309f Author: Jaco Kroon uls co za> AuthorDate: Wed Jun 30 20:28:39 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jun 30 20:40:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1078f2a8 media-video/pipewire: Rebased non-systemd integration patch. Closes: https://bugs.gentoo.org/799353 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/21491 Signed-off-by: Lars Wendler gentoo.org> .../files/pipewire-0.3.31-non-systemd-integration.patch | 17 +++++++++++++++++ media-video/pipewire/pipewire-9999.ebuild | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch new file mode 100644 index 00000000000..ccc89f1310b --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch @@ -0,0 +1,17 @@ +--- a/src/daemon/pipewire.conf.in 2021-06-30 22:22:09.520402459 +0200 ++++ b/src/daemon/pipewire.conf.in 2021-06-30 22:22:30.620404999 +0200 +@@ -234,12 +234,12 @@ + # but it is better to start it as a systemd service. + # Run the session manager with -h for options. + # +- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ { path = "@session_manager_path@" args = "@session_manager_args@" } + # + # You can optionally start the pulseaudio-server here as well + # but it is better to start it as a systemd service. + # It can be interesting to start another daemon here that listens + # on another address with the -a option (eg. -a tcp:4713). + # +- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } + ] diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index acb7e554b78..4520c807491 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -114,7 +114,7 @@ src_prepare() { if ! use systemd; then # This can be applied non-conditionally but would make for a # significantly worse user experience on systemd then. - eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch + eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch fi einfo "Generating ${limitsdfile}"