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 5EA28139085 for ; Tue, 24 Jan 2017 22:25:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 663F3E0E3D; Tue, 24 Jan 2017 22:25:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30FC9E0E3D for ; Tue, 24 Jan 2017 22:25:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92A4A341649 for ; Tue, 24 Jan 2017 22:25:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B80752E2F for ; Tue, 24 Jan 2017 22:25:42 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1485296726.5f28ce967e668c4403e0c875c3a05a49eadb00b5.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gqrx/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gqrx/gqrx-2.6.ebuild net-wireless/gqrx/gqrx-9999.ebuild net-wireless/gqrx/metadata.xml X-VCS-Directories: net-wireless/gqrx/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 5f28ce967e668c4403e0c875c3a05a49eadb00b5 X-VCS-Branch: master Date: Tue, 24 Jan 2017 22:25:42 +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-Archives-Salt: ad346f2a-fe6b-4201-bfe7-c62b153720e2 X-Archives-Hash: 598d71ae0c7a29915411433036cde9d9 commit: 5f28ce967e668c4403e0c875c3a05a49eadb00b5 Author: Zero_Chaos gentoo org> AuthorDate: Tue Jan 24 22:25:07 2017 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Jan 24 22:25:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f28ce96 net-wireless/gqrx: add audio options from bug #596248 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-wireless/gqrx/gqrx-2.6.ebuild | 21 +++++++++++++++++++-- net-wireless/gqrx/gqrx-9999.ebuild | 21 +++++++++++++++++++-- net-wireless/gqrx/metadata.xml | 3 +++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/net-wireless/gqrx/gqrx-2.6.ebuild b/net-wireless/gqrx/gqrx-2.6.ebuild index eae2f9f..2f342ba 100644 --- a/net-wireless/gqrx/gqrx-2.6.ebuild +++ b/net-wireless/gqrx/gqrx-2.6.ebuild @@ -20,7 +20,8 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="pulseaudio" +IUSE="gr-audio portaudio pulseaudio" +REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= @@ -29,10 +30,26 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 - pulseaudio? ( media-sound/pulseaudio:= )" + pulseaudio? ( media-sound/pulseaudio:= ) + portaudio? ( media-libs/portaudio:= )" RDEPEND="${DEPEND} dev-qt/qtsvg:5" +src_configure() { + if use pulseaudio; then + LINUX_AUDIO_BACKEND=Pulseaudio + elif use portaudio; then + LINUX_AUDIO_BACKEND=Portaudio + elif use gr-audio; then + LINUX_AUDIO_BACKEND=Gr-audio + fi + + local mycmakeargs=( + "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}" + ) + cmake-utils_src_configure +} + src_prepare() { if use !pulseaudio; then sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild index eae2f9f..2f342ba 100644 --- a/net-wireless/gqrx/gqrx-9999.ebuild +++ b/net-wireless/gqrx/gqrx-9999.ebuild @@ -20,7 +20,8 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="pulseaudio" +IUSE="gr-audio portaudio pulseaudio" +REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )" DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= @@ -29,10 +30,26 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 - pulseaudio? ( media-sound/pulseaudio:= )" + pulseaudio? ( media-sound/pulseaudio:= ) + portaudio? ( media-libs/portaudio:= )" RDEPEND="${DEPEND} dev-qt/qtsvg:5" +src_configure() { + if use pulseaudio; then + LINUX_AUDIO_BACKEND=Pulseaudio + elif use portaudio; then + LINUX_AUDIO_BACKEND=Portaudio + elif use gr-audio; then + LINUX_AUDIO_BACKEND=Gr-audio + fi + + local mycmakeargs=( + "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}" + ) + cmake-utils_src_configure +} + src_prepare() { if use !pulseaudio; then sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die diff --git a/net-wireless/gqrx/metadata.xml b/net-wireless/gqrx/metadata.xml index 28b2012..66eed02 100644 --- a/net-wireless/gqrx/metadata.xml +++ b/net-wireless/gqrx/metadata.xml @@ -11,6 +11,9 @@ + + Use audio support from net-wireless/gnuradio + csete/gqrx