Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mumble/
Date: Tue, 08 Feb 2022 07:57:27
Message-Id: 1644307023.6b043712b57faf0969f105d53b7683f8d827a532.polynomial-c@gentoo
1 commit: 6b043712b57faf0969f105d53b7683f8d827a532
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 07:18:13 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 07:57:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b043712
7
8 media-sound/mumble: Fix compilation with live ebuild
9
10 Closes: https://bugs.gentoo.org/832869
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-sound/mumble/mumble-9999.ebuild | 7 +++++--
14 1 file changed, 5 insertions(+), 2 deletions(-)
15
16 diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
17 index 183ef2b659e8..0f0d04d692c3 100644
18 --- a/media-sound/mumble/mumble-9999.ebuild
19 +++ b/media-sound/mumble/mumble-9999.ebuild
20 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info"
21 if [[ "${PV}" == 9999 ]] ; then
22 inherit git-r3
23 EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
24 - EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
25 + EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy )
26 else
27 if [[ "${PV}" == *_pre* ]] ; then
28 SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
29 @@ -68,6 +68,8 @@ BDEPEND="
30 "
31
32 src_prepare() {
33 + sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
34 +
35 # required because of xdg.eclass also providing src_prepare
36 cmake_src_prepare
37 }
38 @@ -76,7 +78,6 @@ src_configure() {
39
40 local mycmakeargs=(
41 -Dalsa="$(usex alsa)"
42 - -Dtests="$(usex test)"
43 -Dbundled-celt="ON"
44 -Dbundled-opus="OFF"
45 -Dbundled-speex="OFF"
46 @@ -91,6 +92,8 @@ src_configure() {
47 -Drnnoise="$(usex rnnoise)"
48 -Dserver="OFF"
49 -Dspeechd="$(usex speech)"
50 + -Dtests="$(usex test)"
51 + -Dtracy="OFF"
52 -Dtranslations="$(usex nls)"
53 -Dupdate="OFF"
54 -Dwarnings-as-errors="OFF"