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 E3435158064 for ; Wed, 8 May 2024 22:06:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F054FE2BA5; Wed, 8 May 2024 22:06:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D84DFE2BA5 for ; Wed, 8 May 2024 22:06:22 +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 140B03430C8 for ; Wed, 8 May 2024 22:06:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D1E51355 for ; Wed, 8 May 2024 22:06:20 +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: <1715205948.26ec15318f5131f5aed63738f225d9448168af5c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/wireplumber/wireplumber-0.5.2.ebuild media-video/wireplumber/wireplumber-9999.ebuild X-VCS-Directories: media-video/wireplumber/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 26ec15318f5131f5aed63738f225d9448168af5c X-VCS-Branch: master Date: Wed, 8 May 2024 22:06:20 +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: e1834a40-3374-4257-b2f8-80641b9c7218 X-Archives-Hash: 742316637420eddc5fa3d6b173a1c923 commit: 26ec15318f5131f5aed63738f225d9448168af5c Author: Sam James gentoo org> AuthorDate: Wed May 8 22:04:09 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 8 22:05:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ec1531 media-video/wireplumber: style tweaks Signed-off-by: Sam James gentoo.org> media-video/wireplumber/wireplumber-0.5.2.ebuild | 27 ++++++++++++------------ media-video/wireplumber/wireplumber-9999.ebuild | 27 ++++++++++++------------ 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/media-video/wireplumber/wireplumber-0.5.2.ebuild b/media-video/wireplumber/wireplumber-0.5.2.ebuild index 21dc5de57874..d7011c60a35b 100644 --- a/media-video/wireplumber/wireplumber-0.5.2.ebuild +++ b/media-video/wireplumber/wireplumber-0.5.2.ebuild @@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} ) inherit lua-single meson systemd +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" EGIT_BRANCH="master" @@ -23,9 +26,6 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - LICENSE="MIT" SLOT="0/0.5" IUSE="elogind system-service systemd test" @@ -46,7 +46,6 @@ BDEPEND=" sys-devel/gettext test? ( sys-apps/dbus ) " - DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.68 @@ -55,12 +54,8 @@ DEPEND=" elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) " - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} system-service? ( acct-user/pipewire acct-group/pipewire @@ -70,7 +65,8 @@ RDEPEND="${DEPEND} DOCS=( {NEWS,README}.rst ) PATCHES=( - "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire + # Defer enabling sound server parts to media-video/pipewire + "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch ) src_configure() { @@ -78,9 +74,11 @@ src_configure() { -Ddaemon=true -Dtools=true -Dmodules=true - -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can + # Ebuild not wired up yet (Sphinx, Doxygen?) + -Ddoc=disabled + # Only used for Sphinx doc generation + -Dintrospection=disabled + -Dsystem-lua=true -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) $(meson_feature elogind) $(meson_feature systemd) @@ -109,6 +107,7 @@ pkg_postinst() { ewarn "or, if it does exist, that any reference to" ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." fi + if use system-service; then ewarn ewarn "WARNING: you have enabled the system-service USE flag, which installs" diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index 21dc5de57874..d7011c60a35b 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -14,6 +14,9 @@ LUA_COMPAT=( lua5-{3,4} ) inherit lua-single meson systemd +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" EGIT_BRANCH="master" @@ -23,9 +26,6 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - LICENSE="MIT" SLOT="0/0.5" IUSE="elogind system-service systemd test" @@ -46,7 +46,6 @@ BDEPEND=" sys-devel/gettext test? ( sys-apps/dbus ) " - DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.68 @@ -55,12 +54,8 @@ DEPEND=" elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) " - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} system-service? ( acct-user/pipewire acct-group/pipewire @@ -70,7 +65,8 @@ RDEPEND="${DEPEND} DOCS=( {NEWS,README}.rst ) PATCHES=( - "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire + # Defer enabling sound server parts to media-video/pipewire + "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch ) src_configure() { @@ -78,9 +74,11 @@ src_configure() { -Ddaemon=true -Dtools=true -Dmodules=true - -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can + # Ebuild not wired up yet (Sphinx, Doxygen?) + -Ddoc=disabled + # Only used for Sphinx doc generation + -Dintrospection=disabled + -Dsystem-lua=true -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) $(meson_feature elogind) $(meson_feature systemd) @@ -109,6 +107,7 @@ pkg_postinst() { ewarn "or, if it does exist, that any reference to" ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." fi + if use system-service; then ewarn ewarn "WARNING: you have enabled the system-service USE flag, which installs"