From: Rick Farina <zerochaos@gentoo.org>
Date: Wed, 9 Jan 2019 04:56:51 +0000 (-0500)
Subject: net-wireless/gqrx: https://github.com/csete/gqrx/pull/671
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=88ad07fbad3841827a7cdc17fe00364f84747474;p=gentoo.git

net-wireless/gqrx: https://github.com/csete/gqrx/pull/671

bladerf micro needs a little help to allow easier setting of available
sample rates and to not crash with the defaults

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
---

diff --git a/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch
new file mode 100644
index 000000000000..76cc7e5dffae
--- /dev/null
+++ b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch
@@ -0,0 +1,31 @@
+diff --git a/src/qtgui/ioconfig.cpp b/src/qtgui/ioconfig.cpp
+index e4fdd8f..ad072a1 100644
+--- a/src/qtgui/ioconfig.cpp
++++ b/src/qtgui/ioconfig.cpp
+@@ -384,8 +384,6 @@ void CIoConfig::updateInputSampleRates(int rate)
+     }
+     else if (ui->inDevEdit->text().contains("bladerf"))
+     {
+-        if (rate > 0)
+-            ui->inSrCombo->addItem(QString("%1").arg(rate));
+         ui->inSrCombo->addItem("160000");
+         ui->inSrCombo->addItem("250000");
+         ui->inSrCombo->addItem("500000");
+@@ -400,6 +398,17 @@ void CIoConfig::updateInputSampleRates(int rate)
+         ui->inSrCombo->addItem("30000000");
+         ui->inSrCombo->addItem("35000000");
+         ui->inSrCombo->addItem("40000000");
++        ui->inSrCombo->addItem("45000000");
++        ui->inSrCombo->addItem("50000000");
++        ui->inSrCombo->addItem("55000000");
++        ui->inSrCombo->addItem("60000000");
++        if (rate > 0)
++        {
++            ui->inSrCombo->insertItem(0, QString("%1").arg(rate));
++            ui->inSrCombo->setCurrentIndex(0);
++        }
++        else
++            ui->inSrCombo->setCurrentIndex(5); // select 5 MHz
+     }
+     else if (ui->inDevEdit->text().contains("sdr-iq"))
+     {
diff --git a/net-wireless/gqrx/gqrx-2.11.5.ebuild b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
similarity index 91%
rename from net-wireless/gqrx/gqrx-2.11.5.ebuild
rename to net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
index b9b3d7bb2cf0..bdc7e5c4192e 100644
--- a/net-wireless/gqrx/gqrx-2.11.5.ebuild
+++ b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
 HOMEPAGE="http://gqrx.dk/"
@@ -34,6 +34,15 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
 	portaudio? ( media-libs/portaudio:= )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
+	fi
+	PATCHES=( "${FILESDIR}/gqrx-bladerf-samplerate.patch" )
+	cmake-utils_src_prepare
+	eapply_user
+}
+
 src_configure() {
 	if use pulseaudio; then
 		LINUX_AUDIO_BACKEND=Pulseaudio
@@ -49,13 +58,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_prepare() {
-	if use !pulseaudio; then
-		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
-	fi
-	cmake-utils_src_prepare
-	eapply_user
-}
 
 src_install() {
 	dobin "${BUILD_DIR}"/src/gqrx