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 2BA5015808C for ; Tue, 8 Feb 2022 07:57:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED2BEE079C; Tue, 8 Feb 2022 07:57:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 6342EE0788 for ; Tue, 8 Feb 2022 07:57:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C98A9342A54 for ; Tue, 8 Feb 2022 07:57:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25264200 for ; Tue, 8 Feb 2022 07:57:22 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1644307023.6b043712b57faf0969f105d53b7683f8d827a532.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mumble/mumble-9999.ebuild X-VCS-Directories: media-sound/mumble/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6b043712b57faf0969f105d53b7683f8d827a532 X-VCS-Branch: master Date: Tue, 8 Feb 2022 07:57:22 +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: 84530a3e-b506-4802-9d25-8ca9212c2ea8 X-Archives-Hash: d2608b1bb7f745fd71d1be629e4c46f0 commit: 6b043712b57faf0969f105d53b7683f8d827a532 Author: Lars Wendler gentoo org> AuthorDate: Tue Feb 8 07:18:13 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Feb 8 07:57:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b043712 media-sound/mumble: Fix compilation with live ebuild Closes: https://bugs.gentoo.org/832869 Signed-off-by: Lars Wendler gentoo.org> media-sound/mumble/mumble-9999.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index 183ef2b659e8..0f0d04d692c3 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info" if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" - EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter ) + EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy ) else if [[ "${PV}" == *_pre* ]] ; then SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" @@ -68,6 +68,8 @@ BDEPEND=" " src_prepare() { + sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die + # required because of xdg.eclass also providing src_prepare cmake_src_prepare } @@ -76,7 +78,6 @@ src_configure() { local mycmakeargs=( -Dalsa="$(usex alsa)" - -Dtests="$(usex test)" -Dbundled-celt="ON" -Dbundled-opus="OFF" -Dbundled-speex="OFF" @@ -91,6 +92,8 @@ src_configure() { -Drnnoise="$(usex rnnoise)" -Dserver="OFF" -Dspeechd="$(usex speech)" + -Dtests="$(usex test)" + -Dtracy="OFF" -Dtranslations="$(usex nls)" -Dupdate="OFF" -Dwarnings-as-errors="OFF"