gentoo resync : 12.01.2019

3 files changed, 44 insertions, 11 deletions

diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index d9c6cad8e4b6..ba2075822728 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,4 +1,5 @@
+AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
-EBUILD gqrx-2.11.5.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
+EBUILD gqrx-2.11.5-r1.ebuild 1459 BLAKE2B eb187a1ae71a56d79159e3aaf6b15ccc48d81e372b665db9eec4573fbce301cb184fbc3091715fcb9b74c9d285c93c994d4b448d268ad50a00f0e31ae9936c91 SHA512 889b96b65b854bd48949298bb2739b684b1f3db1db6c37e04653afbc1de1af5536967b002fc5145a23059ba19f9c2faa76b43eb980168f397664975d089e28c8
 EBUILD gqrx-9999.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
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
index b9b3d7bb2cf0..827cbf70e3de 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,14 +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
 }