* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gqrx/files/, net-wireless/gqrx/
@ 2017-08-28 1:50 Richard Farina
0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina @ 2017-08-28 1:50 UTC (permalink / raw
To: gentoo-commits
commit: d80173835c7868c7d17ab155e3eadacfe484625f
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 01:49:48 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 01:50:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8017383
net-wireless/gqrx: bump and cleanup old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-wireless/gqrx/Manifest | 7 +---
net-wireless/gqrx/files/no_qtsvg.patch | 13 -------
net-wireless/gqrx/gqrx-2.3.1.ebuild | 43 ----------------------
net-wireless/gqrx/gqrx-2.3.2.ebuild | 43 ----------------------
net-wireless/gqrx/gqrx-2.4.ebuild | 42 ---------------------
net-wireless/gqrx/gqrx-2.5.3.ebuild | 42 ---------------------
net-wireless/gqrx/gqrx-2.5.ebuild | 42 ---------------------
.../gqrx/{gqrx-2.6.ebuild => gqrx-2.7.ebuild} | 4 +-
net-wireless/gqrx/gqrx-9999.ebuild | 4 +-
9 files changed, 5 insertions(+), 235 deletions(-)
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index c88e5f76657..2005e130c0f 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,6 +1 @@
-DIST gqrx-2.3.1.tar.gz 1080929 SHA256 1756132f4958a63199396020c6d26658304a2cf7d940650e86764f9d8eea0f81 SHA512 7fd158b039ac593b73da069b6356bfb63e92b5f1d815663ebe59044b8006b4d206e877934e5ae4770d06d0d486bb1d2b47ad96055c369a08af9e2af701e9a307 WHIRLPOOL 367b20ba8c2ccc56f4111fd0ff9abf6110bc5de070d036b88d594bd03714e3615f52f2691144204e733fb597cd4d4eff63f21cff25710f9075daee0f65166605
-DIST gqrx-2.3.2.tar.gz 1080995 SHA256 2748ee14491dbfb5821efba32300124b5a2b0aabc810cdfda91e5f64bd3502cf SHA512 53b271a7b053ebf877152ddd4d6d96e2ae864c8a85a66f5dca5ce670301616fec770e0c2bb2352234fc8566d05679c8c3ef147e62ea5393635a6f57724fd8da0 WHIRLPOOL d36a8b8ab001d5a80a9aff47091c3f54b0026c45c1676341096dba9a06120a4f47110314b2377ea07f93a40eb5e99401c8256e4fb9ff1d90868f5adbbfa3e197
-DIST gqrx-2.4.tar.gz 1154716 SHA256 4c561083b3da9423c017ea4fbe7e12fedb0ba7c2065c17b8ac8a0f5403a5da9b SHA512 9d3619bf1488a0fd1b37892a4d38518c67739771b46402efd6e8d91a590f328faf67e620bba7370371cf9856c90c3f6208d8632d2cc9571ba7e8987835ec8917 WHIRLPOOL 00192b64007274026be0eeeda7a45972ef81cd91b93efdb2123a6b2e1221b2257458b5e84d7944267329ff1c94967aed2be52d9218cc140d911e15dcd5de4c56
-DIST gqrx-2.5.3.tar.gz 1175584 SHA256 a6aa5419af7c8d59a39e749f9f9fd1bff44e84f246000e0d113b1e4a93e3f05c SHA512 5cdb117f5f496d56d4cf8f67b0e05e10253d47ba707bc684c6aec30f9be922a6ea9ad9e858b184d57fdf44d3ce3eca041728f66a0dfb6e06cc839855088980ed WHIRLPOOL 2343e0244a174a3eabf1ca1d9e35e5daaed9525eceb52fb0f8fa53a94525fc806a41e0366cfd73a0b4162d6e84cf2a88bb4dcaf8cd18a78dce8ce17633b51736
-DIST gqrx-2.5.tar.gz 1159489 SHA256 5134e5cf66e5133c12801547decad4b90dd7070a0283dd7b04f3ac0c69dd3b4e SHA512 7c135d0b3e7a75178ab5e5c1126a44de40a7b22dcc16b474ad55e3ad87ef23c0bca889827217a858ca63ee48e416798143205789933db6723a74f13b069ccadb WHIRLPOOL 3a887713afa9be09439f32c92720d25159a62f98fa164e081011eef0b442a51024bf79149fbd5b9356a7089cfdbf50b56230229974d0c56bd39ddcbf4d492bfc
-DIST gqrx-2.6.tar.gz 1195638 SHA256 53d25db8d987a41ccccaf6fd85262bd7770cdfab5539b5901c4558756483c9db SHA512 c45c0a0fc264f140acd892c08e5d187ecbafcd337dc90e4df21b072f11d6834474ddf1e62723361fd237091a1e8633d92fcb73d86a6cd665b48016b4b7d5332b WHIRLPOOL 7cc67ae130a19d426b12ac38c7ce899c222eaec9cb10d1d32844b1a4bb0555a277bf27b05d2098e7515e9908e33b622053e4ffb67a3f854c8fa082055b6f82da
+DIST gqrx-2.7.tar.gz 1326826 SHA256 b58d5b4ba4c656df5a97071640eabdbd53171d411fe3d504f9786178c3638178 SHA512 931f4751b2437ab2286a436ed842cd51203d69c7d6edf0c0125fcb1d9943a028175d8ae70dd62eb4d2f935e97419dc990537d90e2bf50c5d1924282fe0f5531d WHIRLPOOL 5e937beb82fec3fc20ae02782391d1e091ab6131cd74a945a9b51fc3c26e803e4cb7991a6ca8b47c5a7ed12bd12dbc1732d5a66bc2341c380d4a26c8d6c61906
diff --git a/net-wireless/gqrx/files/no_qtsvg.patch b/net-wireless/gqrx/files/no_qtsvg.patch
deleted file mode 100644
index 848f10c8a47..00000000000
--- a/net-wireless/gqrx/files/no_qtsvg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gqrx.pro b/gqrx.pro
-index 2998186..b1e7687 100644
---- a/gqrx.pro
-+++ b/gqrx.pro
-@@ -9,7 +9,7 @@
- # BOOST_SUFFIX=-mt To link against libboost-xyz-mt (needed for pybombs)
- #--------------------------------------------------------------------------------
-
--QT += core gui svg network
-+QT += core gui network
- contains(QT_MAJOR_VERSION,5) {
- QT += widgets
- }
diff --git a/net-wireless/gqrx/gqrx-2.3.1.ebuild b/net-wireless/gqrx/gqrx-2.3.1.ebuild
deleted file mode 100644
index 655f5ac7f6c..00000000000
--- a/net-wireless/gqrx/gqrx-2.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/csete/gqrx.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
- >=net-wireless/gr-osmosdr-0.1.0:=
- dev-libs/boost:=
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- pulseaudio? ( media-sound/pulseaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:4"
-
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
- fi
- epatch "${FILESDIR}"/no_qtsvg.patch
- qt4-r2_src_prepare
-}
-
-src_install() {
- dobin gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.3.2.ebuild b/net-wireless/gqrx/gqrx-2.3.2.ebuild
deleted file mode 100644
index 655f5ac7f6c..00000000000
--- a/net-wireless/gqrx/gqrx-2.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/csete/gqrx.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
- >=net-wireless/gr-osmosdr-0.1.0:=
- dev-libs/boost:=
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- pulseaudio? ( media-sound/pulseaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:4"
-
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
- fi
- epatch "${FILESDIR}"/no_qtsvg.patch
- qt4-r2_src_prepare
-}
-
-src_install() {
- dobin gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.4.ebuild b/net-wireless/gqrx/gqrx-2.4.ebuild
deleted file mode 100644
index b29dc0dfd7d..00000000000
--- a/net-wireless/gqrx/gqrx-2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/csete/gqrx.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
- >=net-wireless/gr-osmosdr-0.1.0:=
- dev-libs/boost:=
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- pulseaudio? ( media-sound/pulseaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:4"
-
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
- fi
- qt4-r2_src_prepare
-}
-
-src_install() {
- dobin gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.5.3.ebuild b/net-wireless/gqrx/gqrx-2.5.3.ebuild
deleted file mode 100644
index 8971a305f12..00000000000
--- a/net-wireless/gqrx/gqrx-2.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/csete/gqrx.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
- >=net-wireless/gr-osmosdr-0.1.0:=
- dev-libs/boost:=
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- pulseaudio? ( media-sound/pulseaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:4"
-
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
- fi
- qt4-r2_src_prepare
-}
-
-src_install() {
- dobin gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.5.ebuild b/net-wireless/gqrx/gqrx-2.5.ebuild
deleted file mode 100644
index 8971a305f12..00000000000
--- a/net-wireless/gqrx/gqrx-2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/csete/gqrx.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
- >=net-wireless/gr-osmosdr-0.1.0:=
- dev-libs/boost:=
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- pulseaudio? ( media-sound/pulseaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:4"
-
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
- fi
- qt4-r2_src_prepare
-}
-
-src_install() {
- dobin gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.6.ebuild b/net-wireless/gqrx/gqrx-2.7.ebuild
similarity index 97%
rename from net-wireless/gqrx/gqrx-2.6.ebuild
rename to net-wireless/gqrx/gqrx-2.7.ebuild
index 0a6d350ad4f..d280c8f3e3c 100644
--- a/net-wireless/gqrx/gqrx-2.6.ebuild
+++ b/net-wireless/gqrx/gqrx-2.7.ebuild
@@ -28,11 +28,11 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
pulseaudio? ( media-sound/pulseaudio:= )
portaudio? ( media-libs/portaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:5"
+RDEPEND="${DEPEND}"
src_configure() {
if use pulseaudio; then
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index 0a6d350ad4f..d280c8f3e3c 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -28,11 +28,11 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
pulseaudio? ( media-sound/pulseaudio:= )
portaudio? ( media-libs/portaudio:= )"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:5"
+RDEPEND="${DEPEND}"
src_configure() {
if use pulseaudio; then
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/gqrx/files/, net-wireless/gqrx/
@ 2019-01-09 4:57 Rick Farina
0 siblings, 0 replies; 2+ messages in thread
From: Rick Farina @ 2019-01-09 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 88ad07fbad3841827a7cdc17fe00364f84747474
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 04:56:51 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 04:57:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ad07fb
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 <AT> gentoo.org>
.../gqrx/files/gqrx-bladerf-samplerate.patch | 31 ++++++++++++++++++++++
.../{gqrx-2.11.5.ebuild => gqrx-2.11.5-r1.ebuild} | 20 +++++++-------
2 files changed, 42 insertions(+), 9 deletions(-)
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 00000000000..76cc7e5dffa
--- /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 b9b3d7bb2cf..bdc7e5c4192 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-09 4:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-09 4:57 [gentoo-commits] repo/gentoo:master commit in: net-wireless/gqrx/files/, net-wireless/gqrx/ Rick Farina
-- strict thread matches above, loose matches on Subject: below --
2017-08-28 1:50 Richard Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox