commit: 26ec15318f5131f5aed63738f225d9448168af5c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 22:04:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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/<NAME>[${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/<NAME>[${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"
