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 7C73015800A for ; Thu, 24 Aug 2023 19:42:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEF142BC016; Thu, 24 Aug 2023 19:42:26 +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 91D342BC016 for ; Thu, 24 Aug 2023 19:42:26 +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 758C2335C2A for ; Thu, 24 Aug 2023 19:42:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D82921071 for ; Thu, 24 Aug 2023 19:42:23 +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: <1692906135.c1e0cc9215766a8fc6c13bce085910ba564a4e87.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.1 media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 media-video/pipewire/pipewire-0.3.75-r2.ebuild media-video/pipewire/pipewire-0.3.75-r3.ebuild media-video/pipewire/pipewire-0.3.77-r1.ebuild media-video/pipewire/pipewire-0.3.77-r2.ebuild media-video/pipewire/pipewire-0.3.78-r1.ebuild media-video/pipewire/pipewire-0.3.78.ebuild X-VCS-Directories: media-video/pipewire/ media-video/pipewire/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c1e0cc9215766a8fc6c13bce085910ba564a4e87 X-VCS-Branch: master Date: Thu, 24 Aug 2023 19:42:23 +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: e06ab312-5bad-496b-9356-d77cb0037458 X-Archives-Hash: c16260cf512b23b040a96403a80ab0f1 commit: c1e0cc9215766a8fc6c13bce085910ba564a4e87 Author: Alexis gmail com> AuthorDate: Thu Aug 10 09:30:26 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 24 19:42:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e0cc92 media-video/pipewire: gentoo-pipewire-launcher configuration. Fall back to using ${HOME}/.config if XDG_CONFIG_HOME isn't set. Closes: https://bugs.gentoo.org/911883 Signed-off-by: Alexis gmail.com> Signed-off-by: Sam James gentoo.org> media-video/pipewire/files/gentoo-pipewire-launcher.1 | 9 +++++++++ media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 | 2 +- .../{pipewire-0.3.75-r2.ebuild => pipewire-0.3.75-r3.ebuild} | 0 .../{pipewire-0.3.77-r1.ebuild => pipewire-0.3.77-r2.ebuild} | 0 .../{pipewire-0.3.78.ebuild => pipewire-0.3.78-r1.ebuild} | 0 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.1 b/media-video/pipewire/files/gentoo-pipewire-launcher.1 index d2c30dc961bc..36e697c632cd 100644 --- a/media-video/pipewire/files/gentoo-pipewire-launcher.1 +++ b/media-video/pipewire/files/gentoo-pipewire-launcher.1 @@ -23,6 +23,10 @@ However, a restart can be forced by calling with an argument of \(oqrestart\(cq. .PP .B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf +(or, if +.B ${XDG_CONFIG_HOME} +is not set, +.BR ${HOME}/.config/gentoo\-pipewire\-launcher.conf ) can be used to specify absolute paths of files to which log output should be sent, by specifying values for one or more of the .B GENTOO_PIPEWIRE_LOG\fR, @@ -36,6 +40,11 @@ Please report bugs via https://bugs.gentoo.org/ .TP .B ${XDG_CONFIG_HOME}/gentoo\-pipewire\-launcher.conf configures locations of files for log output. +.TP +.B ${HOME}/.config/gentoo\-pipewire\-launcher.conf +configures locations of files for log output if +.B ${XDG_CONFIG_HOME} +is not set. .SH "SEE ALSO" .BR pipewire (1), .BR pipewire-pulse (1), diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 index ea2032b74b42..a149b0d326c3 100644 --- a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 +++ b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 @@ -11,7 +11,7 @@ DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z' -CONF="${XDG_CONFIG_HOME}/gentoo-pipewire-launcher.conf" +CONF="${XDG_CONFIG_HOME:-${HOME}/.config}/gentoo-pipewire-launcher.conf" if [ -f "${CONF}" ] then . "${CONF}" diff --git a/media-video/pipewire/pipewire-0.3.75-r2.ebuild b/media-video/pipewire/pipewire-0.3.75-r3.ebuild similarity index 100% rename from media-video/pipewire/pipewire-0.3.75-r2.ebuild rename to media-video/pipewire/pipewire-0.3.75-r3.ebuild diff --git a/media-video/pipewire/pipewire-0.3.77-r1.ebuild b/media-video/pipewire/pipewire-0.3.77-r2.ebuild similarity index 100% rename from media-video/pipewire/pipewire-0.3.77-r1.ebuild rename to media-video/pipewire/pipewire-0.3.77-r2.ebuild diff --git a/media-video/pipewire/pipewire-0.3.78.ebuild b/media-video/pipewire/pipewire-0.3.78-r1.ebuild similarity index 100% rename from media-video/pipewire/pipewire-0.3.78.ebuild rename to media-video/pipewire/pipewire-0.3.78-r1.ebuild