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 8662215808B for ; Sat, 28 Sep 2024 11:34:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2B3EE2BB9; Sat, 28 Sep 2024 11:34:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4BDEE2BB9 for ; Sat, 28 Sep 2024 11:34:11 +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 00BB733BF29 for ; Sat, 28 Sep 2024 11:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90EFEACC for ; Sat, 28 Sep 2024 11:34:09 +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: <1727523174.405e4a00ffd635e120dd188850e7cfc9bc86f714.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/Manifest media-video/pipewire/pipewire-1.2.5.ebuild media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 405e4a00ffd635e120dd188850e7cfc9bc86f714 X-VCS-Branch: master Date: Sat, 28 Sep 2024 11:34:09 +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: 9c7e4ec6-30af-4878-b7e4-9f79bf5417e0 X-Archives-Hash: 34cdfdddf29ae3a5612633f447e8ccec commit: 405e4a00ffd635e120dd188850e7cfc9bc86f714 Author: Sam James gentoo org> AuthorDate: Sat Sep 28 11:31:11 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 28 11:32:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405e4a00 media-video/pipewire: add 1.2.5 Signed-off-by: Sam James gentoo.org> media-video/pipewire/Manifest | 1 + .../{pipewire-9999.ebuild => pipewire-1.2.5.ebuild} | 14 ++++++++++++-- media-video/pipewire/pipewire-9999.ebuild | 12 +++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 95a92afa5a20..930bf08c5cb1 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -3,3 +3,4 @@ DIST pipewire-1.0.7.tar.bz2 1698775 BLAKE2B be075eb82fe516116de0a6a4d390dd99d7ea DIST pipewire-1.2.0-docs.tar.xz 58528 BLAKE2B b7abdfecd46239050ab80695c8f3d1a4e6a2aded3f9d64c435c64c7dc54a4e6ae32c3526da0fb4f6e2a22a6dbc8c768450ac2c0824b685022284eb1e1990c038 SHA512 25792090f258acc6cd52231be3918f0edaefeeb6c757acc748710a2e6f40ff7861a44e376dc9651742173c40153d3f848c9532257036ab874940270559d9c7f3 DIST pipewire-1.2.3.tar.bz2 1813639 BLAKE2B 42bd8a08125e79a67a4adec30541ae7fef3c1e8279d8f84365636f8691a237fc7d6b392ed2576b681a9b9418804978e5a8493d7062567ed89035286fb49977f5 SHA512 8a06ef3a9079b334b0d3248431fe6a09f330ad8078dc378ac465e253d3601c3e4552e2e07f7cf492ff6fbc218e686b30941ea153ccaaf826b5f0ff231f6b214e DIST pipewire-1.2.4.tar.bz2 1813941 BLAKE2B 07819879ccd4122ea543fa7dffb45701741520577f09dd6a6fff9931fc571e0a2f1b3d1a023effd57e13148b6d1fb988fbd6444519b5e7c30b2c10fe30aa1cae SHA512 844c3c95b61aa78c21e5e471648f9c4c03839a64ca365ef39cfba6e4b9cc86a72dbfd725cdbbf00db22d3b82ae6faa20911b2bfcb0bc06a87984bfcb73fc4481 +DIST pipewire-1.2.5.tar.bz2 1814091 BLAKE2B 734fc6e70eab6d7c145a6d6614d6a0a49941b00b51d072f8ba318264d8cb0ec9937da63cf0c1725e90c8a2e6730ae0d590d530cd171aba325611cd916170d902 SHA512 c6b3c59882fe9261c14fb28d3ac3887566c56aeb98b3ec3ad965a007a51519c9597ca88ef76432872220bdd8c802fa1abe1dc043523410f4186321bbd353dc67 diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-1.2.5.ebuild similarity index 97% copy from media-video/pipewire/pipewire-9999.ebuild copy to media-video/pipewire/pipewire-1.2.5.ebuild index 785496b22c13..afba42d0d7cb 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-1.2.5.ebuild @@ -23,7 +23,7 @@ EAPI=8 : ${PIPEWIRE_DOCS_PREBUILT:=1} PIPEWIRE_DOCS_PREBUILT_DEV=sam -PIPEWIRE_DOCS_VERSION="${PV}" +PIPEWIRE_DOCS_VERSION="$(ver_cut 1-2).0" # Default to generating docs (inc. man pages) if no prebuilt; overridden later PIPEWIRE_DOCS_USEFLAG="+man" PYTHON_COMPAT=( python3_{10..12} ) @@ -56,7 +56,7 @@ HOMEPAGE="https://pipewire.org/" LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" -IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth elogind dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that @@ -123,6 +123,7 @@ RDEPEND=" >=net-wireless/bluez-4.101:= virtual/libusb:1 ) + elogind? ( sys-auth/elogind ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) extra? ( >=media-libs/libsndfile-1.0.20 ) @@ -191,6 +192,13 @@ src_prepare() { } multilib_src_configure() { + local logind=disabled + if use systemd ; then + logind=enabled + elif use elogind ; then + logind=enabled + fi + local emesonargs=( -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} @@ -206,6 +214,8 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) $(meson_native_use_feature systemd) + -Dlogind=${logind} + -Dlogind-provider=$(usex systemd 'libsystemd' 'libelogind') $(meson_native_use_feature system-service systemd-system-service) -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 785496b22c13..716d3c1e2ecd 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -56,7 +56,7 @@ HOMEPAGE="https://pipewire.org/" LICENSE="MIT LGPL-2.1+ GPL-2" # ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 SLOT="0/0.4" -IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE="${PIPEWIRE_DOCS_USEFLAG} bluetooth elogind dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that @@ -123,6 +123,7 @@ RDEPEND=" >=net-wireless/bluez-4.101:= virtual/libusb:1 ) + elogind? ( sys-auth/elogind ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) extra? ( >=media-libs/libsndfile-1.0.20 ) @@ -191,6 +192,13 @@ src_prepare() { } multilib_src_configure() { + local logind=disabled + if use systemd ; then + logind=enabled + elif use elogind ; then + logind=enabled + fi + local emesonargs=( -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} @@ -206,6 +214,8 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) $(meson_native_use_feature systemd) + -Dlogind=${logind} + -Dlogind-provider=$(usex systemd 'libsystemd' 'libelogind') $(meson_native_use_feature system-service systemd-system-service) -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"