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 31C89158087 for ; Sun, 30 Jan 2022 00:08:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DC5C2BC006; Sun, 30 Jan 2022 00:08:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 39E2A2BC006 for ; Sun, 30 Jan 2022 00:08:36 +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 6D97C3432FC for ; Sun, 30 Jan 2022 00:08:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E89F528E for ; Sun, 30 Jan 2022 00:08:33 +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: <1643501306.c7095509abf3a3b15f9255e0751e0d7d1385c783.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: c7095509abf3a3b15f9255e0751e0d7d1385c783 X-VCS-Branch: master Date: Sun, 30 Jan 2022 00:08:33 +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: e6e8c9bf-6021-4f94-8420-c02ca9a25e4f X-Archives-Hash: d5cdfde175e0ae59e2e8e24538fc9241 commit: c7095509abf3a3b15f9255e0751e0d7d1385c783 Author: Lars Wendler gentoo org> AuthorDate: Sun Jan 30 00:08:26 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jan 30 00:08:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7095509 media-sound/mumble: Synced live ebuild Signed-off-by: Lars Wendler gentoo.org> media-sound/mumble/mumble-9999.ebuild | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild index 260bec92b200..1ef095f57225 100644 --- a/media-sound/mumble/mumble-9999.ebuild +++ b/media-sound/mumble/mumble-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,19 +17,21 @@ else else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz - https://dl.mumble.info/${MY_P}.tar.gz" - S="${WORKDIR}/${P/_*}" + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz" + S="${WORKDIR}/${P/_*}.src" fi KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="BSD MIT" SLOT="0" -IUSE="+alsa +dbus debug g15 jack portaudio pulseaudio nls +rnnoise speech test zeroconf" +IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf" RESTRICT="!test? ( test )" RDEPEND=" + >=dev-libs/openssl-1.0.0b:0= + dev-libs/poco + >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] @@ -37,8 +39,6 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - dev-libs/poco - >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/opus-1.3.1 >=media-libs/speex-1.2.0 @@ -50,9 +50,9 @@ RDEPEND=" dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) - >=dev-libs/openssl-1.0.0b:0= portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) + pipewire? ( media-video/pipewire ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) " @@ -74,7 +74,7 @@ src_configure() { local mycmakeargs=( -Dalsa="$(usex alsa)" - -DBUILD_TESTING="$(usex test)" + -Dtests="$(usex test)" -Dbundled-celt="ON" -Dbundled-opus="OFF" -Dbundled-speex="OFF" @@ -83,6 +83,8 @@ src_configure() { -Djackaudio="$(usex jack)" -Doverlay="ON" -Dportaudio="$(usex portaudio)" + -Doverlay-xcompile="$(usex multilib)" + -Dpipewire="$(usex pipewire)" -Dpulseaudio="$(usex pulseaudio)" -Drnnoise="$(usex rnnoise)" -Dserver="OFF" @@ -92,14 +94,18 @@ src_configure() { -Dzeroconf="$(usex zeroconf)" ) + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) + fi + cmake_src_configure } src_install() { cmake_src_install - if use amd64 ; then - # The 32bit overlay library gets automatically built and installed on x86_64 platforms. + if use amd64 && use multilib ; then + # The 32bit overlay library gets built when multilib is enabled. # Install it into the correct 32bit lib dir. local libdir_64="/usr/$(get_libdir)/mumble" local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"