1 |
commit: 88ad07fbad3841827a7cdc17fe00364f84747474 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 9 04:56:51 2019 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 9 04:57:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ad07fb |
7 |
|
8 |
net-wireless/gqrx: https://github.com/csete/gqrx/pull/671 |
9 |
|
10 |
bladerf micro needs a little help to allow easier setting of available |
11 |
sample rates and to not crash with the defaults |
12 |
|
13 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
14 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
15 |
|
16 |
.../gqrx/files/gqrx-bladerf-samplerate.patch | 31 ++++++++++++++++++++++ |
17 |
.../{gqrx-2.11.5.ebuild => gqrx-2.11.5-r1.ebuild} | 20 +++++++------- |
18 |
2 files changed, 42 insertions(+), 9 deletions(-) |
19 |
|
20 |
diff --git a/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..76cc7e5dffa |
23 |
--- /dev/null |
24 |
+++ b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch |
25 |
@@ -0,0 +1,31 @@ |
26 |
+diff --git a/src/qtgui/ioconfig.cpp b/src/qtgui/ioconfig.cpp |
27 |
+index e4fdd8f..ad072a1 100644 |
28 |
+--- a/src/qtgui/ioconfig.cpp |
29 |
++++ b/src/qtgui/ioconfig.cpp |
30 |
+@@ -384,8 +384,6 @@ void CIoConfig::updateInputSampleRates(int rate) |
31 |
+ } |
32 |
+ else if (ui->inDevEdit->text().contains("bladerf")) |
33 |
+ { |
34 |
+- if (rate > 0) |
35 |
+- ui->inSrCombo->addItem(QString("%1").arg(rate)); |
36 |
+ ui->inSrCombo->addItem("160000"); |
37 |
+ ui->inSrCombo->addItem("250000"); |
38 |
+ ui->inSrCombo->addItem("500000"); |
39 |
+@@ -400,6 +398,17 @@ void CIoConfig::updateInputSampleRates(int rate) |
40 |
+ ui->inSrCombo->addItem("30000000"); |
41 |
+ ui->inSrCombo->addItem("35000000"); |
42 |
+ ui->inSrCombo->addItem("40000000"); |
43 |
++ ui->inSrCombo->addItem("45000000"); |
44 |
++ ui->inSrCombo->addItem("50000000"); |
45 |
++ ui->inSrCombo->addItem("55000000"); |
46 |
++ ui->inSrCombo->addItem("60000000"); |
47 |
++ if (rate > 0) |
48 |
++ { |
49 |
++ ui->inSrCombo->insertItem(0, QString("%1").arg(rate)); |
50 |
++ ui->inSrCombo->setCurrentIndex(0); |
51 |
++ } |
52 |
++ else |
53 |
++ ui->inSrCombo->setCurrentIndex(5); // select 5 MHz |
54 |
+ } |
55 |
+ else if (ui->inDevEdit->text().contains("sdr-iq")) |
56 |
+ { |
57 |
|
58 |
diff --git a/net-wireless/gqrx/gqrx-2.11.5.ebuild b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild |
59 |
similarity index 91% |
60 |
rename from net-wireless/gqrx/gqrx-2.11.5.ebuild |
61 |
rename to net-wireless/gqrx/gqrx-2.11.5-r1.ebuild |
62 |
index b9b3d7bb2cf..bdc7e5c4192 100644 |
63 |
--- a/net-wireless/gqrx/gqrx-2.11.5.ebuild |
64 |
+++ b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild |
65 |
@@ -1,9 +1,9 @@ |
66 |
-# Copyright 1999-2018 Gentoo Foundation |
67 |
+# Copyright 1999-2019 Gentoo Authors |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
EAPI=6 |
71 |
|
72 |
-inherit cmake-utils |
73 |
+inherit cmake-utils eutils |
74 |
|
75 |
DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt" |
76 |
HOMEPAGE="http://gqrx.dk/" |
77 |
@@ -34,6 +34,15 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] |
78 |
portaudio? ( media-libs/portaudio:= )" |
79 |
RDEPEND="${DEPEND}" |
80 |
|
81 |
+src_prepare() { |
82 |
+ if use !pulseaudio; then |
83 |
+ sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die |
84 |
+ fi |
85 |
+ PATCHES=( "${FILESDIR}/gqrx-bladerf-samplerate.patch" ) |
86 |
+ cmake-utils_src_prepare |
87 |
+ eapply_user |
88 |
+} |
89 |
+ |
90 |
src_configure() { |
91 |
if use pulseaudio; then |
92 |
LINUX_AUDIO_BACKEND=Pulseaudio |
93 |
@@ -49,13 +58,6 @@ src_configure() { |
94 |
cmake-utils_src_configure |
95 |
} |
96 |
|
97 |
-src_prepare() { |
98 |
- if use !pulseaudio; then |
99 |
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die |
100 |
- fi |
101 |
- cmake-utils_src_prepare |
102 |
- eapply_user |
103 |
-} |
104 |
|
105 |
src_install() { |
106 |
dobin "${BUILD_DIR}"/src/gqrx |