From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- media-video/wireplumber/Manifest | 6 +- media-video/wireplumber/wireplumber-0.4.4.ebuild | 86 ----------------------- media-video/wireplumber/wireplumber-0.4.5.ebuild | 89 ++++++++++++++++++++++++ media-video/wireplumber/wireplumber-9999.ebuild | 21 +++--- 4 files changed, 104 insertions(+), 98 deletions(-) delete mode 100644 media-video/wireplumber/wireplumber-0.4.4.ebuild create mode 100644 media-video/wireplumber/wireplumber-0.4.5.ebuild (limited to 'media-video/wireplumber') diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index eb5726772562..4d6a61ef5bff 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -4,8 +4,8 @@ AUX wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch 2 AUX wireplumber-0.4.2-meson-Build-tests-conditionally.patch 1232 BLAKE2B f828160ff6e86f3a6b693a4e09fcc6f0647d742998777264483906d8974e294fa1fb9522d67c7a12c3893f6182a248cc14c50c785a50115d65a6f0779b615079 SHA512 b89c1519fb10c1b59ea8ed42f24cfff9b03c7024b33fb88ad8d5bfa57042ee6d1baf8f1a17e897b7da97b4fd4b91c04e7a66ee5105762a4ae690998145b20995 AUX wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch 1466 BLAKE2B bfbec8088c33d38a637cbdc517c1bad3b472b296c6302872cefaa444b1524248ce73b14aef3b9d1d7ef35528b46cadce8dd9a846c2e9b43d8b232f894c58a839 SHA512 4b654808c2e3c9b5b8f401d2874040e32efaa25bfb76cd5080c529c75922685e3466d570bd7278e2b6079f6fa28134e5b493f3d54c26d06993572f7aa08ce142 DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c -DIST wireplumber-0.4.4.tar.gz 346770 BLAKE2B cc2768db3a4f6f26a176c9fff759384fedb020c98540ecbe1e02e28a7f16fa3ecc4ec25de50a65021cabb4e5746c41c683b714e0bc5cf5003f2a7d9c9414516c SHA512 f8d764c1728c2e550fc41044a8ebbbeba27157540077648431796d7de5a04281df00d9742b04c6f76b50e446b2a723f2555520cb953d432f90b05148967de4ef +DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a EBUILD wireplumber-0.4.2-r1.ebuild 2581 BLAKE2B 95aad145ac9fb82a4264306c1035ffa7ec565f9dd73480020d42b30c87ca4e3a549deb37e5e458c24408ab4cdf03e9ebb98c259c921cb2b0636860aa524e17bc SHA512 6fae3994707b949385fb72f60c771563617fdb2e46e7d0e076b38c96bf7d6308f2c2fcc61cf94311a5786b1a9b1fff9dbac6bc06b7b8c0453848c0fe19cc2679 -EBUILD wireplumber-0.4.4.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6 -EBUILD wireplumber-9999.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6 +EBUILD wireplumber-0.4.5.ebuild 2484 BLAKE2B c1c7818835dc033b59b9807953376bb7a32a662c532962054dfb4c5f0a6d2476e1f88efbe49728bdde44305665be8fad9ad487c7de6789bab4e7e6a8cbf079f7 SHA512 e8952d878d24051e98d5a7827dd571f25643e0d085439b1b312dbe7c50d97908d2ebd80dc1ac1c5f8d4112922a643c08f023a943d2475017952c18d62abead5a +EBUILD wireplumber-9999.ebuild 2484 BLAKE2B c1c7818835dc033b59b9807953376bb7a32a662c532962054dfb4c5f0a6d2476e1f88efbe49728bdde44305665be8fad9ad487c7de6789bab4e7e6a8cbf079f7 SHA512 e8952d878d24051e98d5a7827dd571f25643e0d085439b1b312dbe7c50d97908d2ebd80dc1ac1c5f8d4112922a643c08f023a943d2475017952c18d62abead5a MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96 diff --git a/media-video/wireplumber/wireplumber-0.4.4.ebuild b/media-video/wireplumber/wireplumber-0.4.4.ebuild deleted file mode 100644 index bcb971cdf84c..000000000000 --- a/media-video/wireplumber/wireplumber-0.4.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single meson systemd - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" - EGIT_BRANCH="master" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - -LICENSE="MIT" -SLOT="0/0.4" -IUSE="elogind systemd test" - -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - ?? ( elogind systemd ) -" - -RESTRICT="!test? ( test )" - -# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building -BDEPEND=" - dev-libs/glib - dev-util/gdbus-codegen - dev-util/glib-utils -" - -DEPEND=" - ${LUA_DEPS} - >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.37 - virtual/libc - 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}" - -DOCS=( {NEWS,README}.rst ) - -src_configure() { - local emesonargs=( - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can - -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) - $(meson_feature elogind) - $(meson_feature systemd) - -Dsystemd-system-service=false # Matches upstream - $(meson_use systemd systemd-user-service) - -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) - -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) - $(meson_use test tests) - ) - - meson_src_configure -} - -pkg_postinst() { - if systemd_is_booted ; then - elog "To replace media-session with WirePlumber immediately:" - elog "systemctl --user disable --now pipewire-media-session.service" - elog "systemctl --user enable --now wireplumber.service" - else - elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf" - elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace" - elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber" - elog "The switch to WirePlumber will happen the next time pipewire is started." - fi - elog -} diff --git a/media-video/wireplumber/wireplumber-0.4.5.ebuild b/media-video/wireplumber/wireplumber-0.4.5.ebuild new file mode 100644 index 000000000000..8bac4b024755 --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.4.5.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson systemd + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + +LICENSE="MIT" +SLOT="0/0.4" +IUSE="elogind systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind systemd ) +" + +RESTRICT="!test? ( test )" + +# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils +" + +DEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.62 + >=media-video/pipewire-0.3.39 + virtual/libc + 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}" + +DOCS=( {NEWS,README}.rst ) + +src_configure() { + local emesonargs=( + -Dintrospection=disabled # Only used for Sphinx doc generation + -Dsystem-lua=true # We always unbundle everything we can + -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) + $(meson_feature elogind) + $(meson_feature systemd) + -Dsystemd-system-service=false # Matches upstream + $(meson_use systemd systemd-user-service) + -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) + -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) + $(meson_use test tests) + ) + + meson_src_configure +} + +pkg_postinst() { + if systemd_is_booted ; then + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable --now pipewire-media-session.service" + ewarn "systemctl --user enable --now wireplumber.service" + else + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." + fi + ewarn +} diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index bcb971cdf84c..8bac4b024755 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -40,7 +40,7 @@ BDEPEND=" DEPEND=" ${LUA_DEPS} >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.37 + >=media-video/pipewire-0.3.39 virtual/libc elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) @@ -73,14 +73,17 @@ src_configure() { pkg_postinst() { if systemd_is_booted ; then - elog "To replace media-session with WirePlumber immediately:" - elog "systemctl --user disable --now pipewire-media-session.service" - elog "systemctl --user enable --now wireplumber.service" + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable --now pipewire-media-session.service" + ewarn "systemctl --user enable --now wireplumber.service" else - elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf" - elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace" - elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber" - elog "The switch to WirePlumber will happen the next time pipewire is started." + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." fi - elog + ewarn } -- cgit v1.2.3