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: Sun, 30 Jan 2022 00:08:37
Message-Id: 1643501306.c7095509abf3a3b15f9255e0751e0d7d1385c783.polynomial-c@gentoo
1 commit: c7095509abf3a3b15f9255e0751e0d7d1385c783
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 30 00:08:26 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 30 00:08:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7095509
7
8 media-sound/mumble: Synced live ebuild
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 media-sound/mumble/mumble-9999.ebuild | 28 +++++++++++++++++-----------
13 1 file changed, 17 insertions(+), 11 deletions(-)
14
15 diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
16 index 260bec92b200..1ef095f57225 100644
17 --- a/media-sound/mumble/mumble-9999.ebuild
18 +++ b/media-sound/mumble/mumble-9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2021 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=7
25 @@ -17,19 +17,21 @@ else
26 else
27 MY_PV="${PV/_/-}"
28 MY_P="${PN}-${MY_PV}"
29 - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
30 - https://dl.mumble.info/${MY_P}.tar.gz"
31 - S="${WORKDIR}/${P/_*}"
32 + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
33 + S="${WORKDIR}/${P/_*}.src"
34 fi
35 KEYWORDS="~amd64 ~arm64 ~x86"
36 fi
37
38 LICENSE="BSD MIT"
39 SLOT="0"
40 -IUSE="+alsa +dbus debug g15 jack portaudio pulseaudio nls +rnnoise speech test zeroconf"
41 +IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
42 RESTRICT="!test? ( test )"
43
44 RDEPEND="
45 + >=dev-libs/openssl-1.0.0b:0=
46 + dev-libs/poco
47 + >=dev-libs/protobuf-2.2.0:=
48 dev-qt/qtcore:5
49 dev-qt/qtgui:5
50 dev-qt/qtnetwork:5[ssl]
51 @@ -37,8 +39,6 @@ RDEPEND="
52 dev-qt/qtsvg:5
53 dev-qt/qtwidgets:5
54 dev-qt/qtxml:5
55 - dev-libs/poco
56 - >=dev-libs/protobuf-2.2.0:=
57 >=media-libs/libsndfile-1.0.20[-minimal]
58 >=media-libs/opus-1.3.1
59 >=media-libs/speex-1.2.0
60 @@ -50,9 +50,9 @@ RDEPEND="
61 dbus? ( dev-qt/qtdbus:5 )
62 g15? ( app-misc/g15daemon )
63 jack? ( virtual/jack )
64 - >=dev-libs/openssl-1.0.0b:0=
65 portaudio? ( media-libs/portaudio )
66 pulseaudio? ( media-sound/pulseaudio )
67 + pipewire? ( media-video/pipewire )
68 speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
69 zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
70 "
71 @@ -74,7 +74,7 @@ src_configure() {
72
73 local mycmakeargs=(
74 -Dalsa="$(usex alsa)"
75 - -DBUILD_TESTING="$(usex test)"
76 + -Dtests="$(usex test)"
77 -Dbundled-celt="ON"
78 -Dbundled-opus="OFF"
79 -Dbundled-speex="OFF"
80 @@ -83,6 +83,8 @@ src_configure() {
81 -Djackaudio="$(usex jack)"
82 -Doverlay="ON"
83 -Dportaudio="$(usex portaudio)"
84 + -Doverlay-xcompile="$(usex multilib)"
85 + -Dpipewire="$(usex pipewire)"
86 -Dpulseaudio="$(usex pulseaudio)"
87 -Drnnoise="$(usex rnnoise)"
88 -Dserver="OFF"
89 @@ -92,14 +94,18 @@ src_configure() {
90 -Dzeroconf="$(usex zeroconf)"
91 )
92
93 + if [[ "${PV}" != 9999 ]] ; then
94 + mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
95 + fi
96 +
97 cmake_src_configure
98 }
99
100 src_install() {
101 cmake_src_install
102
103 - if use amd64 ; then
104 - # The 32bit overlay library gets automatically built and installed on x86_64 platforms.
105 + if use amd64 && use multilib ; then
106 + # The 32bit overlay library gets built when multilib is enabled.
107 # Install it into the correct 32bit lib dir.
108 local libdir_64="/usr/$(get_libdir)/mumble"
109 local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"