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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CE03158012 for ; Thu, 23 Sep 2021 16:42:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC576E086F; Thu, 23 Sep 2021 16:42:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A497DE086F for ; Thu, 23 Sep 2021 16:42:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 843B9342DDF for ; Thu, 23 Sep 2021 16:42:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABBF6104 for ; Thu, 23 Sep 2021 16:42:50 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1632415204.218b1bd507c45ed3f48c1abd1e479a15e6efb58f.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild X-VCS-Directories: media-sound/pulseaudio/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 218b1bd507c45ed3f48c1abd1e479a15e6efb58f X-VCS-Branch: master Date: Thu, 23 Sep 2021 16:42:50 +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: 618580fb-3a95-4eb0-b01e-5bb90c551a0d X-Archives-Hash: 1cc59ce47bc08fd8775d2fc36d990c08 commit: 218b1bd507c45ed3f48c1abd1e479a15e6efb58f Author: Mart Raudsepp gentoo org> AuthorDate: Thu Sep 23 16:34:26 2021 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Thu Sep 23 16:40:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218b1bd5 media-sound/pulseaudio: ebuild touchups List meson options in the same order as meson_options.txt as is standard for gnome@ packages. Disable unnecessary running-from-build-tree support. Pass some option flags explicitly. Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Mart Raudsepp gentoo.org> media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild | 51 ++++++++++++++---------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild index 96dafe77206..3fb7ba2e269 100644 --- a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild @@ -179,46 +179,57 @@ src_prepare() { multilib_src_configure() { local emesonargs=( - -Dadrian-aec=false # Not packaged? --localstatedir="${EPREFIX}"/var + + $(meson_native_use_bool daemon) + $(meson_native_use_bool doc doxygen) + -Dgcov=false + # tests involve random modules, so just do them for the native # TODO: tests should run always + $(meson_native_use_bool test tests) + -Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it + -Dstream-restore-clear-old-devices=true + -Drunning-from-build-tree=false + + # Paths -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/${PN}/modules" # Was $(get_libdir)/${P} -Dsystemduserunitdir=$(systemd_get_userunitdir) -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value + + # Optional features $(meson_native_use_feature alsa) + $(meson_feature asyncns) + $(meson_native_use_feature zeroconf avahi) $(meson_native_use_feature bluetooth bluez5) -Dbluez5-gstreamer=disabled # no ldacenc/rtpldacpay gst elements packaged yet - $(meson_native_use_bool daemon) - $(meson_native_use_bool doc doxygen) $(meson_native_use_bool native-headset bluez5-native-headset) $(meson_native_use_bool ofono-headset bluez5-ofono-headset) + $(meson_feature dbus) + $(meson_native_use_feature elogind) + $(meson_native_use_feature equalizer fftw) + $(meson_feature glib) # WARNING: toggling this likely changes ABI $(meson_native_use_feature glib gsettings) # Supposedly correct? $(meson_native_use_feature gstreamer) $(meson_native_use_feature gtk) + -Dhal-compat=true # Consider disabling on next revbump + $(meson_use ipv6) $(meson_native_use_feature jack) - -Dsamplerate=disabled # Matches upstream - -Dstream-restore-clear-old-devices=true $(meson_native_use_feature lirc) + $(meson_native_use_feature ssl openssl) $(meson_native_use_feature orc) $(meson_native_use_feature oss oss-output) - $(meson_native_use_feature ssl openssl) - # tests involve random modules, so just do them for the native # TODO: tests should run always - $(meson_native_use_bool test tests) - $(meson_native_use_feature udev) - $(meson_native_use_feature webrtc-aec) - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature equalizer fftw) + -Dsamplerate=disabled # Matches upstream $(meson_native_use_feature sox soxr) - -Ddatabase=$(multilib_native_usex gdbm gdbm simple) # tdb is also an option but no one cares about it - $(meson_feature glib) # WARNING: toggling this likely changes ABI - $(meson_feature asyncns) - #$(meson_use cpu_flags_arm_neon neon-opt) + -Dspeex=enabled + $(meson_native_use_feature systemd) $(meson_native_use_feature tcpd tcpwrap) - $(meson_feature dbus) - $(meson_native_use_feature elogind) + $(meson_native_use_feature udev) + -Dvalgrind=auto $(meson_feature X x11) - $(meson_native_use_feature systemd) - $(meson_use ipv6) + + # Echo cancellation + -Dadrian-aec=false # Not packaged? + $(meson_native_use_feature webrtc-aec) ) if multilib_is_native_abi; then